git.oblomov.eu Git - git/blob - revision.c

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