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