describe: document and test --first-parent
[git/mjg.git] / builtin / describe.c
blob7eaa66cadf6f6e5a439e42386d6e52e4fbbc0abe
1 #include "cache.h"
2 #include "commit.h"
3 #include "tag.h"
4 #include "refs.h"
5 #include "builtin.h"
6 #include "exec_cmd.h"
7 #include "parse-options.h"
8 #include "diff.h"
9 #include "hash.h"
11 #define SEEN (1u<<0)
12 #define MAX_TAGS (FLAG_BITS - 1)
14 static const char * const describe_usage[] = {
15 N_("git describe [options] <committish>*"),
16 N_("git describe [options] --dirty"),
17 NULL
20 static int debug; /* Display lots of verbose info */
21 static int all; /* Any valid ref can be used */
22 static int tags; /* Allow lightweight tags */
23 static int longformat;
24 static int abbrev = -1; /* unspecified */
25 static int max_candidates = 10;
26 static struct hash_table names;
27 static int have_util;
28 static int first_parent;
29 static const char *pattern;
30 static int always;
31 static const char *dirty;
33 /* diff-index command arguments to check if working tree is dirty. */
34 static const char *diff_index_args[] = {
35 "diff-index", "--quiet", "HEAD", "--", NULL
39 struct commit_name {
40 struct commit_name *next;
41 unsigned char peeled[20];
42 struct tag *tag;
43 unsigned prio:2; /* annotated tag = 2, tag = 1, head = 0 */
44 unsigned name_checked:1;
45 unsigned char sha1[20];
46 const char *path;
48 static const char *prio_names[] = {
49 "head", "lightweight", "annotated",
52 static inline unsigned int hash_sha1(const unsigned char *sha1)
54 unsigned int hash;
55 memcpy(&hash, sha1, sizeof(hash));
56 return hash;
59 static inline struct commit_name *find_commit_name(const unsigned char *peeled)
61 struct commit_name *n = lookup_hash(hash_sha1(peeled), &names);
62 while (n && !!hashcmp(peeled, n->peeled))
63 n = n->next;
64 return n;
67 static int set_util(void *chain, void *data)
69 struct commit_name *n;
70 for (n = chain; n; n = n->next) {
71 struct commit *c = lookup_commit_reference_gently(n->peeled, 1);
72 if (c)
73 c->util = n;
75 return 0;
78 static int replace_name(struct commit_name *e,
79 int prio,
80 const unsigned char *sha1,
81 struct tag **tag)
83 if (!e || e->prio < prio)
84 return 1;
86 if (e->prio == 2 && prio == 2) {
87 /* Multiple annotated tags point to the same commit.
88 * Select one to keep based upon their tagger date.
90 struct tag *t;
92 if (!e->tag) {
93 t = lookup_tag(e->sha1);
94 if (!t || parse_tag(t))
95 return 1;
96 e->tag = t;
99 t = lookup_tag(sha1);
100 if (!t || parse_tag(t))
101 return 0;
102 *tag = t;
104 if (e->tag->date < t->date)
105 return 1;
108 return 0;
111 static void add_to_known_names(const char *path,
112 const unsigned char *peeled,
113 int prio,
114 const unsigned char *sha1)
116 struct commit_name *e = find_commit_name(peeled);
117 struct tag *tag = NULL;
118 if (replace_name(e, prio, sha1, &tag)) {
119 if (!e) {
120 void **pos;
121 e = xmalloc(sizeof(struct commit_name));
122 hashcpy(e->peeled, peeled);
123 pos = insert_hash(hash_sha1(peeled), e, &names);
124 if (pos) {
125 e->next = *pos;
126 *pos = e;
127 } else {
128 e->next = NULL;
131 e->tag = tag;
132 e->prio = prio;
133 e->name_checked = 0;
134 hashcpy(e->sha1, sha1);
135 e->path = path;
139 static int get_name(const char *path, const unsigned char *sha1, int flag, void *cb_data)
141 int is_tag = !prefixcmp(path, "refs/tags/");
142 unsigned char peeled[20];
143 int is_annotated, prio;
145 /* Reject anything outside refs/tags/ unless --all */
146 if (!all && !is_tag)
147 return 0;
149 /* Accept only tags that match the pattern, if given */
150 if (pattern && (!is_tag || fnmatch(pattern, path + 10, 0)))
151 return 0;
153 /* Is it annotated? */
154 if (!peel_ref(path, peeled)) {
155 is_annotated = !!hashcmp(sha1, peeled);
156 } else {
157 hashcpy(peeled, sha1);
158 is_annotated = 0;
162 * By default, we only use annotated tags, but with --tags
163 * we fall back to lightweight ones (even without --tags,
164 * we still remember lightweight ones, only to give hints
165 * in an error message). --all allows any refs to be used.
167 if (is_annotated)
168 prio = 2;
169 else if (is_tag)
170 prio = 1;
171 else
172 prio = 0;
174 add_to_known_names(all ? path + 5 : path + 10, peeled, prio, sha1);
175 return 0;
178 struct possible_tag {
179 struct commit_name *name;
180 int depth;
181 int found_order;
182 unsigned flag_within;
185 static int compare_pt(const void *a_, const void *b_)
187 struct possible_tag *a = (struct possible_tag *)a_;
188 struct possible_tag *b = (struct possible_tag *)b_;
189 if (a->depth != b->depth)
190 return a->depth - b->depth;
191 if (a->found_order != b->found_order)
192 return a->found_order - b->found_order;
193 return 0;
196 static unsigned long finish_depth_computation(
197 struct commit_list **list,
198 struct possible_tag *best)
200 unsigned long seen_commits = 0;
201 while (*list) {
202 struct commit *c = pop_commit(list);
203 struct commit_list *parents = c->parents;
204 seen_commits++;
205 if (c->object.flags & best->flag_within) {
206 struct commit_list *a = *list;
207 while (a) {
208 struct commit *i = a->item;
209 if (!(i->object.flags & best->flag_within))
210 break;
211 a = a->next;
213 if (!a)
214 break;
215 } else
216 best->depth++;
217 while (parents) {
218 struct commit *p = parents->item;
219 parse_commit(p);
220 if (!(p->object.flags & SEEN))
221 commit_list_insert_by_date(p, list);
222 p->object.flags |= c->object.flags;
223 parents = parents->next;
226 return seen_commits;
229 static void display_name(struct commit_name *n)
231 if (n->prio == 2 && !n->tag) {
232 n->tag = lookup_tag(n->sha1);
233 if (!n->tag || parse_tag(n->tag))
234 die(_("annotated tag %s not available"), n->path);
236 if (n->tag && !n->name_checked) {
237 if (!n->tag->tag)
238 die(_("annotated tag %s has no embedded name"), n->path);
239 if (strcmp(n->tag->tag, all ? n->path + 5 : n->path))
240 warning(_("tag '%s' is really '%s' here"), n->tag->tag, n->path);
241 n->name_checked = 1;
244 if (n->tag)
245 printf("%s", n->tag->tag);
246 else
247 printf("%s", n->path);
250 static void show_suffix(int depth, const unsigned char *sha1)
252 printf("-%d-g%s", depth, find_unique_abbrev(sha1, abbrev));
255 static void describe(const char *arg, int last_one)
257 unsigned char sha1[20];
258 struct commit *cmit, *gave_up_on = NULL;
259 struct commit_list *list;
260 struct commit_name *n;
261 struct possible_tag all_matches[MAX_TAGS];
262 unsigned int match_cnt = 0, annotated_cnt = 0, cur_match;
263 unsigned long seen_commits = 0;
264 unsigned int unannotated_cnt = 0;
266 if (get_sha1(arg, sha1))
267 die(_("Not a valid object name %s"), arg);
268 cmit = lookup_commit_reference(sha1);
269 if (!cmit)
270 die(_("%s is not a valid '%s' object"), arg, commit_type);
272 n = find_commit_name(cmit->object.sha1);
273 if (n && (tags || all || n->prio == 2)) {
275 * Exact match to an existing ref.
277 display_name(n);
278 if (longformat)
279 show_suffix(0, n->tag ? n->tag->tagged->sha1 : sha1);
280 if (dirty)
281 printf("%s", dirty);
282 printf("\n");
283 return;
286 if (!max_candidates)
287 die(_("no tag exactly matches '%s'"), sha1_to_hex(cmit->object.sha1));
288 if (debug)
289 fprintf(stderr, _("searching to describe %s\n"), arg);
291 if (!have_util) {
292 for_each_hash(&names, set_util, NULL);
293 have_util = 1;
296 list = NULL;
297 cmit->object.flags = SEEN;
298 commit_list_insert(cmit, &list);
299 while (list) {
300 struct commit *c = pop_commit(&list);
301 struct commit_list *parents = c->parents;
302 seen_commits++;
303 n = c->util;
304 if (n) {
305 if (!tags && !all && n->prio < 2) {
306 unannotated_cnt++;
307 } else if (match_cnt < max_candidates) {
308 struct possible_tag *t = &all_matches[match_cnt++];
309 t->name = n;
310 t->depth = seen_commits - 1;
311 t->flag_within = 1u << match_cnt;
312 t->found_order = match_cnt;
313 c->object.flags |= t->flag_within;
314 if (n->prio == 2)
315 annotated_cnt++;
317 else {
318 gave_up_on = c;
319 break;
322 for (cur_match = 0; cur_match < match_cnt; cur_match++) {
323 struct possible_tag *t = &all_matches[cur_match];
324 if (!(c->object.flags & t->flag_within))
325 t->depth++;
327 if (annotated_cnt && !list) {
328 if (debug)
329 fprintf(stderr, _("finished search at %s\n"),
330 sha1_to_hex(c->object.sha1));
331 break;
333 while (parents) {
334 struct commit *p = parents->item;
335 parse_commit(p);
336 if (!(p->object.flags & SEEN))
337 commit_list_insert_by_date(p, &list);
338 p->object.flags |= c->object.flags;
339 parents = first_parent ? NULL : parents->next;
343 if (!match_cnt) {
344 const unsigned char *sha1 = cmit->object.sha1;
345 if (always) {
346 printf("%s", find_unique_abbrev(sha1, abbrev));
347 if (dirty)
348 printf("%s", dirty);
349 printf("\n");
350 return;
352 if (unannotated_cnt)
353 die(_("No annotated tags can describe '%s'.\n"
354 "However, there were unannotated tags: try --tags."),
355 sha1_to_hex(sha1));
356 else
357 die(_("No tags can describe '%s'.\n"
358 "Try --always, or create some tags."),
359 sha1_to_hex(sha1));
362 qsort(all_matches, match_cnt, sizeof(all_matches[0]), compare_pt);
364 if (gave_up_on) {
365 commit_list_insert_by_date(gave_up_on, &list);
366 seen_commits--;
368 seen_commits += finish_depth_computation(&list, &all_matches[0]);
369 free_commit_list(list);
371 if (debug) {
372 for (cur_match = 0; cur_match < match_cnt; cur_match++) {
373 struct possible_tag *t = &all_matches[cur_match];
374 fprintf(stderr, " %-11s %8d %s\n",
375 prio_names[t->name->prio],
376 t->depth, t->name->path);
378 fprintf(stderr, _("traversed %lu commits\n"), seen_commits);
379 if (gave_up_on) {
380 fprintf(stderr,
381 _("more than %i tags found; listed %i most recent\n"
382 "gave up search at %s\n"),
383 max_candidates, max_candidates,
384 sha1_to_hex(gave_up_on->object.sha1));
388 display_name(all_matches[0].name);
389 if (abbrev)
390 show_suffix(all_matches[0].depth, cmit->object.sha1);
391 if (dirty)
392 printf("%s", dirty);
393 printf("\n");
395 if (!last_one)
396 clear_commit_marks(cmit, -1);
399 int cmd_describe(int argc, const char **argv, const char *prefix)
401 int contains = 0;
402 struct option options[] = {
403 OPT_BOOLEAN(0, "contains", &contains, N_("find the tag that comes after the commit")),
404 OPT_BOOLEAN(0, "debug", &debug, N_("debug search strategy on stderr")),
405 OPT_BOOLEAN(0, "all", &all, N_("use any ref")),
406 OPT_BOOLEAN(0, "tags", &tags, N_("use any tag, even unannotated")),
407 OPT_BOOLEAN(0, "long", &longformat, N_("always use long format")),
408 OPT__ABBREV(&abbrev),
409 OPT_SET_INT(0, "exact-match", &max_candidates,
410 N_("only output exact matches"), 0),
411 OPT_INTEGER(0, "candidates", &max_candidates,
412 N_("consider <n> most recent tags (default: 10)")),
413 OPT_STRING(0, "match", &pattern, N_("pattern"),
414 N_("only consider tags matching <pattern>")),
415 OPT_BOOLEAN(0, "always", &always,
416 N_("show abbreviated commit object as fallback")),
417 OPT_BOOLEAN(0, "first-parent", &first_parent,
418 "follow first parents only"),
419 {OPTION_STRING, 0, "dirty", &dirty, N_("mark"),
420 N_("append <mark> on dirty working tree (default: \"-dirty\")"),
421 PARSE_OPT_OPTARG, NULL, (intptr_t) "-dirty"},
422 OPT_END(),
425 git_config(git_default_config, NULL);
426 argc = parse_options(argc, argv, prefix, options, describe_usage, 0);
427 if (abbrev < 0)
428 abbrev = DEFAULT_ABBREV;
430 if (max_candidates < 0)
431 max_candidates = 0;
432 else if (max_candidates > MAX_TAGS)
433 max_candidates = MAX_TAGS;
435 save_commit_buffer = 0;
437 if (longformat && abbrev == 0)
438 die(_("--long is incompatible with --abbrev=0"));
440 if (contains && first_parent)
441 die(_("--contains is incompatible with --first-parent"));
443 if (contains) {
444 const char **args = xmalloc((7 + argc) * sizeof(char *));
445 int i = 0;
446 args[i++] = "name-rev";
447 args[i++] = "--name-only";
448 args[i++] = "--no-undefined";
449 if (always)
450 args[i++] = "--always";
451 if (!all) {
452 args[i++] = "--tags";
453 if (pattern) {
454 char *s = xmalloc(strlen("--refs=refs/tags/") + strlen(pattern) + 1);
455 sprintf(s, "--refs=refs/tags/%s", pattern);
456 args[i++] = s;
459 memcpy(args + i, argv, argc * sizeof(char *));
460 args[i + argc] = NULL;
461 return cmd_name_rev(i + argc, args, prefix);
464 init_hash(&names);
465 for_each_rawref(get_name, NULL);
466 if (!names.nr && !always)
467 die(_("No names found, cannot describe anything."));
469 if (argc == 0) {
470 if (dirty) {
471 static struct lock_file index_lock;
472 int fd;
474 read_cache_preload(NULL);
475 refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED,
476 NULL, NULL, NULL);
477 fd = hold_locked_index(&index_lock, 0);
478 if (0 <= fd)
479 update_index_if_able(&the_index, &index_lock);
481 if (!cmd_diff_index(ARRAY_SIZE(diff_index_args) - 1,
482 diff_index_args, prefix))
483 dirty = NULL;
485 describe("HEAD", 1);
486 } else if (dirty) {
487 die(_("--dirty is incompatible with committishes"));
488 } else {
489 while (argc-- > 0) {
490 describe(*argv++, argc == 0);
493 return 0;