6 static const char show_branch_usage[] =
7 "git-show-branch [--sparse] [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...] | --reflog[=n] <branch>";
9 static int default_num;
10 static int default_alloc;
11 static const char **default_arg;
13 #define UNINTERESTING 01
16 #define MAX_REVS (FLAG_BITS - REV_SHIFT) /* should not exceed bits_per_int - REV_SHIFT */
18 #define DEFAULT_REFLOG 4
20 static struct commit *interesting(struct commit_list *list)
23 struct commit *commit = list->item;
25 if (commit->object.flags & UNINTERESTING)
32 static struct commit *pop_one_commit(struct commit_list **list_p)
34 struct commit *commit;
35 struct commit_list *list;
44 const char *head_name; /* which head's ancestor? */
45 int generation; /* how many parents away from head_name */
48 /* Name the commit as nth generation ancestor of head_name;
49 * we count only the first-parent relationship for naming purposes.
51 static void name_commit(struct commit *commit, const char *head_name, int nth)
53 struct commit_name *name;
55 commit->util = xmalloc(sizeof(struct commit_name));
57 name->head_name = head_name;
58 name->generation = nth;
61 /* Parent is the first parent of the commit. We may name it
62 * as (n+1)th generation ancestor of the same head_name as
63 * commit is nth generation ancestor of, if that generation
64 * number is better than the name it already has.
66 static void name_parent(struct commit *commit, struct commit *parent)
68 struct commit_name *commit_name = commit->util;
69 struct commit_name *parent_name = parent->util;
73 commit_name->generation + 1 < parent_name->generation)
74 name_commit(parent, commit_name->head_name,
75 commit_name->generation + 1);
78 static int name_first_parent_chain(struct commit *c)
99 static void name_commits(struct commit_list *list,
104 struct commit_list *cl;
108 /* First give names to the given heads */
109 for (cl = list; cl; cl = cl->next) {
113 for (i = 0; i < num_rev; i++) {
115 name_commit(c, ref_name[i], 0);
121 /* Then commits on the first parent ancestry chain */
124 for (cl = list; cl; cl = cl->next) {
125 i += name_first_parent_chain(cl->item);
129 /* Finally, any unnamed commits */
132 for (cl = list; cl; cl = cl->next) {
133 struct commit_list *parents;
134 struct commit_name *n;
140 parents = c->parents;
143 struct commit *p = parents->item;
144 char newname[1000], *en;
145 parents = parents->next;
150 switch (n->generation) {
152 en += sprintf(en, "%s", n->head_name);
155 en += sprintf(en, "%s^", n->head_name);
158 en += sprintf(en, "%s~%d",
159 n->head_name, n->generation);
163 en += sprintf(en, "^");
165 en += sprintf(en, "^%d", nth);
166 name_commit(p, xstrdup(newname), 0);
168 name_first_parent_chain(p);
174 static int mark_seen(struct commit *commit, struct commit_list **seen_p)
176 if (!commit->object.flags) {
177 commit_list_insert(commit, seen_p);
183 static void join_revs(struct commit_list **list_p,
184 struct commit_list **seen_p,
185 int num_rev, int extra)
187 int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
188 int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
191 struct commit_list *parents;
192 int still_interesting = !!interesting(*list_p);
193 struct commit *commit = pop_one_commit(list_p);
194 int flags = commit->object.flags & all_mask;
196 if (!still_interesting && extra <= 0)
199 mark_seen(commit, seen_p);
200 if ((flags & all_revs) == all_revs)
201 flags |= UNINTERESTING;
202 parents = commit->parents;
205 struct commit *p = parents->item;
206 int this_flag = p->object.flags;
207 parents = parents->next;
208 if ((this_flag & flags) == flags)
210 if (!p->object.parsed)
212 if (mark_seen(p, seen_p) && !still_interesting)
214 p->object.flags |= flags;
215 insert_by_date(p, list_p);
220 * Postprocess to complete well-poisoning.
222 * At this point we have all the commits we have seen in
223 * seen_p list. Mark anything that can be reached from
224 * uninteresting commits not interesting.
228 struct commit_list *s;
229 for (s = *seen_p; s; s = s->next) {
230 struct commit *c = s->item;
231 struct commit_list *parents;
233 if (((c->object.flags & all_revs) != all_revs) &&
234 !(c->object.flags & UNINTERESTING))
237 /* The current commit is either a merge base or
238 * already uninteresting one. Mark its parents
239 * as uninteresting commits _only_ if they are
240 * already parsed. No reason to find new ones
243 parents = c->parents;
245 struct commit *p = parents->item;
246 parents = parents->next;
247 if (!(p->object.flags & UNINTERESTING)) {
248 p->object.flags |= UNINTERESTING;
258 static void show_one_commit(struct commit *commit, int no_name)
260 char pretty[256], *cp;
261 struct commit_name *name = commit->util;
262 if (commit->object.parsed)
263 pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
264 pretty, sizeof(pretty), 0, NULL, NULL, 0);
266 strcpy(pretty, "(unavailable)");
267 if (!strncmp(pretty, "[PATCH] ", 8))
273 if (name && name->head_name) {
274 printf("[%s", name->head_name);
275 if (name->generation) {
276 if (name->generation == 1)
279 printf("~%d", name->generation);
285 find_unique_abbrev(commit->object.sha1, 7));
290 static char *ref_name[MAX_REVS + 1];
291 static int ref_name_cnt;
293 static const char *find_digit_prefix(const char *s, int *v)
300 '0' <= (ch = *p) && ch <= '9';
302 ver = ver * 10 + ch - '0';
308 static int version_cmp(const char *a, const char *b)
313 a = find_digit_prefix(a, &va);
314 b = find_digit_prefix(b, &vb);
321 if ('0' <= ca && ca <= '9')
323 if ('0' <= cb && cb <= '9')
337 static int compare_ref_name(const void *a_, const void *b_)
339 const char * const*a = a_, * const*b = b_;
340 return version_cmp(*a, *b);
343 static void sort_ref_range(int bottom, int top)
345 qsort(ref_name + bottom, top - bottom, sizeof(ref_name[0]),
349 static int append_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
351 struct commit *commit = lookup_commit_reference_gently(sha1, 1);
356 /* Avoid adding the same thing twice */
357 for (i = 0; i < ref_name_cnt; i++)
358 if (!strcmp(refname, ref_name[i]))
361 if (MAX_REVS <= ref_name_cnt) {
362 fprintf(stderr, "warning: ignoring %s; "
363 "cannot handle more than %d refs\n",
367 ref_name[ref_name_cnt++] = xstrdup(refname);
368 ref_name[ref_name_cnt] = NULL;
372 static int append_head_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
374 unsigned char tmp[20];
376 if (strncmp(refname, "refs/heads/", ofs))
378 /* If both heads/foo and tags/foo exists, get_sha1 would
381 if (get_sha1(refname + ofs, tmp) || hashcmp(tmp, sha1))
383 return append_ref(refname + ofs, sha1, flag, cb_data);
386 static int append_tag_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
388 if (strncmp(refname, "refs/tags/", 10))
390 return append_ref(refname + 5, sha1, flag, cb_data);
393 static const char *match_ref_pattern = NULL;
394 static int match_ref_slash = 0;
395 static int count_slash(const char *s)
404 static int append_matching_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
406 /* we want to allow pattern hold/<asterisk> to show all
407 * branches under refs/heads/hold/, and v0.99.9? to show
408 * refs/tags/v0.99.9a and friends.
411 int slash = count_slash(refname);
412 for (tail = refname; *tail && match_ref_slash < slash; )
417 if (fnmatch(match_ref_pattern, tail, 0))
419 if (!strncmp("refs/heads/", refname, 11))
420 return append_head_ref(refname, sha1, flag, cb_data);
421 if (!strncmp("refs/tags/", refname, 10))
422 return append_tag_ref(refname, sha1, flag, cb_data);
423 return append_ref(refname, sha1, flag, cb_data);
426 static void snarf_refs(int head, int tag)
429 int orig_cnt = ref_name_cnt;
430 for_each_ref(append_head_ref, NULL);
431 sort_ref_range(orig_cnt, ref_name_cnt);
434 int orig_cnt = ref_name_cnt;
435 for_each_ref(append_tag_ref, NULL);
436 sort_ref_range(orig_cnt, ref_name_cnt);
440 static int rev_is_head(char *head, int headlen, char *name,
441 unsigned char *head_sha1, unsigned char *sha1)
444 (head_sha1 && sha1 && hashcmp(head_sha1, sha1)))
446 if (!strncmp(head, "refs/heads/", 11))
448 if (!strncmp(name, "refs/heads/", 11))
450 else if (!strncmp(name, "heads/", 6))
452 return !strcmp(head, name);
455 static int show_merge_base(struct commit_list *seen, int num_rev)
457 int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
458 int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
462 struct commit *commit = pop_one_commit(&seen);
463 int flags = commit->object.flags & all_mask;
464 if (!(flags & UNINTERESTING) &&
465 ((flags & all_revs) == all_revs)) {
466 puts(sha1_to_hex(commit->object.sha1));
468 commit->object.flags |= UNINTERESTING;
474 static int show_independent(struct commit **rev,
477 unsigned int *rev_mask)
481 for (i = 0; i < num_rev; i++) {
482 struct commit *commit = rev[i];
483 unsigned int flag = rev_mask[i];
485 if (commit->object.flags == flag)
486 puts(sha1_to_hex(commit->object.sha1));
487 commit->object.flags |= UNINTERESTING;
492 static void append_one_rev(const char *av)
494 unsigned char revkey[20];
495 if (!get_sha1(av, revkey)) {
496 append_ref(av, revkey, 0, NULL);
499 if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
500 /* glob style match */
501 int saved_matches = ref_name_cnt;
502 match_ref_pattern = av;
503 match_ref_slash = count_slash(av);
504 for_each_ref(append_matching_ref, NULL);
505 if (saved_matches == ref_name_cnt &&
506 ref_name_cnt < MAX_REVS)
507 error("no matching refs with %s", av);
508 if (saved_matches + 1 < ref_name_cnt)
509 sort_ref_range(saved_matches, ref_name_cnt);
512 die("bad sha1 reference %s", av);
515 static int git_show_branch_config(const char *var, const char *value)
517 if (!strcmp(var, "showbranch.default")) {
518 if (default_alloc <= default_num + 1) {
519 default_alloc = default_alloc * 3 / 2 + 20;
520 default_arg = xrealloc(default_arg, sizeof *default_arg * default_alloc);
522 default_arg[default_num++] = xstrdup(value);
523 default_arg[default_num] = NULL;
527 return git_default_config(var, value);
530 static int omit_in_dense(struct commit *commit, struct commit **rev, int n)
532 /* If the commit is tip of the named branches, do not
534 * Otherwise, if it is a merge that is reachable from only one
535 * tip, it is not that interesting.
538 for (i = 0; i < n; i++)
539 if (rev[i] == commit)
541 flag = commit->object.flags;
542 for (i = count = 0; i < n; i++) {
543 if (flag & (1u << (i + REV_SHIFT)))
551 int cmd_show_branch(int ac, const char **av, const char *prefix)
553 struct commit *rev[MAX_REVS], *commit;
554 struct commit_list *list = NULL, *seen = NULL;
555 unsigned int rev_mask[MAX_REVS];
556 int num_rev, i, extra = 0;
557 int all_heads = 0, all_tags = 0;
558 int all_mask, all_revs;
563 unsigned char head_sha1[20];
568 int shown_merge_point = 0;
569 int with_current_branch = 0;
575 git_config(git_show_branch_config);
577 /* If nothing is specified, try the default first */
578 if (ac == 1 && default_num) {
579 ac = default_num + 1;
580 av = default_arg - 1; /* ick; we would not address av[0] */
583 while (1 < ac && av[1][0] == '-') {
584 const char *arg = av[1];
585 if (!strcmp(arg, "--")) {
589 else if (!strcmp(arg, "--all"))
590 all_heads = all_tags = 1;
591 else if (!strcmp(arg, "--heads"))
593 else if (!strcmp(arg, "--tags"))
595 else if (!strcmp(arg, "--more"))
597 else if (!strcmp(arg, "--list"))
599 else if (!strcmp(arg, "--no-name"))
601 else if (!strcmp(arg, "--current"))
602 with_current_branch = 1;
603 else if (!strcmp(arg, "--sha1-name"))
605 else if (!strncmp(arg, "--more=", 7))
606 extra = atoi(arg + 7);
607 else if (!strcmp(arg, "--merge-base"))
609 else if (!strcmp(arg, "--independent"))
611 else if (!strcmp(arg, "--topo-order"))
613 else if (!strcmp(arg, "--topics"))
615 else if (!strcmp(arg, "--sparse"))
617 else if (!strcmp(arg, "--date-order"))
619 else if (!strcmp(arg, "--reflog")) {
620 reflog = DEFAULT_REFLOG;
622 else if (!strncmp(arg, "--reflog=", 9)) {
624 reflog = strtoul(arg + 9, &end, 10);
626 die("unrecognized reflog count '%s'", arg + 9);
629 usage(show_branch_usage);
634 /* Only one of these is allowed */
635 if (1 < independent + merge_base + (extra != 0) + (!!reflog))
636 usage(show_branch_usage);
638 /* If nothing is specified, show all branches by default */
639 if (ac + all_heads + all_tags == 0)
642 if (all_heads + all_tags)
643 snarf_refs(all_heads, all_tags);
647 die("--reflog option needs one branch name");
648 reflen = strlen(*av);
649 for (i = 0; i < reflog; i++) {
650 char *name = xmalloc(reflen + 20);
651 sprintf(name, "%s@{%d}", *av, i);
652 append_one_rev(name);
662 head_p = resolve_ref("HEAD", head_sha1, 1, NULL);
664 head_len = strlen(head_p);
665 memcpy(head, head_p, head_len + 1);
672 if (with_current_branch && head_p) {
674 for (i = 0; !has_head && i < ref_name_cnt; i++) {
675 /* We are only interested in adding the branch
678 if (rev_is_head(head,
685 int pfxlen = strlen("refs/heads/");
686 append_one_rev(head + pfxlen);
691 fprintf(stderr, "No revs to be shown.\n");
695 for (num_rev = 0; ref_name[num_rev]; num_rev++) {
696 unsigned char revkey[20];
697 unsigned int flag = 1u << (num_rev + REV_SHIFT);
699 if (MAX_REVS <= num_rev)
700 die("cannot handle more than %d revs.", MAX_REVS);
701 if (get_sha1(ref_name[num_rev], revkey))
702 die("'%s' is not a valid ref.", ref_name[num_rev]);
703 commit = lookup_commit_reference(revkey);
705 die("cannot find commit %s (%s)",
706 ref_name[num_rev], revkey);
707 parse_commit(commit);
708 mark_seen(commit, &seen);
710 /* rev#0 uses bit REV_SHIFT, rev#1 uses bit REV_SHIFT+1,
711 * and so on. REV_SHIFT bits from bit 0 are used for
712 * internal bookkeeping.
714 commit->object.flags |= flag;
715 if (commit->object.flags == flag)
716 insert_by_date(commit, &list);
717 rev[num_rev] = commit;
719 for (i = 0; i < num_rev; i++)
720 rev_mask[i] = rev[i]->object.flags;
723 join_revs(&list, &seen, num_rev, extra);
728 return show_merge_base(seen, num_rev);
731 return show_independent(rev, num_rev, ref_name, rev_mask);
733 /* Show list; --more=-1 means list-only */
734 if (1 < num_rev || extra < 0) {
735 for (i = 0; i < num_rev; i++) {
737 int is_head = rev_is_head(head,
741 rev[i]->object.sha1);
744 is_head ? '*' : ' ', ref_name[i]);
746 for (j = 0; j < i; j++)
749 is_head ? '*' : '!', ref_name[i]);
751 /* header lines never need name */
752 show_one_commit(rev[i], 1);
757 for (i = 0; i < num_rev; i++)
765 /* Sort topologically */
766 sort_in_topological_order(&seen, lifo);
768 /* Give names to commits */
769 if (!sha1_name && !no_name)
770 name_commits(seen, rev, ref_name, num_rev);
772 all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
773 all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
776 struct commit *commit = pop_one_commit(&seen);
777 int this_flag = commit->object.flags;
778 int is_merge_point = ((this_flag & all_revs) == all_revs);
780 shown_merge_point |= is_merge_point;
783 int is_merge = !!(commit->parents &&
784 commit->parents->next);
787 (this_flag & (1u << REV_SHIFT)))
789 if (dense && is_merge &&
790 omit_in_dense(commit, rev, num_rev))
792 for (i = 0; i < num_rev; i++) {
794 if (!(this_flag & (1u << (i + REV_SHIFT))))
798 else if (i == head_at)
806 show_one_commit(commit, no_name);
808 if (shown_merge_point && --extra < 0)