describe: prepend "tags/" when describing tags with embedded name
[git/gitster.git] / builtin / describe.c
blob2004a1a86eb381221f643becb7862a5690ed4880
1 #include "cache.h"
2 #include "config.h"
3 #include "lockfile.h"
4 #include "commit.h"
5 #include "tag.h"
6 #include "refs.h"
7 #include "builtin.h"
8 #include "exec_cmd.h"
9 #include "parse-options.h"
10 #include "diff.h"
11 #include "hashmap.h"
12 #include "argv-array.h"
13 #include "run-command.h"
15 #define SEEN (1u << 0)
16 #define MAX_TAGS (FLAG_BITS - 1)
18 static const char * const describe_usage[] = {
19 N_("git describe [<options>] [<commit-ish>...]"),
20 N_("git describe [<options>] --dirty"),
21 NULL
24 static int debug; /* Display lots of verbose info */
25 static int all; /* Any valid ref can be used */
26 static int tags; /* Allow lightweight tags */
27 static int longformat;
28 static int first_parent;
29 static int abbrev = -1; /* unspecified */
30 static int max_candidates = 10;
31 static struct hashmap names;
32 static int have_util;
33 static struct string_list patterns = STRING_LIST_INIT_NODUP;
34 static struct string_list exclude_patterns = STRING_LIST_INIT_NODUP;
35 static int always;
36 static const char *suffix, *dirty, *broken;
38 /* diff-index command arguments to check if working tree is dirty. */
39 static const char *diff_index_args[] = {
40 "diff-index", "--quiet", "HEAD", "--", NULL
43 struct commit_name {
44 struct hashmap_entry entry;
45 struct object_id peeled;
46 struct tag *tag;
47 unsigned prio:2; /* annotated tag = 2, tag = 1, head = 0 */
48 unsigned name_checked:1;
49 struct object_id oid;
50 char *path;
53 static const char *prio_names[] = {
54 N_("head"), N_("lightweight"), N_("annotated"),
57 static int commit_name_cmp(const void *unused_cmp_data,
58 const void *entry,
59 const void *entry_or_key,
60 const void *peeled)
62 const struct commit_name *cn1 = entry;
63 const struct commit_name *cn2 = entry_or_key;
65 return oidcmp(&cn1->peeled, peeled ? peeled : &cn2->peeled);
68 static inline struct commit_name *find_commit_name(const struct object_id *peeled)
70 return hashmap_get_from_hash(&names, sha1hash(peeled->hash), peeled->hash);
73 static int replace_name(struct commit_name *e,
74 int prio,
75 const struct object_id *oid,
76 struct tag **tag)
78 if (!e || e->prio < prio)
79 return 1;
81 if (e->prio == 2 && prio == 2) {
82 /* Multiple annotated tags point to the same commit.
83 * Select one to keep based upon their tagger date.
85 struct tag *t;
87 if (!e->tag) {
88 t = lookup_tag(&e->oid);
89 if (!t || parse_tag(t))
90 return 1;
91 e->tag = t;
94 t = lookup_tag(oid);
95 if (!t || parse_tag(t))
96 return 0;
97 *tag = t;
99 if (e->tag->date < t->date)
100 return 1;
103 return 0;
106 static void add_to_known_names(const char *path,
107 const struct object_id *peeled,
108 int prio,
109 const struct object_id *oid)
111 struct commit_name *e = find_commit_name(peeled);
112 struct tag *tag = NULL;
113 if (replace_name(e, prio, oid, &tag)) {
114 if (!e) {
115 e = xmalloc(sizeof(struct commit_name));
116 oidcpy(&e->peeled, peeled);
117 hashmap_entry_init(e, sha1hash(peeled->hash));
118 hashmap_add(&names, e);
119 e->path = NULL;
121 e->tag = tag;
122 e->prio = prio;
123 e->name_checked = 0;
124 oidcpy(&e->oid, oid);
125 free(e->path);
126 e->path = xstrdup(path);
130 static int get_name(const char *path, const struct object_id *oid, int flag, void *cb_data)
132 int is_tag = 0;
133 struct object_id peeled;
134 int is_annotated, prio;
135 const char *path_to_match = NULL;
137 if (skip_prefix(path, "refs/tags/", &path_to_match)) {
138 is_tag = 1;
139 } else if (all) {
140 if ((exclude_patterns.nr || patterns.nr) &&
141 !skip_prefix(path, "refs/heads/", &path_to_match) &&
142 !skip_prefix(path, "refs/remotes/", &path_to_match)) {
143 /* Only accept reference of known type if there are match/exclude patterns */
144 return 0;
146 } else {
147 /* Reject anything outside refs/tags/ unless --all */
148 return 0;
152 * If we're given exclude patterns, first exclude any tag which match
153 * any of the exclude pattern.
155 if (exclude_patterns.nr) {
156 struct string_list_item *item;
158 for_each_string_list_item(item, &exclude_patterns) {
159 if (!wildmatch(item->string, path_to_match, 0))
160 return 0;
165 * If we're given patterns, accept only tags which match at least one
166 * pattern.
168 if (patterns.nr) {
169 int found = 0;
170 struct string_list_item *item;
172 for_each_string_list_item(item, &patterns) {
173 if (!wildmatch(item->string, path_to_match, 0)) {
174 found = 1;
175 break;
179 if (!found)
180 return 0;
183 /* Is it annotated? */
184 if (!peel_ref(path, peeled.hash)) {
185 is_annotated = !!oidcmp(oid, &peeled);
186 } else {
187 oidcpy(&peeled, oid);
188 is_annotated = 0;
192 * By default, we only use annotated tags, but with --tags
193 * we fall back to lightweight ones (even without --tags,
194 * we still remember lightweight ones, only to give hints
195 * in an error message). --all allows any refs to be used.
197 if (is_annotated)
198 prio = 2;
199 else if (is_tag)
200 prio = 1;
201 else
202 prio = 0;
204 add_to_known_names(all ? path + 5 : path + 10, &peeled, prio, oid);
205 return 0;
208 struct possible_tag {
209 struct commit_name *name;
210 int depth;
211 int found_order;
212 unsigned flag_within;
215 static int compare_pt(const void *a_, const void *b_)
217 struct possible_tag *a = (struct possible_tag *)a_;
218 struct possible_tag *b = (struct possible_tag *)b_;
219 if (a->depth != b->depth)
220 return a->depth - b->depth;
221 if (a->found_order != b->found_order)
222 return a->found_order - b->found_order;
223 return 0;
226 static unsigned long finish_depth_computation(
227 struct commit_list **list,
228 struct possible_tag *best)
230 unsigned long seen_commits = 0;
231 while (*list) {
232 struct commit *c = pop_commit(list);
233 struct commit_list *parents = c->parents;
234 seen_commits++;
235 if (c->object.flags & best->flag_within) {
236 struct commit_list *a = *list;
237 while (a) {
238 struct commit *i = a->item;
239 if (!(i->object.flags & best->flag_within))
240 break;
241 a = a->next;
243 if (!a)
244 break;
245 } else
246 best->depth++;
247 while (parents) {
248 struct commit *p = parents->item;
249 parse_commit(p);
250 if (!(p->object.flags & SEEN))
251 commit_list_insert_by_date(p, list);
252 p->object.flags |= c->object.flags;
253 parents = parents->next;
256 return seen_commits;
259 static void display_name(struct commit_name *n)
261 if (n->prio == 2 && !n->tag) {
262 n->tag = lookup_tag(&n->oid);
263 if (!n->tag || parse_tag(n->tag))
264 die(_("annotated tag %s not available"), n->path);
266 if (n->tag && !n->name_checked) {
267 if (!n->tag->tag)
268 die(_("annotated tag %s has no embedded name"), n->path);
269 if (strcmp(n->tag->tag, all ? n->path + 5 : n->path))
270 warning(_("tag '%s' is really '%s' here"), n->tag->tag, n->path);
271 n->name_checked = 1;
274 if (n->tag) {
275 if (all)
276 printf("tags/");
277 printf("%s", n->tag->tag);
278 } else {
279 printf("%s", n->path);
283 static void show_suffix(int depth, const struct object_id *oid)
285 printf("-%d-g%s", depth, find_unique_abbrev(oid->hash, abbrev));
288 static void describe(const char *arg, int last_one)
290 struct object_id oid;
291 struct commit *cmit, *gave_up_on = NULL;
292 struct commit_list *list;
293 struct commit_name *n;
294 struct possible_tag all_matches[MAX_TAGS];
295 unsigned int match_cnt = 0, annotated_cnt = 0, cur_match;
296 unsigned long seen_commits = 0;
297 unsigned int unannotated_cnt = 0;
299 if (get_oid(arg, &oid))
300 die(_("Not a valid object name %s"), arg);
301 cmit = lookup_commit_reference(&oid);
302 if (!cmit)
303 die(_("%s is not a valid '%s' object"), arg, commit_type);
305 n = find_commit_name(&cmit->object.oid);
306 if (n && (tags || all || n->prio == 2)) {
308 * Exact match to an existing ref.
310 display_name(n);
311 if (longformat)
312 show_suffix(0, n->tag ? &n->tag->tagged->oid : &oid);
313 if (suffix)
314 printf("%s", suffix);
315 printf("\n");
316 return;
319 if (!max_candidates)
320 die(_("no tag exactly matches '%s'"), oid_to_hex(&cmit->object.oid));
321 if (debug)
322 fprintf(stderr, _("searching to describe %s\n"), arg);
324 if (!have_util) {
325 struct hashmap_iter iter;
326 struct commit *c;
327 struct commit_name *n = hashmap_iter_first(&names, &iter);
328 for (; n; n = hashmap_iter_next(&iter)) {
329 c = lookup_commit_reference_gently(&n->peeled, 1);
330 if (c)
331 c->util = n;
333 have_util = 1;
336 list = NULL;
337 cmit->object.flags = SEEN;
338 commit_list_insert(cmit, &list);
339 while (list) {
340 struct commit *c = pop_commit(&list);
341 struct commit_list *parents = c->parents;
342 seen_commits++;
343 n = c->util;
344 if (n) {
345 if (!tags && !all && n->prio < 2) {
346 unannotated_cnt++;
347 } else if (match_cnt < max_candidates) {
348 struct possible_tag *t = &all_matches[match_cnt++];
349 t->name = n;
350 t->depth = seen_commits - 1;
351 t->flag_within = 1u << match_cnt;
352 t->found_order = match_cnt;
353 c->object.flags |= t->flag_within;
354 if (n->prio == 2)
355 annotated_cnt++;
357 else {
358 gave_up_on = c;
359 break;
362 for (cur_match = 0; cur_match < match_cnt; cur_match++) {
363 struct possible_tag *t = &all_matches[cur_match];
364 if (!(c->object.flags & t->flag_within))
365 t->depth++;
367 if (annotated_cnt && !list) {
368 if (debug)
369 fprintf(stderr, _("finished search at %s\n"),
370 oid_to_hex(&c->object.oid));
371 break;
373 while (parents) {
374 struct commit *p = parents->item;
375 parse_commit(p);
376 if (!(p->object.flags & SEEN))
377 commit_list_insert_by_date(p, &list);
378 p->object.flags |= c->object.flags;
379 parents = parents->next;
381 if (first_parent)
382 break;
386 if (!match_cnt) {
387 struct object_id *oid = &cmit->object.oid;
388 if (always) {
389 printf("%s", find_unique_abbrev(oid->hash, abbrev));
390 if (suffix)
391 printf("%s", suffix);
392 printf("\n");
393 return;
395 if (unannotated_cnt)
396 die(_("No annotated tags can describe '%s'.\n"
397 "However, there were unannotated tags: try --tags."),
398 oid_to_hex(oid));
399 else
400 die(_("No tags can describe '%s'.\n"
401 "Try --always, or create some tags."),
402 oid_to_hex(oid));
405 QSORT(all_matches, match_cnt, compare_pt);
407 if (gave_up_on) {
408 commit_list_insert_by_date(gave_up_on, &list);
409 seen_commits--;
411 seen_commits += finish_depth_computation(&list, &all_matches[0]);
412 free_commit_list(list);
414 if (debug) {
415 static int label_width = -1;
416 if (label_width < 0) {
417 int i, w;
418 for (i = 0; i < ARRAY_SIZE(prio_names); i++) {
419 w = strlen(_(prio_names[i]));
420 if (label_width < w)
421 label_width = w;
424 for (cur_match = 0; cur_match < match_cnt; cur_match++) {
425 struct possible_tag *t = &all_matches[cur_match];
426 fprintf(stderr, " %-*s %8d %s\n",
427 label_width, _(prio_names[t->name->prio]),
428 t->depth, t->name->path);
430 fprintf(stderr, _("traversed %lu commits\n"), seen_commits);
431 if (gave_up_on) {
432 fprintf(stderr,
433 _("more than %i tags found; listed %i most recent\n"
434 "gave up search at %s\n"),
435 max_candidates, max_candidates,
436 oid_to_hex(&gave_up_on->object.oid));
440 display_name(all_matches[0].name);
441 if (abbrev)
442 show_suffix(all_matches[0].depth, &cmit->object.oid);
443 if (suffix)
444 printf("%s", suffix);
445 printf("\n");
447 if (!last_one)
448 clear_commit_marks(cmit, -1);
451 int cmd_describe(int argc, const char **argv, const char *prefix)
453 int contains = 0;
454 struct option options[] = {
455 OPT_BOOL(0, "contains", &contains, N_("find the tag that comes after the commit")),
456 OPT_BOOL(0, "debug", &debug, N_("debug search strategy on stderr")),
457 OPT_BOOL(0, "all", &all, N_("use any ref")),
458 OPT_BOOL(0, "tags", &tags, N_("use any tag, even unannotated")),
459 OPT_BOOL(0, "long", &longformat, N_("always use long format")),
460 OPT_BOOL(0, "first-parent", &first_parent, N_("only follow first parent")),
461 OPT__ABBREV(&abbrev),
462 OPT_SET_INT(0, "exact-match", &max_candidates,
463 N_("only output exact matches"), 0),
464 OPT_INTEGER(0, "candidates", &max_candidates,
465 N_("consider <n> most recent tags (default: 10)")),
466 OPT_STRING_LIST(0, "match", &patterns, N_("pattern"),
467 N_("only consider tags matching <pattern>")),
468 OPT_STRING_LIST(0, "exclude", &exclude_patterns, N_("pattern"),
469 N_("do not consider tags matching <pattern>")),
470 OPT_BOOL(0, "always", &always,
471 N_("show abbreviated commit object as fallback")),
472 {OPTION_STRING, 0, "dirty", &dirty, N_("mark"),
473 N_("append <mark> on dirty working tree (default: \"-dirty\")"),
474 PARSE_OPT_OPTARG, NULL, (intptr_t) "-dirty"},
475 {OPTION_STRING, 0, "broken", &broken, N_("mark"),
476 N_("append <mark> on broken working tree (default: \"-broken\")"),
477 PARSE_OPT_OPTARG, NULL, (intptr_t) "-broken"},
478 OPT_END(),
481 git_config(git_default_config, NULL);
482 argc = parse_options(argc, argv, prefix, options, describe_usage, 0);
483 if (abbrev < 0)
484 abbrev = DEFAULT_ABBREV;
486 if (max_candidates < 0)
487 max_candidates = 0;
488 else if (max_candidates > MAX_TAGS)
489 max_candidates = MAX_TAGS;
491 save_commit_buffer = 0;
493 if (longformat && abbrev == 0)
494 die(_("--long is incompatible with --abbrev=0"));
496 if (contains) {
497 struct string_list_item *item;
498 struct argv_array args;
500 argv_array_init(&args);
501 argv_array_pushl(&args, "name-rev",
502 "--peel-tag", "--name-only", "--no-undefined",
503 NULL);
504 if (always)
505 argv_array_push(&args, "--always");
506 if (!all) {
507 argv_array_push(&args, "--tags");
508 for_each_string_list_item(item, &patterns)
509 argv_array_pushf(&args, "--refs=refs/tags/%s", item->string);
510 for_each_string_list_item(item, &exclude_patterns)
511 argv_array_pushf(&args, "--exclude=refs/tags/%s", item->string);
513 if (argc)
514 argv_array_pushv(&args, argv);
515 else
516 argv_array_push(&args, "HEAD");
517 return cmd_name_rev(args.argc, args.argv, prefix);
520 hashmap_init(&names, commit_name_cmp, NULL, 0);
521 for_each_rawref(get_name, NULL);
522 if (!hashmap_get_size(&names) && !always)
523 die(_("No names found, cannot describe anything."));
525 if (argc == 0) {
526 if (broken) {
527 struct child_process cp = CHILD_PROCESS_INIT;
528 argv_array_pushv(&cp.args, diff_index_args);
529 cp.git_cmd = 1;
530 cp.no_stdin = 1;
531 cp.no_stdout = 1;
533 if (!dirty)
534 dirty = "-dirty";
536 switch (run_command(&cp)) {
537 case 0:
538 suffix = NULL;
539 break;
540 case 1:
541 suffix = dirty;
542 break;
543 default:
544 /* diff-index aborted abnormally */
545 suffix = broken;
547 } else if (dirty) {
548 static struct lock_file index_lock;
549 int fd;
551 read_cache_preload(NULL);
552 refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED,
553 NULL, NULL, NULL);
554 fd = hold_locked_index(&index_lock, 0);
555 if (0 <= fd)
556 update_index_if_able(&the_index, &index_lock);
558 if (!cmd_diff_index(ARRAY_SIZE(diff_index_args) - 1,
559 diff_index_args, prefix))
560 suffix = NULL;
561 else
562 suffix = dirty;
564 describe("HEAD", 1);
565 } else if (dirty) {
566 die(_("--dirty is incompatible with commit-ishes"));
567 } else if (broken) {
568 die(_("--broken is incompatible with commit-ishes"));
569 } else {
570 while (argc-- > 0)
571 describe(*argv++, argc == 0);
573 return 0;