8 static const char show_branch_usage
[] =
9 "git-show-branch [--dense] [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...]";
11 static int default_num
= 0;
12 static int default_alloc
= 0;
13 static const char **default_arg
= NULL
;
15 #define UNINTERESTING 01
18 #define MAX_REVS (FLAG_BITS - REV_SHIFT) /* should not exceed bits_per_int - REV_SHIFT */
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
;
54 if (!commit
->object
.util
)
55 commit
->object
.util
= xmalloc(sizeof(struct commit_name
));
56 name
= commit
->object
.util
;
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
->object
.util
;
69 struct commit_name
*parent_name
= parent
->object
.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
)
88 if (!p
->object
.util
) {
97 static void name_commits(struct commit_list
*list
,
102 struct commit_list
*cl
;
106 /* First give names to the given heads */
107 for (cl
= list
; cl
; cl
= cl
->next
) {
111 for (i
= 0; i
< num_rev
; i
++) {
113 name_commit(c
, ref_name
[i
], 0);
119 /* Then commits on the first parent ancestry chain */
122 for (cl
= list
; cl
; cl
= cl
->next
) {
123 i
+= name_first_parent_chain(cl
->item
);
127 /* Finally, any unnamed commits */
130 for (cl
= list
; cl
; cl
= cl
->next
) {
131 struct commit_list
*parents
;
132 struct commit_name
*n
;
138 parents
= c
->parents
;
141 struct commit
*p
= parents
->item
;
142 char newname
[1000], *en
;
143 parents
= parents
->next
;
148 switch (n
->generation
) {
150 en
+= sprintf(en
, "%s", n
->head_name
);
153 en
+= sprintf(en
, "%s^", n
->head_name
);
156 en
+= sprintf(en
, "%s~%d",
157 n
->head_name
, n
->generation
);
161 en
+= sprintf(en
, "^");
163 en
+= sprintf(en
, "^%d", nth
);
164 name_commit(p
, strdup(newname
), 0);
166 name_first_parent_chain(p
);
172 static int mark_seen(struct commit
*commit
, struct commit_list
**seen_p
)
174 if (!commit
->object
.flags
) {
175 insert_by_date(commit
, seen_p
);
181 static void join_revs(struct commit_list
**list_p
,
182 struct commit_list
**seen_p
,
183 int num_rev
, int extra
)
185 int all_mask
= ((1u << (REV_SHIFT
+ num_rev
)) - 1);
186 int all_revs
= all_mask
& ~((1u << REV_SHIFT
) - 1);
189 struct commit_list
*parents
;
190 int still_interesting
= !!interesting(*list_p
);
191 struct commit
*commit
= pop_one_commit(list_p
);
192 int flags
= commit
->object
.flags
& all_mask
;
194 if (!still_interesting
&& extra
<= 0)
197 mark_seen(commit
, seen_p
);
198 if ((flags
& all_revs
) == all_revs
)
199 flags
|= UNINTERESTING
;
200 parents
= commit
->parents
;
203 struct commit
*p
= parents
->item
;
204 int this_flag
= p
->object
.flags
;
205 parents
= parents
->next
;
206 if ((this_flag
& flags
) == flags
)
208 if (!p
->object
.parsed
)
210 if (mark_seen(p
, seen_p
) && !still_interesting
)
212 p
->object
.flags
|= flags
;
213 insert_by_date(p
, list_p
);
218 * Postprocess to complete well-poisoning.
220 * At this point we have all the commits we have seen in
221 * seen_p list (which happens to be sorted chronologically but
222 * it does not really matter). Mark anything that can be
223 * reached from uninteresting commits not interesting.
227 struct commit_list
*s
;
228 for (s
= *seen_p
; s
; s
= s
->next
) {
229 struct commit
*c
= s
->item
;
230 struct commit_list
*parents
;
232 if (((c
->object
.flags
& all_revs
) != all_revs
) &&
233 !(c
->object
.flags
& UNINTERESTING
))
236 /* The current commit is either a merge base or
237 * already uninteresting one. Mark its parents
238 * as uninteresting commits _only_ if they are
239 * already parsed. No reason to find new ones
242 parents
= c
->parents
;
244 struct commit
*p
= parents
->item
;
245 parents
= parents
->next
;
246 if (!(p
->object
.flags
& UNINTERESTING
)) {
247 p
->object
.flags
|= UNINTERESTING
;
257 static void show_one_commit(struct commit
*commit
, int no_name
)
259 char pretty
[256], *cp
;
260 struct commit_name
*name
= commit
->object
.util
;
261 if (commit
->object
.parsed
)
262 pretty_print_commit(CMIT_FMT_ONELINE
, commit
, ~0,
263 pretty
, sizeof(pretty
), 0, NULL
, NULL
);
265 strcpy(pretty
, "(unavailable)");
266 if (!strncmp(pretty
, "[PATCH] ", 8))
272 if (name
&& name
->head_name
) {
273 printf("[%s", name
->head_name
);
274 if (name
->generation
) {
275 if (name
->generation
== 1)
278 printf("~%d", name
->generation
);
284 find_unique_abbrev(commit
->object
.sha1
, 7));
289 static char *ref_name
[MAX_REVS
+ 1];
290 static int ref_name_cnt
;
292 static const char *find_digit_prefix(const char *s
, int *v
)
299 '0' <= (ch
= *p
) && ch
<= '9';
301 ver
= ver
* 10 + ch
- '0';
307 static int version_cmp(const char *a
, const char *b
)
312 a
= find_digit_prefix(a
, &va
);
313 b
= find_digit_prefix(b
, &vb
);
320 if ('0' <= ca
&& ca
<= '9')
322 if ('0' <= cb
&& cb
<= '9')
336 static int compare_ref_name(const void *a_
, const void *b_
)
338 const char * const*a
= a_
, * const*b
= b_
;
339 return version_cmp(*a
, *b
);
342 static void sort_ref_range(int bottom
, int top
)
344 qsort(ref_name
+ bottom
, top
- bottom
, sizeof(ref_name
[0]),
348 static int append_ref(const char *refname
, const unsigned char *sha1
)
350 struct commit
*commit
= lookup_commit_reference_gently(sha1
, 1);
355 /* Avoid adding the same thing twice */
356 for (i
= 0; i
< ref_name_cnt
; i
++)
357 if (!strcmp(refname
, ref_name
[i
]))
360 if (MAX_REVS
<= ref_name_cnt
) {
361 fprintf(stderr
, "warning: ignoring %s; "
362 "cannot handle more than %d refs\n",
366 ref_name
[ref_name_cnt
++] = strdup(refname
);
367 ref_name
[ref_name_cnt
] = NULL
;
371 static int append_head_ref(const char *refname
, const unsigned char *sha1
)
373 unsigned char tmp
[20];
375 if (strncmp(refname
, "refs/heads/", ofs
))
377 /* If both heads/foo and tags/foo exists, get_sha1 would
380 if (get_sha1(refname
+ ofs
, tmp
) || memcmp(tmp
, sha1
, 20))
382 return append_ref(refname
+ ofs
, sha1
);
385 static int append_tag_ref(const char *refname
, const unsigned char *sha1
)
387 if (strncmp(refname
, "refs/tags/", 10))
389 return append_ref(refname
+ 5, sha1
);
392 static const char *match_ref_pattern
= NULL
;
393 static int match_ref_slash
= 0;
394 static int count_slash(const char *s
)
403 static int append_matching_ref(const char *refname
, const unsigned char *sha1
)
405 /* we want to allow pattern hold/<asterisk> to show all
406 * branches under refs/heads/hold/, and v0.99.9? to show
407 * refs/tags/v0.99.9a and friends.
410 int slash
= count_slash(refname
);
411 for (tail
= refname
; *tail
&& match_ref_slash
< slash
; )
416 if (fnmatch(match_ref_pattern
, tail
, 0))
418 if (!strncmp("refs/heads/", refname
, 11))
419 return append_head_ref(refname
, sha1
);
420 if (!strncmp("refs/tags/", refname
, 10))
421 return append_tag_ref(refname
, sha1
);
422 return append_ref(refname
, sha1
);
425 static void snarf_refs(int head
, int tag
)
428 int orig_cnt
= ref_name_cnt
;
429 for_each_ref(append_head_ref
);
430 sort_ref_range(orig_cnt
, ref_name_cnt
);
433 int orig_cnt
= ref_name_cnt
;
434 for_each_ref(append_tag_ref
);
435 sort_ref_range(orig_cnt
, ref_name_cnt
);
439 static int rev_is_head(char *head_path
, int headlen
, char *name
,
440 unsigned char *head_sha1
, unsigned char *sha1
)
443 if ((!head_path
[0]) ||
444 (head_sha1
&& sha1
&& memcmp(head_sha1
, sha1
, 20)))
446 namelen
= strlen(name
);
447 if ((headlen
< namelen
) ||
448 memcmp(head_path
+ headlen
- namelen
, name
, namelen
))
450 if (headlen
== namelen
||
451 head_path
[headlen
- namelen
- 1] == '/')
456 static int show_merge_base(struct commit_list
*seen
, int num_rev
)
458 int all_mask
= ((1u << (REV_SHIFT
+ num_rev
)) - 1);
459 int all_revs
= all_mask
& ~((1u << REV_SHIFT
) - 1);
463 struct commit
*commit
= pop_one_commit(&seen
);
464 int flags
= commit
->object
.flags
& all_mask
;
465 if (!(flags
& UNINTERESTING
) &&
466 ((flags
& all_revs
) == all_revs
)) {
467 puts(sha1_to_hex(commit
->object
.sha1
));
469 commit
->object
.flags
|= UNINTERESTING
;
475 static int show_independent(struct commit
**rev
,
478 unsigned int *rev_mask
)
482 for (i
= 0; i
< num_rev
; i
++) {
483 struct commit
*commit
= rev
[i
];
484 unsigned int flag
= rev_mask
[i
];
486 if (commit
->object
.flags
== flag
)
487 puts(sha1_to_hex(commit
->object
.sha1
));
488 commit
->object
.flags
|= UNINTERESTING
;
493 static void append_one_rev(const char *av
)
495 unsigned char revkey
[20];
496 if (!get_sha1(av
, revkey
)) {
497 append_ref(av
, revkey
);
500 if (strchr(av
, '*') || strchr(av
, '?') || strchr(av
, '[')) {
501 /* glob style match */
502 int saved_matches
= ref_name_cnt
;
503 match_ref_pattern
= av
;
504 match_ref_slash
= count_slash(av
);
505 for_each_ref(append_matching_ref
);
506 if (saved_matches
== ref_name_cnt
&&
507 ref_name_cnt
< MAX_REVS
)
508 error("no matching refs with %s", av
);
509 if (saved_matches
+ 1 < ref_name_cnt
)
510 sort_ref_range(saved_matches
, ref_name_cnt
);
513 die("bad sha1 reference %s", av
);
516 static int git_show_branch_config(const char *var
, const char *value
)
518 if (!strcmp(var
, "showbranch.default")) {
519 if (default_alloc
<= default_num
+ 1) {
520 default_alloc
= default_alloc
* 3 / 2 + 20;
521 default_arg
= xrealloc(default_arg
, sizeof *default_arg
* default_alloc
);
523 default_arg
[default_num
++] = strdup(value
);
524 default_arg
[default_num
] = NULL
;
528 return git_default_config(var
, value
);
531 static int omit_in_dense(struct commit
*commit
, struct commit
**rev
, int n
)
533 /* If the commit is tip of the named branches, do not
535 * Otherwise, if it is a merge that is reachable from only one
536 * tip, it is not that interesting.
539 for (i
= 0; i
< n
; i
++)
540 if (rev
[i
] == commit
)
542 flag
= commit
->object
.flags
;
543 for (i
= count
= 0; i
< n
; i
++) {
544 if (flag
& (1u << (i
+ REV_SHIFT
)))
552 int cmd_show_branch(int ac
, const char **av
, char **envp
)
554 struct commit
*rev
[MAX_REVS
], *commit
;
555 struct commit_list
*list
= NULL
, *seen
= NULL
;
556 unsigned int rev_mask
[MAX_REVS
];
557 int num_rev
, i
, extra
= 0;
558 int all_heads
= 0, all_tags
= 0;
559 int all_mask
, all_revs
;
562 const char *head_path_p
;
564 unsigned char head_sha1
[20];
569 int shown_merge_point
= 0;
570 int with_current_branch
= 0;
575 setup_git_directory();
576 git_config(git_show_branch_config
);
578 /* If nothing is specified, try the default first */
579 if (ac
== 1 && default_num
) {
580 ac
= default_num
+ 1;
581 av
= default_arg
- 1; /* ick; we would not address av[0] */
584 while (1 < ac
&& av
[1][0] == '-') {
585 const char *arg
= av
[1];
586 if (!strcmp(arg
, "--")) {
590 else if (!strcmp(arg
, "--all"))
591 all_heads
= all_tags
= 1;
592 else if (!strcmp(arg
, "--heads"))
594 else if (!strcmp(arg
, "--tags"))
596 else if (!strcmp(arg
, "--more"))
598 else if (!strcmp(arg
, "--list"))
600 else if (!strcmp(arg
, "--no-name"))
602 else if (!strcmp(arg
, "--current"))
603 with_current_branch
= 1;
604 else if (!strcmp(arg
, "--sha1-name"))
606 else if (!strncmp(arg
, "--more=", 7))
607 extra
= atoi(arg
+ 7);
608 else if (!strcmp(arg
, "--merge-base"))
610 else if (!strcmp(arg
, "--independent"))
612 else if (!strcmp(arg
, "--topo-order"))
614 else if (!strcmp(arg
, "--topics"))
616 else if (!strcmp(arg
, "--sparse"))
618 else if (!strcmp(arg
, "--date-order"))
621 usage(show_branch_usage
);
626 /* Only one of these is allowed */
627 if (1 < independent
+ merge_base
+ (extra
!= 0))
628 usage(show_branch_usage
);
630 /* If nothing is specified, show all branches by default */
631 if (ac
+ all_heads
+ all_tags
== 0)
634 if (all_heads
+ all_tags
)
635 snarf_refs(all_heads
, all_tags
);
641 head_path_p
= resolve_ref(git_path("HEAD"), head_sha1
, 1);
643 head_path_len
= strlen(head_path_p
);
644 memcpy(head_path
, head_path_p
, head_path_len
+ 1);
651 if (with_current_branch
&& head_path_p
) {
653 for (i
= 0; !has_head
&& i
< ref_name_cnt
; i
++) {
654 /* We are only interested in adding the branch
657 if (rev_is_head(head_path
,
664 int pfxlen
= strlen(git_path("refs/heads/"));
665 append_one_rev(head_path
+ pfxlen
);
670 fprintf(stderr
, "No revs to be shown.\n");
674 for (num_rev
= 0; ref_name
[num_rev
]; num_rev
++) {
675 unsigned char revkey
[20];
676 unsigned int flag
= 1u << (num_rev
+ REV_SHIFT
);
678 if (MAX_REVS
<= num_rev
)
679 die("cannot handle more than %d revs.", MAX_REVS
);
680 if (get_sha1(ref_name
[num_rev
], revkey
))
681 die("'%s' is not a valid ref.", ref_name
[num_rev
]);
682 commit
= lookup_commit_reference(revkey
);
684 die("cannot find commit %s (%s)",
685 ref_name
[num_rev
], revkey
);
686 parse_commit(commit
);
687 mark_seen(commit
, &seen
);
689 /* rev#0 uses bit REV_SHIFT, rev#1 uses bit REV_SHIFT+1,
690 * and so on. REV_SHIFT bits from bit 0 are used for
691 * internal bookkeeping.
693 commit
->object
.flags
|= flag
;
694 if (commit
->object
.flags
== flag
)
695 insert_by_date(commit
, &list
);
696 rev
[num_rev
] = commit
;
698 for (i
= 0; i
< num_rev
; i
++)
699 rev_mask
[i
] = rev
[i
]->object
.flags
;
702 join_revs(&list
, &seen
, num_rev
, extra
);
705 return show_merge_base(seen
, num_rev
);
708 return show_independent(rev
, num_rev
, ref_name
, rev_mask
);
710 /* Show list; --more=-1 means list-only */
711 if (1 < num_rev
|| extra
< 0) {
712 for (i
= 0; i
< num_rev
; i
++) {
714 int is_head
= rev_is_head(head_path
,
718 rev
[i
]->object
.sha1
);
721 is_head
? '*' : ' ', ref_name
[i
]);
723 for (j
= 0; j
< i
; j
++)
726 is_head
? '*' : '!', ref_name
[i
]);
728 /* header lines never need name */
729 show_one_commit(rev
[i
], 1);
734 for (i
= 0; i
< num_rev
; i
++)
742 /* Sort topologically */
743 sort_in_topological_order(&seen
, lifo
);
745 /* Give names to commits */
746 if (!sha1_name
&& !no_name
)
747 name_commits(seen
, rev
, ref_name
, num_rev
);
749 all_mask
= ((1u << (REV_SHIFT
+ num_rev
)) - 1);
750 all_revs
= all_mask
& ~((1u << REV_SHIFT
) - 1);
753 struct commit
*commit
= pop_one_commit(&seen
);
754 int this_flag
= commit
->object
.flags
;
755 int is_merge_point
= ((this_flag
& all_revs
) == all_revs
);
757 shown_merge_point
|= is_merge_point
;
760 int is_merge
= !!(commit
->parents
&&
761 commit
->parents
->next
);
764 (this_flag
& (1u << REV_SHIFT
)))
766 if (dense
&& is_merge
&&
767 omit_in_dense(commit
, rev
, num_rev
))
769 for (i
= 0; i
< num_rev
; i
++) {
771 if (!(this_flag
& (1u << (i
+ REV_SHIFT
))))
775 else if (i
== head_at
)
783 show_one_commit(commit
, no_name
);
785 if (shown_merge_point
&& --extra
< 0)