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