]>
Commit | Line | Data |
---|---|---|
f8adbec9 | 1 | #define USE_THE_INDEX_COMPATIBILITY_MACROS |
908e5310 | 2 | #include "cache.h" |
b2141fc1 | 3 | #include "config.h" |
697cc8ef | 4 | #include "lockfile.h" |
908e5310 | 5 | #include "commit.h" |
635d4134 | 6 | #include "tag.h" |
644eb60b | 7 | #include "blob.h" |
908e5310 | 8 | #include "refs.h" |
9a0eaf83 | 9 | #include "builtin.h" |
d807c4a0 | 10 | #include "exec-cmd.h" |
166185be | 11 | #include "parse-options.h" |
be26d2b2 | 12 | #include "revision.h" |
9f67d2e8 | 13 | #include "diff.h" |
29d8a834 | 14 | #include "hashmap.h" |
45bc950b | 15 | #include "argv-array.h" |
b0176ce6 | 16 | #include "run-command.h" |
cbd53a21 | 17 | #include "object-store.h" |
644eb60b SB |
18 | #include "revision.h" |
19 | #include "list-objects.h" | |
c6b7206b | 20 | #include "commit-slab.h" |
908e5310 | 21 | |
8713ab30 SP |
22 | #define MAX_TAGS (FLAG_BITS - 1) |
23 | ||
c6b7206b NTND |
24 | define_commit_slab(commit_names, struct commit_name *); |
25 | ||
166185be | 26 | static const char * const describe_usage[] = { |
9c9b4f2f AH |
27 | N_("git describe [<options>] [<commit-ish>...]"), |
28 | N_("git describe [<options>] --dirty"), | |
166185be PH |
29 | NULL |
30 | }; | |
908e5310 | 31 | |
8713ab30 | 32 | static int debug; /* Display lots of verbose info */ |
7e425c4f SP |
33 | static int all; /* Any valid ref can be used */ |
34 | static int tags; /* Allow lightweight tags */ | |
518120e3 | 35 | static int longformat; |
e00dd1e9 | 36 | static int first_parent; |
dce96489 | 37 | static int abbrev = -1; /* unspecified */ |
8713ab30 | 38 | static int max_candidates = 10; |
29d8a834 | 39 | static struct hashmap names; |
d1645d02 | 40 | static int have_util; |
43f8080e | 41 | static struct string_list patterns = STRING_LIST_INIT_NODUP; |
77d21f29 | 42 | static struct string_list exclude_patterns = STRING_LIST_INIT_NODUP; |
da2478db | 43 | static int always; |
b0176ce6 | 44 | static const char *suffix, *dirty, *broken; |
c6b7206b | 45 | static struct commit_names commit_names; |
9f67d2e8 JP |
46 | |
47 | /* diff-index command arguments to check if working tree is dirty. */ | |
48 | static const char *diff_index_args[] = { | |
49 | "diff-index", "--quiet", "HEAD", "--", NULL | |
50 | }; | |
51 | ||
e7eb5034 | 52 | struct commit_name { |
29d8a834 | 53 | struct hashmap_entry entry; |
6439b5d9 | 54 | struct object_id peeled; |
212945d4 | 55 | struct tag *tag; |
03e8b541 SP |
56 | unsigned prio:2; /* annotated tag = 2, tag = 1, head = 0 */ |
57 | unsigned name_checked:1; | |
6439b5d9 | 58 | struct object_id oid; |
219a0f33 | 59 | char *path; |
e7eb5034 | 60 | }; |
c4472643 | 61 | |
cf69fd49 | 62 | static const char *prio_names[] = { |
646c3bd1 | 63 | N_("head"), N_("lightweight"), N_("annotated"), |
cf69fd49 | 64 | }; |
908e5310 | 65 | |
cc00e5ce | 66 | static int commit_name_neq(const void *unused_cmp_data, |
939af16e EW |
67 | const struct hashmap_entry *eptr, |
68 | const struct hashmap_entry *entry_or_key, | |
7663cdc8 | 69 | const void *peeled) |
29d8a834 | 70 | { |
939af16e EW |
71 | const struct commit_name *cn1, *cn2; |
72 | ||
73 | cn1 = container_of(eptr, const struct commit_name, entry); | |
74 | cn2 = container_of(entry_or_key, const struct commit_name, entry); | |
0068cede | 75 | |
cc00e5ce | 76 | return !oideq(&cn1->peeled, peeled ? peeled : &cn2->peeled); |
29d8a834 KB |
77 | } |
78 | ||
6439b5d9 | 79 | static inline struct commit_name *find_commit_name(const struct object_id *peeled) |
3cfa4db3 | 80 | { |
f23a4651 EW |
81 | return hashmap_get_entry_from_hash(&names, oidhash(peeled), peeled, |
82 | struct commit_name, entry); | |
d1645d02 AK |
83 | } |
84 | ||
03e8b541 SP |
85 | static int replace_name(struct commit_name *e, |
86 | int prio, | |
6439b5d9 | 87 | const struct object_id *oid, |
03e8b541 SP |
88 | struct tag **tag) |
89 | { | |
90 | if (!e || e->prio < prio) | |
91 | return 1; | |
92 | ||
93 | if (e->prio == 2 && prio == 2) { | |
94 | /* Multiple annotated tags point to the same commit. | |
95 | * Select one to keep based upon their tagger date. | |
96 | */ | |
97 | struct tag *t; | |
98 | ||
99 | if (!e->tag) { | |
ce71efb7 | 100 | t = lookup_tag(the_repository, &e->oid); |
03e8b541 SP |
101 | if (!t || parse_tag(t)) |
102 | return 1; | |
103 | e->tag = t; | |
104 | } | |
105 | ||
ce71efb7 | 106 | t = lookup_tag(the_repository, oid); |
03e8b541 SP |
107 | if (!t || parse_tag(t)) |
108 | return 0; | |
109 | *tag = t; | |
110 | ||
111 | if (e->tag->date < t->date) | |
112 | return 1; | |
113 | } | |
114 | ||
115 | return 0; | |
116 | } | |
117 | ||
64deb858 | 118 | static void add_to_known_names(const char *path, |
6439b5d9 | 119 | const struct object_id *peeled, |
212945d4 | 120 | int prio, |
6439b5d9 | 121 | const struct object_id *oid) |
908e5310 | 122 | { |
3cfa4db3 | 123 | struct commit_name *e = find_commit_name(peeled); |
03e8b541 | 124 | struct tag *tag = NULL; |
6439b5d9 | 125 | if (replace_name(e, prio, oid, &tag)) { |
1e1ade18 AK |
126 | if (!e) { |
127 | e = xmalloc(sizeof(struct commit_name)); | |
6439b5d9 | 128 | oidcpy(&e->peeled, peeled); |
d22245a2 | 129 | hashmap_entry_init(&e->entry, oidhash(peeled)); |
b94e5c1d | 130 | hashmap_add(&names, &e->entry); |
219a0f33 | 131 | e->path = NULL; |
1e1ade18 | 132 | } |
03e8b541 | 133 | e->tag = tag; |
e7eb5034 | 134 | e->prio = prio; |
03e8b541 | 135 | e->name_checked = 0; |
6439b5d9 | 136 | oidcpy(&e->oid, oid); |
219a0f33 MH |
137 | free(e->path); |
138 | e->path = xstrdup(path); | |
908e5310 | 139 | } |
908e5310 LT |
140 | } |
141 | ||
99a2cfbf | 142 | static int get_name(const char *path, const struct object_id *oid, int flag, void *cb_data) |
908e5310 | 143 | { |
6d68b2ab | 144 | int is_tag = 0; |
99a2cfbf | 145 | struct object_id peeled; |
46e1d6eb | 146 | int is_annotated, prio; |
6d68b2ab MK |
147 | const char *path_to_match = NULL; |
148 | ||
149 | if (skip_prefix(path, "refs/tags/", &path_to_match)) { | |
150 | is_tag = 1; | |
151 | } else if (all) { | |
152 | if ((exclude_patterns.nr || patterns.nr) && | |
153 | !skip_prefix(path, "refs/heads/", &path_to_match) && | |
154 | !skip_prefix(path, "refs/remotes/", &path_to_match)) { | |
155 | /* Only accept reference of known type if there are match/exclude patterns */ | |
156 | return 0; | |
157 | } | |
158 | } else { | |
159 | /* Reject anything outside refs/tags/ unless --all */ | |
8a5a1884 | 160 | return 0; |
6d68b2ab | 161 | } |
8a5a1884 | 162 | |
77d21f29 JK |
163 | /* |
164 | * If we're given exclude patterns, first exclude any tag which match | |
165 | * any of the exclude pattern. | |
166 | */ | |
167 | if (exclude_patterns.nr) { | |
168 | struct string_list_item *item; | |
169 | ||
77d21f29 | 170 | for_each_string_list_item(item, &exclude_patterns) { |
6d68b2ab | 171 | if (!wildmatch(item->string, path_to_match, 0)) |
77d21f29 JK |
172 | return 0; |
173 | } | |
174 | } | |
175 | ||
43f8080e JK |
176 | /* |
177 | * If we're given patterns, accept only tags which match at least one | |
178 | * pattern. | |
179 | */ | |
180 | if (patterns.nr) { | |
da769d29 | 181 | int found = 0; |
43f8080e JK |
182 | struct string_list_item *item; |
183 | ||
43f8080e | 184 | for_each_string_list_item(item, &patterns) { |
6d68b2ab | 185 | if (!wildmatch(item->string, path_to_match, 0)) { |
da769d29 | 186 | found = 1; |
43f8080e | 187 | break; |
da769d29 MK |
188 | } |
189 | } | |
43f8080e | 190 | |
da769d29 | 191 | if (!found) |
43f8080e | 192 | return 0; |
43f8080e | 193 | } |
46e1d6eb JH |
194 | |
195 | /* Is it annotated? */ | |
b420d909 | 196 | if (!peel_ref(path, &peeled)) { |
4a7e27e9 | 197 | is_annotated = !oideq(oid, &peeled); |
feededd0 | 198 | } else { |
99a2cfbf | 199 | oidcpy(&peeled, oid); |
46e1d6eb | 200 | is_annotated = 0; |
feededd0 | 201 | } |
64deb858 | 202 | |
46e1d6eb JH |
203 | /* |
204 | * By default, we only use annotated tags, but with --tags | |
205 | * we fall back to lightweight ones (even without --tags, | |
206 | * we still remember lightweight ones, only to give hints | |
207 | * in an error message). --all allows any refs to be used. | |
2d9e7c9f | 208 | */ |
46e1d6eb JH |
209 | if (is_annotated) |
210 | prio = 2; | |
211 | else if (is_tag) | |
212 | prio = 1; | |
64deb858 JH |
213 | else |
214 | prio = 0; | |
215 | ||
6439b5d9 | 216 | add_to_known_names(all ? path + 5 : path + 10, &peeled, prio, oid); |
908e5310 LT |
217 | return 0; |
218 | } | |
219 | ||
80dbae03 | 220 | struct possible_tag { |
80dbae03 | 221 | struct commit_name *name; |
cf69fd49 SP |
222 | int depth; |
223 | int found_order; | |
8713ab30 | 224 | unsigned flag_within; |
80dbae03 SP |
225 | }; |
226 | ||
cf69fd49 SP |
227 | static int compare_pt(const void *a_, const void *b_) |
228 | { | |
229 | struct possible_tag *a = (struct possible_tag *)a_; | |
230 | struct possible_tag *b = (struct possible_tag *)b_; | |
cf69fd49 SP |
231 | if (a->depth != b->depth) |
232 | return a->depth - b->depth; | |
233 | if (a->found_order != b->found_order) | |
234 | return a->found_order - b->found_order; | |
235 | return 0; | |
236 | } | |
237 | ||
1b600e65 SP |
238 | static unsigned long finish_depth_computation( |
239 | struct commit_list **list, | |
240 | struct possible_tag *best) | |
241 | { | |
242 | unsigned long seen_commits = 0; | |
243 | while (*list) { | |
244 | struct commit *c = pop_commit(list); | |
245 | struct commit_list *parents = c->parents; | |
246 | seen_commits++; | |
247 | if (c->object.flags & best->flag_within) { | |
248 | struct commit_list *a = *list; | |
249 | while (a) { | |
250 | struct commit *i = a->item; | |
251 | if (!(i->object.flags & best->flag_within)) | |
252 | break; | |
253 | a = a->next; | |
254 | } | |
255 | if (!a) | |
256 | break; | |
257 | } else | |
258 | best->depth++; | |
259 | while (parents) { | |
260 | struct commit *p = parents->item; | |
261 | parse_commit(p); | |
262 | if (!(p->object.flags & SEEN)) | |
47e44ed1 | 263 | commit_list_insert_by_date(p, list); |
1b600e65 SP |
264 | p->object.flags |= c->object.flags; |
265 | parents = parents->next; | |
266 | } | |
267 | } | |
268 | return seen_commits; | |
269 | } | |
270 | ||
4dbc59a4 | 271 | static void append_name(struct commit_name *n, struct strbuf *dst) |
212945d4 SP |
272 | { |
273 | if (n->prio == 2 && !n->tag) { | |
ce71efb7 | 274 | n->tag = lookup_tag(the_repository, &n->oid); |
03e8b541 | 275 | if (!n->tag || parse_tag(n->tag)) |
e41f1cb3 | 276 | die(_("annotated tag %s not available"), n->path); |
03e8b541 SP |
277 | } |
278 | if (n->tag && !n->name_checked) { | |
279 | if (!n->tag->tag) | |
e41f1cb3 | 280 | die(_("annotated tag %s has no embedded name"), n->path); |
81dc223d | 281 | if (strcmp(n->tag->tag, all ? n->path + 5 : n->path)) |
e41f1cb3 | 282 | warning(_("tag '%s' is really '%s' here"), n->tag->tag, n->path); |
03e8b541 | 283 | n->name_checked = 1; |
212945d4 SP |
284 | } |
285 | ||
1bba0013 DKF |
286 | if (n->tag) { |
287 | if (all) | |
fac64e01 | 288 | strbuf_addstr(dst, "tags/"); |
4dbc59a4 | 289 | strbuf_addstr(dst, n->tag->tag); |
1bba0013 | 290 | } else { |
4dbc59a4 | 291 | strbuf_addstr(dst, n->path); |
1bba0013 | 292 | } |
870cf7d6 JH |
293 | } |
294 | ||
4dbc59a4 | 295 | static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst) |
870cf7d6 | 296 | { |
aab9583f | 297 | strbuf_addf(dst, "-%d-g%s", depth, find_unique_abbrev(oid, abbrev)); |
212945d4 SP |
298 | } |
299 | ||
4dbc59a4 | 300 | static void describe_commit(struct object_id *oid, struct strbuf *dst) |
908e5310 | 301 | { |
8713ab30 | 302 | struct commit *cmit, *gave_up_on = NULL; |
908e5310 | 303 | struct commit_list *list; |
908e5310 | 304 | struct commit_name *n; |
cf69fd49 | 305 | struct possible_tag all_matches[MAX_TAGS]; |
8713ab30 SP |
306 | unsigned int match_cnt = 0, annotated_cnt = 0, cur_match; |
307 | unsigned long seen_commits = 0; | |
4d23660e | 308 | unsigned int unannotated_cnt = 0; |
908e5310 | 309 | |
2122f675 | 310 | cmit = lookup_commit_reference(the_repository, oid); |
4c34a2c5 | 311 | |
6439b5d9 | 312 | n = find_commit_name(&cmit->object.oid); |
7a0d61bb | 313 | if (n && (tags || all || n->prio == 2)) { |
870cf7d6 JH |
314 | /* |
315 | * Exact match to an existing ref. | |
316 | */ | |
4dbc59a4 | 317 | append_name(n, dst); |
870cf7d6 | 318 | if (longformat) |
4dbc59a4 | 319 | append_suffix(0, n->tag ? &n->tag->tagged->oid : oid, dst); |
b0176ce6 | 320 | if (suffix) |
4dbc59a4 | 321 | strbuf_addstr(dst, suffix); |
908e5310 LT |
322 | return; |
323 | } | |
324 | ||
2c33f757 | 325 | if (!max_candidates) |
f2fd0760 | 326 | die(_("no tag exactly matches '%s'"), oid_to_hex(&cmit->object.oid)); |
8713ab30 | 327 | if (debug) |
cdaed0cf | 328 | fprintf(stderr, _("No exact match on refs or tags, searching to describe\n")); |
8713ab30 | 329 | |
d1645d02 | 330 | if (!have_util) { |
29d8a834 KB |
331 | struct hashmap_iter iter; |
332 | struct commit *c; | |
c6b7206b NTND |
333 | struct commit_name *n; |
334 | ||
335 | init_commit_names(&commit_names); | |
87571c3f EW |
336 | hashmap_for_each_entry(&names, &iter, n, struct commit_name, |
337 | entry /* member name */) { | |
21e1ee8f SB |
338 | c = lookup_commit_reference_gently(the_repository, |
339 | &n->peeled, 1); | |
29d8a834 | 340 | if (c) |
c6b7206b | 341 | *commit_names_at(&commit_names, c) = n; |
29d8a834 | 342 | } |
d1645d02 AK |
343 | have_util = 1; |
344 | } | |
345 | ||
908e5310 | 346 | list = NULL; |
8713ab30 | 347 | cmit->object.flags = SEEN; |
908e5310 LT |
348 | commit_list_insert(cmit, &list); |
349 | while (list) { | |
80dbae03 | 350 | struct commit *c = pop_commit(&list); |
dccd0c2a | 351 | struct commit_list *parents = c->parents; |
c6b7206b NTND |
352 | struct commit_name **slot; |
353 | ||
8713ab30 | 354 | seen_commits++; |
c6b7206b NTND |
355 | slot = commit_names_peek(&commit_names, c); |
356 | n = slot ? *slot : NULL; | |
908e5310 | 357 | if (n) { |
4d23660e TR |
358 | if (!tags && !all && n->prio < 2) { |
359 | unannotated_cnt++; | |
360 | } else if (match_cnt < max_candidates) { | |
8713ab30 SP |
361 | struct possible_tag *t = &all_matches[match_cnt++]; |
362 | t->name = n; | |
363 | t->depth = seen_commits - 1; | |
364 | t->flag_within = 1u << match_cnt; | |
8a8169c0 | 365 | t->found_order = match_cnt; |
8713ab30 SP |
366 | c->object.flags |= t->flag_within; |
367 | if (n->prio == 2) | |
368 | annotated_cnt++; | |
369 | } | |
370 | else { | |
371 | gave_up_on = c; | |
372 | break; | |
373 | } | |
374 | } | |
375 | for (cur_match = 0; cur_match < match_cnt; cur_match++) { | |
376 | struct possible_tag *t = &all_matches[cur_match]; | |
377 | if (!(c->object.flags & t->flag_within)) | |
378 | t->depth++; | |
379 | } | |
380 | if (annotated_cnt && !list) { | |
381 | if (debug) | |
e41f1cb3 | 382 | fprintf(stderr, _("finished search at %s\n"), |
f2fd0760 | 383 | oid_to_hex(&c->object.oid)); |
8713ab30 | 384 | break; |
dccd0c2a SP |
385 | } |
386 | while (parents) { | |
387 | struct commit *p = parents->item; | |
388 | parse_commit(p); | |
8713ab30 | 389 | if (!(p->object.flags & SEEN)) |
47e44ed1 | 390 | commit_list_insert_by_date(p, &list); |
8713ab30 | 391 | p->object.flags |= c->object.flags; |
dccd0c2a | 392 | parents = parents->next; |
e00dd1e9 MC |
393 | |
394 | if (first_parent) | |
395 | break; | |
80dbae03 SP |
396 | } |
397 | } | |
398 | ||
da2478db | 399 | if (!match_cnt) { |
c87b653c | 400 | struct object_id *cmit_oid = &cmit->object.oid; |
da2478db | 401 | if (always) { |
aab9583f | 402 | strbuf_add_unique_abbrev(dst, cmit_oid, abbrev); |
b0176ce6 | 403 | if (suffix) |
4dbc59a4 | 404 | strbuf_addstr(dst, suffix); |
da2478db JH |
405 | return; |
406 | } | |
4d23660e | 407 | if (unannotated_cnt) |
e41f1cb3 ÆAB |
408 | die(_("No annotated tags can describe '%s'.\n" |
409 | "However, there were unannotated tags: try --tags."), | |
c87b653c | 410 | oid_to_hex(cmit_oid)); |
4d23660e | 411 | else |
e41f1cb3 ÆAB |
412 | die(_("No tags can describe '%s'.\n" |
413 | "Try --always, or create some tags."), | |
c87b653c | 414 | oid_to_hex(cmit_oid)); |
da2478db | 415 | } |
80dbae03 | 416 | |
9ed0d8d6 | 417 | QSORT(all_matches, match_cnt, compare_pt); |
1b600e65 SP |
418 | |
419 | if (gave_up_on) { | |
47e44ed1 | 420 | commit_list_insert_by_date(gave_up_on, &list); |
1b600e65 SP |
421 | seen_commits--; |
422 | } | |
423 | seen_commits += finish_depth_computation(&list, &all_matches[0]); | |
424 | free_commit_list(list); | |
425 | ||
8713ab30 | 426 | if (debug) { |
646c3bd1 MG |
427 | static int label_width = -1; |
428 | if (label_width < 0) { | |
429 | int i, w; | |
430 | for (i = 0; i < ARRAY_SIZE(prio_names); i++) { | |
431 | w = strlen(_(prio_names[i])); | |
432 | if (label_width < w) | |
433 | label_width = w; | |
434 | } | |
435 | } | |
8713ab30 SP |
436 | for (cur_match = 0; cur_match < match_cnt; cur_match++) { |
437 | struct possible_tag *t = &all_matches[cur_match]; | |
646c3bd1 MG |
438 | fprintf(stderr, " %-*s %8d %s\n", |
439 | label_width, _(prio_names[t->name->prio]), | |
8713ab30 SP |
440 | t->depth, t->name->path); |
441 | } | |
e41f1cb3 | 442 | fprintf(stderr, _("traversed %lu commits\n"), seen_commits); |
8713ab30 SP |
443 | if (gave_up_on) { |
444 | fprintf(stderr, | |
e41f1cb3 ÆAB |
445 | _("more than %i tags found; listed %i most recent\n" |
446 | "gave up search at %s\n"), | |
8713ab30 | 447 | max_candidates, max_candidates, |
f2fd0760 | 448 | oid_to_hex(&gave_up_on->object.oid)); |
8713ab30 | 449 | } |
80dbae03 | 450 | } |
212945d4 | 451 | |
4dbc59a4 | 452 | append_name(all_matches[0].name, dst); |
212945d4 | 453 | if (abbrev) |
4dbc59a4 | 454 | append_suffix(all_matches[0].depth, &cmit->object.oid, dst); |
b0176ce6 | 455 | if (suffix) |
4dbc59a4 SB |
456 | strbuf_addstr(dst, suffix); |
457 | } | |
458 | ||
644eb60b SB |
459 | struct process_commit_data { |
460 | struct object_id current_commit; | |
461 | struct object_id looking_for; | |
462 | struct strbuf *dst; | |
463 | struct rev_info *revs; | |
464 | }; | |
465 | ||
466 | static void process_commit(struct commit *commit, void *data) | |
467 | { | |
468 | struct process_commit_data *pcd = data; | |
469 | pcd->current_commit = commit->object.oid; | |
470 | } | |
471 | ||
472 | static void process_object(struct object *obj, const char *path, void *data) | |
473 | { | |
474 | struct process_commit_data *pcd = data; | |
475 | ||
4a7e27e9 | 476 | if (oideq(&pcd->looking_for, &obj->oid) && !pcd->dst->len) { |
644eb60b SB |
477 | reset_revision_walk(); |
478 | describe_commit(&pcd->current_commit, pcd->dst); | |
479 | strbuf_addf(pcd->dst, ":%s", path); | |
480 | free_commit_list(pcd->revs->commits); | |
481 | pcd->revs->commits = NULL; | |
482 | } | |
483 | } | |
484 | ||
485 | static void describe_blob(struct object_id oid, struct strbuf *dst) | |
486 | { | |
487 | struct rev_info revs; | |
488 | struct argv_array args = ARGV_ARRAY_INIT; | |
489 | struct process_commit_data pcd = { null_oid, oid, dst, &revs}; | |
490 | ||
491 | argv_array_pushl(&args, "internal: The first arg is not parsed", | |
492 | "--objects", "--in-commit-order", "--reverse", "HEAD", | |
493 | NULL); | |
494 | ||
2abf3503 | 495 | repo_init_revisions(the_repository, &revs, NULL); |
644eb60b SB |
496 | if (setup_revisions(args.argc, args.argv, &revs, NULL) > 1) |
497 | BUG("setup_revisions could not handle all args?"); | |
498 | ||
499 | if (prepare_revision_walk(&revs)) | |
500 | die("revision walk setup failed"); | |
501 | ||
502 | traverse_commit_list(&revs, process_commit, process_object, &pcd); | |
503 | reset_revision_walk(); | |
504 | } | |
505 | ||
4dbc59a4 SB |
506 | static void describe(const char *arg, int last_one) |
507 | { | |
508 | struct object_id oid; | |
509 | struct commit *cmit; | |
510 | struct strbuf sb = STRBUF_INIT; | |
511 | ||
512 | if (debug) | |
513 | fprintf(stderr, _("describe %s\n"), arg); | |
514 | ||
515 | if (get_oid(arg, &oid)) | |
516 | die(_("Not a valid object name %s"), arg); | |
21e1ee8f | 517 | cmit = lookup_commit_reference_gently(the_repository, &oid, 1); |
4dbc59a4 | 518 | |
644eb60b SB |
519 | if (cmit) |
520 | describe_commit(&oid, &sb); | |
0df8e965 | 521 | else if (oid_object_info(the_repository, &oid, NULL) == OBJ_BLOB) |
644eb60b SB |
522 | describe_blob(oid, &sb); |
523 | else | |
524 | die(_("%s is neither a commit nor blob"), arg); | |
4dbc59a4 SB |
525 | |
526 | puts(sb.buf); | |
80dbae03 | 527 | |
8713ab30 SP |
528 | if (!last_one) |
529 | clear_commit_marks(cmit, -1); | |
4dbc59a4 SB |
530 | |
531 | strbuf_release(&sb); | |
908e5310 LT |
532 | } |
533 | ||
9a0eaf83 | 534 | int cmd_describe(int argc, const char **argv, const char *prefix) |
908e5310 | 535 | { |
23615708 | 536 | int contains = 0; |
166185be | 537 | struct option options[] = { |
d5d09d47 SB |
538 | OPT_BOOL(0, "contains", &contains, N_("find the tag that comes after the commit")), |
539 | OPT_BOOL(0, "debug", &debug, N_("debug search strategy on stderr")), | |
540 | OPT_BOOL(0, "all", &all, N_("use any ref")), | |
541 | OPT_BOOL(0, "tags", &tags, N_("use any tag, even unannotated")), | |
542 | OPT_BOOL(0, "long", &longformat, N_("always use long format")), | |
543 | OPT_BOOL(0, "first-parent", &first_parent, N_("only follow first parent")), | |
166185be | 544 | OPT__ABBREV(&abbrev), |
2c33f757 | 545 | OPT_SET_INT(0, "exact-match", &max_candidates, |
bfb0737d | 546 | N_("only output exact matches"), 0), |
166185be | 547 | OPT_INTEGER(0, "candidates", &max_candidates, |
bfb0737d | 548 | N_("consider <n> most recent tags (default: 10)")), |
43f8080e | 549 | OPT_STRING_LIST(0, "match", &patterns, N_("pattern"), |
bfb0737d | 550 | N_("only consider tags matching <pattern>")), |
77d21f29 JK |
551 | OPT_STRING_LIST(0, "exclude", &exclude_patterns, N_("pattern"), |
552 | N_("do not consider tags matching <pattern>")), | |
d5d09d47 SB |
553 | OPT_BOOL(0, "always", &always, |
554 | N_("show abbreviated commit object as fallback")), | |
bfb0737d | 555 | {OPTION_STRING, 0, "dirty", &dirty, N_("mark"), |
d5d09d47 SB |
556 | N_("append <mark> on dirty working tree (default: \"-dirty\")"), |
557 | PARSE_OPT_OPTARG, NULL, (intptr_t) "-dirty"}, | |
b0176ce6 SB |
558 | {OPTION_STRING, 0, "broken", &broken, N_("mark"), |
559 | N_("append <mark> on broken working tree (default: \"-broken\")"), | |
560 | PARSE_OPT_OPTARG, NULL, (intptr_t) "-broken"}, | |
166185be PH |
561 | OPT_END(), |
562 | }; | |
908e5310 | 563 | |
dce96489 | 564 | git_config(git_default_config, NULL); |
37782920 | 565 | argc = parse_options(argc, argv, prefix, options, describe_usage, 0); |
dce96489 LT |
566 | if (abbrev < 0) |
567 | abbrev = DEFAULT_ABBREV; | |
568 | ||
2c33f757 SP |
569 | if (max_candidates < 0) |
570 | max_candidates = 0; | |
166185be PH |
571 | else if (max_candidates > MAX_TAGS) |
572 | max_candidates = MAX_TAGS; | |
4c34a2c5 | 573 | |
8c599c74 | 574 | save_commit_buffer = 0; |
8112894d | 575 | |
518120e3 | 576 | if (longformat && abbrev == 0) |
e41f1cb3 | 577 | die(_("--long is incompatible with --abbrev=0")); |
518120e3 | 578 | |
23615708 | 579 | if (contains) { |
43f8080e | 580 | struct string_list_item *item; |
45bc950b JH |
581 | struct argv_array args; |
582 | ||
583 | argv_array_init(&args); | |
adfc1857 JH |
584 | argv_array_pushl(&args, "name-rev", |
585 | "--peel-tag", "--name-only", "--no-undefined", | |
45bc950b | 586 | NULL); |
da2478db | 587 | if (always) |
45bc950b | 588 | argv_array_push(&args, "--always"); |
30ffa603 | 589 | if (!all) { |
45bc950b | 590 | argv_array_push(&args, "--tags"); |
43f8080e JK |
591 | for_each_string_list_item(item, &patterns) |
592 | argv_array_pushf(&args, "--refs=refs/tags/%s", item->string); | |
77d21f29 JK |
593 | for_each_string_list_item(item, &exclude_patterns) |
594 | argv_array_pushf(&args, "--exclude=refs/tags/%s", item->string); | |
45bc950b | 595 | } |
2bd07065 SG |
596 | if (argc) |
597 | argv_array_pushv(&args, argv); | |
598 | else | |
599 | argv_array_push(&args, "HEAD"); | |
45bc950b | 600 | return cmd_name_rev(args.argc, args.argv, prefix); |
23615708 SP |
601 | } |
602 | ||
cc00e5ce | 603 | hashmap_init(&names, commit_name_neq, NULL, 0); |
99a2cfbf | 604 | for_each_rawref(get_name, NULL); |
8b604d19 | 605 | if (!hashmap_get_size(&names) && !always) |
e41f1cb3 | 606 | die(_("No names found, cannot describe anything.")); |
fb423da0 | 607 | |
166185be | 608 | if (argc == 0) { |
b0176ce6 SB |
609 | if (broken) { |
610 | struct child_process cp = CHILD_PROCESS_INIT; | |
611 | argv_array_pushv(&cp.args, diff_index_args); | |
612 | cp.git_cmd = 1; | |
613 | cp.no_stdin = 1; | |
614 | cp.no_stdout = 1; | |
615 | ||
616 | if (!dirty) | |
617 | dirty = "-dirty"; | |
618 | ||
619 | switch (run_command(&cp)) { | |
620 | case 0: | |
621 | suffix = NULL; | |
622 | break; | |
623 | case 1: | |
624 | suffix = dirty; | |
625 | break; | |
626 | default: | |
627 | /* diff-index aborted abnormally */ | |
628 | suffix = broken; | |
629 | } | |
630 | } else if (dirty) { | |
b2275868 | 631 | struct lock_file index_lock = LOCK_INIT; |
be26d2b2 JH |
632 | struct rev_info revs; |
633 | struct argv_array args = ARGV_ARRAY_INIT; | |
634 | int fd, result; | |
bb571486 | 635 | |
2ed5c8e1 | 636 | setup_work_tree(); |
6c5b7f55 | 637 | read_cache(); |
bb571486 AC |
638 | refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, |
639 | NULL, NULL, NULL); | |
640 | fd = hold_locked_index(&index_lock, 0); | |
641 | if (0 <= fd) | |
1b0d968b | 642 | repo_update_index_if_able(the_repository, &index_lock); |
bb571486 | 643 | |
2abf3503 | 644 | repo_init_revisions(the_repository, &revs, prefix); |
be26d2b2 JH |
645 | argv_array_pushv(&args, diff_index_args); |
646 | if (setup_revisions(args.argc, args.argv, &revs, NULL) != 1) | |
647 | BUG("malformed internal diff-index command line"); | |
648 | result = run_diff_index(&revs, 0); | |
649 | ||
650 | if (!diff_result_code(&revs.diffopt, result)) | |
b0176ce6 SB |
651 | suffix = NULL; |
652 | else | |
653 | suffix = dirty; | |
bb571486 | 654 | } |
fec9ebf1 | 655 | describe("HEAD", 1); |
9f67d2e8 | 656 | } else if (dirty) { |
a8a5406a | 657 | die(_("--dirty is incompatible with commit-ishes")); |
b0176ce6 SB |
658 | } else if (broken) { |
659 | die(_("--broken is incompatible with commit-ishes")); | |
166185be | 660 | } else { |
c4472643 | 661 | while (argc-- > 0) |
166185be | 662 | describe(*argv++, argc == 0); |
166185be | 663 | } |
908e5310 LT |
664 | return 0; |
665 | } |