revision.con commit Support --amend on initial commit in status output (98bf8a4)
   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
  11static char *path_name(struct name_path *path, const char *name)
  12{
  13        struct name_path *p;
  14        char *n, *m;
  15        int nlen = strlen(name);
  16        int len = nlen + 1;
  17
  18        for (p = path; p; p = p->up) {
  19                if (p->elem_len)
  20                        len += p->elem_len + 1;
  21        }
  22        n = xmalloc(len);
  23        m = n + len - (nlen + 1);
  24        strcpy(m, name);
  25        for (p = path; p; p = p->up) {
  26                if (p->elem_len) {
  27                        m -= p->elem_len + 1;
  28                        memcpy(m, p->elem, p->elem_len);
  29                        m[p->elem_len] = '/';
  30                }
  31        }
  32        return n;
  33}
  34
  35void add_object(struct object *obj,
  36                struct object_array *p,
  37                struct name_path *path,
  38                const char *name)
  39{
  40        add_object_array(obj, path_name(path, name), p);
  41}
  42
  43static void mark_blob_uninteresting(struct blob *blob)
  44{
  45        if (blob->object.flags & UNINTERESTING)
  46                return;
  47        blob->object.flags |= UNINTERESTING;
  48}
  49
  50void mark_tree_uninteresting(struct tree *tree)
  51{
  52        struct tree_desc desc;
  53        struct name_entry entry;
  54        struct object *obj = &tree->object;
  55
  56        if (obj->flags & UNINTERESTING)
  57                return;
  58        obj->flags |= UNINTERESTING;
  59        if (!has_sha1_file(obj->sha1))
  60                return;
  61        if (parse_tree(tree) < 0)
  62                die("bad tree %s", sha1_to_hex(obj->sha1));
  63
  64        desc.buf = tree->buffer;
  65        desc.size = tree->size;
  66        while (tree_entry(&desc, &entry)) {
  67                if (S_ISDIR(entry.mode))
  68                        mark_tree_uninteresting(lookup_tree(entry.sha1));
  69                else
  70                        mark_blob_uninteresting(lookup_blob(entry.sha1));
  71        }
  72
  73        /*
  74         * We don't care about the tree any more
  75         * after it has been marked uninteresting.
  76         */
  77        free(tree->buffer);
  78        tree->buffer = NULL;
  79}
  80
  81void mark_parents_uninteresting(struct commit *commit)
  82{
  83        struct commit_list *parents = commit->parents;
  84
  85        while (parents) {
  86                struct commit *commit = parents->item;
  87                if (!(commit->object.flags & UNINTERESTING)) {
  88                        commit->object.flags |= UNINTERESTING;
  89
  90                        /*
  91                         * Normally we haven't parsed the parent
  92                         * yet, so we won't have a parent of a parent
  93                         * here. However, it may turn out that we've
  94                         * reached this commit some other way (where it
  95                         * wasn't uninteresting), in which case we need
  96                         * to mark its parents recursively too..
  97                         */
  98                        if (commit->parents)
  99                                mark_parents_uninteresting(commit);
 100                }
 101
 102                /*
 103                 * A missing commit is ok iff its parent is marked
 104                 * uninteresting.
 105                 *
 106                 * We just mark such a thing parsed, so that when
 107                 * it is popped next time around, we won't be trying
 108                 * to parse it and get an error.
 109                 */
 110                if (!has_sha1_file(commit->object.sha1))
 111                        commit->object.parsed = 1;
 112                parents = parents->next;
 113        }
 114}
 115
 116void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
 117{
 118        add_object_array(obj, name, &revs->pending);
 119}
 120
 121static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
 122{
 123        struct object *object;
 124
 125        object = parse_object(sha1);
 126        if (!object)
 127                die("bad object %s", name);
 128        object->flags |= flags;
 129        return object;
 130}
 131
 132static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
 133{
 134        unsigned long flags = object->flags;
 135
 136        /*
 137         * Tag object? Look what it points to..
 138         */
 139        while (object->type == OBJ_TAG) {
 140                struct tag *tag = (struct tag *) object;
 141                if (revs->tag_objects && !(flags & UNINTERESTING))
 142                        add_pending_object(revs, object, tag->tag);
 143                object = parse_object(tag->tagged->sha1);
 144                if (!object)
 145                        die("bad object %s", sha1_to_hex(tag->tagged->sha1));
 146        }
 147
 148        /*
 149         * Commit object? Just return it, we'll do all the complex
 150         * reachability crud.
 151         */
 152        if (object->type == OBJ_COMMIT) {
 153                struct commit *commit = (struct commit *)object;
 154                if (parse_commit(commit) < 0)
 155                        die("unable to parse commit %s", name);
 156                if (flags & UNINTERESTING) {
 157                        commit->object.flags |= UNINTERESTING;
 158                        mark_parents_uninteresting(commit);
 159                        revs->limited = 1;
 160                }
 161                return commit;
 162        }
 163
 164        /*
 165         * Tree object? Either mark it uniniteresting, or add it
 166         * to the list of objects to look at later..
 167         */
 168        if (object->type == OBJ_TREE) {
 169                struct tree *tree = (struct tree *)object;
 170                if (!revs->tree_objects)
 171                        return NULL;
 172                if (flags & UNINTERESTING) {
 173                        mark_tree_uninteresting(tree);
 174                        return NULL;
 175                }
 176                add_pending_object(revs, object, "");
 177                return NULL;
 178        }
 179
 180        /*
 181         * Blob object? You know the drill by now..
 182         */
 183        if (object->type == OBJ_BLOB) {
 184                struct blob *blob = (struct blob *)object;
 185                if (!revs->blob_objects)
 186                        return NULL;
 187                if (flags & UNINTERESTING) {
 188                        mark_blob_uninteresting(blob);
 189                        return NULL;
 190                }
 191                add_pending_object(revs, object, "");
 192                return NULL;
 193        }
 194        die("%s is unknown object", name);
 195}
 196
 197static int everybody_uninteresting(struct commit_list *orig)
 198{
 199        struct commit_list *list = orig;
 200        while (list) {
 201                struct commit *commit = list->item;
 202                list = list->next;
 203                if (commit->object.flags & UNINTERESTING)
 204                        continue;
 205                return 0;
 206        }
 207        return 1;
 208}
 209
 210static int tree_difference = REV_TREE_SAME;
 211
 212static void file_add_remove(struct diff_options *options,
 213                    int addremove, unsigned mode,
 214                    const unsigned char *sha1,
 215                    const char *base, const char *path)
 216{
 217        int diff = REV_TREE_DIFFERENT;
 218
 219        /*
 220         * Is it an add of a new file? It means that the old tree
 221         * didn't have it at all, so we will turn "REV_TREE_SAME" ->
 222         * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
 223         * (and if it already was "REV_TREE_NEW", we'll keep it
 224         * "REV_TREE_NEW" of course).
 225         */
 226        if (addremove == '+') {
 227                diff = tree_difference;
 228                if (diff != REV_TREE_SAME)
 229                        return;
 230                diff = REV_TREE_NEW;
 231        }
 232        tree_difference = diff;
 233}
 234
 235static void file_change(struct diff_options *options,
 236                 unsigned old_mode, unsigned new_mode,
 237                 const unsigned char *old_sha1,
 238                 const unsigned char *new_sha1,
 239                 const char *base, const char *path)
 240{
 241        tree_difference = REV_TREE_DIFFERENT;
 242}
 243
 244int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
 245{
 246        if (!t1)
 247                return REV_TREE_NEW;
 248        if (!t2)
 249                return REV_TREE_DIFFERENT;
 250        tree_difference = REV_TREE_SAME;
 251        if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
 252                           &revs->pruning) < 0)
 253                return REV_TREE_DIFFERENT;
 254        return tree_difference;
 255}
 256
 257int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
 258{
 259        int retval;
 260        void *tree;
 261        struct tree_desc empty, real;
 262
 263        if (!t1)
 264                return 0;
 265
 266        tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
 267        if (!tree)
 268                return 0;
 269        real.buf = tree;
 270
 271        empty.buf = "";
 272        empty.size = 0;
 273
 274        tree_difference = 0;
 275        retval = diff_tree(&empty, &real, "", &revs->pruning);
 276        free(tree);
 277
 278        return retval >= 0 && !tree_difference;
 279}
 280
 281static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 282{
 283        struct commit_list **pp, *parent;
 284        int tree_changed = 0, tree_same = 0;
 285
 286        if (!commit->tree)
 287                return;
 288
 289        if (!commit->parents) {
 290                if (!rev_same_tree_as_empty(revs, commit->tree))
 291                        commit->object.flags |= TREECHANGE;
 292                return;
 293        }
 294
 295        pp = &commit->parents;
 296        while ((parent = *pp) != NULL) {
 297                struct commit *p = parent->item;
 298
 299                parse_commit(p);
 300                switch (rev_compare_tree(revs, p->tree, commit->tree)) {
 301                case REV_TREE_SAME:
 302                        tree_same = 1;
 303                        if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
 304                                /* Even if a merge with an uninteresting
 305                                 * side branch brought the entire change
 306                                 * we are interested in, we do not want
 307                                 * to lose the other branches of this
 308                                 * merge, so we just keep going.
 309                                 */
 310                                pp = &parent->next;
 311                                continue;
 312                        }
 313                        parent->next = NULL;
 314                        commit->parents = parent;
 315                        return;
 316
 317                case REV_TREE_NEW:
 318                        if (revs->remove_empty_trees &&
 319                            rev_same_tree_as_empty(revs, p->tree)) {
 320                                /* We are adding all the specified
 321                                 * paths from this parent, so the
 322                                 * history beyond this parent is not
 323                                 * interesting.  Remove its parents
 324                                 * (they are grandparents for us).
 325                                 * IOW, we pretend this parent is a
 326                                 * "root" commit.
 327                                 */
 328                                parse_commit(p);
 329                                p->parents = NULL;
 330                        }
 331                /* fallthrough */
 332                case REV_TREE_DIFFERENT:
 333                        tree_changed = 1;
 334                        pp = &parent->next;
 335                        continue;
 336                }
 337                die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
 338        }
 339        if (tree_changed && !tree_same)
 340                commit->object.flags |= TREECHANGE;
 341}
 342
 343static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
 344{
 345        struct commit_list *parent = commit->parents;
 346        unsigned left_flag;
 347
 348        if (commit->object.flags & ADDED)
 349                return;
 350        commit->object.flags |= ADDED;
 351
 352        /*
 353         * If the commit is uninteresting, don't try to
 354         * prune parents - we want the maximal uninteresting
 355         * set.
 356         *
 357         * Normally we haven't parsed the parent
 358         * yet, so we won't have a parent of a parent
 359         * here. However, it may turn out that we've
 360         * reached this commit some other way (where it
 361         * wasn't uninteresting), in which case we need
 362         * to mark its parents recursively too..
 363         */
 364        if (commit->object.flags & UNINTERESTING) {
 365                while (parent) {
 366                        struct commit *p = parent->item;
 367                        parent = parent->next;
 368                        parse_commit(p);
 369                        p->object.flags |= UNINTERESTING;
 370                        if (p->parents)
 371                                mark_parents_uninteresting(p);
 372                        if (p->object.flags & SEEN)
 373                                continue;
 374                        p->object.flags |= SEEN;
 375                        insert_by_date(p, list);
 376                }
 377                return;
 378        }
 379
 380        /*
 381         * Ok, the commit wasn't uninteresting. Try to
 382         * simplify the commit history and find the parent
 383         * that has no differences in the path set if one exists.
 384         */
 385        if (revs->prune_fn)
 386                revs->prune_fn(revs, commit);
 387
 388        if (revs->no_walk)
 389                return;
 390
 391        left_flag = (commit->object.flags & SYMMETRIC_LEFT);
 392        parent = commit->parents;
 393        while (parent) {
 394                struct commit *p = parent->item;
 395
 396                parent = parent->next;
 397
 398                parse_commit(p);
 399                p->object.flags |= left_flag;
 400                if (p->object.flags & SEEN)
 401                        continue;
 402                p->object.flags |= SEEN;
 403                insert_by_date(p, list);
 404        }
 405}
 406
 407static void limit_list(struct rev_info *revs)
 408{
 409        struct commit_list *list = revs->commits;
 410        struct commit_list *newlist = NULL;
 411        struct commit_list **p = &newlist;
 412
 413        while (list) {
 414                struct commit_list *entry = list;
 415                struct commit *commit = list->item;
 416                struct object *obj = &commit->object;
 417
 418                list = list->next;
 419                free(entry);
 420
 421                if (revs->max_age != -1 && (commit->date < revs->max_age))
 422                        obj->flags |= UNINTERESTING;
 423                add_parents_to_list(revs, commit, &list);
 424                if (obj->flags & UNINTERESTING) {
 425                        mark_parents_uninteresting(commit);
 426                        if (everybody_uninteresting(list))
 427                                break;
 428                        continue;
 429                }
 430                if (revs->min_age != -1 && (commit->date > revs->min_age))
 431                        continue;
 432                p = &commit_list_insert(commit, p)->next;
 433        }
 434        if (revs->boundary) {
 435                /* mark the ones that are on the result list first */
 436                for (list = newlist; list; list = list->next) {
 437                        struct commit *commit = list->item;
 438                        commit->object.flags |= TMP_MARK;
 439                }
 440                for (list = newlist; list; list = list->next) {
 441                        struct commit *commit = list->item;
 442                        struct object *obj = &commit->object;
 443                        struct commit_list *parent;
 444                        if (obj->flags & UNINTERESTING)
 445                                continue;
 446                        for (parent = commit->parents;
 447                             parent;
 448                             parent = parent->next) {
 449                                struct commit *pcommit = parent->item;
 450                                if (!(pcommit->object.flags & UNINTERESTING))
 451                                        continue;
 452                                pcommit->object.flags |= BOUNDARY;
 453                                if (pcommit->object.flags & TMP_MARK)
 454                                        continue;
 455                                pcommit->object.flags |= TMP_MARK;
 456                                p = &commit_list_insert(pcommit, p)->next;
 457                        }
 458                }
 459                for (list = newlist; list; list = list->next) {
 460                        struct commit *commit = list->item;
 461                        commit->object.flags &= ~TMP_MARK;
 462                }
 463        }
 464        revs->commits = newlist;
 465}
 466
 467struct all_refs_cb {
 468        int all_flags;
 469        int warned_bad_reflog;
 470        struct rev_info *all_revs;
 471        const char *name_for_errormsg;
 472};
 473
 474static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 475{
 476        struct all_refs_cb *cb = cb_data;
 477        struct object *object = get_reference(cb->all_revs, path, sha1,
 478                                              cb->all_flags);
 479        add_pending_object(cb->all_revs, object, "");
 480        return 0;
 481}
 482
 483static void handle_all(struct rev_info *revs, unsigned flags)
 484{
 485        struct all_refs_cb cb;
 486        cb.all_revs = revs;
 487        cb.all_flags = flags;
 488        for_each_ref(handle_one_ref, &cb);
 489}
 490
 491static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
 492{
 493        struct all_refs_cb *cb = cb_data;
 494        if (!is_null_sha1(sha1)) {
 495                struct object *o = parse_object(sha1);
 496                if (o) {
 497                        o->flags |= cb->all_flags;
 498                        add_pending_object(cb->all_revs, o, "");
 499                }
 500                else if (!cb->warned_bad_reflog) {
 501                        warn("reflog of '%s' references pruned commits",
 502                                cb->name_for_errormsg);
 503                        cb->warned_bad_reflog = 1;
 504                }
 505        }
 506}
 507
 508static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, char *detail, void *cb_data)
 509{
 510        handle_one_reflog_commit(osha1, cb_data);
 511        handle_one_reflog_commit(nsha1, cb_data);
 512        return 0;
 513}
 514
 515static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 516{
 517        struct all_refs_cb *cb = cb_data;
 518        cb->warned_bad_reflog = 0;
 519        cb->name_for_errormsg = path;
 520        for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
 521        return 0;
 522}
 523
 524static void handle_reflog(struct rev_info *revs, unsigned flags)
 525{
 526        struct all_refs_cb cb;
 527        cb.all_revs = revs;
 528        cb.all_flags = flags;
 529        for_each_ref(handle_one_reflog, &cb);
 530}
 531
 532static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
 533{
 534        unsigned char sha1[20];
 535        struct object *it;
 536        struct commit *commit;
 537        struct commit_list *parents;
 538
 539        if (*arg == '^') {
 540                flags ^= UNINTERESTING;
 541                arg++;
 542        }
 543        if (get_sha1(arg, sha1))
 544                return 0;
 545        while (1) {
 546                it = get_reference(revs, arg, sha1, 0);
 547                if (it->type != OBJ_TAG)
 548                        break;
 549                hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
 550        }
 551        if (it->type != OBJ_COMMIT)
 552                return 0;
 553        commit = (struct commit *)it;
 554        for (parents = commit->parents; parents; parents = parents->next) {
 555                it = &parents->item->object;
 556                it->flags |= flags;
 557                add_pending_object(revs, it, arg);
 558        }
 559        return 1;
 560}
 561
 562void init_revisions(struct rev_info *revs, const char *prefix)
 563{
 564        memset(revs, 0, sizeof(*revs));
 565
 566        revs->abbrev = DEFAULT_ABBREV;
 567        revs->ignore_merges = 1;
 568        revs->simplify_history = 1;
 569        revs->pruning.recursive = 1;
 570        revs->pruning.add_remove = file_add_remove;
 571        revs->pruning.change = file_change;
 572        revs->lifo = 1;
 573        revs->dense = 1;
 574        revs->prefix = prefix;
 575        revs->max_age = -1;
 576        revs->min_age = -1;
 577        revs->skip_count = -1;
 578        revs->max_count = -1;
 579
 580        revs->prune_fn = NULL;
 581        revs->prune_data = NULL;
 582
 583        revs->topo_setter = topo_sort_default_setter;
 584        revs->topo_getter = topo_sort_default_getter;
 585
 586        revs->commit_format = CMIT_FMT_DEFAULT;
 587
 588        diff_setup(&revs->diffopt);
 589}
 590
 591static void add_pending_commit_list(struct rev_info *revs,
 592                                    struct commit_list *commit_list,
 593                                    unsigned int flags)
 594{
 595        while (commit_list) {
 596                struct object *object = &commit_list->item->object;
 597                object->flags |= flags;
 598                add_pending_object(revs, object, sha1_to_hex(object->sha1));
 599                commit_list = commit_list->next;
 600        }
 601}
 602
 603static void prepare_show_merge(struct rev_info *revs)
 604{
 605        struct commit_list *bases;
 606        struct commit *head, *other;
 607        unsigned char sha1[20];
 608        const char **prune = NULL;
 609        int i, prune_num = 1; /* counting terminating NULL */
 610
 611        if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
 612                die("--merge without HEAD?");
 613        if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
 614                die("--merge without MERGE_HEAD?");
 615        add_pending_object(revs, &head->object, "HEAD");
 616        add_pending_object(revs, &other->object, "MERGE_HEAD");
 617        bases = get_merge_bases(head, other, 1);
 618        while (bases) {
 619                struct commit *it = bases->item;
 620                struct commit_list *n = bases->next;
 621                free(bases);
 622                bases = n;
 623                it->object.flags |= UNINTERESTING;
 624                add_pending_object(revs, &it->object, "(merge-base)");
 625        }
 626
 627        if (!active_nr)
 628                read_cache();
 629        for (i = 0; i < active_nr; i++) {
 630                struct cache_entry *ce = active_cache[i];
 631                if (!ce_stage(ce))
 632                        continue;
 633                if (ce_path_match(ce, revs->prune_data)) {
 634                        prune_num++;
 635                        prune = xrealloc(prune, sizeof(*prune) * prune_num);
 636                        prune[prune_num-2] = ce->name;
 637                        prune[prune_num-1] = NULL;
 638                }
 639                while ((i+1 < active_nr) &&
 640                       ce_same_name(ce, active_cache[i+1]))
 641                        i++;
 642        }
 643        revs->prune_data = prune;
 644}
 645
 646int handle_revision_arg(const char *arg, struct rev_info *revs,
 647                        int flags,
 648                        int cant_be_filename)
 649{
 650        char *dotdot;
 651        struct object *object;
 652        unsigned char sha1[20];
 653        int local_flags;
 654
 655        dotdot = strstr(arg, "..");
 656        if (dotdot) {
 657                unsigned char from_sha1[20];
 658                const char *next = dotdot + 2;
 659                const char *this = arg;
 660                int symmetric = *next == '.';
 661                unsigned int flags_exclude = flags ^ UNINTERESTING;
 662
 663                *dotdot = 0;
 664                next += symmetric;
 665
 666                if (!*next)
 667                        next = "HEAD";
 668                if (dotdot == arg)
 669                        this = "HEAD";
 670                if (!get_sha1(this, from_sha1) &&
 671                    !get_sha1(next, sha1)) {
 672                        struct commit *a, *b;
 673                        struct commit_list *exclude;
 674
 675                        a = lookup_commit_reference(from_sha1);
 676                        b = lookup_commit_reference(sha1);
 677                        if (!a || !b) {
 678                                die(symmetric ?
 679                                    "Invalid symmetric difference expression %s...%s" :
 680                                    "Invalid revision range %s..%s",
 681                                    arg, next);
 682                        }
 683
 684                        if (!cant_be_filename) {
 685                                *dotdot = '.';
 686                                verify_non_filename(revs->prefix, arg);
 687                        }
 688
 689                        if (symmetric) {
 690                                exclude = get_merge_bases(a, b, 1);
 691                                add_pending_commit_list(revs, exclude,
 692                                                        flags_exclude);
 693                                free_commit_list(exclude);
 694                                a->object.flags |= flags | SYMMETRIC_LEFT;
 695                        } else
 696                                a->object.flags |= flags_exclude;
 697                        b->object.flags |= flags;
 698                        add_pending_object(revs, &a->object, this);
 699                        add_pending_object(revs, &b->object, next);
 700                        return 0;
 701                }
 702                *dotdot = '.';
 703        }
 704        dotdot = strstr(arg, "^@");
 705        if (dotdot && !dotdot[2]) {
 706                *dotdot = 0;
 707                if (add_parents_only(revs, arg, flags))
 708                        return 0;
 709                *dotdot = '^';
 710        }
 711        dotdot = strstr(arg, "^!");
 712        if (dotdot && !dotdot[2]) {
 713                *dotdot = 0;
 714                if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
 715                        *dotdot = '^';
 716        }
 717
 718        local_flags = 0;
 719        if (*arg == '^') {
 720                local_flags = UNINTERESTING;
 721                arg++;
 722        }
 723        if (get_sha1(arg, sha1))
 724                return -1;
 725        if (!cant_be_filename)
 726                verify_non_filename(revs->prefix, arg);
 727        object = get_reference(revs, arg, sha1, flags ^ local_flags);
 728        add_pending_object(revs, object, arg);
 729        return 0;
 730}
 731
 732static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
 733{
 734        if (!revs->grep_filter) {
 735                struct grep_opt *opt = xcalloc(1, sizeof(*opt));
 736                opt->status_only = 1;
 737                opt->pattern_tail = &(opt->pattern_list);
 738                opt->regflags = REG_NEWLINE;
 739                revs->grep_filter = opt;
 740        }
 741        append_grep_pattern(revs->grep_filter, ptn,
 742                            "command line", 0, what);
 743}
 744
 745static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
 746{
 747        char *pat;
 748        const char *prefix;
 749        int patlen, fldlen;
 750
 751        fldlen = strlen(field);
 752        patlen = strlen(pattern);
 753        pat = xmalloc(patlen + fldlen + 10);
 754        prefix = ".*";
 755        if (*pattern == '^') {
 756                prefix = "";
 757                pattern++;
 758        }
 759        sprintf(pat, "^%s %s%s", field, prefix, pattern);
 760        add_grep(revs, pat, GREP_PATTERN_HEAD);
 761}
 762
 763static void add_message_grep(struct rev_info *revs, const char *pattern)
 764{
 765        add_grep(revs, pattern, GREP_PATTERN_BODY);
 766}
 767
 768static void add_ignore_packed(struct rev_info *revs, const char *name)
 769{
 770        int num = ++revs->num_ignore_packed;
 771
 772        revs->ignore_packed = xrealloc(revs->ignore_packed,
 773                                       sizeof(const char **) * (num + 1));
 774        revs->ignore_packed[num-1] = name;
 775        revs->ignore_packed[num] = NULL;
 776}
 777
 778/*
 779 * Parse revision information, filling in the "rev_info" structure,
 780 * and removing the used arguments from the argument list.
 781 *
 782 * Returns the number of arguments left that weren't recognized
 783 * (which are also moved to the head of the argument list)
 784 */
 785int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
 786{
 787        int i, flags, seen_dashdash, show_merge;
 788        const char **unrecognized = argv + 1;
 789        int left = 1;
 790        int all_match = 0;
 791
 792        /* First, search for "--" */
 793        seen_dashdash = 0;
 794        for (i = 1; i < argc; i++) {
 795                const char *arg = argv[i];
 796                if (strcmp(arg, "--"))
 797                        continue;
 798                argv[i] = NULL;
 799                argc = i;
 800                revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
 801                seen_dashdash = 1;
 802                break;
 803        }
 804
 805        flags = show_merge = 0;
 806        for (i = 1; i < argc; i++) {
 807                const char *arg = argv[i];
 808                if (*arg == '-') {
 809                        int opts;
 810                        if (!strncmp(arg, "--max-count=", 12)) {
 811                                revs->max_count = atoi(arg + 12);
 812                                continue;
 813                        }
 814                        if (!strncmp(arg, "--skip=", 7)) {
 815                                revs->skip_count = atoi(arg + 7);
 816                                continue;
 817                        }
 818                        /* accept -<digit>, like traditional "head" */
 819                        if ((*arg == '-') && isdigit(arg[1])) {
 820                                revs->max_count = atoi(arg + 1);
 821                                continue;
 822                        }
 823                        if (!strcmp(arg, "-n")) {
 824                                if (argc <= i + 1)
 825                                        die("-n requires an argument");
 826                                revs->max_count = atoi(argv[++i]);
 827                                continue;
 828                        }
 829                        if (!strncmp(arg,"-n",2)) {
 830                                revs->max_count = atoi(arg + 2);
 831                                continue;
 832                        }
 833                        if (!strncmp(arg, "--max-age=", 10)) {
 834                                revs->max_age = atoi(arg + 10);
 835                                continue;
 836                        }
 837                        if (!strncmp(arg, "--since=", 8)) {
 838                                revs->max_age = approxidate(arg + 8);
 839                                continue;
 840                        }
 841                        if (!strncmp(arg, "--after=", 8)) {
 842                                revs->max_age = approxidate(arg + 8);
 843                                continue;
 844                        }
 845                        if (!strncmp(arg, "--min-age=", 10)) {
 846                                revs->min_age = atoi(arg + 10);
 847                                continue;
 848                        }
 849                        if (!strncmp(arg, "--before=", 9)) {
 850                                revs->min_age = approxidate(arg + 9);
 851                                continue;
 852                        }
 853                        if (!strncmp(arg, "--until=", 8)) {
 854                                revs->min_age = approxidate(arg + 8);
 855                                continue;
 856                        }
 857                        if (!strcmp(arg, "--all")) {
 858                                handle_all(revs, flags);
 859                                continue;
 860                        }
 861                        if (!strcmp(arg, "--reflog")) {
 862                                handle_reflog(revs, flags);
 863                                continue;
 864                        }
 865                        if (!strcmp(arg, "--not")) {
 866                                flags ^= UNINTERESTING;
 867                                continue;
 868                        }
 869                        if (!strcmp(arg, "--default")) {
 870                                if (++i >= argc)
 871                                        die("bad --default argument");
 872                                def = argv[i];
 873                                continue;
 874                        }
 875                        if (!strcmp(arg, "--merge")) {
 876                                show_merge = 1;
 877                                continue;
 878                        }
 879                        if (!strcmp(arg, "--topo-order")) {
 880                                revs->topo_order = 1;
 881                                continue;
 882                        }
 883                        if (!strcmp(arg, "--date-order")) {
 884                                revs->lifo = 0;
 885                                revs->topo_order = 1;
 886                                continue;
 887                        }
 888                        if (!strcmp(arg, "--parents")) {
 889                                revs->parents = 1;
 890                                continue;
 891                        }
 892                        if (!strcmp(arg, "--dense")) {
 893                                revs->dense = 1;
 894                                continue;
 895                        }
 896                        if (!strcmp(arg, "--sparse")) {
 897                                revs->dense = 0;
 898                                continue;
 899                        }
 900                        if (!strcmp(arg, "--remove-empty")) {
 901                                revs->remove_empty_trees = 1;
 902                                continue;
 903                        }
 904                        if (!strcmp(arg, "--no-merges")) {
 905                                revs->no_merges = 1;
 906                                continue;
 907                        }
 908                        if (!strcmp(arg, "--boundary")) {
 909                                revs->boundary = 1;
 910                                continue;
 911                        }
 912                        if (!strcmp(arg, "--left-right")) {
 913                                revs->left_right = 1;
 914                                continue;
 915                        }
 916                        if (!strcmp(arg, "--objects")) {
 917                                revs->tag_objects = 1;
 918                                revs->tree_objects = 1;
 919                                revs->blob_objects = 1;
 920                                continue;
 921                        }
 922                        if (!strcmp(arg, "--objects-edge")) {
 923                                revs->tag_objects = 1;
 924                                revs->tree_objects = 1;
 925                                revs->blob_objects = 1;
 926                                revs->edge_hint = 1;
 927                                continue;
 928                        }
 929                        if (!strcmp(arg, "--unpacked")) {
 930                                revs->unpacked = 1;
 931                                free(revs->ignore_packed);
 932                                revs->ignore_packed = NULL;
 933                                revs->num_ignore_packed = 0;
 934                                continue;
 935                        }
 936                        if (!strncmp(arg, "--unpacked=", 11)) {
 937                                revs->unpacked = 1;
 938                                add_ignore_packed(revs, arg+11);
 939                                continue;
 940                        }
 941                        if (!strcmp(arg, "-r")) {
 942                                revs->diff = 1;
 943                                revs->diffopt.recursive = 1;
 944                                continue;
 945                        }
 946                        if (!strcmp(arg, "-t")) {
 947                                revs->diff = 1;
 948                                revs->diffopt.recursive = 1;
 949                                revs->diffopt.tree_in_recursive = 1;
 950                                continue;
 951                        }
 952                        if (!strcmp(arg, "-m")) {
 953                                revs->ignore_merges = 0;
 954                                continue;
 955                        }
 956                        if (!strcmp(arg, "-c")) {
 957                                revs->diff = 1;
 958                                revs->dense_combined_merges = 0;
 959                                revs->combine_merges = 1;
 960                                continue;
 961                        }
 962                        if (!strcmp(arg, "--cc")) {
 963                                revs->diff = 1;
 964                                revs->dense_combined_merges = 1;
 965                                revs->combine_merges = 1;
 966                                continue;
 967                        }
 968                        if (!strcmp(arg, "-v")) {
 969                                revs->verbose_header = 1;
 970                                continue;
 971                        }
 972                        if (!strncmp(arg, "--pretty", 8)) {
 973                                revs->verbose_header = 1;
 974                                revs->commit_format = get_commit_format(arg+8);
 975                                continue;
 976                        }
 977                        if (!strcmp(arg, "--root")) {
 978                                revs->show_root_diff = 1;
 979                                continue;
 980                        }
 981                        if (!strcmp(arg, "--no-commit-id")) {
 982                                revs->no_commit_id = 1;
 983                                continue;
 984                        }
 985                        if (!strcmp(arg, "--always")) {
 986                                revs->always_show_header = 1;
 987                                continue;
 988                        }
 989                        if (!strcmp(arg, "--no-abbrev")) {
 990                                revs->abbrev = 0;
 991                                continue;
 992                        }
 993                        if (!strcmp(arg, "--abbrev")) {
 994                                revs->abbrev = DEFAULT_ABBREV;
 995                                continue;
 996                        }
 997                        if (!strncmp(arg, "--abbrev=", 9)) {
 998                                revs->abbrev = strtoul(arg + 9, NULL, 10);
 999                                if (revs->abbrev < MINIMUM_ABBREV)
1000                                        revs->abbrev = MINIMUM_ABBREV;
1001                                else if (revs->abbrev > 40)
1002                                        revs->abbrev = 40;
1003                                continue;
1004                        }
1005                        if (!strcmp(arg, "--abbrev-commit")) {
1006                                revs->abbrev_commit = 1;
1007                                continue;
1008                        }
1009                        if (!strcmp(arg, "--full-diff")) {
1010                                revs->diff = 1;
1011                                revs->full_diff = 1;
1012                                continue;
1013                        }
1014                        if (!strcmp(arg, "--full-history")) {
1015                                revs->simplify_history = 0;
1016                                continue;
1017                        }
1018                        if (!strcmp(arg, "--relative-date")) {
1019                                revs->relative_date = 1;
1020                                continue;
1021                        }
1022
1023                        /*
1024                         * Grepping the commit log
1025                         */
1026                        if (!strncmp(arg, "--author=", 9)) {
1027                                add_header_grep(revs, "author", arg+9);
1028                                continue;
1029                        }
1030                        if (!strncmp(arg, "--committer=", 12)) {
1031                                add_header_grep(revs, "committer", arg+12);
1032                                continue;
1033                        }
1034                        if (!strncmp(arg, "--grep=", 7)) {
1035                                add_message_grep(revs, arg+7);
1036                                continue;
1037                        }
1038                        if (!strcmp(arg, "--all-match")) {
1039                                all_match = 1;
1040                                continue;
1041                        }
1042                        if (!strncmp(arg, "--encoding=", 11)) {
1043                                arg += 11;
1044                                if (strcmp(arg, "none"))
1045                                        git_log_output_encoding = strdup(arg);
1046                                else
1047                                        git_log_output_encoding = "";
1048                                continue;
1049                        }
1050
1051                        opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
1052                        if (opts > 0) {
1053                                revs->diff = 1;
1054                                i += opts - 1;
1055                                continue;
1056                        }
1057                        *unrecognized++ = arg;
1058                        left++;
1059                        continue;
1060                }
1061
1062                if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1063                        int j;
1064                        if (seen_dashdash || *arg == '^')
1065                                die("bad revision '%s'", arg);
1066
1067                        /* If we didn't have a "--":
1068                         * (1) all filenames must exist;
1069                         * (2) all rev-args must not be interpretable
1070                         *     as a valid filename.
1071                         * but the latter we have checked in the main loop.
1072                         */
1073                        for (j = i; j < argc; j++)
1074                                verify_filename(revs->prefix, argv[j]);
1075
1076                        revs->prune_data = get_pathspec(revs->prefix,
1077                                                        argv + i);
1078                        break;
1079                }
1080        }
1081
1082        if (show_merge)
1083                prepare_show_merge(revs);
1084        if (def && !revs->pending.nr) {
1085                unsigned char sha1[20];
1086                struct object *object;
1087                if (get_sha1(def, sha1))
1088                        die("bad default revision '%s'", def);
1089                object = get_reference(revs, def, sha1, 0);
1090                add_pending_object(revs, object, def);
1091        }
1092
1093        if (revs->topo_order)
1094                revs->limited = 1;
1095
1096        if (revs->prune_data) {
1097                diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1098                revs->prune_fn = try_to_simplify_commit;
1099                if (!revs->full_diff)
1100                        diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1101        }
1102        if (revs->combine_merges) {
1103                revs->ignore_merges = 0;
1104                if (revs->dense_combined_merges && !revs->diffopt.output_format)
1105                        revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1106        }
1107        revs->diffopt.abbrev = revs->abbrev;
1108        if (diff_setup_done(&revs->diffopt) < 0)
1109                die("diff_setup_done failed");
1110
1111        if (revs->grep_filter) {
1112                revs->grep_filter->all_match = all_match;
1113                compile_grep_patterns(revs->grep_filter);
1114        }
1115
1116        return left;
1117}
1118
1119void prepare_revision_walk(struct rev_info *revs)
1120{
1121        int nr = revs->pending.nr;
1122        struct object_array_entry *list = revs->pending.objects;
1123
1124        revs->pending.nr = 0;
1125        revs->pending.alloc = 0;
1126        revs->pending.objects = NULL;
1127        while (--nr >= 0) {
1128                struct commit *commit = handle_commit(revs, list->item, list->name);
1129                if (commit) {
1130                        if (!(commit->object.flags & SEEN)) {
1131                                commit->object.flags |= SEEN;
1132                                insert_by_date(commit, &revs->commits);
1133                        }
1134                }
1135                list++;
1136        }
1137
1138        if (revs->no_walk)
1139                return;
1140        if (revs->limited)
1141                limit_list(revs);
1142        if (revs->topo_order)
1143                sort_in_topological_order_fn(&revs->commits, revs->lifo,
1144                                             revs->topo_setter,
1145                                             revs->topo_getter);
1146}
1147
1148static int rewrite_one(struct rev_info *revs, struct commit **pp)
1149{
1150        for (;;) {
1151                struct commit *p = *pp;
1152                if (!revs->limited)
1153                        add_parents_to_list(revs, p, &revs->commits);
1154                if (p->parents && p->parents->next)
1155                        return 0;
1156                if (p->object.flags & (TREECHANGE | UNINTERESTING))
1157                        return 0;
1158                if (!p->parents)
1159                        return -1;
1160                *pp = p->parents->item;
1161        }
1162}
1163
1164static void rewrite_parents(struct rev_info *revs, struct commit *commit)
1165{
1166        struct commit_list **pp = &commit->parents;
1167        while (*pp) {
1168                struct commit_list *parent = *pp;
1169                if (rewrite_one(revs, &parent->item) < 0) {
1170                        *pp = parent->next;
1171                        continue;
1172                }
1173                pp = &parent->next;
1174        }
1175}
1176
1177static void mark_boundary_to_show(struct commit *commit)
1178{
1179        struct commit_list *p = commit->parents;
1180        while (p) {
1181                commit = p->item;
1182                p = p->next;
1183                if (commit->object.flags & BOUNDARY)
1184                        commit->object.flags |= BOUNDARY_SHOW;
1185        }
1186}
1187
1188static int commit_match(struct commit *commit, struct rev_info *opt)
1189{
1190        if (!opt->grep_filter)
1191                return 1;
1192        return grep_buffer(opt->grep_filter,
1193                           NULL, /* we say nothing, not even filename */
1194                           commit->buffer, strlen(commit->buffer));
1195}
1196
1197static struct commit *get_revision_1(struct rev_info *revs)
1198{
1199        if (!revs->commits)
1200                return NULL;
1201
1202        do {
1203                struct commit_list *entry = revs->commits;
1204                struct commit *commit = entry->item;
1205
1206                revs->commits = entry->next;
1207                free(entry);
1208
1209                /*
1210                 * If we haven't done the list limiting, we need to look at
1211                 * the parents here. We also need to do the date-based limiting
1212                 * that we'd otherwise have done in limit_list().
1213                 */
1214                if (!revs->limited) {
1215                        if (revs->max_age != -1 &&
1216                            (commit->date < revs->max_age))
1217                                continue;
1218                        add_parents_to_list(revs, commit, &revs->commits);
1219                }
1220                if (commit->object.flags & SHOWN)
1221                        continue;
1222
1223                if (revs->unpacked && has_sha1_pack(commit->object.sha1,
1224                                                    revs->ignore_packed))
1225                    continue;
1226
1227                /* We want to show boundary commits only when their
1228                 * children are shown.  When path-limiter is in effect,
1229                 * rewrite_parents() drops some commits from getting shown,
1230                 * and there is no point showing boundary parents that
1231                 * are not shown.  After rewrite_parents() rewrites the
1232                 * parents of a commit that is shown, we mark the boundary
1233                 * parents with BOUNDARY_SHOW.
1234                 */
1235                if (commit->object.flags & BOUNDARY_SHOW) {
1236                        commit->object.flags |= SHOWN;
1237                        return commit;
1238                }
1239                if (commit->object.flags & UNINTERESTING)
1240                        continue;
1241                if (revs->min_age != -1 && (commit->date > revs->min_age))
1242                        continue;
1243                if (revs->no_merges &&
1244                    commit->parents && commit->parents->next)
1245                        continue;
1246                if (!commit_match(commit, revs))
1247                        continue;
1248                if (revs->prune_fn && revs->dense) {
1249                        /* Commit without changes? */
1250                        if (!(commit->object.flags & TREECHANGE)) {
1251                                /* drop merges unless we want parenthood */
1252                                if (!revs->parents)
1253                                        continue;
1254                                /* non-merge - always ignore it */
1255                                if (!commit->parents || !commit->parents->next)
1256                                        continue;
1257                        }
1258                        if (revs->parents)
1259                                rewrite_parents(revs, commit);
1260                }
1261                if (revs->boundary)
1262                        mark_boundary_to_show(commit);
1263                commit->object.flags |= SHOWN;
1264                return commit;
1265        } while (revs->commits);
1266        return NULL;
1267}
1268
1269struct commit *get_revision(struct rev_info *revs)
1270{
1271        struct commit *c = NULL;
1272
1273        if (0 < revs->skip_count) {
1274                while ((c = get_revision_1(revs)) != NULL) {
1275                        if (revs->skip_count-- <= 0)
1276                                break;
1277                }
1278        }
1279
1280        /* Check the max_count ... */
1281        switch (revs->max_count) {
1282        case -1:
1283                break;
1284        case 0:
1285                return NULL;
1286        default:
1287                revs->max_count--;
1288        }
1289        if (c)
1290                return c;
1291        return get_revision_1(revs);
1292}