builtin/show-branch.c

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