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