6 #include "parse-options.h"
8 static const char* show_branch_usage[] = {
9 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]",
10 "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]",
14 static int showbranch_use_color = -1;
16 static int default_num;
17 static int default_alloc;
18 static const char **default_arg;
20 #define UNINTERESTING 01
23 #define MAX_REVS (FLAG_BITS - REV_SHIFT) /* should not exceed bits_per_int - REV_SHIFT */
25 #define DEFAULT_REFLOG 4
27 static const char *get_color_code(int idx)
29 if (want_color(showbranch_use_color))
30 return column_colors_ansi[idx % column_colors_ansi_max];
34 static const char *get_color_reset_code(void)
36 if (want_color(showbranch_use_color))
37 return GIT_COLOR_RESET;
41 static struct commit *interesting(struct commit_list *list)
44 struct commit *commit = list->item;
46 if (commit->object.flags & UNINTERESTING)
53 static struct commit *pop_one_commit(struct commit_list **list_p)
55 struct commit *commit;
56 struct commit_list *list;
65 const char *head_name; /* which head's ancestor? */
66 int generation; /* how many parents away from head_name */
69 /* Name the commit as nth generation ancestor of head_name;
70 * we count only the first-parent relationship for naming purposes.
72 static void name_commit(struct commit *commit, const char *head_name, int nth)
74 struct commit_name *name;
76 commit->util = xmalloc(sizeof(struct commit_name));
78 name->head_name = head_name;
79 name->generation = nth;
82 /* Parent is the first parent of the commit. We may name it
83 * as (n+1)th generation ancestor of the same head_name as
84 * commit is nth generation ancestor of, if that generation
85 * number is better than the name it already has.
87 static void name_parent(struct commit *commit, struct commit *parent)
89 struct commit_name *commit_name = commit->util;
90 struct commit_name *parent_name = parent->util;
94 commit_name->generation + 1 < parent_name->generation)
95 name_commit(parent, commit_name->head_name,
96 commit_name->generation + 1);
99 static int name_first_parent_chain(struct commit *c)
108 p = c->parents->item;
120 static void name_commits(struct commit_list *list,
125 struct commit_list *cl;
129 /* First give names to the given heads */
130 for (cl = list; cl; cl = cl->next) {
134 for (i = 0; i < num_rev; i++) {
136 name_commit(c, ref_name[i], 0);
142 /* Then commits on the first parent ancestry chain */
145 for (cl = list; cl; cl = cl->next) {
146 i += name_first_parent_chain(cl->item);
150 /* Finally, any unnamed commits */
153 for (cl = list; cl; cl = cl->next) {
154 struct commit_list *parents;
155 struct commit_name *n;
161 parents = c->parents;
164 struct commit *p = parents->item;
165 char newname[1000], *en;
166 parents = parents->next;
171 switch (n->generation) {
173 en += sprintf(en, "%s", n->head_name);
176 en += sprintf(en, "%s^", n->head_name);
179 en += sprintf(en, "%s~%d",
180 n->head_name, n->generation);
184 en += sprintf(en, "^");
186 en += sprintf(en, "^%d", nth);
187 name_commit(p, xstrdup(newname), 0);
189 name_first_parent_chain(p);
195 static int mark_seen(struct commit *commit, struct commit_list **seen_p)
197 if (!commit->object.flags) {
198 commit_list_insert(commit, seen_p);
204 static void join_revs(struct commit_list **list_p,
205 struct commit_list **seen_p,
206 int num_rev, int extra)
208 int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
209 int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
212 struct commit_list *parents;
213 int still_interesting = !!interesting(*list_p);
214 struct commit *commit = pop_one_commit(list_p);
215 int flags = commit->object.flags & all_mask;
217 if (!still_interesting && extra <= 0)
220 mark_seen(commit, seen_p);
221 if ((flags & all_revs) == all_revs)
222 flags |= UNINTERESTING;
223 parents = commit->parents;
226 struct commit *p = parents->item;
227 int this_flag = p->object.flags;
228 parents = parents->next;
229 if ((this_flag & flags) == flags)
231 if (!p->object.parsed)
233 if (mark_seen(p, seen_p) && !still_interesting)
235 p->object.flags |= flags;
236 commit_list_insert_by_date(p, list_p);
241 * Postprocess to complete well-poisoning.
243 * At this point we have all the commits we have seen in
244 * seen_p list. Mark anything that can be reached from
245 * uninteresting commits not interesting.
249 struct commit_list *s;
250 for (s = *seen_p; s; s = s->next) {
251 struct commit *c = s->item;
252 struct commit_list *parents;
254 if (((c->object.flags & all_revs) != all_revs) &&
255 !(c->object.flags & UNINTERESTING))
258 /* The current commit is either a merge base or
259 * already uninteresting one. Mark its parents
260 * as uninteresting commits _only_ if they are
261 * already parsed. No reason to find new ones
264 parents = c->parents;
266 struct commit *p = parents->item;
267 parents = parents->next;
268 if (!(p->object.flags & UNINTERESTING)) {
269 p->object.flags |= UNINTERESTING;
279 static void show_one_commit(struct commit *commit, int no_name)
281 struct strbuf pretty = STRBUF_INIT;
282 const char *pretty_str = "(unavailable)";
283 struct commit_name *name = commit->util;
285 if (commit->object.parsed) {
286 pp_commit_easy(CMIT_FMT_ONELINE, commit, &pretty);
287 pretty_str = pretty.buf;
289 if (!prefixcmp(pretty_str, "[PATCH] "))
293 if (name && name->head_name) {
294 printf("[%s", name->head_name);
295 if (name->generation) {
296 if (name->generation == 1)
299 printf("~%d", name->generation);
305 find_unique_abbrev(commit->object.sha1,
309 strbuf_release(&pretty);
312 static char *ref_name[MAX_REVS + 1];
313 static int ref_name_cnt;
315 static const char *find_digit_prefix(const char *s, int *v)
322 '0' <= (ch = *p) && ch <= '9';
324 ver = ver * 10 + ch - '0';
330 static int version_cmp(const char *a, const char *b)
335 a = find_digit_prefix(a, &va);
336 b = find_digit_prefix(b, &vb);
343 if ('0' <= ca && ca <= '9')
345 if ('0' <= cb && cb <= '9')
359 static int compare_ref_name(const void *a_, const void *b_)
361 const char * const*a = a_, * const*b = b_;
362 return version_cmp(*a, *b);
365 static void sort_ref_range(int bottom, int top)
367 qsort(ref_name + bottom, top - bottom, sizeof(ref_name[0]),
371 static int append_ref(const char *refname, const unsigned char *sha1,
374 struct commit *commit = lookup_commit_reference_gently(sha1, 1);
381 /* Avoid adding the same thing twice */
382 for (i = 0; i < ref_name_cnt; i++)
383 if (!strcmp(refname, ref_name[i]))
386 if (MAX_REVS <= ref_name_cnt) {
387 warning("ignoring %s; cannot handle more than %d refs",
391 ref_name[ref_name_cnt++] = xstrdup(refname);
392 ref_name[ref_name_cnt] = NULL;
396 static int append_head_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
398 unsigned char tmp[20];
400 if (prefixcmp(refname, "refs/heads/"))
402 /* If both heads/foo and tags/foo exists, get_sha1 would
405 if (get_sha1(refname + ofs, tmp) || hashcmp(tmp, sha1))
407 return append_ref(refname + ofs, sha1, 0);
410 static int append_remote_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
412 unsigned char tmp[20];
414 if (prefixcmp(refname, "refs/remotes/"))
416 /* If both heads/foo and tags/foo exists, get_sha1 would
419 if (get_sha1(refname + ofs, tmp) || hashcmp(tmp, sha1))
421 return append_ref(refname + ofs, sha1, 0);
424 static int append_tag_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
426 if (prefixcmp(refname, "refs/tags/"))
428 return append_ref(refname + 5, sha1, 0);
431 static const char *match_ref_pattern = NULL;
432 static int match_ref_slash = 0;
433 static int count_slash(const char *s)
442 static int append_matching_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
444 /* we want to allow pattern hold/<asterisk> to show all
445 * branches under refs/heads/hold/, and v0.99.9? to show
446 * refs/tags/v0.99.9a and friends.
449 int slash = count_slash(refname);
450 for (tail = refname; *tail && match_ref_slash < slash; )
455 if (fnmatch(match_ref_pattern, tail, 0))
457 if (!prefixcmp(refname, "refs/heads/"))
458 return append_head_ref(refname, sha1, flag, cb_data);
459 if (!prefixcmp(refname, "refs/tags/"))
460 return append_tag_ref(refname, sha1, flag, cb_data);
461 return append_ref(refname, sha1, 0);
464 static void snarf_refs(int head, int remotes)
467 int orig_cnt = ref_name_cnt;
468 for_each_ref(append_head_ref, NULL);
469 sort_ref_range(orig_cnt, ref_name_cnt);
472 int orig_cnt = ref_name_cnt;
473 for_each_ref(append_remote_ref, NULL);
474 sort_ref_range(orig_cnt, ref_name_cnt);
478 static int rev_is_head(char *head, int headlen, char *name,
479 unsigned char *head_sha1, unsigned char *sha1)
482 (head_sha1 && sha1 && hashcmp(head_sha1, sha1)))
484 if (!prefixcmp(head, "refs/heads/"))
486 if (!prefixcmp(name, "refs/heads/"))
488 else if (!prefixcmp(name, "heads/"))
490 return !strcmp(head, name);
493 static int show_merge_base(struct commit_list *seen, int num_rev)
495 int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
496 int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
500 struct commit *commit = pop_one_commit(&seen);
501 int flags = commit->object.flags & all_mask;
502 if (!(flags & UNINTERESTING) &&
503 ((flags & all_revs) == all_revs)) {
504 puts(sha1_to_hex(commit->object.sha1));
506 commit->object.flags |= UNINTERESTING;
512 static int show_independent(struct commit **rev,
515 unsigned int *rev_mask)
519 for (i = 0; i < num_rev; i++) {
520 struct commit *commit = rev[i];
521 unsigned int flag = rev_mask[i];
523 if (commit->object.flags == flag)
524 puts(sha1_to_hex(commit->object.sha1));
525 commit->object.flags |= UNINTERESTING;
530 static void append_one_rev(const char *av)
532 unsigned char revkey[20];
533 if (!get_sha1(av, revkey)) {
534 append_ref(av, revkey, 0);
537 if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
538 /* glob style match */
539 int saved_matches = ref_name_cnt;
540 match_ref_pattern = av;
541 match_ref_slash = count_slash(av);
542 for_each_ref(append_matching_ref, NULL);
543 if (saved_matches == ref_name_cnt &&
544 ref_name_cnt < MAX_REVS)
545 error("no matching refs with %s", av);
546 if (saved_matches + 1 < ref_name_cnt)
547 sort_ref_range(saved_matches, ref_name_cnt);
550 die("bad sha1 reference %s", av);
553 static int git_show_branch_config(const char *var, const char *value, void *cb)
555 if (!strcmp(var, "showbranch.default")) {
557 return config_error_nonbool(var);
559 * default_arg is now passed to parse_options(), so we need to
560 * mimic the real argv a bit better.
564 default_arg = xcalloc(default_alloc, sizeof(*default_arg));
565 default_arg[default_num++] = "show-branch";
566 } else if (default_alloc <= default_num + 1) {
567 default_alloc = default_alloc * 3 / 2 + 20;
568 default_arg = xrealloc(default_arg, sizeof *default_arg * default_alloc);
570 default_arg[default_num++] = xstrdup(value);
571 default_arg[default_num] = NULL;
575 if (!strcmp(var, "color.showbranch")) {
576 showbranch_use_color = git_config_colorbool(var, value);
580 return git_color_default_config(var, value, cb);
583 static int omit_in_dense(struct commit *commit, struct commit **rev, int n)
585 /* If the commit is tip of the named branches, do not
587 * Otherwise, if it is a merge that is reachable from only one
588 * tip, it is not that interesting.
591 for (i = 0; i < n; i++)
592 if (rev[i] == commit)
594 flag = commit->object.flags;
595 for (i = count = 0; i < n; i++) {
596 if (flag & (1u << (i + REV_SHIFT)))
604 static int reflog = 0;
606 static int parse_reflog_param(const struct option *opt, const char *arg,
610 const char **base = (const char **)opt->value;
613 reflog = strtoul(arg, &ep, 10);
617 return error("unrecognized reflog param '%s'", arg);
621 reflog = DEFAULT_REFLOG;
625 int cmd_show_branch(int ac, const char **av, const char *prefix)
627 struct commit *rev[MAX_REVS], *commit;
628 char *reflog_msg[MAX_REVS];
629 struct commit_list *list = NULL, *seen = NULL;
630 unsigned int rev_mask[MAX_REVS];
631 int num_rev, i, extra = 0;
632 int all_heads = 0, all_remotes = 0;
633 int all_mask, all_revs;
638 unsigned char head_sha1[20];
643 int shown_merge_point = 0;
644 int with_current_branch = 0;
648 const char *reflog_base = NULL;
649 struct option builtin_show_branch_options[] = {
650 OPT_BOOLEAN('a', "all", &all_heads,
651 "show remote-tracking and local branches"),
652 OPT_BOOLEAN('r', "remotes", &all_remotes,
653 "show remote-tracking branches"),
654 OPT__COLOR(&showbranch_use_color,
655 "color '*!+-' corresponding to the branch"),
656 { OPTION_INTEGER, 0, "more", &extra, "n",
657 "show <n> more commits after the common ancestor",
658 PARSE_OPT_OPTARG, NULL, (intptr_t)1 },
659 OPT_SET_INT(0, "list", &extra, "synonym to more=-1", -1),
660 OPT_BOOLEAN(0, "no-name", &no_name, "suppress naming strings"),
661 OPT_BOOLEAN(0, "current", &with_current_branch,
662 "include the current branch"),
663 OPT_BOOLEAN(0, "sha1-name", &sha1_name,
664 "name commits with their object names"),
665 OPT_BOOLEAN(0, "merge-base", &merge_base,
666 "show possible merge bases"),
667 OPT_BOOLEAN(0, "independent", &independent,
668 "show refs unreachable from any other ref"),
669 OPT_BOOLEAN(0, "topo-order", &lifo,
670 "show commits in topological order"),
671 OPT_BOOLEAN(0, "topics", &topics,
672 "show only commits not on the first branch"),
673 OPT_SET_INT(0, "sparse", &dense,
674 "show merges reachable from only one tip", 0),
675 OPT_SET_INT(0, "date-order", &lifo,
676 "show commits where no parent comes before its "
678 { OPTION_CALLBACK, 'g', "reflog", &reflog_base, "<n>[,<base>]",
679 "show <n> most recent ref-log entries starting at "
681 PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP,
682 parse_reflog_param },
686 git_config(git_show_branch_config, NULL);
688 /* If nothing is specified, try the default first */
689 if (ac == 1 && default_num) {
694 ac = parse_options(ac, av, prefix, builtin_show_branch_options,
695 show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION);
699 if (extra || reflog) {
700 /* "listing" mode is incompatible with
701 * independent nor merge-base modes.
703 if (independent || merge_base)
704 usage_with_options(show_branch_usage,
705 builtin_show_branch_options);
706 if (reflog && ((0 < extra) || all_heads || all_remotes))
708 * Asking for --more in reflog mode does not
709 * make sense. --list is Ok.
711 * Also --all and --remotes do not make sense either.
713 die("--reflog is incompatible with --all, --remotes, "
714 "--independent or --merge-base");
717 /* If nothing is specified, show all branches by default */
718 if (ac + all_heads + all_remotes == 0)
722 unsigned char sha1[20];
728 static const char *fake_av[2];
731 refname = resolve_ref("HEAD", sha1, 1, NULL);
732 fake_av[0] = xstrdup(refname);
738 die("--reflog option needs one branch name");
740 if (MAX_REVS < reflog)
741 die("Only %d entries can be shown at one time.",
743 if (!dwim_ref(*av, strlen(*av), sha1, &ref))
744 die("No such ref %s", *av);
746 /* Has the base been specified? */
749 base = strtoul(reflog_base, &ep, 10);
751 /* Ah, that is a date spec... */
753 at = approxidate(reflog_base);
754 read_ref_at(ref, at, -1, sha1, NULL,
759 for (i = 0; i < reflog; i++) {
762 unsigned long timestamp;
765 if (read_ref_at(ref, 0, base+i, sha1, &logmsg,
766 ×tamp, &tz, NULL)) {
770 msg = strchr(logmsg, '\t');
775 m = xmalloc(strlen(msg) + 200);
776 sprintf(m, "(%s) %s",
777 show_date(timestamp, tz, 1),
781 sprintf(nth_desc, "%s@{%d}", *av, base+i);
782 append_ref(nth_desc, sha1, 1);
785 else if (all_heads + all_remotes)
786 snarf_refs(all_heads, all_remotes);
794 head_p = resolve_ref("HEAD", head_sha1, 1, NULL);
796 head_len = strlen(head_p);
797 memcpy(head, head_p, head_len + 1);
804 if (with_current_branch && head_p) {
806 for (i = 0; !has_head && i < ref_name_cnt; i++) {
807 /* We are only interested in adding the branch
810 if (rev_is_head(head,
817 int offset = !prefixcmp(head, "refs/heads/") ? 11 : 0;
818 append_one_rev(head + offset);
823 fprintf(stderr, "No revs to be shown.\n");
827 for (num_rev = 0; ref_name[num_rev]; num_rev++) {
828 unsigned char revkey[20];
829 unsigned int flag = 1u << (num_rev + REV_SHIFT);
831 if (MAX_REVS <= num_rev)
832 die("cannot handle more than %d revs.", MAX_REVS);
833 if (get_sha1(ref_name[num_rev], revkey))
834 die("'%s' is not a valid ref.", ref_name[num_rev]);
835 commit = lookup_commit_reference(revkey);
837 die("cannot find commit %s (%s)",
838 ref_name[num_rev], revkey);
839 parse_commit(commit);
840 mark_seen(commit, &seen);
842 /* rev#0 uses bit REV_SHIFT, rev#1 uses bit REV_SHIFT+1,
843 * and so on. REV_SHIFT bits from bit 0 are used for
844 * internal bookkeeping.
846 commit->object.flags |= flag;
847 if (commit->object.flags == flag)
848 commit_list_insert_by_date(commit, &list);
849 rev[num_rev] = commit;
851 for (i = 0; i < num_rev; i++)
852 rev_mask[i] = rev[i]->object.flags;
855 join_revs(&list, &seen, num_rev, extra);
857 commit_list_sort_by_date(&seen);
860 return show_merge_base(seen, num_rev);
863 return show_independent(rev, num_rev, ref_name, rev_mask);
865 /* Show list; --more=-1 means list-only */
866 if (1 < num_rev || extra < 0) {
867 for (i = 0; i < num_rev; i++) {
869 int is_head = rev_is_head(head,
873 rev[i]->object.sha1);
876 is_head ? '*' : ' ', ref_name[i]);
878 for (j = 0; j < i; j++)
880 printf("%s%c%s [%s] ",
883 get_color_reset_code(), ref_name[i]);
887 /* header lines never need name */
888 show_one_commit(rev[i], 1);
897 for (i = 0; i < num_rev; i++)
905 /* Sort topologically */
906 sort_in_topological_order(&seen, lifo);
908 /* Give names to commits */
909 if (!sha1_name && !no_name)
910 name_commits(seen, rev, ref_name, num_rev);
912 all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
913 all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
916 struct commit *commit = pop_one_commit(&seen);
917 int this_flag = commit->object.flags;
918 int is_merge_point = ((this_flag & all_revs) == all_revs);
920 shown_merge_point |= is_merge_point;
923 int is_merge = !!(commit->parents &&
924 commit->parents->next);
927 (this_flag & (1u << REV_SHIFT)))
929 if (dense && is_merge &&
930 omit_in_dense(commit, rev, num_rev))
932 for (i = 0; i < num_rev; i++) {
934 if (!(this_flag & (1u << (i + REV_SHIFT))))
938 else if (i == head_at)
944 mark, get_color_reset_code());
948 show_one_commit(commit, no_name);
950 if (shown_merge_point && --extra < 0)