6 #include "parse-options.h"
8 static const char* show_branch_usage[] = {
9 N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10 " [--current] [--color[=<when>] | --no-color] [--sparse]\n"
11 " [--more=<n> | --list | --independent | --merge-base]\n"
12 " [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
13 N_("git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"),
17 static int showbranch_use_color = -1;
19 static int default_num;
20 static int default_alloc;
21 static const char **default_arg;
23 #define UNINTERESTING 01
26 #define MAX_REVS (FLAG_BITS - REV_SHIFT) /* should not exceed bits_per_int - REV_SHIFT */
28 #define DEFAULT_REFLOG 4
30 static const char *get_color_code(int idx)
32 if (want_color(showbranch_use_color))
33 return column_colors_ansi[idx % column_colors_ansi_max];
37 static const char *get_color_reset_code(void)
39 if (want_color(showbranch_use_color))
40 return GIT_COLOR_RESET;
44 static struct commit *interesting(struct commit_list *list)
47 struct commit *commit = list->item;
49 if (commit->object.flags & UNINTERESTING)
56 static struct commit *pop_one_commit(struct commit_list **list_p)
58 struct commit *commit;
59 struct commit_list *list;
68 const char *head_name; /* which head's ancestor? */
69 int generation; /* how many parents away from head_name */
72 /* Name the commit as nth generation ancestor of head_name;
73 * we count only the first-parent relationship for naming purposes.
75 static void name_commit(struct commit *commit, const char *head_name, int nth)
77 struct commit_name *name;
79 commit->util = xmalloc(sizeof(struct commit_name));
81 name->head_name = head_name;
82 name->generation = nth;
85 /* Parent is the first parent of the commit. We may name it
86 * as (n+1)th generation ancestor of the same head_name as
87 * commit is nth generation ancestor of, if that generation
88 * number is better than the name it already has.
90 static void name_parent(struct commit *commit, struct commit *parent)
92 struct commit_name *commit_name = commit->util;
93 struct commit_name *parent_name = parent->util;
97 commit_name->generation + 1 < parent_name->generation)
98 name_commit(parent, commit_name->head_name,
99 commit_name->generation + 1);
102 static int name_first_parent_chain(struct commit *c)
111 p = c->parents->item;
123 static void name_commits(struct commit_list *list,
128 struct commit_list *cl;
132 /* First give names to the given heads */
133 for (cl = list; cl; cl = cl->next) {
137 for (i = 0; i < num_rev; i++) {
139 name_commit(c, ref_name[i], 0);
145 /* Then commits on the first parent ancestry chain */
148 for (cl = list; cl; cl = cl->next) {
149 i += name_first_parent_chain(cl->item);
153 /* Finally, any unnamed commits */
156 for (cl = list; cl; cl = cl->next) {
157 struct commit_list *parents;
158 struct commit_name *n;
164 parents = c->parents;
167 struct commit *p = parents->item;
168 struct strbuf newname = STRBUF_INIT;
169 parents = parents->next;
173 switch (n->generation) {
175 strbuf_addstr(&newname, n->head_name);
178 strbuf_addf(&newname, "%s^", n->head_name);
181 strbuf_addf(&newname, "%s~%d",
182 n->head_name, n->generation);
186 strbuf_addch(&newname, '^');
188 strbuf_addf(&newname, "^%d", nth);
189 name_commit(p, strbuf_detach(&newname, NULL), 0);
191 name_first_parent_chain(p);
197 static int mark_seen(struct commit *commit, struct commit_list **seen_p)
199 if (!commit->object.flags) {
200 commit_list_insert(commit, seen_p);
206 static void join_revs(struct commit_list **list_p,
207 struct commit_list **seen_p,
208 int num_rev, int extra)
210 int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
211 int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
214 struct commit_list *parents;
215 int still_interesting = !!interesting(*list_p);
216 struct commit *commit = pop_one_commit(list_p);
217 int flags = commit->object.flags & all_mask;
219 if (!still_interesting && extra <= 0)
222 mark_seen(commit, seen_p);
223 if ((flags & all_revs) == all_revs)
224 flags |= UNINTERESTING;
225 parents = commit->parents;
228 struct commit *p = parents->item;
229 int this_flag = p->object.flags;
230 parents = parents->next;
231 if ((this_flag & flags) == flags)
234 if (mark_seen(p, seen_p) && !still_interesting)
236 p->object.flags |= flags;
237 commit_list_insert_by_date(p, list_p);
242 * Postprocess to complete well-poisoning.
244 * At this point we have all the commits we have seen in
245 * seen_p list. Mark anything that can be reached from
246 * uninteresting commits not interesting.
250 struct commit_list *s;
251 for (s = *seen_p; s; s = s->next) {
252 struct commit *c = s->item;
253 struct commit_list *parents;
255 if (((c->object.flags & all_revs) != all_revs) &&
256 !(c->object.flags & UNINTERESTING))
259 /* The current commit is either a merge base or
260 * already uninteresting one. Mark its parents
261 * as uninteresting commits _only_ if they are
262 * already parsed. No reason to find new ones
265 parents = c->parents;
267 struct commit *p = parents->item;
268 parents = parents->next;
269 if (!(p->object.flags & UNINTERESTING)) {
270 p->object.flags |= UNINTERESTING;
280 static void show_one_commit(struct commit *commit, int no_name)
282 struct strbuf pretty = STRBUF_INIT;
283 const char *pretty_str = "(unavailable)";
284 struct commit_name *name = commit->util;
286 if (commit->object.parsed) {
287 pp_commit_easy(CMIT_FMT_ONELINE, commit, &pretty);
288 pretty_str = pretty.buf;
290 if (starts_with(pretty_str, "[PATCH] "))
294 if (name && name->head_name) {
295 printf("[%s", name->head_name);
296 if (name->generation) {
297 if (name->generation == 1)
300 printf("~%d", name->generation);
306 find_unique_abbrev(commit->object.sha1,
310 strbuf_release(&pretty);
313 static char *ref_name[MAX_REVS + 1];
314 static int ref_name_cnt;
316 static const char *find_digit_prefix(const char *s, int *v)
323 '0' <= (ch = *p) && ch <= '9';
325 ver = ver * 10 + ch - '0';
331 static int version_cmp(const char *a, const char *b)
336 a = find_digit_prefix(a, &va);
337 b = find_digit_prefix(b, &vb);
344 if ('0' <= ca && ca <= '9')
346 if ('0' <= cb && cb <= '9')
360 static int compare_ref_name(const void *a_, const void *b_)
362 const char * const*a = a_, * const*b = b_;
363 return version_cmp(*a, *b);
366 static void sort_ref_range(int bottom, int top)
368 qsort(ref_name + bottom, top - bottom, sizeof(ref_name[0]),
372 static int append_ref(const char *refname, const unsigned char *sha1,
375 struct commit *commit = lookup_commit_reference_gently(sha1, 1);
382 /* Avoid adding the same thing twice */
383 for (i = 0; i < ref_name_cnt; i++)
384 if (!strcmp(refname, ref_name[i]))
387 if (MAX_REVS <= ref_name_cnt) {
388 warning("ignoring %s; cannot handle more than %d refs",
392 ref_name[ref_name_cnt++] = xstrdup(refname);
393 ref_name[ref_name_cnt] = NULL;
397 static int append_head_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
399 unsigned char tmp[20];
401 if (!starts_with(refname, "refs/heads/"))
403 /* If both heads/foo and tags/foo exists, get_sha1 would
406 if (get_sha1(refname + ofs, tmp) || hashcmp(tmp, sha1))
408 return append_ref(refname + ofs, sha1, 0);
411 static int append_remote_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
413 unsigned char tmp[20];
415 if (!starts_with(refname, "refs/remotes/"))
417 /* If both heads/foo and tags/foo exists, get_sha1 would
420 if (get_sha1(refname + ofs, tmp) || hashcmp(tmp, sha1))
422 return append_ref(refname + ofs, sha1, 0);
425 static int append_tag_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
427 if (!starts_with(refname, "refs/tags/"))
429 return append_ref(refname + 5, sha1, 0);
432 static const char *match_ref_pattern = NULL;
433 static int match_ref_slash = 0;
434 static int count_slash(const char *s)
443 static int append_matching_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
445 /* we want to allow pattern hold/<asterisk> to show all
446 * branches under refs/heads/hold/, and v0.99.9? to show
447 * refs/tags/v0.99.9a and friends.
450 int slash = count_slash(refname);
451 for (tail = refname; *tail && match_ref_slash < slash; )
456 if (wildmatch(match_ref_pattern, tail, 0, NULL))
458 if (starts_with(refname, "refs/heads/"))
459 return append_head_ref(refname, sha1, flag, cb_data);
460 if (starts_with(refname, "refs/tags/"))
461 return append_tag_ref(refname, sha1, flag, cb_data);
462 return append_ref(refname, sha1, 0);
465 static void snarf_refs(int head, int remotes)
468 int orig_cnt = ref_name_cnt;
469 struct each_ref_fn_sha1_adapter wrapped_append_head_ref =
470 {append_head_ref, NULL};
472 for_each_ref(each_ref_fn_adapter, &wrapped_append_head_ref);
473 sort_ref_range(orig_cnt, ref_name_cnt);
476 int orig_cnt = ref_name_cnt;
477 struct each_ref_fn_sha1_adapter wrapped_append_remote_ref =
478 {append_remote_ref, NULL};
480 for_each_ref(each_ref_fn_adapter, &wrapped_append_remote_ref);
481 sort_ref_range(orig_cnt, ref_name_cnt);
485 static int rev_is_head(char *head, int headlen, char *name,
486 unsigned char *head_sha1, unsigned char *sha1)
489 (head_sha1 && sha1 && hashcmp(head_sha1, sha1)))
491 if (starts_with(head, "refs/heads/"))
493 if (starts_with(name, "refs/heads/"))
495 else if (starts_with(name, "heads/"))
497 return !strcmp(head, name);
500 static int show_merge_base(struct commit_list *seen, int num_rev)
502 int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
503 int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
507 struct commit *commit = pop_one_commit(&seen);
508 int flags = commit->object.flags & all_mask;
509 if (!(flags & UNINTERESTING) &&
510 ((flags & all_revs) == all_revs)) {
511 puts(sha1_to_hex(commit->object.sha1));
513 commit->object.flags |= UNINTERESTING;
519 static int show_independent(struct commit **rev,
522 unsigned int *rev_mask)
526 for (i = 0; i < num_rev; i++) {
527 struct commit *commit = rev[i];
528 unsigned int flag = rev_mask[i];
530 if (commit->object.flags == flag)
531 puts(sha1_to_hex(commit->object.sha1));
532 commit->object.flags |= UNINTERESTING;
537 static void append_one_rev(const char *av)
539 unsigned char revkey[20];
540 if (!get_sha1(av, revkey)) {
541 append_ref(av, revkey, 0);
544 if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
545 /* glob style match */
546 int saved_matches = ref_name_cnt;
547 struct each_ref_fn_sha1_adapter wrapped_append_matching_ref =
548 {append_matching_ref, NULL};
550 match_ref_pattern = av;
551 match_ref_slash = count_slash(av);
552 for_each_ref(each_ref_fn_adapter, &wrapped_append_matching_ref);
553 if (saved_matches == ref_name_cnt &&
554 ref_name_cnt < MAX_REVS)
555 error("no matching refs with %s", av);
556 if (saved_matches + 1 < ref_name_cnt)
557 sort_ref_range(saved_matches, ref_name_cnt);
560 die("bad sha1 reference %s", av);
563 static int git_show_branch_config(const char *var, const char *value, void *cb)
565 if (!strcmp(var, "showbranch.default")) {
567 return config_error_nonbool(var);
569 * default_arg is now passed to parse_options(), so we need to
570 * mimic the real argv a bit better.
574 default_arg = xcalloc(default_alloc, sizeof(*default_arg));
575 default_arg[default_num++] = "show-branch";
576 } else if (default_alloc <= default_num + 1) {
577 default_alloc = default_alloc * 3 / 2 + 20;
578 REALLOC_ARRAY(default_arg, default_alloc);
580 default_arg[default_num++] = xstrdup(value);
581 default_arg[default_num] = NULL;
585 if (!strcmp(var, "color.showbranch")) {
586 showbranch_use_color = git_config_colorbool(var, value);
590 return git_color_default_config(var, value, cb);
593 static int omit_in_dense(struct commit *commit, struct commit **rev, int n)
595 /* If the commit is tip of the named branches, do not
597 * Otherwise, if it is a merge that is reachable from only one
598 * tip, it is not that interesting.
601 for (i = 0; i < n; i++)
602 if (rev[i] == commit)
604 flag = commit->object.flags;
605 for (i = count = 0; i < n; i++) {
606 if (flag & (1u << (i + REV_SHIFT)))
614 static int reflog = 0;
616 static int parse_reflog_param(const struct option *opt, const char *arg,
620 const char **base = (const char **)opt->value;
623 reflog = strtoul(arg, &ep, 10);
627 return error("unrecognized reflog param '%s'", arg);
631 reflog = DEFAULT_REFLOG;
635 int cmd_show_branch(int ac, const char **av, const char *prefix)
637 struct commit *rev[MAX_REVS], *commit;
638 char *reflog_msg[MAX_REVS];
639 struct commit_list *list = NULL, *seen = NULL;
640 unsigned int rev_mask[MAX_REVS];
641 int num_rev, i, extra = 0;
642 int all_heads = 0, all_remotes = 0;
643 int all_mask, all_revs;
644 enum rev_sort_order sort_order = REV_SORT_IN_GRAPH_ORDER;
648 unsigned char head_sha1[20];
653 int shown_merge_point = 0;
654 int with_current_branch = 0;
658 const char *reflog_base = NULL;
659 struct option builtin_show_branch_options[] = {
660 OPT_BOOL('a', "all", &all_heads,
661 N_("show remote-tracking and local branches")),
662 OPT_BOOL('r', "remotes", &all_remotes,
663 N_("show remote-tracking branches")),
664 OPT__COLOR(&showbranch_use_color,
665 N_("color '*!+-' corresponding to the branch")),
666 { OPTION_INTEGER, 0, "more", &extra, N_("n"),
667 N_("show <n> more commits after the common ancestor"),
668 PARSE_OPT_OPTARG, NULL, (intptr_t)1 },
669 OPT_SET_INT(0, "list", &extra, N_("synonym to more=-1"), -1),
670 OPT_BOOL(0, "no-name", &no_name, N_("suppress naming strings")),
671 OPT_BOOL(0, "current", &with_current_branch,
672 N_("include the current branch")),
673 OPT_BOOL(0, "sha1-name", &sha1_name,
674 N_("name commits with their object names")),
675 OPT_BOOL(0, "merge-base", &merge_base,
676 N_("show possible merge bases")),
677 OPT_BOOL(0, "independent", &independent,
678 N_("show refs unreachable from any other ref")),
679 OPT_SET_INT(0, "topo-order", &sort_order,
680 N_("show commits in topological order"),
681 REV_SORT_IN_GRAPH_ORDER),
682 OPT_BOOL(0, "topics", &topics,
683 N_("show only commits not on the first branch")),
684 OPT_SET_INT(0, "sparse", &dense,
685 N_("show merges reachable from only one tip"), 0),
686 OPT_SET_INT(0, "date-order", &sort_order,
687 N_("topologically sort, maintaining date order "
689 REV_SORT_BY_COMMIT_DATE),
690 { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"),
691 N_("show <n> most recent ref-log entries starting at "
693 PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP,
694 parse_reflog_param },
698 git_config(git_show_branch_config, NULL);
700 /* If nothing is specified, try the default first */
701 if (ac == 1 && default_num) {
706 ac = parse_options(ac, av, prefix, builtin_show_branch_options,
707 show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION);
711 if (extra || reflog) {
712 /* "listing" mode is incompatible with
713 * independent nor merge-base modes.
715 if (independent || merge_base)
716 usage_with_options(show_branch_usage,
717 builtin_show_branch_options);
718 if (reflog && ((0 < extra) || all_heads || all_remotes))
720 * Asking for --more in reflog mode does not
721 * make sense. --list is Ok.
723 * Also --all and --remotes do not make sense either.
725 die("--reflog is incompatible with --all, --remotes, "
726 "--independent or --merge-base");
729 /* If nothing is specified, show all branches by default */
730 if (ac <= topics && all_heads + all_remotes == 0)
734 unsigned char sha1[20];
738 unsigned int flags = 0;
741 static const char *fake_av[2];
743 fake_av[0] = resolve_refdup("HEAD",
751 die("--reflog option needs one branch name");
753 if (MAX_REVS < reflog)
754 die("Only %d entries can be shown at one time.",
756 if (!dwim_ref(*av, strlen(*av), sha1, &ref))
757 die("No such ref %s", *av);
759 /* Has the base been specified? */
762 base = strtoul(reflog_base, &ep, 10);
764 /* Ah, that is a date spec... */
766 at = approxidate(reflog_base);
767 read_ref_at(ref, flags, at, -1, sha1, NULL,
772 for (i = 0; i < reflog; i++) {
775 unsigned long timestamp;
778 if (read_ref_at(ref, flags, 0, base+i, sha1, &logmsg,
779 ×tamp, &tz, NULL)) {
783 msg = strchr(logmsg, '\t');
788 reflog_msg[i] = xstrfmt("(%s) %s",
789 show_date(timestamp, tz, 1),
792 sprintf(nth_desc, "%s@{%d}", *av, base+i);
793 append_ref(nth_desc, sha1, 1);
802 if (all_heads + all_remotes)
803 snarf_refs(all_heads, all_remotes);
806 head_p = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
809 head_len = strlen(head_p);
810 memcpy(head, head_p, head_len + 1);
817 if (with_current_branch && head_p) {
819 for (i = 0; !has_head && i < ref_name_cnt; i++) {
820 /* We are only interested in adding the branch
823 if (rev_is_head(head,
830 int offset = starts_with(head, "refs/heads/") ? 11 : 0;
831 append_one_rev(head + offset);
836 fprintf(stderr, "No revs to be shown.\n");
840 for (num_rev = 0; ref_name[num_rev]; num_rev++) {
841 unsigned char revkey[20];
842 unsigned int flag = 1u << (num_rev + REV_SHIFT);
844 if (MAX_REVS <= num_rev)
845 die("cannot handle more than %d revs.", MAX_REVS);
846 if (get_sha1(ref_name[num_rev], revkey))
847 die("'%s' is not a valid ref.", ref_name[num_rev]);
848 commit = lookup_commit_reference(revkey);
850 die("cannot find commit %s (%s)",
851 ref_name[num_rev], revkey);
852 parse_commit(commit);
853 mark_seen(commit, &seen);
855 /* rev#0 uses bit REV_SHIFT, rev#1 uses bit REV_SHIFT+1,
856 * and so on. REV_SHIFT bits from bit 0 are used for
857 * internal bookkeeping.
859 commit->object.flags |= flag;
860 if (commit->object.flags == flag)
861 commit_list_insert_by_date(commit, &list);
862 rev[num_rev] = commit;
864 for (i = 0; i < num_rev; i++)
865 rev_mask[i] = rev[i]->object.flags;
868 join_revs(&list, &seen, num_rev, extra);
870 commit_list_sort_by_date(&seen);
873 return show_merge_base(seen, num_rev);
876 return show_independent(rev, num_rev, ref_name, rev_mask);
878 /* Show list; --more=-1 means list-only */
879 if (1 < num_rev || extra < 0) {
880 for (i = 0; i < num_rev; i++) {
882 int is_head = rev_is_head(head,
886 rev[i]->object.sha1);
889 is_head ? '*' : ' ', ref_name[i]);
891 for (j = 0; j < i; j++)
893 printf("%s%c%s [%s] ",
896 get_color_reset_code(), ref_name[i]);
900 /* header lines never need name */
901 show_one_commit(rev[i], 1);
910 for (i = 0; i < num_rev; i++)
918 /* Sort topologically */
919 sort_in_topological_order(&seen, sort_order);
921 /* Give names to commits */
922 if (!sha1_name && !no_name)
923 name_commits(seen, rev, ref_name, num_rev);
925 all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
926 all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
929 struct commit *commit = pop_one_commit(&seen);
930 int this_flag = commit->object.flags;
931 int is_merge_point = ((this_flag & all_revs) == all_revs);
933 shown_merge_point |= is_merge_point;
936 int is_merge = !!(commit->parents &&
937 commit->parents->next);
940 (this_flag & (1u << REV_SHIFT)))
942 if (dense && is_merge &&
943 omit_in_dense(commit, rev, num_rev))
945 for (i = 0; i < num_rev; i++) {
947 if (!(this_flag & (1u << (i + REV_SHIFT))))
951 else if (i == head_at)
957 mark, get_color_reset_code());
961 show_one_commit(commit, no_name);
963 if (shown_merge_point && --extra < 0)