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