show-branch: migrate to parse-options API
[git/git.git] / builtin-show-branch.c
CommitLineData
f76412ed
JH
1#include "cache.h"
2#include "commit.h"
3#include "refs.h"
51ce34b9 4#include "builtin.h"
ab07ba2a 5#include "color.h"
57343652 6#include "parse-options.h"
f76412ed 7
57343652
SB
8static const char* show_branch_usage[] = {
9 "git show-branch [--sparse] [--current] [--all] [--remotes] [--topo-order] [--more=count | --list | --independent | --merge-base] [--topics] [--color] [<refs>...]",
10 "--reflog[=n[,b]] [--list] [--color] <branch>",
11 NULL
12};
f76412ed 13
ab07ba2a
MH
14static int showbranch_use_color = -1;
15static char column_colors[][COLOR_MAXLEN] = {
16 GIT_COLOR_RED,
17 GIT_COLOR_GREEN,
18 GIT_COLOR_YELLOW,
19 GIT_COLOR_BLUE,
20 GIT_COLOR_MAGENTA,
21 GIT_COLOR_CYAN,
22};
23
24#define COLUMN_COLORS_MAX (ARRAY_SIZE(column_colors))
25
96f1e58f
DR
26static int default_num;
27static int default_alloc;
28static const char **default_arg;
c2bdd6af 29
f76412ed
JH
30#define UNINTERESTING 01
31
32#define REV_SHIFT 2
885a86ab 33#define MAX_REVS (FLAG_BITS - REV_SHIFT) /* should not exceed bits_per_int - REV_SHIFT */
f76412ed 34
7e3fe904
JH
35#define DEFAULT_REFLOG 4
36
ab07ba2a
MH
37static const char *get_color_code(int idx)
38{
39 if (showbranch_use_color)
40 return column_colors[idx];
41 return "";
42}
43
44static const char *get_color_reset_code(void)
45{
46 if (showbranch_use_color)
47 return GIT_COLOR_RESET;
48 return "";
49}
50
f76412ed
JH
51static struct commit *interesting(struct commit_list *list)
52{
53 while (list) {
54 struct commit *commit = list->item;
55 list = list->next;
56 if (commit->object.flags & UNINTERESTING)
57 continue;
58 return commit;
59 }
60 return NULL;
61}
62
63static struct commit *pop_one_commit(struct commit_list **list_p)
64{
65 struct commit *commit;
66 struct commit_list *list;
67 list = *list_p;
68 commit = list->item;
69 *list_p = list->next;
70 free(list);
71 return commit;
72}
73
74struct commit_name {
8e5dd22b
JH
75 const char *head_name; /* which head's ancestor? */
76 int generation; /* how many parents away from head_name */
f76412ed
JH
77};
78
8e5dd22b 79/* Name the commit as nth generation ancestor of head_name;
f76412ed
JH
80 * we count only the first-parent relationship for naming purposes.
81 */
8e5dd22b 82static void name_commit(struct commit *commit, const char *head_name, int nth)
f76412ed
JH
83{
84 struct commit_name *name;
d3ff6f55
LT
85 if (!commit->util)
86 commit->util = xmalloc(sizeof(struct commit_name));
87 name = commit->util;
8e5dd22b 88 name->head_name = head_name;
f76412ed
JH
89 name->generation = nth;
90}
91
92/* Parent is the first parent of the commit. We may name it
8e5dd22b 93 * as (n+1)th generation ancestor of the same head_name as
bcaf60b2 94 * commit is nth generation ancestor of, if that generation
f76412ed
JH
95 * number is better than the name it already has.
96 */
97static void name_parent(struct commit *commit, struct commit *parent)
98{
d3ff6f55
LT
99 struct commit_name *commit_name = commit->util;
100 struct commit_name *parent_name = parent->util;
f76412ed
JH
101 if (!commit_name)
102 return;
103 if (!parent_name ||
104 commit_name->generation + 1 < parent_name->generation)
8e5dd22b 105 name_commit(parent, commit_name->head_name,
f76412ed
JH
106 commit_name->generation + 1);
107}
108
8e5dd22b
JH
109static int name_first_parent_chain(struct commit *c)
110{
111 int i = 0;
112 while (c) {
113 struct commit *p;
d3ff6f55 114 if (!c->util)
8e5dd22b
JH
115 break;
116 if (!c->parents)
117 break;
118 p = c->parents->item;
d3ff6f55 119 if (!p->util) {
8e5dd22b
JH
120 name_parent(c, p);
121 i++;
122 }
f8263c53
AJ
123 else
124 break;
8e5dd22b
JH
125 c = p;
126 }
127 return i;
128}
129
130static void name_commits(struct commit_list *list,
131 struct commit **rev,
132 char **ref_name,
133 int num_rev)
134{
135 struct commit_list *cl;
136 struct commit *c;
137 int i;
138
139 /* First give names to the given heads */
140 for (cl = list; cl; cl = cl->next) {
141 c = cl->item;
d3ff6f55 142 if (c->util)
8e5dd22b
JH
143 continue;
144 for (i = 0; i < num_rev; i++) {
145 if (rev[i] == c) {
146 name_commit(c, ref_name[i], 0);
147 break;
148 }
149 }
150 }
151
152 /* Then commits on the first parent ancestry chain */
153 do {
154 i = 0;
155 for (cl = list; cl; cl = cl->next) {
156 i += name_first_parent_chain(cl->item);
157 }
158 } while (i);
159
160 /* Finally, any unnamed commits */
161 do {
162 i = 0;
163 for (cl = list; cl; cl = cl->next) {
164 struct commit_list *parents;
165 struct commit_name *n;
166 int nth;
167 c = cl->item;
d3ff6f55 168 if (!c->util)
8e5dd22b 169 continue;
d3ff6f55 170 n = c->util;
8e5dd22b
JH
171 parents = c->parents;
172 nth = 0;
173 while (parents) {
174 struct commit *p = parents->item;
013f276e 175 char newname[1000], *en;
8e5dd22b
JH
176 parents = parents->next;
177 nth++;
d3ff6f55 178 if (p->util)
8e5dd22b 179 continue;
013f276e 180 en = newname;
fbaf834d
JH
181 switch (n->generation) {
182 case 0:
013f276e 183 en += sprintf(en, "%s", n->head_name);
fbaf834d
JH
184 break;
185 case 1:
013f276e 186 en += sprintf(en, "%s^", n->head_name);
fbaf834d
JH
187 break;
188 default:
013f276e
JH
189 en += sprintf(en, "%s~%d",
190 n->head_name, n->generation);
191 break;
fbaf834d 192 }
013f276e
JH
193 if (nth == 1)
194 en += sprintf(en, "^");
195 else
196 en += sprintf(en, "^%d", nth);
9befac47 197 name_commit(p, xstrdup(newname), 0);
8e5dd22b
JH
198 i++;
199 name_first_parent_chain(p);
200 }
201 }
202 } while (i);
203}
204
f76412ed
JH
205static int mark_seen(struct commit *commit, struct commit_list **seen_p)
206{
207 if (!commit->object.flags) {
26a8ad25 208 commit_list_insert(commit, seen_p);
f76412ed
JH
209 return 1;
210 }
211 return 0;
212}
213
214static void join_revs(struct commit_list **list_p,
215 struct commit_list **seen_p,
216 int num_rev, int extra)
217{
218 int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
219 int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
220
221 while (*list_p) {
222 struct commit_list *parents;
9ce70285 223 int still_interesting = !!interesting(*list_p);
f76412ed
JH
224 struct commit *commit = pop_one_commit(list_p);
225 int flags = commit->object.flags & all_mask;
f76412ed 226
9ce70285 227 if (!still_interesting && extra <= 0)
f76412ed
JH
228 break;
229
230 mark_seen(commit, seen_p);
231 if ((flags & all_revs) == all_revs)
232 flags |= UNINTERESTING;
233 parents = commit->parents;
234
235 while (parents) {
236 struct commit *p = parents->item;
237 int this_flag = p->object.flags;
238 parents = parents->next;
f76412ed
JH
239 if ((this_flag & flags) == flags)
240 continue;
6b209d47
JH
241 if (!p->object.parsed)
242 parse_commit(p);
f76412ed
JH
243 if (mark_seen(p, seen_p) && !still_interesting)
244 extra--;
245 p->object.flags |= flags;
246 insert_by_date(p, list_p);
247 }
248 }
6b209d47
JH
249
250 /*
251 * Postprocess to complete well-poisoning.
252 *
253 * At this point we have all the commits we have seen in
26a8ad25
JH
254 * seen_p list. Mark anything that can be reached from
255 * uninteresting commits not interesting.
6b209d47
JH
256 */
257 for (;;) {
258 int changed = 0;
259 struct commit_list *s;
260 for (s = *seen_p; s; s = s->next) {
261 struct commit *c = s->item;
262 struct commit_list *parents;
263
264 if (((c->object.flags & all_revs) != all_revs) &&
265 !(c->object.flags & UNINTERESTING))
266 continue;
267
268 /* The current commit is either a merge base or
269 * already uninteresting one. Mark its parents
270 * as uninteresting commits _only_ if they are
271 * already parsed. No reason to find new ones
272 * here.
273 */
274 parents = c->parents;
275 while (parents) {
276 struct commit *p = parents->item;
277 parents = parents->next;
278 if (!(p->object.flags & UNINTERESTING)) {
279 p->object.flags |= UNINTERESTING;
280 changed = 1;
281 }
282 }
283 }
284 if (!changed)
285 break;
286 }
f76412ed
JH
287}
288
013f276e 289static void show_one_commit(struct commit *commit, int no_name)
f76412ed 290{
f285a2d7 291 struct strbuf pretty = STRBUF_INIT;
80583c0e 292 const char *pretty_str = "(unavailable)";
d3ff6f55 293 struct commit_name *name = commit->util;
80583c0e
JH
294
295 if (commit->object.parsed) {
674d1727 296 pretty_print_commit(CMIT_FMT_ONELINE, commit,
4593fb84 297 &pretty, 0, NULL, NULL, 0, 0);
674d1727 298 pretty_str = pretty.buf;
80583c0e
JH
299 }
300 if (!prefixcmp(pretty_str, "[PATCH] "))
301 pretty_str += 8;
013f276e
JH
302
303 if (!no_name) {
304 if (name && name->head_name) {
305 printf("[%s", name->head_name);
306 if (name->generation) {
307 if (name->generation == 1)
308 printf("^");
309 else
310 printf("~%d", name->generation);
311 }
312 printf("] ");
313 }
314 else
315 printf("[%s] ",
316 find_unique_abbrev(commit->object.sha1, 7));
f76412ed 317 }
80583c0e 318 puts(pretty_str);
674d1727 319 strbuf_release(&pretty);
f76412ed
JH
320}
321
322static char *ref_name[MAX_REVS + 1];
323static int ref_name_cnt;
324
bb5ebed7
JH
325static const char *find_digit_prefix(const char *s, int *v)
326{
327 const char *p;
328 int ver;
329 char ch;
330
331 for (p = s, ver = 0;
332 '0' <= (ch = *p) && ch <= '9';
333 p++)
334 ver = ver * 10 + ch - '0';
335 *v = ver;
336 return p;
337}
338
339
340static int version_cmp(const char *a, const char *b)
341{
342 while (1) {
343 int va, vb;
344
345 a = find_digit_prefix(a, &va);
346 b = find_digit_prefix(b, &vb);
347 if (va != vb)
348 return va - vb;
349
350 while (1) {
351 int ca = *a;
352 int cb = *b;
353 if ('0' <= ca && ca <= '9')
354 ca = 0;
355 if ('0' <= cb && cb <= '9')
356 cb = 0;
357 if (ca != cb)
358 return ca - cb;
359 if (!ca)
360 break;
361 a++;
362 b++;
363 }
364 if (!*a && !*b)
365 return 0;
366 }
367}
368
628894b2
JH
369static int compare_ref_name(const void *a_, const void *b_)
370{
371 const char * const*a = a_, * const*b = b_;
bb5ebed7 372 return version_cmp(*a, *b);
628894b2
JH
373}
374
375static void sort_ref_range(int bottom, int top)
376{
377 qsort(ref_name + bottom, top - bottom, sizeof(ref_name[0]),
378 compare_ref_name);
379}
380
76a44c5c
JH
381static int append_ref(const char *refname, const unsigned char *sha1,
382 int allow_dups)
f76412ed
JH
383{
384 struct commit *commit = lookup_commit_reference_gently(sha1, 1);
bb5ebed7
JH
385 int i;
386
f76412ed
JH
387 if (!commit)
388 return 0;
bb5ebed7 389
76a44c5c
JH
390 if (!allow_dups) {
391 /* Avoid adding the same thing twice */
392 for (i = 0; i < ref_name_cnt; i++)
393 if (!strcmp(refname, ref_name[i]))
394 return 0;
395 }
79778e46 396 if (MAX_REVS <= ref_name_cnt) {
33fa4d3d 397 warning("ignoring %s; cannot handle more than %d refs",
f76412ed
JH
398 refname, MAX_REVS);
399 return 0;
400 }
9befac47 401 ref_name[ref_name_cnt++] = xstrdup(refname);
f76412ed
JH
402 ref_name[ref_name_cnt] = NULL;
403 return 0;
404}
405
8da19775 406static int append_head_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
f76412ed 407{
92421502
JH
408 unsigned char tmp[20];
409 int ofs = 11;
1968d77d 410 if (prefixcmp(refname, "refs/heads/"))
f76412ed 411 return 0;
92421502
JH
412 /* If both heads/foo and tags/foo exists, get_sha1 would
413 * get confused.
414 */
a89fccd2 415 if (get_sha1(refname + ofs, tmp) || hashcmp(tmp, sha1))
92421502 416 ofs = 5;
76a44c5c 417 return append_ref(refname + ofs, sha1, 0);
f76412ed
JH
418}
419
f49006b0
BG
420static int append_remote_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
421{
422 unsigned char tmp[20];
423 int ofs = 13;
1968d77d 424 if (prefixcmp(refname, "refs/remotes/"))
f49006b0
BG
425 return 0;
426 /* If both heads/foo and tags/foo exists, get_sha1 would
427 * get confused.
428 */
429 if (get_sha1(refname + ofs, tmp) || hashcmp(tmp, sha1))
430 ofs = 5;
76a44c5c 431 return append_ref(refname + ofs, sha1, 0);
f49006b0
BG
432}
433
8da19775 434static int append_tag_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
f76412ed 435{
cc44c765 436 if (prefixcmp(refname, "refs/tags/"))
f76412ed 437 return 0;
76a44c5c 438 return append_ref(refname + 5, sha1, 0);
f76412ed
JH
439}
440
287f8600
JH
441static const char *match_ref_pattern = NULL;
442static int match_ref_slash = 0;
443static int count_slash(const char *s)
444{
445 int cnt = 0;
446 while (*s)
447 if (*s++ == '/')
448 cnt++;
449 return cnt;
450}
451
8da19775 452static int append_matching_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
287f8600
JH
453{
454 /* we want to allow pattern hold/<asterisk> to show all
455 * branches under refs/heads/hold/, and v0.99.9? to show
456 * refs/tags/v0.99.9a and friends.
457 */
458 const char *tail;
459 int slash = count_slash(refname);
460 for (tail = refname; *tail && match_ref_slash < slash; )
461 if (*tail++ == '/')
462 slash--;
463 if (!*tail)
464 return 0;
465 if (fnmatch(match_ref_pattern, tail, 0))
466 return 0;
599065a3 467 if (!prefixcmp(refname, "refs/heads/"))
8da19775 468 return append_head_ref(refname, sha1, flag, cb_data);
599065a3 469 if (!prefixcmp(refname, "refs/tags/"))
8da19775 470 return append_tag_ref(refname, sha1, flag, cb_data);
76a44c5c 471 return append_ref(refname, sha1, 0);
287f8600
JH
472}
473
f49006b0 474static void snarf_refs(int head, int remotes)
f76412ed 475{
628894b2
JH
476 if (head) {
477 int orig_cnt = ref_name_cnt;
cb5d709f 478 for_each_ref(append_head_ref, NULL);
628894b2
JH
479 sort_ref_range(orig_cnt, ref_name_cnt);
480 }
f49006b0 481 if (remotes) {
628894b2 482 int orig_cnt = ref_name_cnt;
f49006b0 483 for_each_ref(append_remote_ref, NULL);
628894b2
JH
484 sort_ref_range(orig_cnt, ref_name_cnt);
485 }
f76412ed
JH
486}
487
ed378ec7 488static int rev_is_head(char *head, int headlen, char *name,
f76412ed
JH
489 unsigned char *head_sha1, unsigned char *sha1)
490{
ed378ec7 491 if ((!head[0]) ||
a89fccd2 492 (head_sha1 && sha1 && hashcmp(head_sha1, sha1)))
f76412ed 493 return 0;
cc44c765 494 if (!prefixcmp(head, "refs/heads/"))
afdcec73 495 head += 11;
cc44c765 496 if (!prefixcmp(name, "refs/heads/"))
afdcec73 497 name += 11;
cc44c765 498 else if (!prefixcmp(name, "heads/"))
afdcec73 499 name += 6;
ed378ec7 500 return !strcmp(head, name);
f76412ed
JH
501}
502
503static int show_merge_base(struct commit_list *seen, int num_rev)
504{
505 int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
506 int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
2f0f8b71 507 int exit_status = 1;
f76412ed
JH
508
509 while (seen) {
510 struct commit *commit = pop_one_commit(&seen);
511 int flags = commit->object.flags & all_mask;
512 if (!(flags & UNINTERESTING) &&
513 ((flags & all_revs) == all_revs)) {
514 puts(sha1_to_hex(commit->object.sha1));
2f0f8b71
JH
515 exit_status = 0;
516 commit->object.flags |= UNINTERESTING;
f76412ed
JH
517 }
518 }
2f0f8b71 519 return exit_status;
f76412ed
JH
520}
521
1f8af483
JH
522static int show_independent(struct commit **rev,
523 int num_rev,
524 char **ref_name,
525 unsigned int *rev_mask)
526{
527 int i;
528
529 for (i = 0; i < num_rev; i++) {
530 struct commit *commit = rev[i];
531 unsigned int flag = rev_mask[i];
532
533 if (commit->object.flags == flag)
534 puts(sha1_to_hex(commit->object.sha1));
535 commit->object.flags |= UNINTERESTING;
536 }
537 return 0;
538}
539
287f8600
JH
540static void append_one_rev(const char *av)
541{
542 unsigned char revkey[20];
543 if (!get_sha1(av, revkey)) {
76a44c5c 544 append_ref(av, revkey, 0);
287f8600
JH
545 return;
546 }
87758f97 547 if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
287f8600
JH
548 /* glob style match */
549 int saved_matches = ref_name_cnt;
550 match_ref_pattern = av;
551 match_ref_slash = count_slash(av);
cb5d709f 552 for_each_ref(append_matching_ref, NULL);
287f8600
JH
553 if (saved_matches == ref_name_cnt &&
554 ref_name_cnt < MAX_REVS)
555 error("no matching refs with %s", av);
06d900cf
JH
556 if (saved_matches + 1 < ref_name_cnt)
557 sort_ref_range(saved_matches, ref_name_cnt);
287f8600
JH
558 return;
559 }
560 die("bad sha1 reference %s", av);
561}
562
ef90d6d4 563static int git_show_branch_config(const char *var, const char *value, void *cb)
c2bdd6af
JH
564{
565 if (!strcmp(var, "showbranch.default")) {
4f9c412b
JH
566 if (!value)
567 return config_error_nonbool(var);
c2bdd6af
JH
568 if (default_alloc <= default_num + 1) {
569 default_alloc = default_alloc * 3 / 2 + 20;
570 default_arg = xrealloc(default_arg, sizeof *default_arg * default_alloc);
571 }
9befac47 572 default_arg[default_num++] = xstrdup(value);
c2bdd6af
JH
573 default_arg[default_num] = NULL;
574 return 0;
575 }
576
ab07ba2a
MH
577 if (!strcmp(var, "color.showbranch")) {
578 showbranch_use_color = git_config_colorbool(var, value, -1);
579 return 0;
580 }
581
582 return git_color_default_config(var, value, cb);
c2bdd6af
JH
583}
584
c24fe420
JH
585static int omit_in_dense(struct commit *commit, struct commit **rev, int n)
586{
587 /* If the commit is tip of the named branches, do not
588 * omit it.
589 * Otherwise, if it is a merge that is reachable from only one
590 * tip, it is not that interesting.
591 */
592 int i, flag, count;
593 for (i = 0; i < n; i++)
594 if (rev[i] == commit)
595 return 0;
596 flag = commit->object.flags;
597 for (i = count = 0; i < n; i++) {
598 if (flag & (1u << (i + REV_SHIFT)))
599 count++;
600 }
601 if (count == 1)
602 return 1;
603 return 0;
604}
605
57343652
SB
606static int reflog = 0;
607
608static int parse_reflog_param(const struct option *opt, const char *arg,
609 int unset)
76a44c5c
JH
610{
611 char *ep;
57343652
SB
612 const char **base = (const char **)opt->value;
613 if (!arg)
614 arg = "";
615 reflog = strtoul(arg, &ep, 10);
76a44c5c
JH
616 if (*ep == ',')
617 *base = ep + 1;
618 else if (*ep)
57343652 619 return error("unrecognized reflog param '%s'", arg);
76a44c5c
JH
620 else
621 *base = NULL;
57343652
SB
622 if (reflog <= 0)
623 reflog = DEFAULT_REFLOG;
624 return 0;
76a44c5c
JH
625}
626
a633fca0 627int cmd_show_branch(int ac, const char **av, const char *prefix)
f76412ed
JH
628{
629 struct commit *rev[MAX_REVS], *commit;
76a44c5c 630 char *reflog_msg[MAX_REVS];
f76412ed 631 struct commit_list *list = NULL, *seen = NULL;
1f8af483 632 unsigned int rev_mask[MAX_REVS];
f76412ed 633 int num_rev, i, extra = 0;
f49006b0 634 int all_heads = 0, all_remotes = 0;
6b209d47 635 int all_mask, all_revs;
4c8725f1 636 int lifo = 1;
ed378ec7
LT
637 char head[128];
638 const char *head_p;
639 int head_len;
f76412ed
JH
640 unsigned char head_sha1[20];
641 int merge_base = 0;
1f8af483 642 int independent = 0;
013f276e
JH
643 int no_name = 0;
644 int sha1_name = 0;
6b209d47 645 int shown_merge_point = 0;
1aa68d67 646 int with_current_branch = 0;
ebedc319 647 int head_at = -1;
d320a543 648 int topics = 0;
c24fe420 649 int dense = 1;
76a44c5c 650 const char *reflog_base = NULL;
57343652
SB
651 struct option builtin_show_branch_options[] = {
652 OPT_BOOLEAN('a', "all", &all_heads,
653 "show remote-tracking and local branches"),
654 OPT_BOOLEAN('r', "remotes", &all_remotes,
655 "show remote-tracking branches"),
656 OPT_BOOLEAN(0, "color", &showbranch_use_color,
657 "color '*!+-' corresponding to the branch"),
658 { OPTION_INTEGER, 0, "more", &extra, "n",
659 "show <n> more commits after the common ancestor",
660 PARSE_OPT_OPTARG | PARSE_OPT_LASTARG_DEFAULT,
661 NULL, (intptr_t)1 },
662 OPT_SET_INT(0, "list", &extra, "synonym to more=-1", -1),
663 OPT_BOOLEAN(0, "no-name", &no_name, "suppress naming strings"),
664 OPT_BOOLEAN(0, "current", &with_current_branch,
665 "include the current branch"),
666 OPT_BOOLEAN(0, "sha1-name", &sha1_name,
667 "name commits with their object names"),
668 OPT_BOOLEAN(0, "merge-base", &merge_base,
669 "act like git merge-base -a"),
670 OPT_BOOLEAN(0, "independent", &independent,
671 "show refs unreachable from any other ref"),
672 OPT_BOOLEAN(0, "topo-order", &lifo,
673 "show commits in topological order"),
674 OPT_BOOLEAN(0, "topics", &topics,
675 "show only commits not on the first branch"),
676 OPT_SET_INT(0, "sparse", &dense,
677 "show merges reachable from only one tip", 0),
678 OPT_SET_INT(0, "date-order", &lifo,
679 "show commits where no parent comes before its "
680 "children", 0),
681 { OPTION_CALLBACK, 'g', "reflog", &reflog_base, "<n>[,<base>]",
682 "show <n> most recent ref-log entries starting at "
683 "base",
684 PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP,
685 parse_reflog_param },
686 OPT_END()
687 };
f76412ed 688
ef90d6d4 689 git_config(git_show_branch_config, NULL);
076b2324 690
ab07ba2a
MH
691 if (showbranch_use_color == -1)
692 showbranch_use_color = git_use_color_default;
693
c2bdd6af
JH
694 /* If nothing is specified, try the default first */
695 if (ac == 1 && default_num) {
696 ac = default_num + 1;
697 av = default_arg - 1; /* ick; we would not address av[0] */
698 }
699
57343652
SB
700 ac = parse_options(ac, av, builtin_show_branch_options,
701 show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION);
702 if (all_heads)
703 all_remotes = 1;
f76412ed 704
df373ea9 705 if (extra || reflog) {
76a44c5c
JH
706 /* "listing" mode is incompatible with
707 * independent nor merge-base modes.
708 */
709 if (independent || merge_base)
57343652
SB
710 usage_with_options(show_branch_usage,
711 builtin_show_branch_options);
df373ea9 712 if (reflog && ((0 < extra) || all_heads || all_remotes))
76a44c5c
JH
713 /*
714 * Asking for --more in reflog mode does not
b15af079
JH
715 * make sense. --list is Ok.
716 *
717 * Also --all and --remotes do not make sense either.
76a44c5c 718 */
57343652
SB
719 die("--reflog is incompatible with --all, --remotes, "
720 "--independent or --merge-base");
76a44c5c 721 }
1f8af483 722
bb5ebed7 723 /* If nothing is specified, show all branches by default */
f49006b0 724 if (ac + all_heads + all_remotes == 0)
bb5ebed7
JH
725 all_heads = 1;
726
7e3fe904 727 if (reflog) {
76a44c5c
JH
728 unsigned char sha1[20];
729 char nth_desc[256];
730 char *ref;
731 int base = 0;
df373ea9
JH
732
733 if (ac == 0) {
734 static const char *fake_av[2];
632ac9fd
JH
735 const char *refname;
736
737 refname = resolve_ref("HEAD", sha1, 1, NULL);
738 fake_av[0] = xstrdup(refname);
df373ea9
JH
739 fake_av[1] = NULL;
740 av = fake_av;
741 ac = 1;
742 }
76a44c5c 743 if (ac != 1)
7e3fe904 744 die("--reflog option needs one branch name");
df373ea9 745
b15af079
JH
746 if (MAX_REVS < reflog)
747 die("Only %d entries can be shown at one time.",
748 MAX_REVS);
76a44c5c
JH
749 if (!dwim_ref(*av, strlen(*av), sha1, &ref))
750 die("No such ref %s", *av);
751
752 /* Has the base been specified? */
753 if (reflog_base) {
754 char *ep;
755 base = strtoul(reflog_base, &ep, 10);
756 if (*ep) {
757 /* Ah, that is a date spec... */
758 unsigned long at;
759 at = approxidate(reflog_base);
760 read_ref_at(ref, at, -1, sha1, NULL,
761 NULL, NULL, &base);
762 }
763 }
764
7e3fe904 765 for (i = 0; i < reflog; i++) {
3a55602e
SP
766 char *logmsg, *m;
767 const char *msg;
76a44c5c
JH
768 unsigned long timestamp;
769 int tz;
770
771 if (read_ref_at(ref, 0, base+i, sha1, &logmsg,
772 &timestamp, &tz, NULL)) {
773 reflog = i;
774 break;
775 }
776 msg = strchr(logmsg, '\t');
777 if (!msg)
778 msg = "(none)";
779 else
780 msg++;
781 m = xmalloc(strlen(msg) + 200);
782 sprintf(m, "(%s) %s",
16bfefee 783 show_date(timestamp, tz, 1),
76a44c5c
JH
784 msg);
785 reflog_msg[i] = m;
786 free(logmsg);
787 sprintf(nth_desc, "%s@{%d}", *av, base+i);
788 append_ref(nth_desc, sha1, 1);
7e3fe904
JH
789 }
790 }
df373ea9
JH
791 else if (all_heads + all_remotes)
792 snarf_refs(all_heads, all_remotes);
7e3fe904
JH
793 else {
794 while (0 < ac) {
795 append_one_rev(*av);
796 ac--; av++;
797 }
287f8600 798 }
bb5ebed7 799
8da19775 800 head_p = resolve_ref("HEAD", head_sha1, 1, NULL);
ed378ec7
LT
801 if (head_p) {
802 head_len = strlen(head_p);
803 memcpy(head, head_p, head_len + 1);
1aa68d67
JH
804 }
805 else {
ed378ec7
LT
806 head_len = 0;
807 head[0] = 0;
1aa68d67
JH
808 }
809
ed378ec7 810 if (with_current_branch && head_p) {
1aa68d67
JH
811 int has_head = 0;
812 for (i = 0; !has_head && i < ref_name_cnt; i++) {
813 /* We are only interested in adding the branch
814 * HEAD points at.
815 */
ed378ec7
LT
816 if (rev_is_head(head,
817 head_len,
1aa68d67
JH
818 ref_name[i],
819 head_sha1, NULL))
820 has_head++;
821 }
822 if (!has_head) {
f8fcb57b
JH
823 int offset = !prefixcmp(head, "refs/heads/") ? 11 : 0;
824 append_one_rev(head + offset);
1aa68d67
JH
825 }
826 }
827
287f8600
JH
828 if (!ref_name_cnt) {
829 fprintf(stderr, "No revs to be shown.\n");
830 exit(0);
831 }
f76412ed
JH
832
833 for (num_rev = 0; ref_name[num_rev]; num_rev++) {
834 unsigned char revkey[20];
1f8af483 835 unsigned int flag = 1u << (num_rev + REV_SHIFT);
f76412ed
JH
836
837 if (MAX_REVS <= num_rev)
838 die("cannot handle more than %d revs.", MAX_REVS);
839 if (get_sha1(ref_name[num_rev], revkey))
7246ed43 840 die("'%s' is not a valid ref.", ref_name[num_rev]);
f76412ed
JH
841 commit = lookup_commit_reference(revkey);
842 if (!commit)
843 die("cannot find commit %s (%s)",
844 ref_name[num_rev], revkey);
845 parse_commit(commit);
f76412ed
JH
846 mark_seen(commit, &seen);
847
848 /* rev#0 uses bit REV_SHIFT, rev#1 uses bit REV_SHIFT+1,
849 * and so on. REV_SHIFT bits from bit 0 are used for
850 * internal bookkeeping.
851 */
1f8af483
JH
852 commit->object.flags |= flag;
853 if (commit->object.flags == flag)
854 insert_by_date(commit, &list);
f76412ed
JH
855 rev[num_rev] = commit;
856 }
1f8af483
JH
857 for (i = 0; i < num_rev; i++)
858 rev_mask[i] = rev[i]->object.flags;
859
860 if (0 <= extra)
861 join_revs(&list, &seen, num_rev, extra);
f76412ed 862
26a8ad25
JH
863 sort_by_date(&seen);
864
f76412ed
JH
865 if (merge_base)
866 return show_merge_base(seen, num_rev);
867
1f8af483
JH
868 if (independent)
869 return show_independent(rev, num_rev, ref_name, rev_mask);
870
871 /* Show list; --more=-1 means list-only */
c9d023b2 872 if (1 < num_rev || extra < 0) {
f76412ed
JH
873 for (i = 0; i < num_rev; i++) {
874 int j;
ed378ec7
LT
875 int is_head = rev_is_head(head,
876 head_len,
f76412ed
JH
877 ref_name[i],
878 head_sha1,
879 rev[i]->object.sha1);
1f8af483
JH
880 if (extra < 0)
881 printf("%c [%s] ",
882 is_head ? '*' : ' ', ref_name[i]);
883 else {
884 for (j = 0; j < i; j++)
885 putchar(' ');
ab07ba2a
MH
886 printf("%s%c%s [%s] ",
887 get_color_code(i % COLUMN_COLORS_MAX),
888 is_head ? '*' : '!',
889 get_color_reset_code(), ref_name[i]);
1f8af483 890 }
76a44c5c
JH
891
892 if (!reflog) {
893 /* header lines never need name */
894 show_one_commit(rev[i], 1);
895 }
896 else
897 puts(reflog_msg[i]);
898
ebedc319
JH
899 if (is_head)
900 head_at = i;
f76412ed 901 }
1f8af483
JH
902 if (0 <= extra) {
903 for (i = 0; i < num_rev; i++)
904 putchar('-');
905 putchar('\n');
906 }
f5e375c9 907 }
1f8af483
JH
908 if (extra < 0)
909 exit(0);
f5e375c9 910
8e5dd22b 911 /* Sort topologically */
4c8725f1 912 sort_in_topological_order(&seen, lifo);
8e5dd22b
JH
913
914 /* Give names to commits */
013f276e
JH
915 if (!sha1_name && !no_name)
916 name_commits(seen, rev, ref_name, num_rev);
8e5dd22b
JH
917
918 all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
919 all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
8e5dd22b 920
f76412ed
JH
921 while (seen) {
922 struct commit *commit = pop_one_commit(&seen);
923 int this_flag = commit->object.flags;
f794c234 924 int is_merge_point = ((this_flag & all_revs) == all_revs);
f5e375c9 925
f794c234 926 shown_merge_point |= is_merge_point;
8e5dd22b 927
f5e375c9 928 if (1 < num_rev) {
c24fe420
JH
929 int is_merge = !!(commit->parents &&
930 commit->parents->next);
f794c234
JH
931 if (topics &&
932 !is_merge_point &&
933 (this_flag & (1u << REV_SHIFT)))
934 continue;
c24fe420
JH
935 if (dense && is_merge &&
936 omit_in_dense(commit, rev, num_rev))
937 continue;
ebedc319
JH
938 for (i = 0; i < num_rev; i++) {
939 int mark;
940 if (!(this_flag & (1u << (i + REV_SHIFT))))
941 mark = ' ';
942 else if (is_merge)
943 mark = '-';
944 else if (i == head_at)
945 mark = '*';
946 else
947 mark = '+';
ab07ba2a
MH
948 printf("%s%c%s",
949 get_color_code(i % COLUMN_COLORS_MAX),
950 mark, get_color_reset_code());
ebedc319 951 }
f5e375c9
JH
952 putchar(' ');
953 }
013f276e 954 show_one_commit(commit, no_name);
6b209d47
JH
955
956 if (shown_merge_point && --extra < 0)
957 break;
f76412ed
JH
958 }
959 return 0;
960}