revision.con commit Add "--show-all" revision walker flag for debugging (3131b71)
   1#include "cache.h"
   2#include "tag.h"
   3#include "blob.h"
   4#include "tree.h"
   5#include "commit.h"
   6#include "diff.h"
   7#include "refs.h"
   8#include "revision.h"
   9#include "grep.h"
  10#include "reflog-walk.h"
  11#include "patch-ids.h"
  12
  13volatile show_early_output_fn_t show_early_output;
  14
  15static char *path_name(struct name_path *path, const char *name)
  16{
  17        struct name_path *p;
  18        char *n, *m;
  19        int nlen = strlen(name);
  20        int len = nlen + 1;
  21
  22        for (p = path; p; p = p->up) {
  23                if (p->elem_len)
  24                        len += p->elem_len + 1;
  25        }
  26        n = xmalloc(len);
  27        m = n + len - (nlen + 1);
  28        strcpy(m, name);
  29        for (p = path; p; p = p->up) {
  30                if (p->elem_len) {
  31                        m -= p->elem_len + 1;
  32                        memcpy(m, p->elem, p->elem_len);
  33                        m[p->elem_len] = '/';
  34                }
  35        }
  36        return n;
  37}
  38
  39void add_object(struct object *obj,
  40                struct object_array *p,
  41                struct name_path *path,
  42                const char *name)
  43{
  44        add_object_array(obj, path_name(path, name), p);
  45}
  46
  47static void mark_blob_uninteresting(struct blob *blob)
  48{
  49        if (blob->object.flags & UNINTERESTING)
  50                return;
  51        blob->object.flags |= UNINTERESTING;
  52}
  53
  54void mark_tree_uninteresting(struct tree *tree)
  55{
  56        struct tree_desc desc;
  57        struct name_entry entry;
  58        struct object *obj = &tree->object;
  59
  60        if (obj->flags & UNINTERESTING)
  61                return;
  62        obj->flags |= UNINTERESTING;
  63        if (!has_sha1_file(obj->sha1))
  64                return;
  65        if (parse_tree(tree) < 0)
  66                die("bad tree %s", sha1_to_hex(obj->sha1));
  67
  68        init_tree_desc(&desc, tree->buffer, tree->size);
  69        while (tree_entry(&desc, &entry)) {
  70                switch (object_type(entry.mode)) {
  71                case OBJ_TREE:
  72                        mark_tree_uninteresting(lookup_tree(entry.sha1));
  73                        break;
  74                case OBJ_BLOB:
  75                        mark_blob_uninteresting(lookup_blob(entry.sha1));
  76                        break;
  77                default:
  78                        /* Subproject commit - not in this repository */
  79                        break;
  80                }
  81        }
  82
  83        /*
  84         * We don't care about the tree any more
  85         * after it has been marked uninteresting.
  86         */
  87        free(tree->buffer);
  88        tree->buffer = NULL;
  89}
  90
  91void mark_parents_uninteresting(struct commit *commit)
  92{
  93        struct commit_list *parents = commit->parents;
  94
  95        while (parents) {
  96                struct commit *commit = parents->item;
  97                if (!(commit->object.flags & UNINTERESTING)) {
  98                        commit->object.flags |= UNINTERESTING;
  99
 100                        /*
 101                         * Normally we haven't parsed the parent
 102                         * yet, so we won't have a parent of a parent
 103                         * here. However, it may turn out that we've
 104                         * reached this commit some other way (where it
 105                         * wasn't uninteresting), in which case we need
 106                         * to mark its parents recursively too..
 107                         */
 108                        if (commit->parents)
 109                                mark_parents_uninteresting(commit);
 110                }
 111
 112                /*
 113                 * A missing commit is ok iff its parent is marked
 114                 * uninteresting.
 115                 *
 116                 * We just mark such a thing parsed, so that when
 117                 * it is popped next time around, we won't be trying
 118                 * to parse it and get an error.
 119                 */
 120                if (!has_sha1_file(commit->object.sha1))
 121                        commit->object.parsed = 1;
 122                parents = parents->next;
 123        }
 124}
 125
 126static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
 127{
 128        if (revs->no_walk && (obj->flags & UNINTERESTING))
 129                die("object ranges do not make sense when not walking revisions");
 130        if (revs->reflog_info && obj->type == OBJ_COMMIT &&
 131                        add_reflog_for_walk(revs->reflog_info,
 132                                (struct commit *)obj, name))
 133                return;
 134        add_object_array_with_mode(obj, name, &revs->pending, mode);
 135}
 136
 137void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
 138{
 139        add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
 140}
 141
 142void add_head_to_pending(struct rev_info *revs)
 143{
 144        unsigned char sha1[20];
 145        struct object *obj;
 146        if (get_sha1("HEAD", sha1))
 147                return;
 148        obj = parse_object(sha1);
 149        if (!obj)
 150                return;
 151        add_pending_object(revs, obj, "HEAD");
 152}
 153
 154static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
 155{
 156        struct object *object;
 157
 158        object = parse_object(sha1);
 159        if (!object)
 160                die("bad object %s", name);
 161        object->flags |= flags;
 162        return object;
 163}
 164
 165static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
 166{
 167        unsigned long flags = object->flags;
 168
 169        /*
 170         * Tag object? Look what it points to..
 171         */
 172        while (object->type == OBJ_TAG) {
 173                struct tag *tag = (struct tag *) object;
 174                if (revs->tag_objects && !(flags & UNINTERESTING))
 175                        add_pending_object(revs, object, tag->tag);
 176                object = parse_object(tag->tagged->sha1);
 177                if (!object)
 178                        die("bad object %s", sha1_to_hex(tag->tagged->sha1));
 179        }
 180
 181        /*
 182         * Commit object? Just return it, we'll do all the complex
 183         * reachability crud.
 184         */
 185        if (object->type == OBJ_COMMIT) {
 186                struct commit *commit = (struct commit *)object;
 187                if (parse_commit(commit) < 0)
 188                        die("unable to parse commit %s", name);
 189                if (flags & UNINTERESTING) {
 190                        commit->object.flags |= UNINTERESTING;
 191                        mark_parents_uninteresting(commit);
 192                        revs->limited = 1;
 193                }
 194                return commit;
 195        }
 196
 197        /*
 198         * Tree object? Either mark it uniniteresting, or add it
 199         * to the list of objects to look at later..
 200         */
 201        if (object->type == OBJ_TREE) {
 202                struct tree *tree = (struct tree *)object;
 203                if (!revs->tree_objects)
 204                        return NULL;
 205                if (flags & UNINTERESTING) {
 206                        mark_tree_uninteresting(tree);
 207                        return NULL;
 208                }
 209                add_pending_object(revs, object, "");
 210                return NULL;
 211        }
 212
 213        /*
 214         * Blob object? You know the drill by now..
 215         */
 216        if (object->type == OBJ_BLOB) {
 217                struct blob *blob = (struct blob *)object;
 218                if (!revs->blob_objects)
 219                        return NULL;
 220                if (flags & UNINTERESTING) {
 221                        mark_blob_uninteresting(blob);
 222                        return NULL;
 223                }
 224                add_pending_object(revs, object, "");
 225                return NULL;
 226        }
 227        die("%s is unknown object", name);
 228}
 229
 230static int everybody_uninteresting(struct commit_list *orig)
 231{
 232        struct commit_list *list = orig;
 233        while (list) {
 234                struct commit *commit = list->item;
 235                list = list->next;
 236                if (commit->object.flags & UNINTERESTING)
 237                        continue;
 238                return 0;
 239        }
 240        return 1;
 241}
 242
 243/*
 244 * The goal is to get REV_TREE_NEW as the result only if the
 245 * diff consists of all '+' (and no other changes), and
 246 * REV_TREE_DIFFERENT otherwise (of course if the trees are
 247 * the same we want REV_TREE_SAME).  That means that once we
 248 * get to REV_TREE_DIFFERENT, we do not have to look any further.
 249 */
 250static int tree_difference = REV_TREE_SAME;
 251
 252static void file_add_remove(struct diff_options *options,
 253                    int addremove, unsigned mode,
 254                    const unsigned char *sha1,
 255                    const char *base, const char *path)
 256{
 257        int diff = REV_TREE_DIFFERENT;
 258
 259        /*
 260         * Is it an add of a new file? It means that the old tree
 261         * didn't have it at all, so we will turn "REV_TREE_SAME" ->
 262         * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
 263         * (and if it already was "REV_TREE_NEW", we'll keep it
 264         * "REV_TREE_NEW" of course).
 265         */
 266        if (addremove == '+') {
 267                diff = tree_difference;
 268                if (diff != REV_TREE_SAME)
 269                        return;
 270                diff = REV_TREE_NEW;
 271        }
 272        tree_difference = diff;
 273        if (tree_difference == REV_TREE_DIFFERENT)
 274                DIFF_OPT_SET(options, HAS_CHANGES);
 275}
 276
 277static void file_change(struct diff_options *options,
 278                 unsigned old_mode, unsigned new_mode,
 279                 const unsigned char *old_sha1,
 280                 const unsigned char *new_sha1,
 281                 const char *base, const char *path)
 282{
 283        tree_difference = REV_TREE_DIFFERENT;
 284        DIFF_OPT_SET(options, HAS_CHANGES);
 285}
 286
 287static int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
 288{
 289        if (!t1)
 290                return REV_TREE_NEW;
 291        if (!t2)
 292                return REV_TREE_DIFFERENT;
 293        tree_difference = REV_TREE_SAME;
 294        DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
 295        if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
 296                           &revs->pruning) < 0)
 297                return REV_TREE_DIFFERENT;
 298        return tree_difference;
 299}
 300
 301static int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
 302{
 303        int retval;
 304        void *tree;
 305        unsigned long size;
 306        struct tree_desc empty, real;
 307
 308        if (!t1)
 309                return 0;
 310
 311        tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
 312        if (!tree)
 313                return 0;
 314        init_tree_desc(&real, tree, size);
 315        init_tree_desc(&empty, "", 0);
 316
 317        tree_difference = REV_TREE_SAME;
 318        DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
 319        retval = diff_tree(&empty, &real, "", &revs->pruning);
 320        free(tree);
 321
 322        return retval >= 0 && (tree_difference == REV_TREE_SAME);
 323}
 324
 325static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 326{
 327        struct commit_list **pp, *parent;
 328        int tree_changed = 0, tree_same = 0;
 329
 330        /*
 331         * If we don't do pruning, everything is interesting
 332         */
 333        if (!revs->prune)
 334                return;
 335
 336        if (!commit->tree)
 337                return;
 338
 339        if (!commit->parents) {
 340                if (rev_same_tree_as_empty(revs, commit->tree))
 341                        commit->object.flags |= TREESAME;
 342                return;
 343        }
 344
 345        /*
 346         * Normal non-merge commit? If we don't want to make the
 347         * history dense, we consider it always to be a change..
 348         */
 349        if (!revs->dense && !commit->parents->next)
 350                return;
 351
 352        pp = &commit->parents;
 353        while ((parent = *pp) != NULL) {
 354                struct commit *p = parent->item;
 355
 356                if (parse_commit(p) < 0)
 357                        die("cannot simplify commit %s (because of %s)",
 358                            sha1_to_hex(commit->object.sha1),
 359                            sha1_to_hex(p->object.sha1));
 360                switch (rev_compare_tree(revs, p->tree, commit->tree)) {
 361                case REV_TREE_SAME:
 362                        tree_same = 1;
 363                        if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
 364                                /* Even if a merge with an uninteresting
 365                                 * side branch brought the entire change
 366                                 * we are interested in, we do not want
 367                                 * to lose the other branches of this
 368                                 * merge, so we just keep going.
 369                                 */
 370                                pp = &parent->next;
 371                                continue;
 372                        }
 373                        parent->next = NULL;
 374                        commit->parents = parent;
 375                        commit->object.flags |= TREESAME;
 376                        return;
 377
 378                case REV_TREE_NEW:
 379                        if (revs->remove_empty_trees &&
 380                            rev_same_tree_as_empty(revs, p->tree)) {
 381                                /* We are adding all the specified
 382                                 * paths from this parent, so the
 383                                 * history beyond this parent is not
 384                                 * interesting.  Remove its parents
 385                                 * (they are grandparents for us).
 386                                 * IOW, we pretend this parent is a
 387                                 * "root" commit.
 388                                 */
 389                                if (parse_commit(p) < 0)
 390                                        die("cannot simplify commit %s (invalid %s)",
 391                                            sha1_to_hex(commit->object.sha1),
 392                                            sha1_to_hex(p->object.sha1));
 393                                p->parents = NULL;
 394                        }
 395                /* fallthrough */
 396                case REV_TREE_DIFFERENT:
 397                        tree_changed = 1;
 398                        pp = &parent->next;
 399                        continue;
 400                }
 401                die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
 402        }
 403        if (tree_changed && !tree_same)
 404                return;
 405        commit->object.flags |= TREESAME;
 406}
 407
 408static int add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
 409{
 410        struct commit_list *parent = commit->parents;
 411        unsigned left_flag;
 412        int add, rest;
 413
 414        if (commit->object.flags & ADDED)
 415                return 0;
 416        commit->object.flags |= ADDED;
 417
 418        /*
 419         * If the commit is uninteresting, don't try to
 420         * prune parents - we want the maximal uninteresting
 421         * set.
 422         *
 423         * Normally we haven't parsed the parent
 424         * yet, so we won't have a parent of a parent
 425         * here. However, it may turn out that we've
 426         * reached this commit some other way (where it
 427         * wasn't uninteresting), in which case we need
 428         * to mark its parents recursively too..
 429         */
 430        if (commit->object.flags & UNINTERESTING) {
 431                while (parent) {
 432                        struct commit *p = parent->item;
 433                        parent = parent->next;
 434                        if (parse_commit(p) < 0)
 435                                return -1;
 436                        p->object.flags |= UNINTERESTING;
 437                        if (p->parents)
 438                                mark_parents_uninteresting(p);
 439                        if (p->object.flags & SEEN)
 440                                continue;
 441                        p->object.flags |= SEEN;
 442                        insert_by_date(p, list);
 443                }
 444                return 0;
 445        }
 446
 447        /*
 448         * Ok, the commit wasn't uninteresting. Try to
 449         * simplify the commit history and find the parent
 450         * that has no differences in the path set if one exists.
 451         */
 452        try_to_simplify_commit(revs, commit);
 453
 454        if (revs->no_walk)
 455                return 0;
 456
 457        left_flag = (commit->object.flags & SYMMETRIC_LEFT);
 458
 459        rest = !revs->first_parent_only;
 460        for (parent = commit->parents, add = 1; parent; add = rest) {
 461                struct commit *p = parent->item;
 462
 463                parent = parent->next;
 464                if (parse_commit(p) < 0)
 465                        return -1;
 466                p->object.flags |= left_flag;
 467                if (p->object.flags & SEEN)
 468                        continue;
 469                p->object.flags |= SEEN;
 470                if (add)
 471                        insert_by_date(p, list);
 472        }
 473        return 0;
 474}
 475
 476static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
 477{
 478        struct commit_list *p;
 479        int left_count = 0, right_count = 0;
 480        int left_first;
 481        struct patch_ids ids;
 482
 483        /* First count the commits on the left and on the right */
 484        for (p = list; p; p = p->next) {
 485                struct commit *commit = p->item;
 486                unsigned flags = commit->object.flags;
 487                if (flags & BOUNDARY)
 488                        ;
 489                else if (flags & SYMMETRIC_LEFT)
 490                        left_count++;
 491                else
 492                        right_count++;
 493        }
 494
 495        left_first = left_count < right_count;
 496        init_patch_ids(&ids);
 497        if (revs->diffopt.nr_paths) {
 498                ids.diffopts.nr_paths = revs->diffopt.nr_paths;
 499                ids.diffopts.paths = revs->diffopt.paths;
 500                ids.diffopts.pathlens = revs->diffopt.pathlens;
 501        }
 502
 503        /* Compute patch-ids for one side */
 504        for (p = list; p; p = p->next) {
 505                struct commit *commit = p->item;
 506                unsigned flags = commit->object.flags;
 507
 508                if (flags & BOUNDARY)
 509                        continue;
 510                /*
 511                 * If we have fewer left, left_first is set and we omit
 512                 * commits on the right branch in this loop.  If we have
 513                 * fewer right, we skip the left ones.
 514                 */
 515                if (left_first != !!(flags & SYMMETRIC_LEFT))
 516                        continue;
 517                commit->util = add_commit_patch_id(commit, &ids);
 518        }
 519
 520        /* Check the other side */
 521        for (p = list; p; p = p->next) {
 522                struct commit *commit = p->item;
 523                struct patch_id *id;
 524                unsigned flags = commit->object.flags;
 525
 526                if (flags & BOUNDARY)
 527                        continue;
 528                /*
 529                 * If we have fewer left, left_first is set and we omit
 530                 * commits on the left branch in this loop.
 531                 */
 532                if (left_first == !!(flags & SYMMETRIC_LEFT))
 533                        continue;
 534
 535                /*
 536                 * Have we seen the same patch id?
 537                 */
 538                id = has_commit_patch_id(commit, &ids);
 539                if (!id)
 540                        continue;
 541                id->seen = 1;
 542                commit->object.flags |= SHOWN;
 543        }
 544
 545        /* Now check the original side for seen ones */
 546        for (p = list; p; p = p->next) {
 547                struct commit *commit = p->item;
 548                struct patch_id *ent;
 549
 550                ent = commit->util;
 551                if (!ent)
 552                        continue;
 553                if (ent->seen)
 554                        commit->object.flags |= SHOWN;
 555                commit->util = NULL;
 556        }
 557
 558        free_patch_ids(&ids);
 559}
 560
 561static void add_to_list(struct commit_list **p, struct commit *commit, struct commit_list *n)
 562{
 563        p = &commit_list_insert(commit, p)->next;
 564        *p = n;
 565}
 566
 567static int limit_list(struct rev_info *revs)
 568{
 569        struct commit_list *list = revs->commits;
 570        struct commit_list *newlist = NULL;
 571        struct commit_list **p = &newlist;
 572
 573        while (list) {
 574                struct commit_list *entry = list;
 575                struct commit *commit = list->item;
 576                struct object *obj = &commit->object;
 577                show_early_output_fn_t show;
 578
 579                list = list->next;
 580                free(entry);
 581
 582                if (revs->max_age != -1 && (commit->date < revs->max_age))
 583                        obj->flags |= UNINTERESTING;
 584                if (add_parents_to_list(revs, commit, &list) < 0)
 585                        return -1;
 586                if (obj->flags & UNINTERESTING) {
 587                        mark_parents_uninteresting(commit);
 588                        if (everybody_uninteresting(list)) {
 589                                if (revs->show_all)
 590                                        add_to_list(p, commit, list);
 591                                break;
 592                        }
 593                        if (!revs->show_all)
 594                                continue;
 595                }
 596                if (revs->min_age != -1 && (commit->date > revs->min_age))
 597                        continue;
 598                p = &commit_list_insert(commit, p)->next;
 599
 600                show = show_early_output;
 601                if (!show)
 602                        continue;
 603
 604                show(revs, newlist);
 605                show_early_output = NULL;
 606        }
 607        if (revs->cherry_pick)
 608                cherry_pick_list(newlist, revs);
 609
 610        revs->commits = newlist;
 611        return 0;
 612}
 613
 614struct all_refs_cb {
 615        int all_flags;
 616        int warned_bad_reflog;
 617        struct rev_info *all_revs;
 618        const char *name_for_errormsg;
 619};
 620
 621static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 622{
 623        struct all_refs_cb *cb = cb_data;
 624        struct object *object = get_reference(cb->all_revs, path, sha1,
 625                                              cb->all_flags);
 626        add_pending_object(cb->all_revs, object, path);
 627        return 0;
 628}
 629
 630static void handle_all(struct rev_info *revs, unsigned flags)
 631{
 632        struct all_refs_cb cb;
 633        cb.all_revs = revs;
 634        cb.all_flags = flags;
 635        for_each_ref(handle_one_ref, &cb);
 636}
 637
 638static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
 639{
 640        struct all_refs_cb *cb = cb_data;
 641        if (!is_null_sha1(sha1)) {
 642                struct object *o = parse_object(sha1);
 643                if (o) {
 644                        o->flags |= cb->all_flags;
 645                        add_pending_object(cb->all_revs, o, "");
 646                }
 647                else if (!cb->warned_bad_reflog) {
 648                        warning("reflog of '%s' references pruned commits",
 649                                cb->name_for_errormsg);
 650                        cb->warned_bad_reflog = 1;
 651                }
 652        }
 653}
 654
 655static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
 656                const char *email, unsigned long timestamp, int tz,
 657                const char *message, void *cb_data)
 658{
 659        handle_one_reflog_commit(osha1, cb_data);
 660        handle_one_reflog_commit(nsha1, cb_data);
 661        return 0;
 662}
 663
 664static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 665{
 666        struct all_refs_cb *cb = cb_data;
 667        cb->warned_bad_reflog = 0;
 668        cb->name_for_errormsg = path;
 669        for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
 670        return 0;
 671}
 672
 673static void handle_reflog(struct rev_info *revs, unsigned flags)
 674{
 675        struct all_refs_cb cb;
 676        cb.all_revs = revs;
 677        cb.all_flags = flags;
 678        for_each_reflog(handle_one_reflog, &cb);
 679}
 680
 681static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
 682{
 683        unsigned char sha1[20];
 684        struct object *it;
 685        struct commit *commit;
 686        struct commit_list *parents;
 687
 688        if (*arg == '^') {
 689                flags ^= UNINTERESTING;
 690                arg++;
 691        }
 692        if (get_sha1(arg, sha1))
 693                return 0;
 694        while (1) {
 695                it = get_reference(revs, arg, sha1, 0);
 696                if (it->type != OBJ_TAG)
 697                        break;
 698                hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
 699        }
 700        if (it->type != OBJ_COMMIT)
 701                return 0;
 702        commit = (struct commit *)it;
 703        for (parents = commit->parents; parents; parents = parents->next) {
 704                it = &parents->item->object;
 705                it->flags |= flags;
 706                add_pending_object(revs, it, arg);
 707        }
 708        return 1;
 709}
 710
 711void init_revisions(struct rev_info *revs, const char *prefix)
 712{
 713        memset(revs, 0, sizeof(*revs));
 714
 715        revs->abbrev = DEFAULT_ABBREV;
 716        revs->ignore_merges = 1;
 717        revs->simplify_history = 1;
 718        DIFF_OPT_SET(&revs->pruning, RECURSIVE);
 719        DIFF_OPT_SET(&revs->pruning, QUIET);
 720        revs->pruning.add_remove = file_add_remove;
 721        revs->pruning.change = file_change;
 722        revs->lifo = 1;
 723        revs->dense = 1;
 724        revs->prefix = prefix;
 725        revs->max_age = -1;
 726        revs->min_age = -1;
 727        revs->skip_count = -1;
 728        revs->max_count = -1;
 729
 730        revs->commit_format = CMIT_FMT_DEFAULT;
 731
 732        diff_setup(&revs->diffopt);
 733}
 734
 735static void add_pending_commit_list(struct rev_info *revs,
 736                                    struct commit_list *commit_list,
 737                                    unsigned int flags)
 738{
 739        while (commit_list) {
 740                struct object *object = &commit_list->item->object;
 741                object->flags |= flags;
 742                add_pending_object(revs, object, sha1_to_hex(object->sha1));
 743                commit_list = commit_list->next;
 744        }
 745}
 746
 747static void prepare_show_merge(struct rev_info *revs)
 748{
 749        struct commit_list *bases;
 750        struct commit *head, *other;
 751        unsigned char sha1[20];
 752        const char **prune = NULL;
 753        int i, prune_num = 1; /* counting terminating NULL */
 754
 755        if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
 756                die("--merge without HEAD?");
 757        if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
 758                die("--merge without MERGE_HEAD?");
 759        add_pending_object(revs, &head->object, "HEAD");
 760        add_pending_object(revs, &other->object, "MERGE_HEAD");
 761        bases = get_merge_bases(head, other, 1);
 762        while (bases) {
 763                struct commit *it = bases->item;
 764                struct commit_list *n = bases->next;
 765                free(bases);
 766                bases = n;
 767                it->object.flags |= UNINTERESTING;
 768                add_pending_object(revs, &it->object, "(merge-base)");
 769        }
 770
 771        if (!active_nr)
 772                read_cache();
 773        for (i = 0; i < active_nr; i++) {
 774                struct cache_entry *ce = active_cache[i];
 775                if (!ce_stage(ce))
 776                        continue;
 777                if (ce_path_match(ce, revs->prune_data)) {
 778                        prune_num++;
 779                        prune = xrealloc(prune, sizeof(*prune) * prune_num);
 780                        prune[prune_num-2] = ce->name;
 781                        prune[prune_num-1] = NULL;
 782                }
 783                while ((i+1 < active_nr) &&
 784                       ce_same_name(ce, active_cache[i+1]))
 785                        i++;
 786        }
 787        revs->prune_data = prune;
 788}
 789
 790int handle_revision_arg(const char *arg, struct rev_info *revs,
 791                        int flags,
 792                        int cant_be_filename)
 793{
 794        unsigned mode;
 795        char *dotdot;
 796        struct object *object;
 797        unsigned char sha1[20];
 798        int local_flags;
 799
 800        dotdot = strstr(arg, "..");
 801        if (dotdot) {
 802                unsigned char from_sha1[20];
 803                const char *next = dotdot + 2;
 804                const char *this = arg;
 805                int symmetric = *next == '.';
 806                unsigned int flags_exclude = flags ^ UNINTERESTING;
 807
 808                *dotdot = 0;
 809                next += symmetric;
 810
 811                if (!*next)
 812                        next = "HEAD";
 813                if (dotdot == arg)
 814                        this = "HEAD";
 815                if (!get_sha1(this, from_sha1) &&
 816                    !get_sha1(next, sha1)) {
 817                        struct commit *a, *b;
 818                        struct commit_list *exclude;
 819
 820                        a = lookup_commit_reference(from_sha1);
 821                        b = lookup_commit_reference(sha1);
 822                        if (!a || !b) {
 823                                die(symmetric ?
 824                                    "Invalid symmetric difference expression %s...%s" :
 825                                    "Invalid revision range %s..%s",
 826                                    arg, next);
 827                        }
 828
 829                        if (!cant_be_filename) {
 830                                *dotdot = '.';
 831                                verify_non_filename(revs->prefix, arg);
 832                        }
 833
 834                        if (symmetric) {
 835                                exclude = get_merge_bases(a, b, 1);
 836                                add_pending_commit_list(revs, exclude,
 837                                                        flags_exclude);
 838                                free_commit_list(exclude);
 839                                a->object.flags |= flags | SYMMETRIC_LEFT;
 840                        } else
 841                                a->object.flags |= flags_exclude;
 842                        b->object.flags |= flags;
 843                        add_pending_object(revs, &a->object, this);
 844                        add_pending_object(revs, &b->object, next);
 845                        return 0;
 846                }
 847                *dotdot = '.';
 848        }
 849        dotdot = strstr(arg, "^@");
 850        if (dotdot && !dotdot[2]) {
 851                *dotdot = 0;
 852                if (add_parents_only(revs, arg, flags))
 853                        return 0;
 854                *dotdot = '^';
 855        }
 856        dotdot = strstr(arg, "^!");
 857        if (dotdot && !dotdot[2]) {
 858                *dotdot = 0;
 859                if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
 860                        *dotdot = '^';
 861        }
 862
 863        local_flags = 0;
 864        if (*arg == '^') {
 865                local_flags = UNINTERESTING;
 866                arg++;
 867        }
 868        if (get_sha1_with_mode(arg, sha1, &mode))
 869                return -1;
 870        if (!cant_be_filename)
 871                verify_non_filename(revs->prefix, arg);
 872        object = get_reference(revs, arg, sha1, flags ^ local_flags);
 873        add_pending_object_with_mode(revs, object, arg, mode);
 874        return 0;
 875}
 876
 877static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
 878{
 879        if (!revs->grep_filter) {
 880                struct grep_opt *opt = xcalloc(1, sizeof(*opt));
 881                opt->status_only = 1;
 882                opt->pattern_tail = &(opt->pattern_list);
 883                opt->regflags = REG_NEWLINE;
 884                revs->grep_filter = opt;
 885        }
 886        append_grep_pattern(revs->grep_filter, ptn,
 887                            "command line", 0, what);
 888}
 889
 890static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
 891{
 892        char *pat;
 893        const char *prefix;
 894        int patlen, fldlen;
 895
 896        fldlen = strlen(field);
 897        patlen = strlen(pattern);
 898        pat = xmalloc(patlen + fldlen + 10);
 899        prefix = ".*";
 900        if (*pattern == '^') {
 901                prefix = "";
 902                pattern++;
 903        }
 904        sprintf(pat, "^%s %s%s", field, prefix, pattern);
 905        add_grep(revs, pat, GREP_PATTERN_HEAD);
 906}
 907
 908static void add_message_grep(struct rev_info *revs, const char *pattern)
 909{
 910        add_grep(revs, pattern, GREP_PATTERN_BODY);
 911}
 912
 913static void add_ignore_packed(struct rev_info *revs, const char *name)
 914{
 915        int num = ++revs->num_ignore_packed;
 916
 917        revs->ignore_packed = xrealloc(revs->ignore_packed,
 918                                       sizeof(const char **) * (num + 1));
 919        revs->ignore_packed[num-1] = name;
 920        revs->ignore_packed[num] = NULL;
 921}
 922
 923/*
 924 * Parse revision information, filling in the "rev_info" structure,
 925 * and removing the used arguments from the argument list.
 926 *
 927 * Returns the number of arguments left that weren't recognized
 928 * (which are also moved to the head of the argument list)
 929 */
 930int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
 931{
 932        int i, flags, seen_dashdash, show_merge;
 933        const char **unrecognized = argv + 1;
 934        int left = 1;
 935        int all_match = 0;
 936        int regflags = 0;
 937
 938        /* First, search for "--" */
 939        seen_dashdash = 0;
 940        for (i = 1; i < argc; i++) {
 941                const char *arg = argv[i];
 942                if (strcmp(arg, "--"))
 943                        continue;
 944                argv[i] = NULL;
 945                argc = i;
 946                if (argv[i + 1])
 947                        revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
 948                seen_dashdash = 1;
 949                break;
 950        }
 951
 952        flags = show_merge = 0;
 953        for (i = 1; i < argc; i++) {
 954                const char *arg = argv[i];
 955                if (*arg == '-') {
 956                        int opts;
 957                        if (!prefixcmp(arg, "--max-count=")) {
 958                                revs->max_count = atoi(arg + 12);
 959                                continue;
 960                        }
 961                        if (!prefixcmp(arg, "--skip=")) {
 962                                revs->skip_count = atoi(arg + 7);
 963                                continue;
 964                        }
 965                        /* accept -<digit>, like traditional "head" */
 966                        if ((*arg == '-') && isdigit(arg[1])) {
 967                                revs->max_count = atoi(arg + 1);
 968                                continue;
 969                        }
 970                        if (!strcmp(arg, "-n")) {
 971                                if (argc <= i + 1)
 972                                        die("-n requires an argument");
 973                                revs->max_count = atoi(argv[++i]);
 974                                continue;
 975                        }
 976                        if (!prefixcmp(arg, "-n")) {
 977                                revs->max_count = atoi(arg + 2);
 978                                continue;
 979                        }
 980                        if (!prefixcmp(arg, "--max-age=")) {
 981                                revs->max_age = atoi(arg + 10);
 982                                continue;
 983                        }
 984                        if (!prefixcmp(arg, "--since=")) {
 985                                revs->max_age = approxidate(arg + 8);
 986                                continue;
 987                        }
 988                        if (!prefixcmp(arg, "--after=")) {
 989                                revs->max_age = approxidate(arg + 8);
 990                                continue;
 991                        }
 992                        if (!prefixcmp(arg, "--min-age=")) {
 993                                revs->min_age = atoi(arg + 10);
 994                                continue;
 995                        }
 996                        if (!prefixcmp(arg, "--before=")) {
 997                                revs->min_age = approxidate(arg + 9);
 998                                continue;
 999                        }
1000                        if (!prefixcmp(arg, "--until=")) {
1001                                revs->min_age = approxidate(arg + 8);
1002                                continue;
1003                        }
1004                        if (!strcmp(arg, "--all")) {
1005                                handle_all(revs, flags);
1006                                continue;
1007                        }
1008                        if (!strcmp(arg, "--first-parent")) {
1009                                revs->first_parent_only = 1;
1010                                continue;
1011                        }
1012                        if (!strcmp(arg, "--reflog")) {
1013                                handle_reflog(revs, flags);
1014                                continue;
1015                        }
1016                        if (!strcmp(arg, "-g") ||
1017                                        !strcmp(arg, "--walk-reflogs")) {
1018                                init_reflog_walk(&revs->reflog_info);
1019                                continue;
1020                        }
1021                        if (!strcmp(arg, "--not")) {
1022                                flags ^= UNINTERESTING;
1023                                continue;
1024                        }
1025                        if (!strcmp(arg, "--default")) {
1026                                if (++i >= argc)
1027                                        die("bad --default argument");
1028                                def = argv[i];
1029                                continue;
1030                        }
1031                        if (!strcmp(arg, "--merge")) {
1032                                show_merge = 1;
1033                                continue;
1034                        }
1035                        if (!strcmp(arg, "--topo-order")) {
1036                                revs->topo_order = 1;
1037                                continue;
1038                        }
1039                        if (!strcmp(arg, "--date-order")) {
1040                                revs->lifo = 0;
1041                                revs->topo_order = 1;
1042                                continue;
1043                        }
1044                        if (!prefixcmp(arg, "--early-output")) {
1045                                int count = 100;
1046                                switch (arg[14]) {
1047                                case '=':
1048                                        count = atoi(arg+15);
1049                                        /* Fallthrough */
1050                                case 0:
1051                                        revs->topo_order = 1;
1052                                        revs->early_output = count;
1053                                        continue;
1054                                }
1055                        }
1056                        if (!strcmp(arg, "--parents")) {
1057                                revs->parents = 1;
1058                                continue;
1059                        }
1060                        if (!strcmp(arg, "--dense")) {
1061                                revs->dense = 1;
1062                                continue;
1063                        }
1064                        if (!strcmp(arg, "--sparse")) {
1065                                revs->dense = 0;
1066                                continue;
1067                        }
1068                        if (!strcmp(arg, "--show-all")) {
1069                                revs->show_all = 1;
1070                                continue;
1071                        }
1072                        if (!strcmp(arg, "--remove-empty")) {
1073                                revs->remove_empty_trees = 1;
1074                                continue;
1075                        }
1076                        if (!strcmp(arg, "--no-merges")) {
1077                                revs->no_merges = 1;
1078                                continue;
1079                        }
1080                        if (!strcmp(arg, "--boundary")) {
1081                                revs->boundary = 1;
1082                                continue;
1083                        }
1084                        if (!strcmp(arg, "--left-right")) {
1085                                revs->left_right = 1;
1086                                continue;
1087                        }
1088                        if (!strcmp(arg, "--cherry-pick")) {
1089                                revs->cherry_pick = 1;
1090                                revs->limited = 1;
1091                                continue;
1092                        }
1093                        if (!strcmp(arg, "--objects")) {
1094                                revs->tag_objects = 1;
1095                                revs->tree_objects = 1;
1096                                revs->blob_objects = 1;
1097                                continue;
1098                        }
1099                        if (!strcmp(arg, "--objects-edge")) {
1100                                revs->tag_objects = 1;
1101                                revs->tree_objects = 1;
1102                                revs->blob_objects = 1;
1103                                revs->edge_hint = 1;
1104                                continue;
1105                        }
1106                        if (!strcmp(arg, "--unpacked")) {
1107                                revs->unpacked = 1;
1108                                free(revs->ignore_packed);
1109                                revs->ignore_packed = NULL;
1110                                revs->num_ignore_packed = 0;
1111                                continue;
1112                        }
1113                        if (!prefixcmp(arg, "--unpacked=")) {
1114                                revs->unpacked = 1;
1115                                add_ignore_packed(revs, arg+11);
1116                                continue;
1117                        }
1118                        if (!strcmp(arg, "-r")) {
1119                                revs->diff = 1;
1120                                DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1121                                continue;
1122                        }
1123                        if (!strcmp(arg, "-t")) {
1124                                revs->diff = 1;
1125                                DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1126                                DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1127                                continue;
1128                        }
1129                        if (!strcmp(arg, "-m")) {
1130                                revs->ignore_merges = 0;
1131                                continue;
1132                        }
1133                        if (!strcmp(arg, "-c")) {
1134                                revs->diff = 1;
1135                                revs->dense_combined_merges = 0;
1136                                revs->combine_merges = 1;
1137                                continue;
1138                        }
1139                        if (!strcmp(arg, "--cc")) {
1140                                revs->diff = 1;
1141                                revs->dense_combined_merges = 1;
1142                                revs->combine_merges = 1;
1143                                continue;
1144                        }
1145                        if (!strcmp(arg, "-v")) {
1146                                revs->verbose_header = 1;
1147                                continue;
1148                        }
1149                        if (!prefixcmp(arg, "--pretty")) {
1150                                revs->verbose_header = 1;
1151                                revs->commit_format = get_commit_format(arg+8);
1152                                continue;
1153                        }
1154                        if (!strcmp(arg, "--root")) {
1155                                revs->show_root_diff = 1;
1156                                continue;
1157                        }
1158                        if (!strcmp(arg, "--no-commit-id")) {
1159                                revs->no_commit_id = 1;
1160                                continue;
1161                        }
1162                        if (!strcmp(arg, "--always")) {
1163                                revs->always_show_header = 1;
1164                                continue;
1165                        }
1166                        if (!strcmp(arg, "--no-abbrev")) {
1167                                revs->abbrev = 0;
1168                                continue;
1169                        }
1170                        if (!strcmp(arg, "--abbrev")) {
1171                                revs->abbrev = DEFAULT_ABBREV;
1172                                continue;
1173                        }
1174                        if (!prefixcmp(arg, "--abbrev=")) {
1175                                revs->abbrev = strtoul(arg + 9, NULL, 10);
1176                                if (revs->abbrev < MINIMUM_ABBREV)
1177                                        revs->abbrev = MINIMUM_ABBREV;
1178                                else if (revs->abbrev > 40)
1179                                        revs->abbrev = 40;
1180                                continue;
1181                        }
1182                        if (!strcmp(arg, "--abbrev-commit")) {
1183                                revs->abbrev_commit = 1;
1184                                continue;
1185                        }
1186                        if (!strcmp(arg, "--full-diff")) {
1187                                revs->diff = 1;
1188                                revs->full_diff = 1;
1189                                continue;
1190                        }
1191                        if (!strcmp(arg, "--full-history")) {
1192                                revs->simplify_history = 0;
1193                                continue;
1194                        }
1195                        if (!strcmp(arg, "--relative-date")) {
1196                                revs->date_mode = DATE_RELATIVE;
1197                                continue;
1198                        }
1199                        if (!strncmp(arg, "--date=", 7)) {
1200                                revs->date_mode = parse_date_format(arg + 7);
1201                                continue;
1202                        }
1203                        if (!strcmp(arg, "--log-size")) {
1204                                revs->show_log_size = 1;
1205                                continue;
1206                        }
1207
1208                        /*
1209                         * Grepping the commit log
1210                         */
1211                        if (!prefixcmp(arg, "--author=")) {
1212                                add_header_grep(revs, "author", arg+9);
1213                                continue;
1214                        }
1215                        if (!prefixcmp(arg, "--committer=")) {
1216                                add_header_grep(revs, "committer", arg+12);
1217                                continue;
1218                        }
1219                        if (!prefixcmp(arg, "--grep=")) {
1220                                add_message_grep(revs, arg+7);
1221                                continue;
1222                        }
1223                        if (!strcmp(arg, "--extended-regexp") ||
1224                            !strcmp(arg, "-E")) {
1225                                regflags |= REG_EXTENDED;
1226                                continue;
1227                        }
1228                        if (!strcmp(arg, "--regexp-ignore-case") ||
1229                            !strcmp(arg, "-i")) {
1230                                regflags |= REG_ICASE;
1231                                continue;
1232                        }
1233                        if (!strcmp(arg, "--all-match")) {
1234                                all_match = 1;
1235                                continue;
1236                        }
1237                        if (!prefixcmp(arg, "--encoding=")) {
1238                                arg += 11;
1239                                if (strcmp(arg, "none"))
1240                                        git_log_output_encoding = xstrdup(arg);
1241                                else
1242                                        git_log_output_encoding = "";
1243                                continue;
1244                        }
1245                        if (!strcmp(arg, "--reverse")) {
1246                                revs->reverse ^= 1;
1247                                continue;
1248                        }
1249                        if (!strcmp(arg, "--no-walk")) {
1250                                revs->no_walk = 1;
1251                                continue;
1252                        }
1253                        if (!strcmp(arg, "--do-walk")) {
1254                                revs->no_walk = 0;
1255                                continue;
1256                        }
1257
1258                        opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
1259                        if (opts > 0) {
1260                                i += opts - 1;
1261                                continue;
1262                        }
1263                        *unrecognized++ = arg;
1264                        left++;
1265                        continue;
1266                }
1267
1268                if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1269                        int j;
1270                        if (seen_dashdash || *arg == '^')
1271                                die("bad revision '%s'", arg);
1272
1273                        /* If we didn't have a "--":
1274                         * (1) all filenames must exist;
1275                         * (2) all rev-args must not be interpretable
1276                         *     as a valid filename.
1277                         * but the latter we have checked in the main loop.
1278                         */
1279                        for (j = i; j < argc; j++)
1280                                verify_filename(revs->prefix, argv[j]);
1281
1282                        revs->prune_data = get_pathspec(revs->prefix,
1283                                                        argv + i);
1284                        break;
1285                }
1286        }
1287
1288        if (revs->grep_filter)
1289                revs->grep_filter->regflags |= regflags;
1290
1291        if (show_merge)
1292                prepare_show_merge(revs);
1293        if (def && !revs->pending.nr) {
1294                unsigned char sha1[20];
1295                struct object *object;
1296                unsigned mode;
1297                if (get_sha1_with_mode(def, sha1, &mode))
1298                        die("bad default revision '%s'", def);
1299                object = get_reference(revs, def, sha1, 0);
1300                add_pending_object_with_mode(revs, object, def, mode);
1301        }
1302
1303        /* Did the user ask for any diff output? Run the diff! */
1304        if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1305                revs->diff = 1;
1306
1307        /* Pickaxe, diff-filter and rename following need diffs */
1308        if (revs->diffopt.pickaxe ||
1309            revs->diffopt.filter ||
1310            DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1311                revs->diff = 1;
1312
1313        if (revs->topo_order)
1314                revs->limited = 1;
1315
1316        if (revs->prune_data) {
1317                diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1318                /* Can't prune commits with rename following: the paths change.. */
1319                if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1320                        revs->prune = 1;
1321                if (!revs->full_diff)
1322                        diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1323        }
1324        if (revs->combine_merges) {
1325                revs->ignore_merges = 0;
1326                if (revs->dense_combined_merges && !revs->diffopt.output_format)
1327                        revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1328        }
1329        revs->diffopt.abbrev = revs->abbrev;
1330        if (diff_setup_done(&revs->diffopt) < 0)
1331                die("diff_setup_done failed");
1332
1333        if (revs->grep_filter) {
1334                revs->grep_filter->all_match = all_match;
1335                compile_grep_patterns(revs->grep_filter);
1336        }
1337
1338        if (revs->reverse && revs->reflog_info)
1339                die("cannot combine --reverse with --walk-reflogs");
1340
1341        return left;
1342}
1343
1344int prepare_revision_walk(struct rev_info *revs)
1345{
1346        int nr = revs->pending.nr;
1347        struct object_array_entry *e, *list;
1348
1349        e = list = revs->pending.objects;
1350        revs->pending.nr = 0;
1351        revs->pending.alloc = 0;
1352        revs->pending.objects = NULL;
1353        while (--nr >= 0) {
1354                struct commit *commit = handle_commit(revs, e->item, e->name);
1355                if (commit) {
1356                        if (!(commit->object.flags & SEEN)) {
1357                                commit->object.flags |= SEEN;
1358                                insert_by_date(commit, &revs->commits);
1359                        }
1360                }
1361                e++;
1362        }
1363        free(list);
1364
1365        if (revs->no_walk)
1366                return 0;
1367        if (revs->limited)
1368                if (limit_list(revs) < 0)
1369                        return -1;
1370        if (revs->topo_order)
1371                sort_in_topological_order(&revs->commits, revs->lifo);
1372        return 0;
1373}
1374
1375enum rewrite_result {
1376        rewrite_one_ok,
1377        rewrite_one_noparents,
1378        rewrite_one_error,
1379};
1380
1381static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
1382{
1383        for (;;) {
1384                struct commit *p = *pp;
1385                if (!revs->limited)
1386                        if (add_parents_to_list(revs, p, &revs->commits) < 0)
1387                                return rewrite_one_error;
1388                if (p->parents && p->parents->next)
1389                        return rewrite_one_ok;
1390                if (p->object.flags & UNINTERESTING)
1391                        return rewrite_one_ok;
1392                if (!(p->object.flags & TREESAME))
1393                        return rewrite_one_ok;
1394                if (!p->parents)
1395                        return rewrite_one_noparents;
1396                *pp = p->parents->item;
1397        }
1398}
1399
1400static void remove_duplicate_parents(struct commit *commit)
1401{
1402        struct commit_list **pp, *p;
1403
1404        /* Examine existing parents while marking ones we have seen... */
1405        pp = &commit->parents;
1406        while ((p = *pp) != NULL) {
1407                struct commit *parent = p->item;
1408                if (parent->object.flags & TMP_MARK) {
1409                        *pp = p->next;
1410                        continue;
1411                }
1412                parent->object.flags |= TMP_MARK;
1413                pp = &p->next;
1414        }
1415        /* ... and clear the temporary mark */
1416        for (p = commit->parents; p; p = p->next)
1417                p->item->object.flags &= ~TMP_MARK;
1418}
1419
1420static int rewrite_parents(struct rev_info *revs, struct commit *commit)
1421{
1422        struct commit_list **pp = &commit->parents;
1423        while (*pp) {
1424                struct commit_list *parent = *pp;
1425                switch (rewrite_one(revs, &parent->item)) {
1426                case rewrite_one_ok:
1427                        break;
1428                case rewrite_one_noparents:
1429                        *pp = parent->next;
1430                        continue;
1431                case rewrite_one_error:
1432                        return -1;
1433                }
1434                pp = &parent->next;
1435        }
1436        remove_duplicate_parents(commit);
1437        return 0;
1438}
1439
1440static int commit_match(struct commit *commit, struct rev_info *opt)
1441{
1442        if (!opt->grep_filter)
1443                return 1;
1444        return grep_buffer(opt->grep_filter,
1445                           NULL, /* we say nothing, not even filename */
1446                           commit->buffer, strlen(commit->buffer));
1447}
1448
1449enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1450{
1451        if (commit->object.flags & SHOWN)
1452                return commit_ignore;
1453        if (revs->unpacked && has_sha1_pack(commit->object.sha1, revs->ignore_packed))
1454                return commit_ignore;
1455        if (revs->show_all)
1456                return commit_show;
1457        if (commit->object.flags & UNINTERESTING)
1458                return commit_ignore;
1459        if (revs->min_age != -1 && (commit->date > revs->min_age))
1460                return commit_ignore;
1461        if (revs->no_merges && commit->parents && commit->parents->next)
1462                return commit_ignore;
1463        if (!commit_match(commit, revs))
1464                return commit_ignore;
1465        if (revs->prune && revs->dense) {
1466                /* Commit without changes? */
1467                if (commit->object.flags & TREESAME) {
1468                        /* drop merges unless we want parenthood */
1469                        if (!revs->parents)
1470                                return commit_ignore;
1471                        /* non-merge - always ignore it */
1472                        if (!commit->parents || !commit->parents->next)
1473                                return commit_ignore;
1474                }
1475                if (revs->parents && rewrite_parents(revs, commit) < 0)
1476                        return commit_error;
1477        }
1478        return commit_show;
1479}
1480
1481static struct commit *get_revision_1(struct rev_info *revs)
1482{
1483        if (!revs->commits)
1484                return NULL;
1485
1486        do {
1487                struct commit_list *entry = revs->commits;
1488                struct commit *commit = entry->item;
1489
1490                revs->commits = entry->next;
1491                free(entry);
1492
1493                if (revs->reflog_info)
1494                        fake_reflog_parent(revs->reflog_info, commit);
1495
1496                /*
1497                 * If we haven't done the list limiting, we need to look at
1498                 * the parents here. We also need to do the date-based limiting
1499                 * that we'd otherwise have done in limit_list().
1500                 */
1501                if (!revs->limited) {
1502                        if (revs->max_age != -1 &&
1503                            (commit->date < revs->max_age))
1504                                continue;
1505                        if (add_parents_to_list(revs, commit, &revs->commits) < 0)
1506                                return NULL;
1507                }
1508
1509                switch (simplify_commit(revs, commit)) {
1510                case commit_ignore:
1511                        continue;
1512                case commit_error:
1513                        return NULL;
1514                default:
1515                        return commit;
1516                }
1517        } while (revs->commits);
1518        return NULL;
1519}
1520
1521static void gc_boundary(struct object_array *array)
1522{
1523        unsigned nr = array->nr;
1524        unsigned alloc = array->alloc;
1525        struct object_array_entry *objects = array->objects;
1526
1527        if (alloc <= nr) {
1528                unsigned i, j;
1529                for (i = j = 0; i < nr; i++) {
1530                        if (objects[i].item->flags & SHOWN)
1531                                continue;
1532                        if (i != j)
1533                                objects[j] = objects[i];
1534                        j++;
1535                }
1536                for (i = j; i < nr; i++)
1537                        objects[i].item = NULL;
1538                array->nr = j;
1539        }
1540}
1541
1542struct commit *get_revision(struct rev_info *revs)
1543{
1544        struct commit *c = NULL;
1545        struct commit_list *l;
1546
1547        if (revs->boundary == 2) {
1548                unsigned i;
1549                struct object_array *array = &revs->boundary_commits;
1550                struct object_array_entry *objects = array->objects;
1551                for (i = 0; i < array->nr; i++) {
1552                        c = (struct commit *)(objects[i].item);
1553                        if (!c)
1554                                continue;
1555                        if (!(c->object.flags & CHILD_SHOWN))
1556                                continue;
1557                        if (!(c->object.flags & SHOWN))
1558                                break;
1559                }
1560                if (array->nr <= i)
1561                        return NULL;
1562
1563                c->object.flags |= SHOWN | BOUNDARY;
1564                return c;
1565        }
1566
1567        if (revs->reverse) {
1568                int limit = -1;
1569
1570                if (0 <= revs->max_count) {
1571                        limit = revs->max_count;
1572                        if (0 < revs->skip_count)
1573                                limit += revs->skip_count;
1574                }
1575                l = NULL;
1576                while ((c = get_revision_1(revs))) {
1577                        commit_list_insert(c, &l);
1578                        if ((0 < limit) && !--limit)
1579                                break;
1580                }
1581                revs->commits = l;
1582                revs->reverse = 0;
1583                revs->max_count = -1;
1584                c = NULL;
1585        }
1586
1587        /*
1588         * Now pick up what they want to give us
1589         */
1590        c = get_revision_1(revs);
1591        if (c) {
1592                while (0 < revs->skip_count) {
1593                        revs->skip_count--;
1594                        c = get_revision_1(revs);
1595                        if (!c)
1596                                break;
1597                }
1598        }
1599
1600        /*
1601         * Check the max_count.
1602         */
1603        switch (revs->max_count) {
1604        case -1:
1605                break;
1606        case 0:
1607                c = NULL;
1608                break;
1609        default:
1610                revs->max_count--;
1611        }
1612
1613        if (c)
1614                c->object.flags |= SHOWN;
1615
1616        if (!revs->boundary) {
1617                return c;
1618        }
1619
1620        if (!c) {
1621                /*
1622                 * get_revision_1() runs out the commits, and
1623                 * we are done computing the boundaries.
1624                 * switch to boundary commits output mode.
1625                 */
1626                revs->boundary = 2;
1627                return get_revision(revs);
1628        }
1629
1630        /*
1631         * boundary commits are the commits that are parents of the
1632         * ones we got from get_revision_1() but they themselves are
1633         * not returned from get_revision_1().  Before returning
1634         * 'c', we need to mark its parents that they could be boundaries.
1635         */
1636
1637        for (l = c->parents; l; l = l->next) {
1638                struct object *p;
1639                p = &(l->item->object);
1640                if (p->flags & (CHILD_SHOWN | SHOWN))
1641                        continue;
1642                p->flags |= CHILD_SHOWN;
1643                gc_boundary(&revs->boundary_commits);
1644                add_object_array(p, NULL, &revs->boundary_commits);
1645        }
1646
1647        return c;
1648}