da53b6ce35841c03a541141165fb49297bf68c27
   1#include "cache.h"
   2#include "tag.h"
   3#include "blob.h"
   4#include "tree.h"
   5#include "commit.h"
   6#include "diff.h"
   7#include "refs.h"
   8#include "revision.h"
   9#include "graph.h"
  10#include "grep.h"
  11#include "reflog-walk.h"
  12#include "patch-ids.h"
  13#include "decorate.h"
  14#include "log-tree.h"
  15#include "string-list.h"
  16#include "line-log.h"
  17#include "mailmap.h"
  18#include "commit-slab.h"
  19#include "dir.h"
  20#include "cache-tree.h"
  21#include "bisect.h"
  22
  23volatile show_early_output_fn_t show_early_output;
  24
  25static const char *term_bad;
  26static const char *term_good;
  27
  28char *path_name(const struct name_path *path, const char *name)
  29{
  30        const struct name_path *p;
  31        char *n, *m;
  32        int nlen = strlen(name);
  33        int len = nlen + 1;
  34
  35        for (p = path; p; p = p->up) {
  36                if (p->elem_len)
  37                        len += p->elem_len + 1;
  38        }
  39        n = xmalloc(len);
  40        m = n + len - (nlen + 1);
  41        memcpy(m, name, nlen + 1);
  42        for (p = path; p; p = p->up) {
  43                if (p->elem_len) {
  44                        m -= p->elem_len + 1;
  45                        memcpy(m, p->elem, p->elem_len);
  46                        m[p->elem_len] = '/';
  47                }
  48        }
  49        return n;
  50}
  51
  52static int show_path_component_truncated(FILE *out, const char *name, int len)
  53{
  54        int cnt;
  55        for (cnt = 0; cnt < len; cnt++) {
  56                int ch = name[cnt];
  57                if (!ch || ch == '\n')
  58                        return -1;
  59                fputc(ch, out);
  60        }
  61        return len;
  62}
  63
  64static int show_path_truncated(FILE *out, const struct name_path *path)
  65{
  66        int emitted, ours;
  67
  68        if (!path)
  69                return 0;
  70        emitted = show_path_truncated(out, path->up);
  71        if (emitted < 0)
  72                return emitted;
  73        if (emitted)
  74                fputc('/', out);
  75        ours = show_path_component_truncated(out, path->elem, path->elem_len);
  76        if (ours < 0)
  77                return ours;
  78        return ours || emitted;
  79}
  80
  81void show_object_with_name(FILE *out, struct object *obj,
  82                           const struct name_path *path, const char *component)
  83{
  84        struct name_path leaf;
  85        leaf.up = (struct name_path *)path;
  86        leaf.elem = component;
  87        leaf.elem_len = strlen(component);
  88
  89        fprintf(out, "%s ", oid_to_hex(&obj->oid));
  90        show_path_truncated(out, &leaf);
  91        fputc('\n', out);
  92}
  93
  94static void mark_blob_uninteresting(struct blob *blob)
  95{
  96        if (!blob)
  97                return;
  98        if (blob->object.flags & UNINTERESTING)
  99                return;
 100        blob->object.flags |= UNINTERESTING;
 101}
 102
 103static void mark_tree_contents_uninteresting(struct tree *tree)
 104{
 105        struct tree_desc desc;
 106        struct name_entry entry;
 107        struct object *obj = &tree->object;
 108
 109        if (!has_object_file(&obj->oid))
 110                return;
 111        if (parse_tree(tree) < 0)
 112                die("bad tree %s", oid_to_hex(&obj->oid));
 113
 114        init_tree_desc(&desc, tree->buffer, tree->size);
 115        while (tree_entry(&desc, &entry)) {
 116                switch (object_type(entry.mode)) {
 117                case OBJ_TREE:
 118                        mark_tree_uninteresting(lookup_tree(entry.sha1));
 119                        break;
 120                case OBJ_BLOB:
 121                        mark_blob_uninteresting(lookup_blob(entry.sha1));
 122                        break;
 123                default:
 124                        /* Subproject commit - not in this repository */
 125                        break;
 126                }
 127        }
 128
 129        /*
 130         * We don't care about the tree any more
 131         * after it has been marked uninteresting.
 132         */
 133        free_tree_buffer(tree);
 134}
 135
 136void mark_tree_uninteresting(struct tree *tree)
 137{
 138        struct object *obj;
 139
 140        if (!tree)
 141                return;
 142
 143        obj = &tree->object;
 144        if (obj->flags & UNINTERESTING)
 145                return;
 146        obj->flags |= UNINTERESTING;
 147        mark_tree_contents_uninteresting(tree);
 148}
 149
 150void mark_parents_uninteresting(struct commit *commit)
 151{
 152        struct commit_list *parents = NULL, *l;
 153
 154        for (l = commit->parents; l; l = l->next)
 155                commit_list_insert(l->item, &parents);
 156
 157        while (parents) {
 158                struct commit *commit = pop_commit(&parents);
 159
 160                while (commit) {
 161                        /*
 162                         * A missing commit is ok iff its parent is marked
 163                         * uninteresting.
 164                         *
 165                         * We just mark such a thing parsed, so that when
 166                         * it is popped next time around, we won't be trying
 167                         * to parse it and get an error.
 168                         */
 169                        if (!has_object_file(&commit->object.oid))
 170                                commit->object.parsed = 1;
 171
 172                        if (commit->object.flags & UNINTERESTING)
 173                                break;
 174
 175                        commit->object.flags |= UNINTERESTING;
 176
 177                        /*
 178                         * Normally we haven't parsed the parent
 179                         * yet, so we won't have a parent of a parent
 180                         * here. However, it may turn out that we've
 181                         * reached this commit some other way (where it
 182                         * wasn't uninteresting), in which case we need
 183                         * to mark its parents recursively too..
 184                         */
 185                        if (!commit->parents)
 186                                break;
 187
 188                        for (l = commit->parents->next; l; l = l->next)
 189                                commit_list_insert(l->item, &parents);
 190                        commit = commit->parents->item;
 191                }
 192        }
 193}
 194
 195static void add_pending_object_with_path(struct rev_info *revs,
 196                                         struct object *obj,
 197                                         const char *name, unsigned mode,
 198                                         const char *path)
 199{
 200        if (!obj)
 201                return;
 202        if (revs->no_walk && (obj->flags & UNINTERESTING))
 203                revs->no_walk = 0;
 204        if (revs->reflog_info && obj->type == OBJ_COMMIT) {
 205                struct strbuf buf = STRBUF_INIT;
 206                int len = interpret_branch_name(name, 0, &buf);
 207                int st;
 208
 209                if (0 < len && name[len] && buf.len)
 210                        strbuf_addstr(&buf, name + len);
 211                st = add_reflog_for_walk(revs->reflog_info,
 212                                         (struct commit *)obj,
 213                                         buf.buf[0] ? buf.buf: name);
 214                strbuf_release(&buf);
 215                if (st)
 216                        return;
 217        }
 218        add_object_array_with_path(obj, name, &revs->pending, mode, path);
 219}
 220
 221static void add_pending_object_with_mode(struct rev_info *revs,
 222                                         struct object *obj,
 223                                         const char *name, unsigned mode)
 224{
 225        add_pending_object_with_path(revs, obj, name, mode, NULL);
 226}
 227
 228void add_pending_object(struct rev_info *revs,
 229                        struct object *obj, const char *name)
 230{
 231        add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
 232}
 233
 234void add_head_to_pending(struct rev_info *revs)
 235{
 236        unsigned char sha1[20];
 237        struct object *obj;
 238        if (get_sha1("HEAD", sha1))
 239                return;
 240        obj = parse_object(sha1);
 241        if (!obj)
 242                return;
 243        add_pending_object(revs, obj, "HEAD");
 244}
 245
 246static struct object *get_reference(struct rev_info *revs, const char *name,
 247                                    const unsigned char *sha1,
 248                                    unsigned int flags)
 249{
 250        struct object *object;
 251
 252        object = parse_object(sha1);
 253        if (!object) {
 254                if (revs->ignore_missing)
 255                        return object;
 256                die("bad object %s", name);
 257        }
 258        object->flags |= flags;
 259        return object;
 260}
 261
 262void add_pending_sha1(struct rev_info *revs, const char *name,
 263                      const unsigned char *sha1, unsigned int flags)
 264{
 265        struct object *object = get_reference(revs, name, sha1, flags);
 266        add_pending_object(revs, object, name);
 267}
 268
 269static struct commit *handle_commit(struct rev_info *revs,
 270                                    struct object_array_entry *entry)
 271{
 272        struct object *object = entry->item;
 273        const char *name = entry->name;
 274        const char *path = entry->path;
 275        unsigned int mode = entry->mode;
 276        unsigned long flags = object->flags;
 277
 278        /*
 279         * Tag object? Look what it points to..
 280         */
 281        while (object->type == OBJ_TAG) {
 282                struct tag *tag = (struct tag *) object;
 283                if (revs->tag_objects && !(flags & UNINTERESTING))
 284                        add_pending_object(revs, object, tag->tag);
 285                if (!tag->tagged)
 286                        die("bad tag");
 287                object = parse_object(tag->tagged->oid.hash);
 288                if (!object) {
 289                        if (flags & UNINTERESTING)
 290                                return NULL;
 291                        die("bad object %s", oid_to_hex(&tag->tagged->oid));
 292                }
 293                object->flags |= flags;
 294                /*
 295                 * We'll handle the tagged object by looping or dropping
 296                 * through to the non-tag handlers below. Do not
 297                 * propagate path data from the tag's pending entry.
 298                 */
 299                path = NULL;
 300                mode = 0;
 301        }
 302
 303        /*
 304         * Commit object? Just return it, we'll do all the complex
 305         * reachability crud.
 306         */
 307        if (object->type == OBJ_COMMIT) {
 308                struct commit *commit = (struct commit *)object;
 309                if (parse_commit(commit) < 0)
 310                        die("unable to parse commit %s", name);
 311                if (flags & UNINTERESTING) {
 312                        mark_parents_uninteresting(commit);
 313                        revs->limited = 1;
 314                }
 315                if (revs->show_source && !commit->util)
 316                        commit->util = xstrdup(name);
 317                return commit;
 318        }
 319
 320        /*
 321         * Tree object? Either mark it uninteresting, or add it
 322         * to the list of objects to look at later..
 323         */
 324        if (object->type == OBJ_TREE) {
 325                struct tree *tree = (struct tree *)object;
 326                if (!revs->tree_objects)
 327                        return NULL;
 328                if (flags & UNINTERESTING) {
 329                        mark_tree_contents_uninteresting(tree);
 330                        return NULL;
 331                }
 332                add_pending_object_with_path(revs, object, name, mode, path);
 333                return NULL;
 334        }
 335
 336        /*
 337         * Blob object? You know the drill by now..
 338         */
 339        if (object->type == OBJ_BLOB) {
 340                if (!revs->blob_objects)
 341                        return NULL;
 342                if (flags & UNINTERESTING)
 343                        return NULL;
 344                add_pending_object_with_path(revs, object, name, mode, path);
 345                return NULL;
 346        }
 347        die("%s is unknown object", name);
 348}
 349
 350static int everybody_uninteresting(struct commit_list *orig,
 351                                   struct commit **interesting_cache)
 352{
 353        struct commit_list *list = orig;
 354
 355        if (*interesting_cache) {
 356                struct commit *commit = *interesting_cache;
 357                if (!(commit->object.flags & UNINTERESTING))
 358                        return 0;
 359        }
 360
 361        while (list) {
 362                struct commit *commit = list->item;
 363                list = list->next;
 364                if (commit->object.flags & UNINTERESTING)
 365                        continue;
 366
 367                *interesting_cache = commit;
 368                return 0;
 369        }
 370        return 1;
 371}
 372
 373/*
 374 * A definition of "relevant" commit that we can use to simplify limited graphs
 375 * by eliminating side branches.
 376 *
 377 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
 378 * in our list), or that is a specified BOTTOM commit. Then after computing
 379 * a limited list, during processing we can generally ignore boundary merges
 380 * coming from outside the graph, (ie from irrelevant parents), and treat
 381 * those merges as if they were single-parent. TREESAME is defined to consider
 382 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
 383 * we don't care if we were !TREESAME to non-graph parents.
 384 *
 385 * Treating bottom commits as relevant ensures that a limited graph's
 386 * connection to the actual bottom commit is not viewed as a side branch, but
 387 * treated as part of the graph. For example:
 388 *
 389 *   ....Z...A---X---o---o---B
 390 *        .     /
 391 *         W---Y
 392 *
 393 * When computing "A..B", the A-X connection is at least as important as
 394 * Y-X, despite A being flagged UNINTERESTING.
 395 *
 396 * And when computing --ancestry-path "A..B", the A-X connection is more
 397 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
 398 */
 399static inline int relevant_commit(struct commit *commit)
 400{
 401        return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
 402}
 403
 404/*
 405 * Return a single relevant commit from a parent list. If we are a TREESAME
 406 * commit, and this selects one of our parents, then we can safely simplify to
 407 * that parent.
 408 */
 409static struct commit *one_relevant_parent(const struct rev_info *revs,
 410                                          struct commit_list *orig)
 411{
 412        struct commit_list *list = orig;
 413        struct commit *relevant = NULL;
 414
 415        if (!orig)
 416                return NULL;
 417
 418        /*
 419         * For 1-parent commits, or if first-parent-only, then return that
 420         * first parent (even if not "relevant" by the above definition).
 421         * TREESAME will have been set purely on that parent.
 422         */
 423        if (revs->first_parent_only || !orig->next)
 424                return orig->item;
 425
 426        /*
 427         * For multi-parent commits, identify a sole relevant parent, if any.
 428         * If we have only one relevant parent, then TREESAME will be set purely
 429         * with regard to that parent, and we can simplify accordingly.
 430         *
 431         * If we have more than one relevant parent, or no relevant parents
 432         * (and multiple irrelevant ones), then we can't select a parent here
 433         * and return NULL.
 434         */
 435        while (list) {
 436                struct commit *commit = list->item;
 437                list = list->next;
 438                if (relevant_commit(commit)) {
 439                        if (relevant)
 440                                return NULL;
 441                        relevant = commit;
 442                }
 443        }
 444        return relevant;
 445}
 446
 447/*
 448 * The goal is to get REV_TREE_NEW as the result only if the
 449 * diff consists of all '+' (and no other changes), REV_TREE_OLD
 450 * if the whole diff is removal of old data, and otherwise
 451 * REV_TREE_DIFFERENT (of course if the trees are the same we
 452 * want REV_TREE_SAME).
 453 * That means that once we get to REV_TREE_DIFFERENT, we do not
 454 * have to look any further.
 455 */
 456static int tree_difference = REV_TREE_SAME;
 457
 458static void file_add_remove(struct diff_options *options,
 459                    int addremove, unsigned mode,
 460                    const unsigned char *sha1,
 461                    int sha1_valid,
 462                    const char *fullpath, unsigned dirty_submodule)
 463{
 464        int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
 465
 466        tree_difference |= diff;
 467        if (tree_difference == REV_TREE_DIFFERENT)
 468                DIFF_OPT_SET(options, HAS_CHANGES);
 469}
 470
 471static void file_change(struct diff_options *options,
 472                 unsigned old_mode, unsigned new_mode,
 473                 const unsigned char *old_sha1,
 474                 const unsigned char *new_sha1,
 475                 int old_sha1_valid, int new_sha1_valid,
 476                 const char *fullpath,
 477                 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
 478{
 479        tree_difference = REV_TREE_DIFFERENT;
 480        DIFF_OPT_SET(options, HAS_CHANGES);
 481}
 482
 483static int rev_compare_tree(struct rev_info *revs,
 484                            struct commit *parent, struct commit *commit)
 485{
 486        struct tree *t1 = parent->tree;
 487        struct tree *t2 = commit->tree;
 488
 489        if (!t1)
 490                return REV_TREE_NEW;
 491        if (!t2)
 492                return REV_TREE_OLD;
 493
 494        if (revs->simplify_by_decoration) {
 495                /*
 496                 * If we are simplifying by decoration, then the commit
 497                 * is worth showing if it has a tag pointing at it.
 498                 */
 499                if (get_name_decoration(&commit->object))
 500                        return REV_TREE_DIFFERENT;
 501                /*
 502                 * A commit that is not pointed by a tag is uninteresting
 503                 * if we are not limited by path.  This means that you will
 504                 * see the usual "commits that touch the paths" plus any
 505                 * tagged commit by specifying both --simplify-by-decoration
 506                 * and pathspec.
 507                 */
 508                if (!revs->prune_data.nr)
 509                        return REV_TREE_SAME;
 510        }
 511
 512        tree_difference = REV_TREE_SAME;
 513        DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
 514        if (diff_tree_sha1(t1->object.oid.hash, t2->object.oid.hash, "",
 515                           &revs->pruning) < 0)
 516                return REV_TREE_DIFFERENT;
 517        return tree_difference;
 518}
 519
 520static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
 521{
 522        int retval;
 523        struct tree *t1 = commit->tree;
 524
 525        if (!t1)
 526                return 0;
 527
 528        tree_difference = REV_TREE_SAME;
 529        DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
 530        retval = diff_tree_sha1(NULL, t1->object.oid.hash, "", &revs->pruning);
 531
 532        return retval >= 0 && (tree_difference == REV_TREE_SAME);
 533}
 534
 535struct treesame_state {
 536        unsigned int nparents;
 537        unsigned char treesame[FLEX_ARRAY];
 538};
 539
 540static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
 541{
 542        unsigned n = commit_list_count(commit->parents);
 543        struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
 544        st->nparents = n;
 545        add_decoration(&revs->treesame, &commit->object, st);
 546        return st;
 547}
 548
 549/*
 550 * Must be called immediately after removing the nth_parent from a commit's
 551 * parent list, if we are maintaining the per-parent treesame[] decoration.
 552 * This does not recalculate the master TREESAME flag - update_treesame()
 553 * should be called to update it after a sequence of treesame[] modifications
 554 * that may have affected it.
 555 */
 556static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
 557{
 558        struct treesame_state *st;
 559        int old_same;
 560
 561        if (!commit->parents) {
 562                /*
 563                 * Have just removed the only parent from a non-merge.
 564                 * Different handling, as we lack decoration.
 565                 */
 566                if (nth_parent != 0)
 567                        die("compact_treesame %u", nth_parent);
 568                old_same = !!(commit->object.flags & TREESAME);
 569                if (rev_same_tree_as_empty(revs, commit))
 570                        commit->object.flags |= TREESAME;
 571                else
 572                        commit->object.flags &= ~TREESAME;
 573                return old_same;
 574        }
 575
 576        st = lookup_decoration(&revs->treesame, &commit->object);
 577        if (!st || nth_parent >= st->nparents)
 578                die("compact_treesame %u", nth_parent);
 579
 580        old_same = st->treesame[nth_parent];
 581        memmove(st->treesame + nth_parent,
 582                st->treesame + nth_parent + 1,
 583                st->nparents - nth_parent - 1);
 584
 585        /*
 586         * If we've just become a non-merge commit, update TREESAME
 587         * immediately, and remove the no-longer-needed decoration.
 588         * If still a merge, defer update until update_treesame().
 589         */
 590        if (--st->nparents == 1) {
 591                if (commit->parents->next)
 592                        die("compact_treesame parents mismatch");
 593                if (st->treesame[0] && revs->dense)
 594                        commit->object.flags |= TREESAME;
 595                else
 596                        commit->object.flags &= ~TREESAME;
 597                free(add_decoration(&revs->treesame, &commit->object, NULL));
 598        }
 599
 600        return old_same;
 601}
 602
 603static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
 604{
 605        if (commit->parents && commit->parents->next) {
 606                unsigned n;
 607                struct treesame_state *st;
 608                struct commit_list *p;
 609                unsigned relevant_parents;
 610                unsigned relevant_change, irrelevant_change;
 611
 612                st = lookup_decoration(&revs->treesame, &commit->object);
 613                if (!st)
 614                        die("update_treesame %s", oid_to_hex(&commit->object.oid));
 615                relevant_parents = 0;
 616                relevant_change = irrelevant_change = 0;
 617                for (p = commit->parents, n = 0; p; n++, p = p->next) {
 618                        if (relevant_commit(p->item)) {
 619                                relevant_change |= !st->treesame[n];
 620                                relevant_parents++;
 621                        } else
 622                                irrelevant_change |= !st->treesame[n];
 623                }
 624                if (relevant_parents ? relevant_change : irrelevant_change)
 625                        commit->object.flags &= ~TREESAME;
 626                else
 627                        commit->object.flags |= TREESAME;
 628        }
 629
 630        return commit->object.flags & TREESAME;
 631}
 632
 633static inline int limiting_can_increase_treesame(const struct rev_info *revs)
 634{
 635        /*
 636         * TREESAME is irrelevant unless prune && dense;
 637         * if simplify_history is set, we can't have a mixture of TREESAME and
 638         *    !TREESAME INTERESTING parents (and we don't have treesame[]
 639         *    decoration anyway);
 640         * if first_parent_only is set, then the TREESAME flag is locked
 641         *    against the first parent (and again we lack treesame[] decoration).
 642         */
 643        return revs->prune && revs->dense &&
 644               !revs->simplify_history &&
 645               !revs->first_parent_only;
 646}
 647
 648static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 649{
 650        struct commit_list **pp, *parent;
 651        struct treesame_state *ts = NULL;
 652        int relevant_change = 0, irrelevant_change = 0;
 653        int relevant_parents, nth_parent;
 654
 655        /*
 656         * If we don't do pruning, everything is interesting
 657         */
 658        if (!revs->prune)
 659                return;
 660
 661        if (!commit->tree)
 662                return;
 663
 664        if (!commit->parents) {
 665                if (rev_same_tree_as_empty(revs, commit))
 666                        commit->object.flags |= TREESAME;
 667                return;
 668        }
 669
 670        /*
 671         * Normal non-merge commit? If we don't want to make the
 672         * history dense, we consider it always to be a change..
 673         */
 674        if (!revs->dense && !commit->parents->next)
 675                return;
 676
 677        for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
 678             (parent = *pp) != NULL;
 679             pp = &parent->next, nth_parent++) {
 680                struct commit *p = parent->item;
 681                if (relevant_commit(p))
 682                        relevant_parents++;
 683
 684                if (nth_parent == 1) {
 685                        /*
 686                         * This our second loop iteration - so we now know
 687                         * we're dealing with a merge.
 688                         *
 689                         * Do not compare with later parents when we care only about
 690                         * the first parent chain, in order to avoid derailing the
 691                         * traversal to follow a side branch that brought everything
 692                         * in the path we are limited to by the pathspec.
 693                         */
 694                        if (revs->first_parent_only)
 695                                break;
 696                        /*
 697                         * If this will remain a potentially-simplifiable
 698                         * merge, remember per-parent treesame if needed.
 699                         * Initialise the array with the comparison from our
 700                         * first iteration.
 701                         */
 702                        if (revs->treesame.name &&
 703                            !revs->simplify_history &&
 704                            !(commit->object.flags & UNINTERESTING)) {
 705                                ts = initialise_treesame(revs, commit);
 706                                if (!(irrelevant_change || relevant_change))
 707                                        ts->treesame[0] = 1;
 708                        }
 709                }
 710                if (parse_commit(p) < 0)
 711                        die("cannot simplify commit %s (because of %s)",
 712                            oid_to_hex(&commit->object.oid),
 713                            oid_to_hex(&p->object.oid));
 714                switch (rev_compare_tree(revs, p, commit)) {
 715                case REV_TREE_SAME:
 716                        if (!revs->simplify_history || !relevant_commit(p)) {
 717                                /* Even if a merge with an uninteresting
 718                                 * side branch brought the entire change
 719                                 * we are interested in, we do not want
 720                                 * to lose the other branches of this
 721                                 * merge, so we just keep going.
 722                                 */
 723                                if (ts)
 724                                        ts->treesame[nth_parent] = 1;
 725                                continue;
 726                        }
 727                        parent->next = NULL;
 728                        commit->parents = parent;
 729                        commit->object.flags |= TREESAME;
 730                        return;
 731
 732                case REV_TREE_NEW:
 733                        if (revs->remove_empty_trees &&
 734                            rev_same_tree_as_empty(revs, p)) {
 735                                /* We are adding all the specified
 736                                 * paths from this parent, so the
 737                                 * history beyond this parent is not
 738                                 * interesting.  Remove its parents
 739                                 * (they are grandparents for us).
 740                                 * IOW, we pretend this parent is a
 741                                 * "root" commit.
 742                                 */
 743                                if (parse_commit(p) < 0)
 744                                        die("cannot simplify commit %s (invalid %s)",
 745                                            oid_to_hex(&commit->object.oid),
 746                                            oid_to_hex(&p->object.oid));
 747                                p->parents = NULL;
 748                        }
 749                /* fallthrough */
 750                case REV_TREE_OLD:
 751                case REV_TREE_DIFFERENT:
 752                        if (relevant_commit(p))
 753                                relevant_change = 1;
 754                        else
 755                                irrelevant_change = 1;
 756                        continue;
 757                }
 758                die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
 759        }
 760
 761        /*
 762         * TREESAME is straightforward for single-parent commits. For merge
 763         * commits, it is most useful to define it so that "irrelevant"
 764         * parents cannot make us !TREESAME - if we have any relevant
 765         * parents, then we only consider TREESAMEness with respect to them,
 766         * allowing irrelevant merges from uninteresting branches to be
 767         * simplified away. Only if we have only irrelevant parents do we
 768         * base TREESAME on them. Note that this logic is replicated in
 769         * update_treesame, which should be kept in sync.
 770         */
 771        if (relevant_parents ? !relevant_change : !irrelevant_change)
 772                commit->object.flags |= TREESAME;
 773}
 774
 775static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
 776                    struct commit_list *cached_base, struct commit_list **cache)
 777{
 778        struct commit_list *new_entry;
 779
 780        if (cached_base && p->date < cached_base->item->date)
 781                new_entry = commit_list_insert_by_date(p, &cached_base->next);
 782        else
 783                new_entry = commit_list_insert_by_date(p, head);
 784
 785        if (cache && (!*cache || p->date < (*cache)->item->date))
 786                *cache = new_entry;
 787}
 788
 789static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
 790                    struct commit_list **list, struct commit_list **cache_ptr)
 791{
 792        struct commit_list *parent = commit->parents;
 793        unsigned left_flag;
 794        struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
 795
 796        if (commit->object.flags & ADDED)
 797                return 0;
 798        commit->object.flags |= ADDED;
 799
 800        if (revs->include_check &&
 801            !revs->include_check(commit, revs->include_check_data))
 802                return 0;
 803
 804        /*
 805         * If the commit is uninteresting, don't try to
 806         * prune parents - we want the maximal uninteresting
 807         * set.
 808         *
 809         * Normally we haven't parsed the parent
 810         * yet, so we won't have a parent of a parent
 811         * here. However, it may turn out that we've
 812         * reached this commit some other way (where it
 813         * wasn't uninteresting), in which case we need
 814         * to mark its parents recursively too..
 815         */
 816        if (commit->object.flags & UNINTERESTING) {
 817                while (parent) {
 818                        struct commit *p = parent->item;
 819                        parent = parent->next;
 820                        if (p)
 821                                p->object.flags |= UNINTERESTING;
 822                        if (parse_commit_gently(p, 1) < 0)
 823                                continue;
 824                        if (p->parents)
 825                                mark_parents_uninteresting(p);
 826                        if (p->object.flags & SEEN)
 827                                continue;
 828                        p->object.flags |= SEEN;
 829                        commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
 830                }
 831                return 0;
 832        }
 833
 834        /*
 835         * Ok, the commit wasn't uninteresting. Try to
 836         * simplify the commit history and find the parent
 837         * that has no differences in the path set if one exists.
 838         */
 839        try_to_simplify_commit(revs, commit);
 840
 841        if (revs->no_walk)
 842                return 0;
 843
 844        left_flag = (commit->object.flags & SYMMETRIC_LEFT);
 845
 846        for (parent = commit->parents; parent; parent = parent->next) {
 847                struct commit *p = parent->item;
 848
 849                if (parse_commit_gently(p, revs->ignore_missing_links) < 0)
 850                        return -1;
 851                if (revs->show_source && !p->util)
 852                        p->util = commit->util;
 853                p->object.flags |= left_flag;
 854                if (!(p->object.flags & SEEN)) {
 855                        p->object.flags |= SEEN;
 856                        commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
 857                }
 858                if (revs->first_parent_only)
 859                        break;
 860        }
 861        return 0;
 862}
 863
 864static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
 865{
 866        struct commit_list *p;
 867        int left_count = 0, right_count = 0;
 868        int left_first;
 869        struct patch_ids ids;
 870        unsigned cherry_flag;
 871
 872        /* First count the commits on the left and on the right */
 873        for (p = list; p; p = p->next) {
 874                struct commit *commit = p->item;
 875                unsigned flags = commit->object.flags;
 876                if (flags & BOUNDARY)
 877                        ;
 878                else if (flags & SYMMETRIC_LEFT)
 879                        left_count++;
 880                else
 881                        right_count++;
 882        }
 883
 884        if (!left_count || !right_count)
 885                return;
 886
 887        left_first = left_count < right_count;
 888        init_patch_ids(&ids);
 889        ids.diffopts.pathspec = revs->diffopt.pathspec;
 890
 891        /* Compute patch-ids for one side */
 892        for (p = list; p; p = p->next) {
 893                struct commit *commit = p->item;
 894                unsigned flags = commit->object.flags;
 895
 896                if (flags & BOUNDARY)
 897                        continue;
 898                /*
 899                 * If we have fewer left, left_first is set and we omit
 900                 * commits on the right branch in this loop.  If we have
 901                 * fewer right, we skip the left ones.
 902                 */
 903                if (left_first != !!(flags & SYMMETRIC_LEFT))
 904                        continue;
 905                commit->util = add_commit_patch_id(commit, &ids);
 906        }
 907
 908        /* either cherry_mark or cherry_pick are true */
 909        cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
 910
 911        /* Check the other side */
 912        for (p = list; p; p = p->next) {
 913                struct commit *commit = p->item;
 914                struct patch_id *id;
 915                unsigned flags = commit->object.flags;
 916
 917                if (flags & BOUNDARY)
 918                        continue;
 919                /*
 920                 * If we have fewer left, left_first is set and we omit
 921                 * commits on the left branch in this loop.
 922                 */
 923                if (left_first == !!(flags & SYMMETRIC_LEFT))
 924                        continue;
 925
 926                /*
 927                 * Have we seen the same patch id?
 928                 */
 929                id = has_commit_patch_id(commit, &ids);
 930                if (!id)
 931                        continue;
 932                id->seen = 1;
 933                commit->object.flags |= cherry_flag;
 934        }
 935
 936        /* Now check the original side for seen ones */
 937        for (p = list; p; p = p->next) {
 938                struct commit *commit = p->item;
 939                struct patch_id *ent;
 940
 941                ent = commit->util;
 942                if (!ent)
 943                        continue;
 944                if (ent->seen)
 945                        commit->object.flags |= cherry_flag;
 946                commit->util = NULL;
 947        }
 948
 949        free_patch_ids(&ids);
 950}
 951
 952/* How many extra uninteresting commits we want to see.. */
 953#define SLOP 5
 954
 955static int still_interesting(struct commit_list *src, unsigned long date, int slop,
 956                             struct commit **interesting_cache)
 957{
 958        /*
 959         * No source list at all? We're definitely done..
 960         */
 961        if (!src)
 962                return 0;
 963
 964        /*
 965         * Does the destination list contain entries with a date
 966         * before the source list? Definitely _not_ done.
 967         */
 968        if (date <= src->item->date)
 969                return SLOP;
 970
 971        /*
 972         * Does the source list still have interesting commits in
 973         * it? Definitely not done..
 974         */
 975        if (!everybody_uninteresting(src, interesting_cache))
 976                return SLOP;
 977
 978        /* Ok, we're closing in.. */
 979        return slop-1;
 980}
 981
 982/*
 983 * "rev-list --ancestry-path A..B" computes commits that are ancestors
 984 * of B but not ancestors of A but further limits the result to those
 985 * that are descendants of A.  This takes the list of bottom commits and
 986 * the result of "A..B" without --ancestry-path, and limits the latter
 987 * further to the ones that can reach one of the commits in "bottom".
 988 */
 989static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
 990{
 991        struct commit_list *p;
 992        struct commit_list *rlist = NULL;
 993        int made_progress;
 994
 995        /*
 996         * Reverse the list so that it will be likely that we would
 997         * process parents before children.
 998         */
 999        for (p = list; p; p = p->next)
1000                commit_list_insert(p->item, &rlist);
1001
1002        for (p = bottom; p; p = p->next)
1003                p->item->object.flags |= TMP_MARK;
1004
1005        /*
1006         * Mark the ones that can reach bottom commits in "list",
1007         * in a bottom-up fashion.
1008         */
1009        do {
1010                made_progress = 0;
1011                for (p = rlist; p; p = p->next) {
1012                        struct commit *c = p->item;
1013                        struct commit_list *parents;
1014                        if (c->object.flags & (TMP_MARK | UNINTERESTING))
1015                                continue;
1016                        for (parents = c->parents;
1017                             parents;
1018                             parents = parents->next) {
1019                                if (!(parents->item->object.flags & TMP_MARK))
1020                                        continue;
1021                                c->object.flags |= TMP_MARK;
1022                                made_progress = 1;
1023                                break;
1024                        }
1025                }
1026        } while (made_progress);
1027
1028        /*
1029         * NEEDSWORK: decide if we want to remove parents that are
1030         * not marked with TMP_MARK from commit->parents for commits
1031         * in the resulting list.  We may not want to do that, though.
1032         */
1033
1034        /*
1035         * The ones that are not marked with TMP_MARK are uninteresting
1036         */
1037        for (p = list; p; p = p->next) {
1038                struct commit *c = p->item;
1039                if (c->object.flags & TMP_MARK)
1040                        continue;
1041                c->object.flags |= UNINTERESTING;
1042        }
1043
1044        /* We are done with the TMP_MARK */
1045        for (p = list; p; p = p->next)
1046                p->item->object.flags &= ~TMP_MARK;
1047        for (p = bottom; p; p = p->next)
1048                p->item->object.flags &= ~TMP_MARK;
1049        free_commit_list(rlist);
1050}
1051
1052/*
1053 * Before walking the history, keep the set of "negative" refs the
1054 * caller has asked to exclude.
1055 *
1056 * This is used to compute "rev-list --ancestry-path A..B", as we need
1057 * to filter the result of "A..B" further to the ones that can actually
1058 * reach A.
1059 */
1060static struct commit_list *collect_bottom_commits(struct commit_list *list)
1061{
1062        struct commit_list *elem, *bottom = NULL;
1063        for (elem = list; elem; elem = elem->next)
1064                if (elem->item->object.flags & BOTTOM)
1065                        commit_list_insert(elem->item, &bottom);
1066        return bottom;
1067}
1068
1069/* Assumes either left_only or right_only is set */
1070static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1071{
1072        struct commit_list *p;
1073
1074        for (p = list; p; p = p->next) {
1075                struct commit *commit = p->item;
1076
1077                if (revs->right_only) {
1078                        if (commit->object.flags & SYMMETRIC_LEFT)
1079                                commit->object.flags |= SHOWN;
1080                } else  /* revs->left_only is set */
1081                        if (!(commit->object.flags & SYMMETRIC_LEFT))
1082                                commit->object.flags |= SHOWN;
1083        }
1084}
1085
1086static int limit_list(struct rev_info *revs)
1087{
1088        int slop = SLOP;
1089        unsigned long date = ~0ul;
1090        struct commit_list *list = revs->commits;
1091        struct commit_list *newlist = NULL;
1092        struct commit_list **p = &newlist;
1093        struct commit_list *bottom = NULL;
1094        struct commit *interesting_cache = NULL;
1095
1096        if (revs->ancestry_path) {
1097                bottom = collect_bottom_commits(list);
1098                if (!bottom)
1099                        die("--ancestry-path given but there are no bottom commits");
1100        }
1101
1102        while (list) {
1103                struct commit *commit = pop_commit(&list);
1104                struct object *obj = &commit->object;
1105                show_early_output_fn_t show;
1106
1107                if (commit == interesting_cache)
1108                        interesting_cache = NULL;
1109
1110                if (revs->max_age != -1 && (commit->date < revs->max_age))
1111                        obj->flags |= UNINTERESTING;
1112                if (add_parents_to_list(revs, commit, &list, NULL) < 0)
1113                        return -1;
1114                if (obj->flags & UNINTERESTING) {
1115                        mark_parents_uninteresting(commit);
1116                        if (revs->show_all)
1117                                p = &commit_list_insert(commit, p)->next;
1118                        slop = still_interesting(list, date, slop, &interesting_cache);
1119                        if (slop)
1120                                continue;
1121                        /* If showing all, add the whole pending list to the end */
1122                        if (revs->show_all)
1123                                *p = list;
1124                        break;
1125                }
1126                if (revs->min_age != -1 && (commit->date > revs->min_age))
1127                        continue;
1128                date = commit->date;
1129                p = &commit_list_insert(commit, p)->next;
1130
1131                show = show_early_output;
1132                if (!show)
1133                        continue;
1134
1135                show(revs, newlist);
1136                show_early_output = NULL;
1137        }
1138        if (revs->cherry_pick || revs->cherry_mark)
1139                cherry_pick_list(newlist, revs);
1140
1141        if (revs->left_only || revs->right_only)
1142                limit_left_right(newlist, revs);
1143
1144        if (bottom) {
1145                limit_to_ancestry(bottom, newlist);
1146                free_commit_list(bottom);
1147        }
1148
1149        /*
1150         * Check if any commits have become TREESAME by some of their parents
1151         * becoming UNINTERESTING.
1152         */
1153        if (limiting_can_increase_treesame(revs))
1154                for (list = newlist; list; list = list->next) {
1155                        struct commit *c = list->item;
1156                        if (c->object.flags & (UNINTERESTING | TREESAME))
1157                                continue;
1158                        update_treesame(revs, c);
1159                }
1160
1161        revs->commits = newlist;
1162        return 0;
1163}
1164
1165/*
1166 * Add an entry to refs->cmdline with the specified information.
1167 * *name is copied.
1168 */
1169static void add_rev_cmdline(struct rev_info *revs,
1170                            struct object *item,
1171                            const char *name,
1172                            int whence,
1173                            unsigned flags)
1174{
1175        struct rev_cmdline_info *info = &revs->cmdline;
1176        int nr = info->nr;
1177
1178        ALLOC_GROW(info->rev, nr + 1, info->alloc);
1179        info->rev[nr].item = item;
1180        info->rev[nr].name = xstrdup(name);
1181        info->rev[nr].whence = whence;
1182        info->rev[nr].flags = flags;
1183        info->nr++;
1184}
1185
1186static void add_rev_cmdline_list(struct rev_info *revs,
1187                                 struct commit_list *commit_list,
1188                                 int whence,
1189                                 unsigned flags)
1190{
1191        while (commit_list) {
1192                struct object *object = &commit_list->item->object;
1193                add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1194                                whence, flags);
1195                commit_list = commit_list->next;
1196        }
1197}
1198
1199struct all_refs_cb {
1200        int all_flags;
1201        int warned_bad_reflog;
1202        struct rev_info *all_revs;
1203        const char *name_for_errormsg;
1204};
1205
1206int ref_excluded(struct string_list *ref_excludes, const char *path)
1207{
1208        struct string_list_item *item;
1209
1210        if (!ref_excludes)
1211                return 0;
1212        for_each_string_list_item(item, ref_excludes) {
1213                if (!wildmatch(item->string, path, 0, NULL))
1214                        return 1;
1215        }
1216        return 0;
1217}
1218
1219static int handle_one_ref(const char *path, const struct object_id *oid,
1220                          int flag, void *cb_data)
1221{
1222        struct all_refs_cb *cb = cb_data;
1223        struct object *object;
1224
1225        if (ref_excluded(cb->all_revs->ref_excludes, path))
1226            return 0;
1227
1228        object = get_reference(cb->all_revs, path, oid->hash, cb->all_flags);
1229        add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1230        add_pending_sha1(cb->all_revs, path, oid->hash, cb->all_flags);
1231        return 0;
1232}
1233
1234static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1235        unsigned flags)
1236{
1237        cb->all_revs = revs;
1238        cb->all_flags = flags;
1239}
1240
1241void clear_ref_exclusion(struct string_list **ref_excludes_p)
1242{
1243        if (*ref_excludes_p) {
1244                string_list_clear(*ref_excludes_p, 0);
1245                free(*ref_excludes_p);
1246        }
1247        *ref_excludes_p = NULL;
1248}
1249
1250void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1251{
1252        if (!*ref_excludes_p) {
1253                *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1254                (*ref_excludes_p)->strdup_strings = 1;
1255        }
1256        string_list_append(*ref_excludes_p, exclude);
1257}
1258
1259static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1260                int (*for_each)(const char *, each_ref_fn, void *))
1261{
1262        struct all_refs_cb cb;
1263        init_all_refs_cb(&cb, revs, flags);
1264        for_each(submodule, handle_one_ref, &cb);
1265}
1266
1267static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
1268{
1269        struct all_refs_cb *cb = cb_data;
1270        if (!is_null_sha1(sha1)) {
1271                struct object *o = parse_object(sha1);
1272                if (o) {
1273                        o->flags |= cb->all_flags;
1274                        /* ??? CMDLINEFLAGS ??? */
1275                        add_pending_object(cb->all_revs, o, "");
1276                }
1277                else if (!cb->warned_bad_reflog) {
1278                        warning("reflog of '%s' references pruned commits",
1279                                cb->name_for_errormsg);
1280                        cb->warned_bad_reflog = 1;
1281                }
1282        }
1283}
1284
1285static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
1286                const char *email, unsigned long timestamp, int tz,
1287                const char *message, void *cb_data)
1288{
1289        handle_one_reflog_commit(osha1, cb_data);
1290        handle_one_reflog_commit(nsha1, cb_data);
1291        return 0;
1292}
1293
1294static int handle_one_reflog(const char *path, const struct object_id *oid,
1295                             int flag, void *cb_data)
1296{
1297        struct all_refs_cb *cb = cb_data;
1298        cb->warned_bad_reflog = 0;
1299        cb->name_for_errormsg = path;
1300        for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1301        return 0;
1302}
1303
1304void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1305{
1306        struct all_refs_cb cb;
1307
1308        cb.all_revs = revs;
1309        cb.all_flags = flags;
1310        for_each_reflog(handle_one_reflog, &cb);
1311}
1312
1313static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1314                           struct strbuf *path)
1315{
1316        size_t baselen = path->len;
1317        int i;
1318
1319        if (it->entry_count >= 0) {
1320                struct tree *tree = lookup_tree(it->sha1);
1321                add_pending_object_with_path(revs, &tree->object, "",
1322                                             040000, path->buf);
1323        }
1324
1325        for (i = 0; i < it->subtree_nr; i++) {
1326                struct cache_tree_sub *sub = it->down[i];
1327                strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1328                add_cache_tree(sub->cache_tree, revs, path);
1329                strbuf_setlen(path, baselen);
1330        }
1331
1332}
1333
1334void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
1335{
1336        int i;
1337
1338        read_cache();
1339        for (i = 0; i < active_nr; i++) {
1340                struct cache_entry *ce = active_cache[i];
1341                struct blob *blob;
1342
1343                if (S_ISGITLINK(ce->ce_mode))
1344                        continue;
1345
1346                blob = lookup_blob(ce->sha1);
1347                if (!blob)
1348                        die("unable to add index blob to traversal");
1349                add_pending_object_with_path(revs, &blob->object, "",
1350                                             ce->ce_mode, ce->name);
1351        }
1352
1353        if (active_cache_tree) {
1354                struct strbuf path = STRBUF_INIT;
1355                add_cache_tree(active_cache_tree, revs, &path);
1356                strbuf_release(&path);
1357        }
1358}
1359
1360static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
1361{
1362        unsigned char sha1[20];
1363        struct object *it;
1364        struct commit *commit;
1365        struct commit_list *parents;
1366        const char *arg = arg_;
1367
1368        if (*arg == '^') {
1369                flags ^= UNINTERESTING | BOTTOM;
1370                arg++;
1371        }
1372        if (get_sha1_committish(arg, sha1))
1373                return 0;
1374        while (1) {
1375                it = get_reference(revs, arg, sha1, 0);
1376                if (!it && revs->ignore_missing)
1377                        return 0;
1378                if (it->type != OBJ_TAG)
1379                        break;
1380                if (!((struct tag*)it)->tagged)
1381                        return 0;
1382                hashcpy(sha1, ((struct tag*)it)->tagged->oid.hash);
1383        }
1384        if (it->type != OBJ_COMMIT)
1385                return 0;
1386        commit = (struct commit *)it;
1387        for (parents = commit->parents; parents; parents = parents->next) {
1388                it = &parents->item->object;
1389                it->flags |= flags;
1390                add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1391                add_pending_object(revs, it, arg);
1392        }
1393        return 1;
1394}
1395
1396void init_revisions(struct rev_info *revs, const char *prefix)
1397{
1398        memset(revs, 0, sizeof(*revs));
1399
1400        revs->abbrev = DEFAULT_ABBREV;
1401        revs->ignore_merges = 1;
1402        revs->simplify_history = 1;
1403        DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1404        DIFF_OPT_SET(&revs->pruning, QUICK);
1405        revs->pruning.add_remove = file_add_remove;
1406        revs->pruning.change = file_change;
1407        revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1408        revs->dense = 1;
1409        revs->prefix = prefix;
1410        revs->max_age = -1;
1411        revs->min_age = -1;
1412        revs->skip_count = -1;
1413        revs->max_count = -1;
1414        revs->max_parents = -1;
1415        revs->expand_tabs_in_log = -1;
1416
1417        revs->commit_format = CMIT_FMT_DEFAULT;
1418        revs->expand_tabs_in_log_default = 1;
1419
1420        init_grep_defaults();
1421        grep_init(&revs->grep_filter, prefix);
1422        revs->grep_filter.status_only = 1;
1423        revs->grep_filter.regflags = REG_NEWLINE;
1424
1425        diff_setup(&revs->diffopt);
1426        if (prefix && !revs->diffopt.prefix) {
1427                revs->diffopt.prefix = prefix;
1428                revs->diffopt.prefix_length = strlen(prefix);
1429        }
1430
1431        revs->notes_opt.use_default_notes = -1;
1432}
1433
1434static void add_pending_commit_list(struct rev_info *revs,
1435                                    struct commit_list *commit_list,
1436                                    unsigned int flags)
1437{
1438        while (commit_list) {
1439                struct object *object = &commit_list->item->object;
1440                object->flags |= flags;
1441                add_pending_object(revs, object, oid_to_hex(&object->oid));
1442                commit_list = commit_list->next;
1443        }
1444}
1445
1446static void prepare_show_merge(struct rev_info *revs)
1447{
1448        struct commit_list *bases;
1449        struct commit *head, *other;
1450        unsigned char sha1[20];
1451        const char **prune = NULL;
1452        int i, prune_num = 1; /* counting terminating NULL */
1453
1454        if (get_sha1("HEAD", sha1))
1455                die("--merge without HEAD?");
1456        head = lookup_commit_or_die(sha1, "HEAD");
1457        if (get_sha1("MERGE_HEAD", sha1))
1458                die("--merge without MERGE_HEAD?");
1459        other = lookup_commit_or_die(sha1, "MERGE_HEAD");
1460        add_pending_object(revs, &head->object, "HEAD");
1461        add_pending_object(revs, &other->object, "MERGE_HEAD");
1462        bases = get_merge_bases(head, other);
1463        add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1464        add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1465        free_commit_list(bases);
1466        head->object.flags |= SYMMETRIC_LEFT;
1467
1468        if (!active_nr)
1469                read_cache();
1470        for (i = 0; i < active_nr; i++) {
1471                const struct cache_entry *ce = active_cache[i];
1472                if (!ce_stage(ce))
1473                        continue;
1474                if (ce_path_match(ce, &revs->prune_data, NULL)) {
1475                        prune_num++;
1476                        REALLOC_ARRAY(prune, prune_num);
1477                        prune[prune_num-2] = ce->name;
1478                        prune[prune_num-1] = NULL;
1479                }
1480                while ((i+1 < active_nr) &&
1481                       ce_same_name(ce, active_cache[i+1]))
1482                        i++;
1483        }
1484        free_pathspec(&revs->prune_data);
1485        parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1486                       PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1487        revs->limited = 1;
1488}
1489
1490int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1491{
1492        struct object_context oc;
1493        char *dotdot;
1494        struct object *object;
1495        unsigned char sha1[20];
1496        int local_flags;
1497        const char *arg = arg_;
1498        int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1499        unsigned get_sha1_flags = 0;
1500
1501        flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1502
1503        dotdot = strstr(arg, "..");
1504        if (dotdot) {
1505                unsigned char from_sha1[20];
1506                const char *next = dotdot + 2;
1507                const char *this = arg;
1508                int symmetric = *next == '.';
1509                unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1510                static const char head_by_default[] = "HEAD";
1511                unsigned int a_flags;
1512
1513                *dotdot = 0;
1514                next += symmetric;
1515
1516                if (!*next)
1517                        next = head_by_default;
1518                if (dotdot == arg)
1519                        this = head_by_default;
1520                if (this == head_by_default && next == head_by_default &&
1521                    !symmetric) {
1522                        /*
1523                         * Just ".."?  That is not a range but the
1524                         * pathspec for the parent directory.
1525                         */
1526                        if (!cant_be_filename) {
1527                                *dotdot = '.';
1528                                return -1;
1529                        }
1530                }
1531                if (!get_sha1_committish(this, from_sha1) &&
1532                    !get_sha1_committish(next, sha1)) {
1533                        struct object *a_obj, *b_obj;
1534
1535                        if (!cant_be_filename) {
1536                                *dotdot = '.';
1537                                verify_non_filename(revs->prefix, arg);
1538                        }
1539
1540                        a_obj = parse_object(from_sha1);
1541                        b_obj = parse_object(sha1);
1542                        if (!a_obj || !b_obj) {
1543                        missing:
1544                                if (revs->ignore_missing)
1545                                        return 0;
1546                                die(symmetric
1547                                    ? "Invalid symmetric difference expression %s"
1548                                    : "Invalid revision range %s", arg);
1549                        }
1550
1551                        if (!symmetric) {
1552                                /* just A..B */
1553                                a_flags = flags_exclude;
1554                        } else {
1555                                /* A...B -- find merge bases between the two */
1556                                struct commit *a, *b;
1557                                struct commit_list *exclude;
1558
1559                                a = (a_obj->type == OBJ_COMMIT
1560                                     ? (struct commit *)a_obj
1561                                     : lookup_commit_reference(a_obj->oid.hash));
1562                                b = (b_obj->type == OBJ_COMMIT
1563                                     ? (struct commit *)b_obj
1564                                     : lookup_commit_reference(b_obj->oid.hash));
1565                                if (!a || !b)
1566                                        goto missing;
1567                                exclude = get_merge_bases(a, b);
1568                                add_rev_cmdline_list(revs, exclude,
1569                                                     REV_CMD_MERGE_BASE,
1570                                                     flags_exclude);
1571                                add_pending_commit_list(revs, exclude,
1572                                                        flags_exclude);
1573                                free_commit_list(exclude);
1574
1575                                a_flags = flags | SYMMETRIC_LEFT;
1576                        }
1577
1578                        a_obj->flags |= a_flags;
1579                        b_obj->flags |= flags;
1580                        add_rev_cmdline(revs, a_obj, this,
1581                                        REV_CMD_LEFT, a_flags);
1582                        add_rev_cmdline(revs, b_obj, next,
1583                                        REV_CMD_RIGHT, flags);
1584                        add_pending_object(revs, a_obj, this);
1585                        add_pending_object(revs, b_obj, next);
1586                        return 0;
1587                }
1588                *dotdot = '.';
1589        }
1590        dotdot = strstr(arg, "^@");
1591        if (dotdot && !dotdot[2]) {
1592                *dotdot = 0;
1593                if (add_parents_only(revs, arg, flags))
1594                        return 0;
1595                *dotdot = '^';
1596        }
1597        dotdot = strstr(arg, "^!");
1598        if (dotdot && !dotdot[2]) {
1599                *dotdot = 0;
1600                if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM)))
1601                        *dotdot = '^';
1602        }
1603
1604        local_flags = 0;
1605        if (*arg == '^') {
1606                local_flags = UNINTERESTING | BOTTOM;
1607                arg++;
1608        }
1609
1610        if (revarg_opt & REVARG_COMMITTISH)
1611                get_sha1_flags = GET_SHA1_COMMITTISH;
1612
1613        if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
1614                return revs->ignore_missing ? 0 : -1;
1615        if (!cant_be_filename)
1616                verify_non_filename(revs->prefix, arg);
1617        object = get_reference(revs, arg, sha1, flags ^ local_flags);
1618        add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1619        add_pending_object_with_mode(revs, object, arg, oc.mode);
1620        return 0;
1621}
1622
1623struct cmdline_pathspec {
1624        int alloc;
1625        int nr;
1626        const char **path;
1627};
1628
1629static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1630{
1631        while (*av) {
1632                ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1633                prune->path[prune->nr++] = *(av++);
1634        }
1635}
1636
1637static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1638                                     struct cmdline_pathspec *prune)
1639{
1640        while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1641                int len = sb->len;
1642                if (len && sb->buf[len - 1] == '\n')
1643                        sb->buf[--len] = '\0';
1644                ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1645                prune->path[prune->nr++] = xstrdup(sb->buf);
1646        }
1647}
1648
1649static void read_revisions_from_stdin(struct rev_info *revs,
1650                                      struct cmdline_pathspec *prune)
1651{
1652        struct strbuf sb;
1653        int seen_dashdash = 0;
1654        int save_warning;
1655
1656        save_warning = warn_on_object_refname_ambiguity;
1657        warn_on_object_refname_ambiguity = 0;
1658
1659        strbuf_init(&sb, 1000);
1660        while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1661                int len = sb.len;
1662                if (len && sb.buf[len - 1] == '\n')
1663                        sb.buf[--len] = '\0';
1664                if (!len)
1665                        break;
1666                if (sb.buf[0] == '-') {
1667                        if (len == 2 && sb.buf[1] == '-') {
1668                                seen_dashdash = 1;
1669                                break;
1670                        }
1671                        die("options not supported in --stdin mode");
1672                }
1673                if (handle_revision_arg(sb.buf, revs, 0,
1674                                        REVARG_CANNOT_BE_FILENAME))
1675                        die("bad revision '%s'", sb.buf);
1676        }
1677        if (seen_dashdash)
1678                read_pathspec_from_stdin(revs, &sb, prune);
1679
1680        strbuf_release(&sb);
1681        warn_on_object_refname_ambiguity = save_warning;
1682}
1683
1684static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1685{
1686        append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1687}
1688
1689static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1690{
1691        append_header_grep_pattern(&revs->grep_filter, field, pattern);
1692}
1693
1694static void add_message_grep(struct rev_info *revs, const char *pattern)
1695{
1696        add_grep(revs, pattern, GREP_PATTERN_BODY);
1697}
1698
1699static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1700                               int *unkc, const char **unkv)
1701{
1702        const char *arg = argv[0];
1703        const char *optarg;
1704        int argcount;
1705
1706        /* pseudo revision arguments */
1707        if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1708            !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1709            !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1710            !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1711            !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
1712            !strcmp(arg, "--indexed-objects") ||
1713            starts_with(arg, "--exclude=") ||
1714            starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1715            starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
1716        {
1717                unkv[(*unkc)++] = arg;
1718                return 1;
1719        }
1720
1721        if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1722                revs->max_count = atoi(optarg);
1723                revs->no_walk = 0;
1724                return argcount;
1725        } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1726                revs->skip_count = atoi(optarg);
1727                return argcount;
1728        } else if ((*arg == '-') && isdigit(arg[1])) {
1729                /* accept -<digit>, like traditional "head" */
1730                if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1731                    revs->max_count < 0)
1732                        die("'%s': not a non-negative integer", arg + 1);
1733                revs->no_walk = 0;
1734        } else if (!strcmp(arg, "-n")) {
1735                if (argc <= 1)
1736                        return error("-n requires an argument");
1737                revs->max_count = atoi(argv[1]);
1738                revs->no_walk = 0;
1739                return 2;
1740        } else if (starts_with(arg, "-n")) {
1741                revs->max_count = atoi(arg + 2);
1742                revs->no_walk = 0;
1743        } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1744                revs->max_age = atoi(optarg);
1745                return argcount;
1746        } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1747                revs->max_age = approxidate(optarg);
1748                return argcount;
1749        } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1750                revs->max_age = approxidate(optarg);
1751                return argcount;
1752        } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1753                revs->min_age = atoi(optarg);
1754                return argcount;
1755        } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1756                revs->min_age = approxidate(optarg);
1757                return argcount;
1758        } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1759                revs->min_age = approxidate(optarg);
1760                return argcount;
1761        } else if (!strcmp(arg, "--first-parent")) {
1762                revs->first_parent_only = 1;
1763        } else if (!strcmp(arg, "--ancestry-path")) {
1764                revs->ancestry_path = 1;
1765                revs->simplify_history = 0;
1766                revs->limited = 1;
1767        } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1768                init_reflog_walk(&revs->reflog_info);
1769        } else if (!strcmp(arg, "--default")) {
1770                if (argc <= 1)
1771                        return error("bad --default argument");
1772                revs->def = argv[1];
1773                return 2;
1774        } else if (!strcmp(arg, "--merge")) {
1775                revs->show_merge = 1;
1776        } else if (!strcmp(arg, "--topo-order")) {
1777                revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1778                revs->topo_order = 1;
1779        } else if (!strcmp(arg, "--simplify-merges")) {
1780                revs->simplify_merges = 1;
1781                revs->topo_order = 1;
1782                revs->rewrite_parents = 1;
1783                revs->simplify_history = 0;
1784                revs->limited = 1;
1785        } else if (!strcmp(arg, "--simplify-by-decoration")) {
1786                revs->simplify_merges = 1;
1787                revs->topo_order = 1;
1788                revs->rewrite_parents = 1;
1789                revs->simplify_history = 0;
1790                revs->simplify_by_decoration = 1;
1791                revs->limited = 1;
1792                revs->prune = 1;
1793                load_ref_decorations(DECORATE_SHORT_REFS);
1794        } else if (!strcmp(arg, "--date-order")) {
1795                revs->sort_order = REV_SORT_BY_COMMIT_DATE;
1796                revs->topo_order = 1;
1797        } else if (!strcmp(arg, "--author-date-order")) {
1798                revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
1799                revs->topo_order = 1;
1800        } else if (starts_with(arg, "--early-output")) {
1801                int count = 100;
1802                switch (arg[14]) {
1803                case '=':
1804                        count = atoi(arg+15);
1805                        /* Fallthrough */
1806                case 0:
1807                        revs->topo_order = 1;
1808                       revs->early_output = count;
1809                }
1810        } else if (!strcmp(arg, "--parents")) {
1811                revs->rewrite_parents = 1;
1812                revs->print_parents = 1;
1813        } else if (!strcmp(arg, "--dense")) {
1814                revs->dense = 1;
1815        } else if (!strcmp(arg, "--sparse")) {
1816                revs->dense = 0;
1817        } else if (!strcmp(arg, "--show-all")) {
1818                revs->show_all = 1;
1819        } else if (!strcmp(arg, "--remove-empty")) {
1820                revs->remove_empty_trees = 1;
1821        } else if (!strcmp(arg, "--merges")) {
1822                revs->min_parents = 2;
1823        } else if (!strcmp(arg, "--no-merges")) {
1824                revs->max_parents = 1;
1825        } else if (starts_with(arg, "--min-parents=")) {
1826                revs->min_parents = atoi(arg+14);
1827        } else if (starts_with(arg, "--no-min-parents")) {
1828                revs->min_parents = 0;
1829        } else if (starts_with(arg, "--max-parents=")) {
1830                revs->max_parents = atoi(arg+14);
1831        } else if (starts_with(arg, "--no-max-parents")) {
1832                revs->max_parents = -1;
1833        } else if (!strcmp(arg, "--boundary")) {
1834                revs->boundary = 1;
1835        } else if (!strcmp(arg, "--left-right")) {
1836                revs->left_right = 1;
1837        } else if (!strcmp(arg, "--left-only")) {
1838                if (revs->right_only)
1839                        die("--left-only is incompatible with --right-only"
1840                            " or --cherry");
1841                revs->left_only = 1;
1842        } else if (!strcmp(arg, "--right-only")) {
1843                if (revs->left_only)
1844                        die("--right-only is incompatible with --left-only");
1845                revs->right_only = 1;
1846        } else if (!strcmp(arg, "--cherry")) {
1847                if (revs->left_only)
1848                        die("--cherry is incompatible with --left-only");
1849                revs->cherry_mark = 1;
1850                revs->right_only = 1;
1851                revs->max_parents = 1;
1852                revs->limited = 1;
1853        } else if (!strcmp(arg, "--count")) {
1854                revs->count = 1;
1855        } else if (!strcmp(arg, "--cherry-mark")) {
1856                if (revs->cherry_pick)
1857                        die("--cherry-mark is incompatible with --cherry-pick");
1858                revs->cherry_mark = 1;
1859                revs->limited = 1; /* needs limit_list() */
1860        } else if (!strcmp(arg, "--cherry-pick")) {
1861                if (revs->cherry_mark)
1862                        die("--cherry-pick is incompatible with --cherry-mark");
1863                revs->cherry_pick = 1;
1864                revs->limited = 1;
1865        } else if (!strcmp(arg, "--objects")) {
1866                revs->tag_objects = 1;
1867                revs->tree_objects = 1;
1868                revs->blob_objects = 1;
1869        } else if (!strcmp(arg, "--objects-edge")) {
1870                revs->tag_objects = 1;
1871                revs->tree_objects = 1;
1872                revs->blob_objects = 1;
1873                revs->edge_hint = 1;
1874        } else if (!strcmp(arg, "--objects-edge-aggressive")) {
1875                revs->tag_objects = 1;
1876                revs->tree_objects = 1;
1877                revs->blob_objects = 1;
1878                revs->edge_hint = 1;
1879                revs->edge_hint_aggressive = 1;
1880        } else if (!strcmp(arg, "--verify-objects")) {
1881                revs->tag_objects = 1;
1882                revs->tree_objects = 1;
1883                revs->blob_objects = 1;
1884                revs->verify_objects = 1;
1885        } else if (!strcmp(arg, "--unpacked")) {
1886                revs->unpacked = 1;
1887        } else if (starts_with(arg, "--unpacked=")) {
1888                die("--unpacked=<packfile> no longer supported.");
1889        } else if (!strcmp(arg, "-r")) {
1890                revs->diff = 1;
1891                DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1892        } else if (!strcmp(arg, "-t")) {
1893                revs->diff = 1;
1894                DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1895                DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1896        } else if (!strcmp(arg, "-m")) {
1897                revs->ignore_merges = 0;
1898        } else if (!strcmp(arg, "-c")) {
1899                revs->diff = 1;
1900                revs->dense_combined_merges = 0;
1901                revs->combine_merges = 1;
1902        } else if (!strcmp(arg, "--cc")) {
1903                revs->diff = 1;
1904                revs->dense_combined_merges = 1;
1905                revs->combine_merges = 1;
1906        } else if (!strcmp(arg, "-v")) {
1907                revs->verbose_header = 1;
1908        } else if (!strcmp(arg, "--pretty")) {
1909                revs->verbose_header = 1;
1910                revs->pretty_given = 1;
1911                get_commit_format(NULL, revs);
1912        } else if (starts_with(arg, "--pretty=") || starts_with(arg, "--format=")) {
1913                /*
1914                 * Detached form ("--pretty X" as opposed to "--pretty=X")
1915                 * not allowed, since the argument is optional.
1916                 */
1917                revs->verbose_header = 1;
1918                revs->pretty_given = 1;
1919                get_commit_format(arg+9, revs);
1920        } else if (!strcmp(arg, "--expand-tabs")) {
1921                revs->expand_tabs_in_log = 1;
1922        } else if (!strcmp(arg, "--no-expand-tabs")) {
1923                revs->expand_tabs_in_log = 0;
1924        } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1925                revs->show_notes = 1;
1926                revs->show_notes_given = 1;
1927                revs->notes_opt.use_default_notes = 1;
1928        } else if (!strcmp(arg, "--show-signature")) {
1929                revs->show_signature = 1;
1930        } else if (!strcmp(arg, "--show-linear-break") ||
1931                   starts_with(arg, "--show-linear-break=")) {
1932                if (starts_with(arg, "--show-linear-break="))
1933                        revs->break_bar = xstrdup(arg + 20);
1934                else
1935                        revs->break_bar = "                    ..........";
1936                revs->track_linear = 1;
1937                revs->track_first_time = 1;
1938        } else if (starts_with(arg, "--show-notes=") ||
1939                   starts_with(arg, "--notes=")) {
1940                struct strbuf buf = STRBUF_INIT;
1941                revs->show_notes = 1;
1942                revs->show_notes_given = 1;
1943                if (starts_with(arg, "--show-notes")) {
1944                        if (revs->notes_opt.use_default_notes < 0)
1945                                revs->notes_opt.use_default_notes = 1;
1946                        strbuf_addstr(&buf, arg+13);
1947                }
1948                else
1949                        strbuf_addstr(&buf, arg+8);
1950                expand_notes_ref(&buf);
1951                string_list_append(&revs->notes_opt.extra_notes_refs,
1952                                   strbuf_detach(&buf, NULL));
1953        } else if (!strcmp(arg, "--no-notes")) {
1954                revs->show_notes = 0;
1955                revs->show_notes_given = 1;
1956                revs->notes_opt.use_default_notes = -1;
1957                /* we have been strdup'ing ourselves, so trick
1958                 * string_list into free()ing strings */
1959                revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1960                string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1961                revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1962        } else if (!strcmp(arg, "--standard-notes")) {
1963                revs->show_notes_given = 1;
1964                revs->notes_opt.use_default_notes = 1;
1965        } else if (!strcmp(arg, "--no-standard-notes")) {
1966                revs->notes_opt.use_default_notes = 0;
1967        } else if (!strcmp(arg, "--oneline")) {
1968                revs->verbose_header = 1;
1969                get_commit_format("oneline", revs);
1970                revs->pretty_given = 1;
1971                revs->abbrev_commit = 1;
1972        } else if (!strcmp(arg, "--graph")) {
1973                revs->topo_order = 1;
1974                revs->rewrite_parents = 1;
1975                revs->graph = graph_init(revs);
1976        } else if (!strcmp(arg, "--root")) {
1977                revs->show_root_diff = 1;
1978        } else if (!strcmp(arg, "--no-commit-id")) {
1979                revs->no_commit_id = 1;
1980        } else if (!strcmp(arg, "--always")) {
1981                revs->always_show_header = 1;
1982        } else if (!strcmp(arg, "--no-abbrev")) {
1983                revs->abbrev = 0;
1984        } else if (!strcmp(arg, "--abbrev")) {
1985                revs->abbrev = DEFAULT_ABBREV;
1986        } else if (starts_with(arg, "--abbrev=")) {
1987                revs->abbrev = strtoul(arg + 9, NULL, 10);
1988                if (revs->abbrev < MINIMUM_ABBREV)
1989                        revs->abbrev = MINIMUM_ABBREV;
1990                else if (revs->abbrev > 40)
1991                        revs->abbrev = 40;
1992        } else if (!strcmp(arg, "--abbrev-commit")) {
1993                revs->abbrev_commit = 1;
1994                revs->abbrev_commit_given = 1;
1995        } else if (!strcmp(arg, "--no-abbrev-commit")) {
1996                revs->abbrev_commit = 0;
1997        } else if (!strcmp(arg, "--full-diff")) {
1998                revs->diff = 1;
1999                revs->full_diff = 1;
2000        } else if (!strcmp(arg, "--full-history")) {
2001                revs->simplify_history = 0;
2002        } else if (!strcmp(arg, "--relative-date")) {
2003                revs->date_mode.type = DATE_RELATIVE;
2004                revs->date_mode_explicit = 1;
2005        } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
2006                parse_date_format(optarg, &revs->date_mode);
2007                revs->date_mode_explicit = 1;
2008                return argcount;
2009        } else if (!strcmp(arg, "--log-size")) {
2010                revs->show_log_size = 1;
2011        }
2012        /*
2013         * Grepping the commit log
2014         */
2015        else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2016                add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2017                return argcount;
2018        } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2019                add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2020                return argcount;
2021        } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2022                add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2023                return argcount;
2024        } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2025                add_message_grep(revs, optarg);
2026                return argcount;
2027        } else if (!strcmp(arg, "--grep-debug")) {
2028                revs->grep_filter.debug = 1;
2029        } else if (!strcmp(arg, "--basic-regexp")) {
2030                grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE, &revs->grep_filter);
2031        } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2032                grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter);
2033        } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2034                revs->grep_filter.regflags |= REG_ICASE;
2035                DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
2036        } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2037                grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter);
2038        } else if (!strcmp(arg, "--perl-regexp")) {
2039                grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE, &revs->grep_filter);
2040        } else if (!strcmp(arg, "--all-match")) {
2041                revs->grep_filter.all_match = 1;
2042        } else if (!strcmp(arg, "--invert-grep")) {
2043                revs->invert_grep = 1;
2044        } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2045                if (strcmp(optarg, "none"))
2046                        git_log_output_encoding = xstrdup(optarg);
2047                else
2048                        git_log_output_encoding = "";
2049                return argcount;
2050        } else if (!strcmp(arg, "--reverse")) {
2051                revs->reverse ^= 1;
2052        } else if (!strcmp(arg, "--children")) {
2053                revs->children.name = "children";
2054                revs->limited = 1;
2055        } else if (!strcmp(arg, "--ignore-missing")) {
2056                revs->ignore_missing = 1;
2057        } else {
2058                int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
2059                if (!opts)
2060                        unkv[(*unkc)++] = arg;
2061                return opts;
2062        }
2063        if (revs->graph && revs->track_linear)
2064                die("--show-linear-break and --graph are incompatible");
2065
2066        return 1;
2067}
2068
2069void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2070                        const struct option *options,
2071                        const char * const usagestr[])
2072{
2073        int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2074                                    &ctx->cpidx, ctx->out);
2075        if (n <= 0) {
2076                error("unknown option `%s'", ctx->argv[0]);
2077                usage_with_options(usagestr, options);
2078        }
2079        ctx->argv += n;
2080        ctx->argc -= n;
2081}
2082
2083static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
2084        struct strbuf bisect_refs = STRBUF_INIT;
2085        int status;
2086        strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2087        status = for_each_ref_in_submodule(submodule, bisect_refs.buf, fn, cb_data);
2088        strbuf_release(&bisect_refs);
2089        return status;
2090}
2091
2092static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2093{
2094        return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
2095}
2096
2097static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2098{
2099        return for_each_bisect_ref(submodule, fn, cb_data, term_good);
2100}
2101
2102static int handle_revision_pseudo_opt(const char *submodule,
2103                                struct rev_info *revs,
2104                                int argc, const char **argv, int *flags)
2105{
2106        const char *arg = argv[0];
2107        const char *optarg;
2108        int argcount;
2109
2110        /*
2111         * NOTE!
2112         *
2113         * Commands like "git shortlog" will not accept the options below
2114         * unless parse_revision_opt queues them (as opposed to erroring
2115         * out).
2116         *
2117         * When implementing your new pseudo-option, remember to
2118         * register it in the list at the top of handle_revision_opt.
2119         */
2120        if (!strcmp(arg, "--all")) {
2121                handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2122                handle_refs(submodule, revs, *flags, head_ref_submodule);
2123                clear_ref_exclusion(&revs->ref_excludes);
2124        } else if (!strcmp(arg, "--branches")) {
2125                handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
2126                clear_ref_exclusion(&revs->ref_excludes);
2127        } else if (!strcmp(arg, "--bisect")) {
2128                read_bisect_terms(&term_bad, &term_good);
2129                handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
2130                handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
2131                revs->bisect = 1;
2132        } else if (!strcmp(arg, "--tags")) {
2133                handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
2134                clear_ref_exclusion(&revs->ref_excludes);
2135        } else if (!strcmp(arg, "--remotes")) {
2136                handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
2137                clear_ref_exclusion(&revs->ref_excludes);
2138        } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2139                struct all_refs_cb cb;
2140                init_all_refs_cb(&cb, revs, *flags);
2141                for_each_glob_ref(handle_one_ref, optarg, &cb);
2142                clear_ref_exclusion(&revs->ref_excludes);
2143                return argcount;
2144        } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2145                add_ref_exclusion(&revs->ref_excludes, optarg);
2146                return argcount;
2147        } else if (starts_with(arg, "--branches=")) {
2148                struct all_refs_cb cb;
2149                init_all_refs_cb(&cb, revs, *flags);
2150                for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
2151                clear_ref_exclusion(&revs->ref_excludes);
2152        } else if (starts_with(arg, "--tags=")) {
2153                struct all_refs_cb cb;
2154                init_all_refs_cb(&cb, revs, *flags);
2155                for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
2156                clear_ref_exclusion(&revs->ref_excludes);
2157        } else if (starts_with(arg, "--remotes=")) {
2158                struct all_refs_cb cb;
2159                init_all_refs_cb(&cb, revs, *flags);
2160                for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
2161                clear_ref_exclusion(&revs->ref_excludes);
2162        } else if (!strcmp(arg, "--reflog")) {
2163                add_reflogs_to_pending(revs, *flags);
2164        } else if (!strcmp(arg, "--indexed-objects")) {
2165                add_index_objects_to_pending(revs, *flags);
2166        } else if (!strcmp(arg, "--not")) {
2167                *flags ^= UNINTERESTING | BOTTOM;
2168        } else if (!strcmp(arg, "--no-walk")) {
2169                revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2170        } else if (starts_with(arg, "--no-walk=")) {
2171                /*
2172                 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2173                 * not allowed, since the argument is optional.
2174                 */
2175                if (!strcmp(arg + 10, "sorted"))
2176                        revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2177                else if (!strcmp(arg + 10, "unsorted"))
2178                        revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2179                else
2180                        return error("invalid argument to --no-walk");
2181        } else if (!strcmp(arg, "--do-walk")) {
2182                revs->no_walk = 0;
2183        } else {
2184                return 0;
2185        }
2186
2187        return 1;
2188}
2189
2190static void NORETURN diagnose_missing_default(const char *def)
2191{
2192        unsigned char sha1[20];
2193        int flags;
2194        const char *refname;
2195
2196        refname = resolve_ref_unsafe(def, 0, sha1, &flags);
2197        if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2198                die(_("your current branch appears to be broken"));
2199
2200        skip_prefix(refname, "refs/heads/", &refname);
2201        die(_("your current branch '%s' does not have any commits yet"),
2202            refname);
2203}
2204
2205/*
2206 * Parse revision information, filling in the "rev_info" structure,
2207 * and removing the used arguments from the argument list.
2208 *
2209 * Returns the number of arguments left that weren't recognized
2210 * (which are also moved to the head of the argument list)
2211 */
2212int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2213{
2214        int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
2215        struct cmdline_pathspec prune_data;
2216        const char *submodule = NULL;
2217
2218        memset(&prune_data, 0, sizeof(prune_data));
2219        if (opt)
2220                submodule = opt->submodule;
2221
2222        /* First, search for "--" */
2223        if (opt && opt->assume_dashdash) {
2224                seen_dashdash = 1;
2225        } else {
2226                seen_dashdash = 0;
2227                for (i = 1; i < argc; i++) {
2228                        const char *arg = argv[i];
2229                        if (strcmp(arg, "--"))
2230                                continue;
2231                        argv[i] = NULL;
2232                        argc = i;
2233                        if (argv[i + 1])
2234                                append_prune_data(&prune_data, argv + i + 1);
2235                        seen_dashdash = 1;
2236                        break;
2237                }
2238        }
2239
2240        /* Second, deal with arguments and options */
2241        flags = 0;
2242        revarg_opt = opt ? opt->revarg_opt : 0;
2243        if (seen_dashdash)
2244                revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2245        read_from_stdin = 0;
2246        for (left = i = 1; i < argc; i++) {
2247                const char *arg = argv[i];
2248                if (*arg == '-') {
2249                        int opts;
2250
2251                        opts = handle_revision_pseudo_opt(submodule,
2252                                                revs, argc - i, argv + i,
2253                                                &flags);
2254                        if (opts > 0) {
2255                                i += opts - 1;
2256                                continue;
2257                        }
2258
2259                        if (!strcmp(arg, "--stdin")) {
2260                                if (revs->disable_stdin) {
2261                                        argv[left++] = arg;
2262                                        continue;
2263                                }
2264                                if (read_from_stdin++)
2265                                        die("--stdin given twice?");
2266                                read_revisions_from_stdin(revs, &prune_data);
2267                                continue;
2268                        }
2269
2270                        opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
2271                        if (opts > 0) {
2272                                i += opts - 1;
2273                                continue;
2274                        }
2275                        if (opts < 0)
2276                                exit(128);
2277                        continue;
2278                }
2279
2280
2281                if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2282                        int j;
2283                        if (seen_dashdash || *arg == '^')
2284                                die("bad revision '%s'", arg);
2285
2286                        /* If we didn't have a "--":
2287                         * (1) all filenames must exist;
2288                         * (2) all rev-args must not be interpretable
2289                         *     as a valid filename.
2290                         * but the latter we have checked in the main loop.
2291                         */
2292                        for (j = i; j < argc; j++)
2293                                verify_filename(revs->prefix, argv[j], j == i);
2294
2295                        append_prune_data(&prune_data, argv + i);
2296                        break;
2297                }
2298                else
2299                        got_rev_arg = 1;
2300        }
2301
2302        if (prune_data.nr) {
2303                /*
2304                 * If we need to introduce the magic "a lone ':' means no
2305                 * pathspec whatsoever", here is the place to do so.
2306                 *
2307                 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2308                 *      prune_data.nr = 0;
2309                 *      prune_data.alloc = 0;
2310                 *      free(prune_data.path);
2311                 *      prune_data.path = NULL;
2312                 * } else {
2313                 *      terminate prune_data.alloc with NULL and
2314                 *      call init_pathspec() to set revs->prune_data here.
2315                 * }
2316                 */
2317                ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
2318                prune_data.path[prune_data.nr++] = NULL;
2319                parse_pathspec(&revs->prune_data, 0, 0,
2320                               revs->prefix, prune_data.path);
2321        }
2322
2323        if (revs->def == NULL)
2324                revs->def = opt ? opt->def : NULL;
2325        if (opt && opt->tweak)
2326                opt->tweak(revs, opt);
2327        if (revs->show_merge)
2328                prepare_show_merge(revs);
2329        if (revs->def && !revs->pending.nr && !got_rev_arg) {
2330                unsigned char sha1[20];
2331                struct object *object;
2332                struct object_context oc;
2333                if (get_sha1_with_context(revs->def, 0, sha1, &oc))
2334                        diagnose_missing_default(revs->def);
2335                object = get_reference(revs, revs->def, sha1, 0);
2336                add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2337        }
2338
2339        /* Did the user ask for any diff output? Run the diff! */
2340        if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2341                revs->diff = 1;
2342
2343        /* Pickaxe, diff-filter and rename following need diffs */
2344        if (revs->diffopt.pickaxe ||
2345            revs->diffopt.filter ||
2346            DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2347                revs->diff = 1;
2348
2349        if (revs->topo_order)
2350                revs->limited = 1;
2351
2352        if (revs->prune_data.nr) {
2353                copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2354                /* Can't prune commits with rename following: the paths change.. */
2355                if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2356                        revs->prune = 1;
2357                if (!revs->full_diff)
2358                        copy_pathspec(&revs->diffopt.pathspec,
2359                                      &revs->prune_data);
2360        }
2361        if (revs->combine_merges)
2362                revs->ignore_merges = 0;
2363        revs->diffopt.abbrev = revs->abbrev;
2364
2365        if (revs->line_level_traverse) {
2366                revs->limited = 1;
2367                revs->topo_order = 1;
2368        }
2369
2370        diff_setup_done(&revs->diffopt);
2371
2372        grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2373                                 &revs->grep_filter);
2374        compile_grep_patterns(&revs->grep_filter);
2375
2376        if (revs->reverse && revs->reflog_info)
2377                die("cannot combine --reverse with --walk-reflogs");
2378        if (revs->rewrite_parents && revs->children.name)
2379                die("cannot combine --parents and --children");
2380
2381        /*
2382         * Limitations on the graph functionality
2383         */
2384        if (revs->reverse && revs->graph)
2385                die("cannot combine --reverse with --graph");
2386
2387        if (revs->reflog_info && revs->graph)
2388                die("cannot combine --walk-reflogs with --graph");
2389        if (revs->no_walk && revs->graph)
2390                die("cannot combine --no-walk with --graph");
2391        if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2392                die("cannot use --grep-reflog without --walk-reflogs");
2393
2394        if (revs->first_parent_only && revs->bisect)
2395                die(_("--first-parent is incompatible with --bisect"));
2396
2397        if (revs->expand_tabs_in_log < 0)
2398                revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2399
2400        return left;
2401}
2402
2403static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2404{
2405        struct commit_list *l = xcalloc(1, sizeof(*l));
2406
2407        l->item = child;
2408        l->next = add_decoration(&revs->children, &parent->object, l);
2409}
2410
2411static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2412{
2413        struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2414        struct commit_list **pp, *p;
2415        int surviving_parents;
2416
2417        /* Examine existing parents while marking ones we have seen... */
2418        pp = &commit->parents;
2419        surviving_parents = 0;
2420        while ((p = *pp) != NULL) {
2421                struct commit *parent = p->item;
2422                if (parent->object.flags & TMP_MARK) {
2423                        *pp = p->next;
2424                        if (ts)
2425                                compact_treesame(revs, commit, surviving_parents);
2426                        continue;
2427                }
2428                parent->object.flags |= TMP_MARK;
2429                surviving_parents++;
2430                pp = &p->next;
2431        }
2432        /* clear the temporary mark */
2433        for (p = commit->parents; p; p = p->next) {
2434                p->item->object.flags &= ~TMP_MARK;
2435        }
2436        /* no update_treesame() - removing duplicates can't affect TREESAME */
2437        return surviving_parents;
2438}
2439
2440struct merge_simplify_state {
2441        struct commit *simplified;
2442};
2443
2444static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2445{
2446        struct merge_simplify_state *st;
2447
2448        st = lookup_decoration(&revs->merge_simplification, &commit->object);
2449        if (!st) {
2450                st = xcalloc(1, sizeof(*st));
2451                add_decoration(&revs->merge_simplification, &commit->object, st);
2452        }
2453        return st;
2454}
2455
2456static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2457{
2458        struct commit_list *h = reduce_heads(commit->parents);
2459        int i = 0, marked = 0;
2460        struct commit_list *po, *pn;
2461
2462        /* Want these for sanity-checking only */
2463        int orig_cnt = commit_list_count(commit->parents);
2464        int cnt = commit_list_count(h);
2465
2466        /*
2467         * Not ready to remove items yet, just mark them for now, based
2468         * on the output of reduce_heads(). reduce_heads outputs the reduced
2469         * set in its original order, so this isn't too hard.
2470         */
2471        po = commit->parents;
2472        pn = h;
2473        while (po) {
2474                if (pn && po->item == pn->item) {
2475                        pn = pn->next;
2476                        i++;
2477                } else {
2478                        po->item->object.flags |= TMP_MARK;
2479                        marked++;
2480                }
2481                po=po->next;
2482        }
2483
2484        if (i != cnt || cnt+marked != orig_cnt)
2485                die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2486
2487        free_commit_list(h);
2488
2489        return marked;
2490}
2491
2492static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2493{
2494        struct commit_list *p;
2495        int marked = 0;
2496
2497        for (p = commit->parents; p; p = p->next) {
2498                struct commit *parent = p->item;
2499                if (!parent->parents && (parent->object.flags & TREESAME)) {
2500                        parent->object.flags |= TMP_MARK;
2501                        marked++;
2502                }
2503        }
2504
2505        return marked;
2506}
2507
2508/*
2509 * Awkward naming - this means one parent we are TREESAME to.
2510 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2511 * empty tree). Better name suggestions?
2512 */
2513static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2514{
2515        struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2516        struct commit *unmarked = NULL, *marked = NULL;
2517        struct commit_list *p;
2518        unsigned n;
2519
2520        for (p = commit->parents, n = 0; p; p = p->next, n++) {
2521                if (ts->treesame[n]) {
2522                        if (p->item->object.flags & TMP_MARK) {
2523                                if (!marked)
2524                                        marked = p->item;
2525                        } else {
2526                                if (!unmarked) {
2527                                        unmarked = p->item;
2528                                        break;
2529                                }
2530                        }
2531                }
2532        }
2533
2534        /*
2535         * If we are TREESAME to a marked-for-deletion parent, but not to any
2536         * unmarked parents, unmark the first TREESAME parent. This is the
2537         * parent that the default simplify_history==1 scan would have followed,
2538         * and it doesn't make sense to omit that path when asking for a
2539         * simplified full history. Retaining it improves the chances of
2540         * understanding odd missed merges that took an old version of a file.
2541         *
2542         * Example:
2543         *
2544         *   I--------*X       A modified the file, but mainline merge X used
2545         *    \       /        "-s ours", so took the version from I. X is
2546         *     `-*A--'         TREESAME to I and !TREESAME to A.
2547         *
2548         * Default log from X would produce "I". Without this check,
2549         * --full-history --simplify-merges would produce "I-A-X", showing
2550         * the merge commit X and that it changed A, but not making clear that
2551         * it had just taken the I version. With this check, the topology above
2552         * is retained.
2553         *
2554         * Note that it is possible that the simplification chooses a different
2555         * TREESAME parent from the default, in which case this test doesn't
2556         * activate, and we _do_ drop the default parent. Example:
2557         *
2558         *   I------X         A modified the file, but it was reverted in B,
2559         *    \    /          meaning mainline merge X is TREESAME to both
2560         *    *A-*B           parents.
2561         *
2562         * Default log would produce "I" by following the first parent;
2563         * --full-history --simplify-merges will produce "I-A-B". But this is a
2564         * reasonable result - it presents a logical full history leading from
2565         * I to X, and X is not an important merge.
2566         */
2567        if (!unmarked && marked) {
2568                marked->object.flags &= ~TMP_MARK;
2569                return 1;
2570        }
2571
2572        return 0;
2573}
2574
2575static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2576{
2577        struct commit_list **pp, *p;
2578        int nth_parent, removed = 0;
2579
2580        pp = &commit->parents;
2581        nth_parent = 0;
2582        while ((p = *pp) != NULL) {
2583                struct commit *parent = p->item;
2584                if (parent->object.flags & TMP_MARK) {
2585                        parent->object.flags &= ~TMP_MARK;
2586                        *pp = p->next;
2587                        free(p);
2588                        removed++;
2589                        compact_treesame(revs, commit, nth_parent);
2590                        continue;
2591                }
2592                pp = &p->next;
2593                nth_parent++;
2594        }
2595
2596        /* Removing parents can only increase TREESAMEness */
2597        if (removed && !(commit->object.flags & TREESAME))
2598                update_treesame(revs, commit);
2599
2600        return nth_parent;
2601}
2602
2603static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
2604{
2605        struct commit_list *p;
2606        struct commit *parent;
2607        struct merge_simplify_state *st, *pst;
2608        int cnt;
2609
2610        st = locate_simplify_state(revs, commit);
2611
2612        /*
2613         * Have we handled this one?
2614         */
2615        if (st->simplified)
2616                return tail;
2617
2618        /*
2619         * An UNINTERESTING commit simplifies to itself, so does a
2620         * root commit.  We do not rewrite parents of such commit
2621         * anyway.
2622         */
2623        if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
2624                st->simplified = commit;
2625                return tail;
2626        }
2627
2628        /*
2629         * Do we know what commit all of our parents that matter
2630         * should be rewritten to?  Otherwise we are not ready to
2631         * rewrite this one yet.
2632         */
2633        for (cnt = 0, p = commit->parents; p; p = p->next) {
2634                pst = locate_simplify_state(revs, p->item);
2635                if (!pst->simplified) {
2636                        tail = &commit_list_insert(p->item, tail)->next;
2637                        cnt++;
2638                }
2639                if (revs->first_parent_only)
2640                        break;
2641        }
2642        if (cnt) {
2643                tail = &commit_list_insert(commit, tail)->next;
2644                return tail;
2645        }
2646
2647        /*
2648         * Rewrite our list of parents. Note that this cannot
2649         * affect our TREESAME flags in any way - a commit is
2650         * always TREESAME to its simplification.
2651         */
2652        for (p = commit->parents; p; p = p->next) {
2653                pst = locate_simplify_state(revs, p->item);
2654                p->item = pst->simplified;
2655                if (revs->first_parent_only)
2656                        break;
2657        }
2658
2659        if (revs->first_parent_only)
2660                cnt = 1;
2661        else
2662                cnt = remove_duplicate_parents(revs, commit);
2663
2664        /*
2665         * It is possible that we are a merge and one side branch
2666         * does not have any commit that touches the given paths;
2667         * in such a case, the immediate parent from that branch
2668         * will be rewritten to be the merge base.
2669         *
2670         *      o----X          X: the commit we are looking at;
2671         *     /    /           o: a commit that touches the paths;
2672         * ---o----'
2673         *
2674         * Further, a merge of an independent branch that doesn't
2675         * touch the path will reduce to a treesame root parent:
2676         *
2677         *  ----o----X          X: the commit we are looking at;
2678         *          /           o: a commit that touches the paths;
2679         *         r            r: a root commit not touching the paths
2680         *
2681         * Detect and simplify both cases.
2682         */
2683        if (1 < cnt) {
2684                int marked = mark_redundant_parents(revs, commit);
2685                marked += mark_treesame_root_parents(revs, commit);
2686                if (marked)
2687                        marked -= leave_one_treesame_to_parent(revs, commit);
2688                if (marked)
2689                        cnt = remove_marked_parents(revs, commit);
2690        }
2691
2692        /*
2693         * A commit simplifies to itself if it is a root, if it is
2694         * UNINTERESTING, if it touches the given paths, or if it is a
2695         * merge and its parents don't simplify to one relevant commit
2696         * (the first two cases are already handled at the beginning of
2697         * this function).
2698         *
2699         * Otherwise, it simplifies to what its sole relevant parent
2700         * simplifies to.
2701         */
2702        if (!cnt ||
2703            (commit->object.flags & UNINTERESTING) ||
2704            !(commit->object.flags & TREESAME) ||
2705            (parent = one_relevant_parent(revs, commit->parents)) == NULL)
2706                st->simplified = commit;
2707        else {
2708                pst = locate_simplify_state(revs, parent);
2709                st->simplified = pst->simplified;
2710        }
2711        return tail;
2712}
2713
2714static void simplify_merges(struct rev_info *revs)
2715{
2716        struct commit_list *list, *next;
2717        struct commit_list *yet_to_do, **tail;
2718        struct commit *commit;
2719
2720        if (!revs->prune)
2721                return;
2722
2723        /* feed the list reversed */
2724        yet_to_do = NULL;
2725        for (list = revs->commits; list; list = next) {
2726                commit = list->item;
2727                next = list->next;
2728                /*
2729                 * Do not free(list) here yet; the original list
2730                 * is used later in this function.
2731                 */
2732                commit_list_insert(commit, &yet_to_do);
2733        }
2734        while (yet_to_do) {
2735                list = yet_to_do;
2736                yet_to_do = NULL;
2737                tail = &yet_to_do;
2738                while (list) {
2739                        commit = pop_commit(&list);
2740                        tail = simplify_one(revs, commit, tail);
2741                }
2742        }
2743
2744        /* clean up the result, removing the simplified ones */
2745        list = revs->commits;
2746        revs->commits = NULL;
2747        tail = &revs->commits;
2748        while (list) {
2749                struct merge_simplify_state *st;
2750
2751                commit = pop_commit(&list);
2752                st = locate_simplify_state(revs, commit);
2753                if (st->simplified == commit)
2754                        tail = &commit_list_insert(commit, tail)->next;
2755        }
2756}
2757
2758static void set_children(struct rev_info *revs)
2759{
2760        struct commit_list *l;
2761        for (l = revs->commits; l; l = l->next) {
2762                struct commit *commit = l->item;
2763                struct commit_list *p;
2764
2765                for (p = commit->parents; p; p = p->next)
2766                        add_child(revs, p->item, commit);
2767        }
2768}
2769
2770void reset_revision_walk(void)
2771{
2772        clear_object_flags(SEEN | ADDED | SHOWN);
2773}
2774
2775int prepare_revision_walk(struct rev_info *revs)
2776{
2777        int i;
2778        struct object_array old_pending;
2779        struct commit_list **next = &revs->commits;
2780
2781        memcpy(&old_pending, &revs->pending, sizeof(old_pending));
2782        revs->pending.nr = 0;
2783        revs->pending.alloc = 0;
2784        revs->pending.objects = NULL;
2785        for (i = 0; i < old_pending.nr; i++) {
2786                struct object_array_entry *e = old_pending.objects + i;
2787                struct commit *commit = handle_commit(revs, e);
2788                if (commit) {
2789                        if (!(commit->object.flags & SEEN)) {
2790                                commit->object.flags |= SEEN;
2791                                next = commit_list_append(commit, next);
2792                        }
2793                }
2794        }
2795        if (!revs->leak_pending)
2796                object_array_clear(&old_pending);
2797
2798        /* Signal whether we need per-parent treesame decoration */
2799        if (revs->simplify_merges ||
2800            (revs->limited && limiting_can_increase_treesame(revs)))
2801                revs->treesame.name = "treesame";
2802
2803        if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2804                commit_list_sort_by_date(&revs->commits);
2805        if (revs->no_walk)
2806                return 0;
2807        if (revs->limited)
2808                if (limit_list(revs) < 0)
2809                        return -1;
2810        if (revs->topo_order)
2811                sort_in_topological_order(&revs->commits, revs->sort_order);
2812        if (revs->line_level_traverse)
2813                line_log_filter(revs);
2814        if (revs->simplify_merges)
2815                simplify_merges(revs);
2816        if (revs->children.name)
2817                set_children(revs);
2818        return 0;
2819}
2820
2821static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2822{
2823        struct commit_list *cache = NULL;
2824
2825        for (;;) {
2826                struct commit *p = *pp;
2827                if (!revs->limited)
2828                        if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2829                                return rewrite_one_error;
2830                if (p->object.flags & UNINTERESTING)
2831                        return rewrite_one_ok;
2832                if (!(p->object.flags & TREESAME))
2833                        return rewrite_one_ok;
2834                if (!p->parents)
2835                        return rewrite_one_noparents;
2836                if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2837                        return rewrite_one_ok;
2838                *pp = p;
2839        }
2840}
2841
2842int rewrite_parents(struct rev_info *revs, struct commit *commit,
2843        rewrite_parent_fn_t rewrite_parent)
2844{
2845        struct commit_list **pp = &commit->parents;
2846        while (*pp) {
2847                struct commit_list *parent = *pp;
2848                switch (rewrite_parent(revs, &parent->item)) {
2849                case rewrite_one_ok:
2850                        break;
2851                case rewrite_one_noparents:
2852                        *pp = parent->next;
2853                        continue;
2854                case rewrite_one_error:
2855                        return -1;
2856                }
2857                pp = &parent->next;
2858        }
2859        remove_duplicate_parents(revs, commit);
2860        return 0;
2861}
2862
2863static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2864{
2865        char *person, *endp;
2866        size_t len, namelen, maillen;
2867        const char *name;
2868        const char *mail;
2869        struct ident_split ident;
2870
2871        person = strstr(buf->buf, what);
2872        if (!person)
2873                return 0;
2874
2875        person += strlen(what);
2876        endp = strchr(person, '\n');
2877        if (!endp)
2878                return 0;
2879
2880        len = endp - person;
2881
2882        if (split_ident_line(&ident, person, len))
2883                return 0;
2884
2885        mail = ident.mail_begin;
2886        maillen = ident.mail_end - ident.mail_begin;
2887        name = ident.name_begin;
2888        namelen = ident.name_end - ident.name_begin;
2889
2890        if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2891                struct strbuf namemail = STRBUF_INIT;
2892
2893                strbuf_addf(&namemail, "%.*s <%.*s>",
2894                            (int)namelen, name, (int)maillen, mail);
2895
2896                strbuf_splice(buf, ident.name_begin - buf->buf,
2897                              ident.mail_end - ident.name_begin + 1,
2898                              namemail.buf, namemail.len);
2899
2900                strbuf_release(&namemail);
2901
2902                return 1;
2903        }
2904
2905        return 0;
2906}
2907
2908static int commit_match(struct commit *commit, struct rev_info *opt)
2909{
2910        int retval;
2911        const char *encoding;
2912        const char *message;
2913        struct strbuf buf = STRBUF_INIT;
2914
2915        if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2916                return 1;
2917
2918        /* Prepend "fake" headers as needed */
2919        if (opt->grep_filter.use_reflog_filter) {
2920                strbuf_addstr(&buf, "reflog ");
2921                get_reflog_message(&buf, opt->reflog_info);
2922                strbuf_addch(&buf, '\n');
2923        }
2924
2925        /*
2926         * We grep in the user's output encoding, under the assumption that it
2927         * is the encoding they are most likely to write their grep pattern
2928         * for. In addition, it means we will match the "notes" encoding below,
2929         * so we will not end up with a buffer that has two different encodings
2930         * in it.
2931         */
2932        encoding = get_log_output_encoding();
2933        message = logmsg_reencode(commit, NULL, encoding);
2934
2935        /* Copy the commit to temporary if we are using "fake" headers */
2936        if (buf.len)
2937                strbuf_addstr(&buf, message);
2938
2939        if (opt->grep_filter.header_list && opt->mailmap) {
2940                if (!buf.len)
2941                        strbuf_addstr(&buf, message);
2942
2943                commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2944                commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2945        }
2946
2947        /* Append "fake" message parts as needed */
2948        if (opt->show_notes) {
2949                if (!buf.len)
2950                        strbuf_addstr(&buf, message);
2951                format_display_notes(commit->object.oid.hash, &buf, encoding, 1);
2952        }
2953
2954        /*
2955         * Find either in the original commit message, or in the temporary.
2956         * Note that we cast away the constness of "message" here. It is
2957         * const because it may come from the cached commit buffer. That's OK,
2958         * because we know that it is modifiable heap memory, and that while
2959         * grep_buffer may modify it for speed, it will restore any
2960         * changes before returning.
2961         */
2962        if (buf.len)
2963                retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2964        else
2965                retval = grep_buffer(&opt->grep_filter,
2966                                     (char *)message, strlen(message));
2967        strbuf_release(&buf);
2968        unuse_commit_buffer(commit, message);
2969        return opt->invert_grep ? !retval : retval;
2970}
2971
2972static inline int want_ancestry(const struct rev_info *revs)
2973{
2974        return (revs->rewrite_parents || revs->children.name);
2975}
2976
2977enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2978{
2979        if (commit->object.flags & SHOWN)
2980                return commit_ignore;
2981        if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))
2982                return commit_ignore;
2983        if (revs->show_all)
2984                return commit_show;
2985        if (commit->object.flags & UNINTERESTING)
2986                return commit_ignore;
2987        if (revs->min_age != -1 && (commit->date > revs->min_age))
2988                return commit_ignore;
2989        if (revs->min_parents || (revs->max_parents >= 0)) {
2990                int n = commit_list_count(commit->parents);
2991                if ((n < revs->min_parents) ||
2992                    ((revs->max_parents >= 0) && (n > revs->max_parents)))
2993                        return commit_ignore;
2994        }
2995        if (!commit_match(commit, revs))
2996                return commit_ignore;
2997        if (revs->prune && revs->dense) {
2998                /* Commit without changes? */
2999                if (commit->object.flags & TREESAME) {
3000                        int n;
3001                        struct commit_list *p;
3002                        /* drop merges unless we want parenthood */
3003                        if (!want_ancestry(revs))
3004                                return commit_ignore;
3005                        /*
3006                         * If we want ancestry, then need to keep any merges
3007                         * between relevant commits to tie together topology.
3008                         * For consistency with TREESAME and simplification
3009                         * use "relevant" here rather than just INTERESTING,
3010                         * to treat bottom commit(s) as part of the topology.
3011                         */
3012                        for (n = 0, p = commit->parents; p; p = p->next)
3013                                if (relevant_commit(p->item))
3014                                        if (++n >= 2)
3015                                                return commit_show;
3016                        return commit_ignore;
3017                }
3018        }
3019        return commit_show;
3020}
3021
3022define_commit_slab(saved_parents, struct commit_list *);
3023
3024#define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3025
3026/*
3027 * You may only call save_parents() once per commit (this is checked
3028 * for non-root commits).
3029 */
3030static void save_parents(struct rev_info *revs, struct commit *commit)
3031{
3032        struct commit_list **pp;
3033
3034        if (!revs->saved_parents_slab) {
3035                revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3036                init_saved_parents(revs->saved_parents_slab);
3037        }
3038
3039        pp = saved_parents_at(revs->saved_parents_slab, commit);
3040
3041        /*
3042         * When walking with reflogs, we may visit the same commit
3043         * several times: once for each appearance in the reflog.
3044         *
3045         * In this case, save_parents() will be called multiple times.
3046         * We want to keep only the first set of parents.  We need to
3047         * store a sentinel value for an empty (i.e., NULL) parent
3048         * list to distinguish it from a not-yet-saved list, however.
3049         */
3050        if (*pp)
3051                return;
3052        if (commit->parents)
3053                *pp = copy_commit_list(commit->parents);
3054        else
3055                *pp = EMPTY_PARENT_LIST;
3056}
3057
3058static void free_saved_parents(struct rev_info *revs)
3059{
3060        if (revs->saved_parents_slab)
3061                clear_saved_parents(revs->saved_parents_slab);
3062}
3063
3064struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3065{
3066        struct commit_list *parents;
3067
3068        if (!revs->saved_parents_slab)
3069                return commit->parents;
3070
3071        parents = *saved_parents_at(revs->saved_parents_slab, commit);
3072        if (parents == EMPTY_PARENT_LIST)
3073                return NULL;
3074        return parents;
3075}
3076
3077enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3078{
3079        enum commit_action action = get_commit_action(revs, commit);
3080
3081        if (action == commit_show &&
3082            !revs->show_all &&
3083            revs->prune && revs->dense && want_ancestry(revs)) {
3084                /*
3085                 * --full-diff on simplified parents is no good: it
3086                 * will show spurious changes from the commits that
3087                 * were elided.  So we save the parents on the side
3088                 * when --full-diff is in effect.
3089                 */
3090                if (revs->full_diff)
3091                        save_parents(revs, commit);
3092                if (rewrite_parents(revs, commit, rewrite_one) < 0)
3093                        return commit_error;
3094        }
3095        return action;
3096}
3097
3098static void track_linear(struct rev_info *revs, struct commit *commit)
3099{
3100        if (revs->track_first_time) {
3101                revs->linear = 1;
3102                revs->track_first_time = 0;
3103        } else {
3104                struct commit_list *p;
3105                for (p = revs->previous_parents; p; p = p->next)
3106                        if (p->item == NULL || /* first commit */
3107                            !oidcmp(&p->item->object.oid, &commit->object.oid))
3108                                break;
3109                revs->linear = p != NULL;
3110        }
3111        if (revs->reverse) {
3112                if (revs->linear)
3113                        commit->object.flags |= TRACK_LINEAR;
3114        }
3115        free_commit_list(revs->previous_parents);
3116        revs->previous_parents = copy_commit_list(commit->parents);
3117}
3118
3119static struct commit *get_revision_1(struct rev_info *revs)
3120{
3121        if (!revs->commits)
3122                return NULL;
3123
3124        do {
3125                struct commit *commit = pop_commit(&revs->commits);
3126
3127                if (revs->reflog_info) {
3128                        save_parents(revs, commit);
3129                        fake_reflog_parent(revs->reflog_info, commit);
3130                        commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3131                }
3132
3133                /*
3134                 * If we haven't done the list limiting, we need to look at
3135                 * the parents here. We also need to do the date-based limiting
3136                 * that we'd otherwise have done in limit_list().
3137                 */
3138                if (!revs->limited) {
3139                        if (revs->max_age != -1 &&
3140                            (commit->date < revs->max_age))
3141                                continue;
3142                        if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3143                                if (!revs->ignore_missing_links)
3144                                        die("Failed to traverse parents of commit %s",
3145                                                oid_to_hex(&commit->object.oid));
3146                        }
3147                }
3148
3149                switch (simplify_commit(revs, commit)) {
3150                case commit_ignore:
3151                        continue;
3152                case commit_error:
3153                        die("Failed to simplify parents of commit %s",
3154                            oid_to_hex(&commit->object.oid));
3155                default:
3156                        if (revs->track_linear)
3157                                track_linear(revs, commit);
3158                        return commit;
3159                }
3160        } while (revs->commits);
3161        return NULL;
3162}
3163
3164/*
3165 * Return true for entries that have not yet been shown.  (This is an
3166 * object_array_each_func_t.)
3167 */
3168static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3169{
3170        return !(entry->item->flags & SHOWN);
3171}
3172
3173/*
3174 * If array is on the verge of a realloc, garbage-collect any entries
3175 * that have already been shown to try to free up some space.
3176 */
3177static void gc_boundary(struct object_array *array)
3178{
3179        if (array->nr == array->alloc)
3180                object_array_filter(array, entry_unshown, NULL);
3181}
3182
3183static void create_boundary_commit_list(struct rev_info *revs)
3184{
3185        unsigned i;
3186        struct commit *c;
3187        struct object_array *array = &revs->boundary_commits;
3188        struct object_array_entry *objects = array->objects;
3189
3190        /*
3191         * If revs->commits is non-NULL at this point, an error occurred in
3192         * get_revision_1().  Ignore the error and continue printing the
3193         * boundary commits anyway.  (This is what the code has always
3194         * done.)
3195         */
3196        if (revs->commits) {
3197                free_commit_list(revs->commits);
3198                revs->commits = NULL;
3199        }
3200
3201        /*
3202         * Put all of the actual boundary commits from revs->boundary_commits
3203         * into revs->commits
3204         */
3205        for (i = 0; i < array->nr; i++) {
3206                c = (struct commit *)(objects[i].item);
3207                if (!c)
3208                        continue;
3209                if (!(c->object.flags & CHILD_SHOWN))
3210                        continue;
3211                if (c->object.flags & (SHOWN | BOUNDARY))
3212                        continue;
3213                c->object.flags |= BOUNDARY;
3214                commit_list_insert(c, &revs->commits);
3215        }
3216
3217        /*
3218         * If revs->topo_order is set, sort the boundary commits
3219         * in topological order
3220         */
3221        sort_in_topological_order(&revs->commits, revs->sort_order);
3222}
3223
3224static struct commit *get_revision_internal(struct rev_info *revs)
3225{
3226        struct commit *c = NULL;
3227        struct commit_list *l;
3228
3229        if (revs->boundary == 2) {
3230                /*
3231                 * All of the normal commits have already been returned,
3232                 * and we are now returning boundary commits.
3233                 * create_boundary_commit_list() has populated
3234                 * revs->commits with the remaining commits to return.
3235                 */
3236                c = pop_commit(&revs->commits);
3237                if (c)
3238                        c->object.flags |= SHOWN;
3239                return c;
3240        }
3241
3242        /*
3243         * If our max_count counter has reached zero, then we are done. We
3244         * don't simply return NULL because we still might need to show
3245         * boundary commits. But we want to avoid calling get_revision_1, which
3246         * might do a considerable amount of work finding the next commit only
3247         * for us to throw it away.
3248         *
3249         * If it is non-zero, then either we don't have a max_count at all
3250         * (-1), or it is still counting, in which case we decrement.
3251         */
3252        if (revs->max_count) {
3253                c = get_revision_1(revs);
3254                if (c) {
3255                        while (revs->skip_count > 0) {
3256                                revs->skip_count--;
3257                                c = get_revision_1(revs);
3258                                if (!c)
3259                                        break;
3260                        }
3261                }
3262
3263                if (revs->max_count > 0)
3264                        revs->max_count--;
3265        }
3266
3267        if (c)
3268                c->object.flags |= SHOWN;
3269
3270        if (!revs->boundary)
3271                return c;
3272
3273        if (!c) {
3274                /*
3275                 * get_revision_1() runs out the commits, and
3276                 * we are done computing the boundaries.
3277                 * switch to boundary commits output mode.
3278                 */
3279                revs->boundary = 2;
3280
3281                /*
3282                 * Update revs->commits to contain the list of
3283                 * boundary commits.
3284                 */
3285                create_boundary_commit_list(revs);
3286
3287                return get_revision_internal(revs);
3288        }
3289
3290        /*
3291         * boundary commits are the commits that are parents of the
3292         * ones we got from get_revision_1() but they themselves are
3293         * not returned from get_revision_1().  Before returning
3294         * 'c', we need to mark its parents that they could be boundaries.
3295         */
3296
3297        for (l = c->parents; l; l = l->next) {
3298                struct object *p;
3299                p = &(l->item->object);
3300                if (p->flags & (CHILD_SHOWN | SHOWN))
3301                        continue;
3302                p->flags |= CHILD_SHOWN;
3303                gc_boundary(&revs->boundary_commits);
3304                add_object_array(p, NULL, &revs->boundary_commits);
3305        }
3306
3307        return c;
3308}
3309
3310struct commit *get_revision(struct rev_info *revs)
3311{
3312        struct commit *c;
3313        struct commit_list *reversed;
3314
3315        if (revs->reverse) {
3316                reversed = NULL;
3317                while ((c = get_revision_internal(revs)))
3318                        commit_list_insert(c, &reversed);
3319                revs->commits = reversed;
3320                revs->reverse = 0;
3321                revs->reverse_output_stage = 1;
3322        }
3323
3324        if (revs->reverse_output_stage) {
3325                c = pop_commit(&revs->commits);
3326                if (revs->track_linear)
3327                        revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3328                return c;
3329        }
3330
3331        c = get_revision_internal(revs);
3332        if (c && revs->graph)
3333                graph_update(revs->graph, c);
3334        if (!c) {
3335                free_saved_parents(revs);
3336                if (revs->previous_parents) {
3337                        free_commit_list(revs->previous_parents);
3338                        revs->previous_parents = NULL;
3339                }
3340        }
3341        return c;
3342}
3343
3344char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3345{
3346        if (commit->object.flags & BOUNDARY)
3347                return "-";
3348        else if (commit->object.flags & UNINTERESTING)
3349                return "^";
3350        else if (commit->object.flags & PATCHSAME)
3351                return "=";
3352        else if (!revs || revs->left_right) {
3353                if (commit->object.flags & SYMMETRIC_LEFT)
3354                        return "<";
3355                else
3356                        return ">";
3357        } else if (revs->graph)
3358                return "*";
3359        else if (revs->cherry_mark)
3360                return "+";
3361        return "";
3362}
3363
3364void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3365{
3366        char *mark = get_revision_mark(revs, commit);
3367        if (!strlen(mark))
3368                return;
3369        fputs(mark, stdout);
3370        putchar(' ');
3371}