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
  10 static char *path_name(struct name_path *path, const char *name)
  11 {
  12         struct name_path *p;
  13         char *n, *m;
  14         int nlen = strlen(name);
  15         int len = nlen + 1;
  16
  17         for (p = path; p; p = p->up) {
  18                 if (p->elem_len)
  19                         len += p->elem_len + 1;
  20         }
  21         n = xmalloc(len);
  22         m = n + len - (nlen + 1);
  23         strcpy(m, name);
  24         for (p = path; p; p = p->up) {
  25                 if (p->elem_len) {
  26                         m -= p->elem_len + 1;
  27                         memcpy(m, p->elem, p->elem_len);
  28                         m[p->elem_len] = '/';
  29                 }
  30         }
  31         return n;
  32 }
  33
  34 struct object_list **add_object(struct object *obj,
  35                                        struct object_list **p,
  36                                        struct name_path *path,
  37                                        const char *name)
  38 {
  39         struct object_list *entry = xmalloc(sizeof(*entry));
  40         entry->item = obj;
  41         entry->next = *p;
  42         entry->name = path_name(path, name);
  43         *p = entry;
  44         return &entry->next;
  45 }
  46
  47 static void mark_blob_uninteresting(struct blob *blob)
  48 {
  49         if (blob->object.flags & UNINTERESTING)
  50                 return;
  51         blob->object.flags |= UNINTERESTING;
  52 }
  53
  54 void mark_tree_uninteresting(struct tree *tree)
  55 {
  56         struct object *obj = &tree->object;
  57         struct tree_entry_list *entry;
  58
  59         if (obj->flags & UNINTERESTING)
  60                 return;
  61         obj->flags |= UNINTERESTING;
  62         if (!has_sha1_file(obj->sha1))
  63                 return;
  64         if (parse_tree(tree) < 0)
  65                 die("bad tree %s", sha1_to_hex(obj->sha1));
  66         entry = tree->entries;
  67         tree->entries = NULL;
  68         while (entry) {
  69                 struct tree_entry_list *next = entry->next;
  70                 if (entry->directory)
  71                         mark_tree_uninteresting(entry->item.tree);
  72                 else
  73                         mark_blob_uninteresting(entry->item.blob);
  74                 free(entry);
  75                 entry = next;
  76         }
  77 }
  78
  79 void mark_parents_uninteresting(struct commit *commit)
  80 {
  81         struct commit_list *parents = commit->parents;
  82
  83         while (parents) {
  84                 struct commit *commit = parents->item;
  85                 if (!(commit->object.flags & UNINTERESTING)) {
  86                         commit->object.flags |= UNINTERESTING;
  87
  88                         /*
  89                          * Normally we haven't parsed the parent
  90                          * yet, so we won't have a parent of a parent
  91                          * here. However, it may turn out that we've
  92                          * reached this commit some other way (where it
  93                          * wasn't uninteresting), in which case we need
  94                          * to mark its parents recursively too..
  95                          */
  96                         if (commit->parents)
  97                                 mark_parents_uninteresting(commit);
  98                 }
  99
 100                 /*
 101                  * A missing commit is ok iff its parent is marked
 102                  * uninteresting.
 103                  *
 104                  * We just mark such a thing parsed, so that when
 105                  * it is popped next time around, we won't be trying
 106                  * to parse it and get an error.
 107                  */
 108                 if (!has_sha1_file(commit->object.sha1))
 109                         commit->object.parsed = 1;
 110                 parents = parents->next;
 111         }
 112 }
 113
 114 static void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
 115 {
 116         add_object(obj, &revs->pending_objects, NULL, name);
 117 }
 118
 119 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
 120 {
 121         struct object *object;
 122
 123         object = parse_object(sha1);
 124         if (!object)
 125                 die("bad object %s", name);
 126         object->flags |= flags;
 127         return object;
 128 }
 129
 130 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
 131 {
 132         unsigned long flags = object->flags;
 133
 134         /*
 135          * Tag object? Look what it points to..
 136          */
 137         while (object->type == tag_type) {
 138                 struct tag *tag = (struct tag *) object;
 139                 if (revs->tag_objects && !(flags & UNINTERESTING))
 140                         add_pending_object(revs, object, tag->tag);
 141                 object = parse_object(tag->tagged->sha1);
 142                 if (!object)
 143                         die("bad object %s", sha1_to_hex(tag->tagged->sha1));
 144         }
 145
 146         /*
 147          * Commit object? Just return it, we'll do all the complex
 148          * reachability crud.
 149          */
 150         if (object->type == commit_type) {
 151                 struct commit *commit = (struct commit *)object;
 152                 if (parse_commit(commit) < 0)
 153                         die("unable to parse commit %s", name);
 154                 if (flags & UNINTERESTING) {
 155                         mark_parents_uninteresting(commit);
 156                         revs->limited = 1;
 157                 }
 158                 return commit;
 159         }
 160
 161         /*
 162          * Tree object? Either mark it uniniteresting, or add it
 163          * to the list of objects to look at later..
 164          */
 165         if (object->type == tree_type) {
 166                 struct tree *tree = (struct tree *)object;
 167                 if (!revs->tree_objects)
 168                         return NULL;
 169                 if (flags & UNINTERESTING) {
 170                         mark_tree_uninteresting(tree);
 171                         return NULL;
 172                 }
 173                 add_pending_object(revs, object, "");
 174                 return NULL;
 175         }
 176
 177         /*
 178          * Blob object? You know the drill by now..
 179          */
 180         if (object->type == blob_type) {
 181                 struct blob *blob = (struct blob *)object;
 182                 if (!revs->blob_objects)
 183                         return NULL;
 184                 if (flags & UNINTERESTING) {
 185                         mark_blob_uninteresting(blob);
 186                         return NULL;
 187                 }
 188                 add_pending_object(revs, object, "");
 189                 return NULL;
 190         }
 191         die("%s is unknown object", name);
 192 }
 193
 194 static int everybody_uninteresting(struct commit_list *orig)
 195 {
 196         struct commit_list *list = orig;
 197         while (list) {
 198                 struct commit *commit = list->item;
 199                 list = list->next;
 200                 if (commit->object.flags & UNINTERESTING)
 201                         continue;
 202                 return 0;
 203         }
 204         return 1;
 205 }
 206
 207 static int tree_difference = REV_TREE_SAME;
 208
 209 static void file_add_remove(struct diff_options *options,
 210                     int addremove, unsigned mode,
 211                     const unsigned char *sha1,
 212                     const char *base, const char *path)
 213 {
 214         int diff = REV_TREE_DIFFERENT;
 215
 216         /*
 217          * Is it an add of a new file? It means that the old tree
 218          * didn't have it at all, so we will turn "REV_TREE_SAME" ->
 219          * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
 220          * (and if it already was "REV_TREE_NEW", we'll keep it
 221          * "REV_TREE_NEW" of course).
 222          */
 223         if (addremove == '+') {
 224                 diff = tree_difference;
 225                 if (diff != REV_TREE_SAME)
 226                         return;
 227                 diff = REV_TREE_NEW;
 228         }
 229         tree_difference = diff;
 230 }
 231
 232 static void file_change(struct diff_options *options,
 233                  unsigned old_mode, unsigned new_mode,
 234                  const unsigned char *old_sha1,
 235                  const unsigned char *new_sha1,
 236                  const char *base, const char *path)
 237 {
 238         tree_difference = REV_TREE_DIFFERENT;
 239 }
 240
 241 int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
 242 {
 243         if (!t1)
 244                 return REV_TREE_NEW;
 245         if (!t2)
 246                 return REV_TREE_DIFFERENT;
 247         tree_difference = REV_TREE_SAME;
 248         if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
 249                            &revs->pruning) < 0)
 250                 return REV_TREE_DIFFERENT;
 251         return tree_difference;
 252 }
 253
 254 int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
 255 {
 256         int retval;
 257         void *tree;
 258         struct tree_desc empty, real;
 259
 260         if (!t1)
 261                 return 0;
 262
 263         tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
 264         if (!tree)
 265                 return 0;
 266         real.buf = tree;
 267
 268         empty.buf = "";
 269         empty.size = 0;
 270
 271         tree_difference = 0;
 272         retval = diff_tree(&empty, &real, "", &revs->pruning);
 273         free(tree);
 274
 275         return retval >= 0 && !tree_difference;
 276 }
 277
 278 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 279 {
 280         struct commit_list **pp, *parent;
 281         int tree_changed = 0;
 282
 283         if (!commit->tree)
 284                 return;
 285
 286         if (!commit->parents) {
 287                 if (!rev_same_tree_as_empty(revs, commit->tree))
 288                         commit->object.flags |= TREECHANGE;
 289                 return;
 290         }
 291
 292         pp = &commit->parents;
 293         while ((parent = *pp) != NULL) {
 294                 struct commit *p = parent->item;
 295
 296                 parse_commit(p);
 297                 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
 298                 case REV_TREE_SAME:
 299                         if (p->object.flags & UNINTERESTING) {
 300                                 /* Even if a merge with an uninteresting
 301                                  * side branch brought the entire change
 302                                  * we are interested in, we do not want
 303                                  * to lose the other branches of this
 304                                  * merge, so we just keep going.
 305                                  */
 306                                 pp = &parent->next;
 307                                 continue;
 308                         }
 309                         parent->next = NULL;
 310                         commit->parents = parent;
 311                         return;
 312
 313                 case REV_TREE_NEW:
 314                         if (revs->remove_empty_trees &&
 315                             rev_same_tree_as_empty(revs, p->tree)) {
 316                                 /* We are adding all the specified
 317                                  * paths from this parent, so the
 318                                  * history beyond this parent is not
 319                                  * interesting.  Remove its parents
 320                                  * (they are grandparents for us).
 321                                  * IOW, we pretend this parent is a
 322                                  * "root" commit.
 323                                  */
 324                                 parse_commit(p);
 325                                 p->parents = NULL;
 326                         }
 327                 /* fallthrough */
 328                 case REV_TREE_DIFFERENT:
 329                         tree_changed = 1;
 330                         pp = &parent->next;
 331                         continue;
 332                 }
 333                 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
 334         }
 335         if (tree_changed)
 336                 commit->object.flags |= TREECHANGE;
 337 }
 338
 339 static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
 340 {
 341         struct commit_list *parent = commit->parents;
 342
 343         if (commit->object.flags & ADDED)
 344                 return;
 345         commit->object.flags |= ADDED;
 346
 347         /*
 348          * If the commit is uninteresting, don't try to
 349          * prune parents - we want the maximal uninteresting
 350          * set.
 351          *
 352          * Normally we haven't parsed the parent
 353          * yet, so we won't have a parent of a parent
 354          * here. However, it may turn out that we've
 355          * reached this commit some other way (where it
 356          * wasn't uninteresting), in which case we need
 357          * to mark its parents recursively too..
 358          */
 359         if (commit->object.flags & UNINTERESTING) {
 360                 while (parent) {
 361                         struct commit *p = parent->item;
 362                         parent = parent->next;
 363                         parse_commit(p);
 364                         p->object.flags |= UNINTERESTING;
 365                         if (p->parents)
 366                                 mark_parents_uninteresting(p);
 367                         if (p->object.flags & SEEN)
 368                                 continue;
 369                         p->object.flags |= SEEN;
 370                         insert_by_date(p, list);
 371                 }
 372                 return;
 373         }
 374
 375         /*
 376          * Ok, the commit wasn't uninteresting. Try to
 377          * simplify the commit history and find the parent
 378          * that has no differences in the path set if one exists.
 379          */
 380         if (revs->prune_fn)
 381                 revs->prune_fn(revs, commit);
 382
 383         if (revs->no_walk)
 384                 return;
 385
 386         parent = commit->parents;
 387         while (parent) {
 388                 struct commit *p = parent->item;
 389
 390                 parent = parent->next;
 391
 392                 parse_commit(p);
 393                 if (p->object.flags & SEEN)
 394                         continue;
 395                 p->object.flags |= SEEN;
 396                 insert_by_date(p, list);
 397         }
 398 }
 399
 400 static void limit_list(struct rev_info *revs)
 401 {
 402         struct commit_list *list = revs->commits;
 403         struct commit_list *newlist = NULL;
 404         struct commit_list **p = &newlist;
 405
 406         while (list) {
 407                 struct commit_list *entry = list;
 408                 struct commit *commit = list->item;
 409                 struct object *obj = &commit->object;
 410
 411                 list = list->next;
 412                 free(entry);
 413
 414                 if (revs->max_age != -1 && (commit->date < revs->max_age))
 415                         obj->flags |= UNINTERESTING;
 416                 if (revs->unpacked && has_sha1_pack(obj->sha1))
 417                         obj->flags |= UNINTERESTING;
 418                 add_parents_to_list(revs, commit, &list);
 419                 if (obj->flags & UNINTERESTING) {
 420                         mark_parents_uninteresting(commit);
 421                         if (everybody_uninteresting(list))
 422                                 break;
 423                         continue;
 424                 }
 425                 if (revs->min_age != -1 && (commit->date > revs->min_age))
 426                         continue;
 427                 p = &commit_list_insert(commit, p)->next;
 428         }
 429         if (revs->boundary) {
 430                 /* mark the ones that are on the result list first */
 431                 for (list = newlist; list; list = list->next) {
 432                         struct commit *commit = list->item;
 433                         commit->object.flags |= TMP_MARK;
 434                 }
 435                 for (list = newlist; list; list = list->next) {
 436                         struct commit *commit = list->item;
 437                         struct object *obj = &commit->object;
 438                         struct commit_list *parent;
 439                         if (obj->flags & UNINTERESTING)
 440                                 continue;
 441                         for (parent = commit->parents;
 442                              parent;
 443                              parent = parent->next) {
 444                                 struct commit *pcommit = parent->item;
 445                                 if (!(pcommit->object.flags & UNINTERESTING))
 446                                         continue;
 447                                 pcommit->object.flags |= BOUNDARY;
 448                                 if (pcommit->object.flags & TMP_MARK)
 449                                         continue;
 450                                 pcommit->object.flags |= TMP_MARK;
 451                                 p = &commit_list_insert(pcommit, p)->next;
 452                         }
 453                 }
 454                 for (list = newlist; list; list = list->next) {
 455                         struct commit *commit = list->item;
 456                         commit->object.flags &= ~TMP_MARK;
 457                 }
 458         }
 459         revs->commits = newlist;
 460 }
 461
 462 static int all_flags;
 463 static struct rev_info *all_revs;
 464
 465 static int handle_one_ref(const char *path, const unsigned char *sha1)
 466 {
 467         struct object *object = get_reference(all_revs, path, sha1, all_flags);
 468         add_pending_object(all_revs, object, "");
 469         return 0;
 470 }
 471
 472 static void handle_all(struct rev_info *revs, unsigned flags)
 473 {
 474         all_revs = revs;
 475         all_flags = flags;
 476         for_each_ref(handle_one_ref);
 477 }
 478
 479 void init_revisions(struct rev_info *revs)
 480 {
 481         memset(revs, 0, sizeof(*revs));
 482
 483         revs->abbrev = DEFAULT_ABBREV;
 484         revs->ignore_merges = 1;
 485         revs->pruning.recursive = 1;
 486         revs->pruning.add_remove = file_add_remove;
 487         revs->pruning.change = file_change;
 488         revs->lifo = 1;
 489         revs->dense = 1;
 490         revs->prefix = setup_git_directory();
 491         revs->max_age = -1;
 492         revs->min_age = -1;
 493         revs->max_count = -1;
 494
 495         revs->prune_fn = NULL;
 496         revs->prune_data = NULL;
 497
 498         revs->topo_setter = topo_sort_default_setter;
 499         revs->topo_getter = topo_sort_default_getter;
 500
 501         revs->commit_format = CMIT_FMT_DEFAULT;
 502
 503         diff_setup(&revs->diffopt);
 504 }
 505
 506 /*
 507  * Parse revision information, filling in the "rev_info" structure,
 508  * and removing the used arguments from the argument list.
 509  *
 510  * Returns the number of arguments left that weren't recognized
 511  * (which are also moved to the head of the argument list)
 512  */
 513 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
 514 {
 515         int i, flags, seen_dashdash;
 516         const char **unrecognized = argv + 1;
 517         int left = 1;
 518
 519         /* First, search for "--" */
 520         seen_dashdash = 0;
 521         for (i = 1; i < argc; i++) {
 522                 const char *arg = argv[i];
 523                 if (strcmp(arg, "--"))
 524                         continue;
 525                 argv[i] = NULL;
 526                 argc = i;
 527                 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
 528                 seen_dashdash = 1;
 529                 break;
 530         }
 531
 532         flags = 0;
 533         for (i = 1; i < argc; i++) {
 534                 struct object *object;
 535                 const char *arg = argv[i];
 536                 unsigned char sha1[20];
 537                 char *dotdot;
 538                 int local_flags;
 539
 540                 if (*arg == '-') {
 541                         int opts;
 542                         if (!strncmp(arg, "--max-count=", 12)) {
 543                                 revs->max_count = atoi(arg + 12);
 544                                 continue;
 545                         }
 546                         /* accept -<digit>, like traditilnal "head" */
 547                         if ((*arg == '-') && isdigit(arg[1])) {
 548                                 revs->max_count = atoi(arg + 1);
 549                                 continue;
 550                         }
 551                         if (!strcmp(arg, "-n")) {
 552                                 if (argc <= i + 1)
 553                                         die("-n requires an argument");
 554                                 revs->max_count = atoi(argv[++i]);
 555                                 continue;
 556                         }
 557                         if (!strncmp(arg,"-n",2)) {
 558                                 revs->max_count = atoi(arg + 2);
 559                                 continue;
 560                         }
 561                         if (!strncmp(arg, "--max-age=", 10)) {
 562                                 revs->max_age = atoi(arg + 10);
 563                                 continue;
 564                         }
 565                         if (!strncmp(arg, "--since=", 8)) {
 566                                 revs->max_age = approxidate(arg + 8);
 567                                 continue;
 568                         }
 569                         if (!strncmp(arg, "--after=", 8)) {
 570                                 revs->max_age = approxidate(arg + 8);
 571                                 continue;
 572                         }
 573                         if (!strncmp(arg, "--min-age=", 10)) {
 574                                 revs->min_age = atoi(arg + 10);
 575                                 continue;
 576                         }
 577                         if (!strncmp(arg, "--before=", 9)) {
 578                                 revs->min_age = approxidate(arg + 9);
 579                                 continue;
 580                         }
 581                         if (!strncmp(arg, "--until=", 8)) {
 582                                 revs->min_age = approxidate(arg + 8);
 583                                 continue;
 584                         }
 585                         if (!strcmp(arg, "--all")) {
 586                                 handle_all(revs, flags);
 587                                 continue;
 588                         }
 589                         if (!strcmp(arg, "--not")) {
 590                                 flags ^= UNINTERESTING;
 591                                 continue;
 592                         }
 593                         if (!strcmp(arg, "--default")) {
 594                                 if (++i >= argc)
 595                                         die("bad --default argument");
 596                                 def = argv[i];
 597                                 continue;
 598                         }
 599                         if (!strcmp(arg, "--topo-order")) {
 600                                 revs->topo_order = 1;
 601                                 continue;
 602                         }
 603                         if (!strcmp(arg, "--date-order")) {
 604                                 revs->lifo = 0;
 605                                 revs->topo_order = 1;
 606                                 continue;
 607                         }
 608                         if (!strcmp(arg, "--parents")) {
 609                                 revs->parents = 1;
 610                                 continue;
 611                         }
 612                         if (!strcmp(arg, "--dense")) {
 613                                 revs->dense = 1;
 614                                 continue;
 615                         }
 616                         if (!strcmp(arg, "--sparse")) {
 617                                 revs->dense = 0;
 618                                 continue;
 619                         }
 620                         if (!strcmp(arg, "--remove-empty")) {
 621                                 revs->remove_empty_trees = 1;
 622                                 continue;
 623                         }
 624                         if (!strcmp(arg, "--no-merges")) {
 625                                 revs->no_merges = 1;
 626                                 continue;
 627                         }
 628                         if (!strcmp(arg, "--boundary")) {
 629                                 revs->boundary = 1;
 630                                 continue;
 631                         }
 632                         if (!strcmp(arg, "--objects")) {
 633                                 revs->tag_objects = 1;
 634                                 revs->tree_objects = 1;
 635                                 revs->blob_objects = 1;
 636                                 continue;
 637                         }
 638                         if (!strcmp(arg, "--objects-edge")) {
 639                                 revs->tag_objects = 1;
 640                                 revs->tree_objects = 1;
 641                                 revs->blob_objects = 1;
 642                                 revs->edge_hint = 1;
 643                                 continue;
 644                         }
 645                         if (!strcmp(arg, "--unpacked")) {
 646                                 revs->unpacked = 1;
 647                                 continue;
 648                         }
 649                         if (!strcmp(arg, "-r")) {
 650                                 revs->diff = 1;
 651                                 revs->diffopt.recursive = 1;
 652                                 continue;
 653                         }
 654                         if (!strcmp(arg, "-t")) {
 655                                 revs->diff = 1;
 656                                 revs->diffopt.recursive = 1;
 657                                 revs->diffopt.tree_in_recursive = 1;
 658                                 continue;
 659                         }
 660                         if (!strcmp(arg, "-m")) {
 661                                 revs->ignore_merges = 0;
 662                                 continue;
 663                         }
 664                         if (!strcmp(arg, "-c")) {
 665                                 revs->diff = 1;
 666                                 revs->combine_merges = 1;
 667                                 continue;
 668                         }
 669                         if (!strcmp(arg, "--cc")) {
 670                                 revs->diff = 1;
 671                                 revs->dense_combined_merges = 1;
 672                                 revs->combine_merges = 1;
 673                                 continue;
 674                         }
 675                         if (!strcmp(arg, "-v")) {
 676                                 revs->verbose_header = 1;
 677                                 continue;
 678                         }
 679                         if (!strncmp(arg, "--pretty", 8)) {
 680                                 revs->verbose_header = 1;
 681                                 revs->commit_format = get_commit_format(arg+8);
 682                                 continue;
 683                         }
 684                         if (!strcmp(arg, "--root")) {
 685                                 revs->show_root_diff = 1;
 686                                 continue;
 687                         }
 688                         if (!strcmp(arg, "--no-commit-id")) {
 689                                 revs->no_commit_id = 1;
 690                                 continue;
 691                         }
 692                         if (!strcmp(arg, "--always")) {
 693                                 revs->always_show_header = 1;
 694                                 continue;
 695                         }
 696                         if (!strcmp(arg, "--no-abbrev")) {
 697                                 revs->abbrev = 0;
 698                                 continue;
 699                         }
 700                         if (!strcmp(arg, "--abbrev")) {
 701                                 revs->abbrev = DEFAULT_ABBREV;
 702                                 continue;
 703                         }
 704                         if (!strcmp(arg, "--abbrev-commit")) {
 705                                 revs->abbrev_commit = 1;
 706                                 continue;
 707                         }
 708                         if (!strcmp(arg, "--full-diff")) {
 709                                 revs->diff = 1;
 710                                 revs->full_diff = 1;
 711                                 continue;
 712                         }
 713                         opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
 714                         if (opts > 0) {
 715                                 revs->diff = 1;
 716                                 i += opts - 1;
 717                                 continue;
 718                         }
 719                         *unrecognized++ = arg;
 720                         left++;
 721                         continue;
 722                 }
 723                 dotdot = strstr(arg, "..");
 724                 if (dotdot) {
 725                         unsigned char from_sha1[20];
 726                         const char *next = dotdot + 2;
 727                         const char *this = arg;
 728                         *dotdot = 0;
 729                         if (!*next)
 730                                 next = "HEAD";
 731                         if (dotdot == arg)
 732                                 this = "HEAD";
 733                         if (!get_sha1(this, from_sha1) &&
 734                             !get_sha1(next, sha1)) {
 735                                 struct object *exclude;
 736                                 struct object *include;
 737
 738                                 exclude = get_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
 739                                 include = get_reference(revs, next, sha1, flags);
 740                                 if (!exclude || !include)
 741                                         die("Invalid revision range %s..%s", arg, next);
 742                                 add_pending_object(revs, exclude, this);
 743                                 add_pending_object(revs, include, next);
 744                                 continue;
 745                         }
 746                         *dotdot = '.';
 747                 }
 748                 local_flags = 0;
 749                 if (*arg == '^') {
 750                         local_flags = UNINTERESTING;
 751                         arg++;
 752                 }
 753                 if (get_sha1(arg, sha1) < 0) {
 754                         struct stat st;
 755                         int j;
 756
 757                         if (seen_dashdash || local_flags)
 758                                 die("bad revision '%s'", arg);
 759
 760                         /* If we didn't have a "--", all filenames must exist */
 761                         for (j = i; j < argc; j++) {
 762                                 if (lstat(argv[j], &st) < 0)
 763                                         die("'%s': %s", argv[j], strerror(errno));
 764                         }
 765                         revs->prune_data = get_pathspec(revs->prefix, argv + i);
 766                         break;
 767                 }
 768                 object = get_reference(revs, arg, sha1, flags ^ local_flags);
 769                 add_pending_object(revs, object, arg);
 770         }
 771         if (def && !revs->pending_objects) {
 772                 unsigned char sha1[20];
 773                 struct object *object;
 774                 if (get_sha1(def, sha1) < 0)
 775                         die("bad default revision '%s'", def);
 776                 object = get_reference(revs, def, sha1, 0);
 777                 add_pending_object(revs, object, def);
 778         }
 779
 780         if (revs->topo_order || revs->unpacked)
 781                 revs->limited = 1;
 782
 783         if (revs->prune_data) {
 784                 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
 785                 revs->prune_fn = try_to_simplify_commit;
 786                 if (!revs->full_diff)
 787                         diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
 788         }
 789         if (revs->combine_merges) {
 790                 revs->ignore_merges = 0;
 791                 if (revs->dense_combined_merges)
 792                         revs->diffopt.output_format = DIFF_FORMAT_PATCH;
 793         }
 794         revs->diffopt.abbrev = revs->abbrev;
 795         diff_setup_done(&revs->diffopt);
 796
 797         return left;
 798 }
 799
 800 void prepare_revision_walk(struct rev_info *revs)
 801 {
 802         struct object_list *list;
 803
 804         list = revs->pending_objects;
 805         revs->pending_objects = NULL;
 806         while (list) {
 807                 struct commit *commit = handle_commit(revs, list->item, list->name);
 808                 if (commit) {
 809                         if (!(commit->object.flags & SEEN)) {
 810                                 commit->object.flags |= SEEN;
 811                                 insert_by_date(commit, &revs->commits);
 812                         }
 813                 }
 814                 list = list->next;
 815         }
 816
 817         if (revs->no_walk)
 818                 return;
 819         if (revs->limited)
 820                 limit_list(revs);
 821         if (revs->topo_order)
 822                 sort_in_topological_order_fn(&revs->commits, revs->lifo,
 823                                              revs->topo_setter,
 824                                              revs->topo_getter);
 825 }
 826
 827 static int rewrite_one(struct rev_info *revs, struct commit **pp)
 828 {
 829         for (;;) {
 830                 struct commit *p = *pp;
 831                 if (!revs->limited)
 832                         add_parents_to_list(revs, p, &revs->commits);
 833                 if (p->object.flags & (TREECHANGE | UNINTERESTING))
 834                         return 0;
 835                 if (!p->parents)
 836                         return -1;
 837                 *pp = p->parents->item;
 838         }
 839 }
 840
 841 static void rewrite_parents(struct rev_info *revs, struct commit *commit)
 842 {
 843         struct commit_list **pp = &commit->parents;
 844         while (*pp) {
 845                 struct commit_list *parent = *pp;
 846                 if (rewrite_one(revs, &parent->item) < 0) {
 847                         *pp = parent->next;
 848                         continue;
 849                 }
 850                 pp = &parent->next;
 851         }
 852 }
 853
 854 static void mark_boundary_to_show(struct commit *commit)
 855 {
 856         struct commit_list *p = commit->parents;
 857         while (p) {
 858                 commit = p->item;
 859                 p = p->next;
 860                 if (commit->object.flags & BOUNDARY)
 861                         commit->object.flags |= BOUNDARY_SHOW;
 862         }
 863 }
 864
 865 struct commit *get_revision(struct rev_info *revs)
 866 {
 867         struct commit_list *list = revs->commits;
 868
 869         if (!list)
 870                 return NULL;
 871
 872         /* Check the max_count ... */
 873         switch (revs->max_count) {
 874         case -1:
 875                 break;
 876         case 0:
 877                 return NULL;
 878         default:
 879                 revs->max_count--;
 880         }
 881
 882         do {
 883                 struct commit *commit = revs->commits->item;
 884
 885                 revs->commits = revs->commits->next;
 886
 887                 /*
 888                  * If we haven't done the list limiting, we need to look at
 889                  * the parents here. We also need to do the date-based limiting
 890                  * that we'd otherwise have done in limit_list().
 891                  */
 892                 if (!revs->limited) {
 893                         if ((revs->unpacked &&
 894                              has_sha1_pack(commit->object.sha1)) ||
 895                             (revs->max_age != -1 &&
 896                              (commit->date < revs->max_age)))
 897                                 continue;
 898                         add_parents_to_list(revs, commit, &revs->commits);
 899                 }
 900                 if (commit->object.flags & SHOWN)
 901                         continue;
 902
 903                 /* We want to show boundary commits only when their
 904                  * children are shown.  When path-limiter is in effect,
 905                  * rewrite_parents() drops some commits from getting shown,
 906                  * and there is no point showing boundary parents that
 907                  * are not shown.  After rewrite_parents() rewrites the
 908                  * parents of a commit that is shown, we mark the boundary
 909                  * parents with BOUNDARY_SHOW.
 910                  */
 911                 if (commit->object.flags & BOUNDARY_SHOW) {
 912                         commit->object.flags |= SHOWN;
 913                         return commit;
 914                 }
 915                 if (commit->object.flags & UNINTERESTING)
 916                         continue;
 917                 if (revs->min_age != -1 && (commit->date > revs->min_age))
 918                         continue;
 919                 if (revs->no_merges &&
 920                     commit->parents && commit->parents->next)
 921                         continue;
 922                 if (revs->prune_fn && revs->dense) {
 923                         if (!(commit->object.flags & TREECHANGE))
 924                                 continue;
 925                         if (revs->parents)
 926                                 rewrite_parents(revs, commit);
 927                 }
 928                 if (revs->boundary)
 929                         mark_boundary_to_show(commit);
 930                 commit->object.flags |= SHOWN;
 931                 return commit;
 932         } while (revs->commits);
 933         return NULL;
 934 }