builtin/show-branch.c

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