Merge branch 'jk/http-backend-keep-committer-ident-env'
[git] / 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 #include "string-list.h"
16
17 volatile show_early_output_fn_t show_early_output;
18
19 char *path_name(const struct name_path *path, const char *name)
20 {
21         const struct name_path *p;
22         char *n, *m;
23         int nlen = strlen(name);
24         int len = nlen + 1;
25
26         for (p = path; p; p = p->up) {
27                 if (p->elem_len)
28                         len += p->elem_len + 1;
29         }
30         n = xmalloc(len);
31         m = n + len - (nlen + 1);
32         strcpy(m, name);
33         for (p = path; p; p = p->up) {
34                 if (p->elem_len) {
35                         m -= p->elem_len + 1;
36                         memcpy(m, p->elem, p->elem_len);
37                         m[p->elem_len] = '/';
38                 }
39         }
40         return n;
41 }
42
43 static int show_path_component_truncated(FILE *out, const char *name, int len)
44 {
45         int cnt;
46         for (cnt = 0; cnt < len; cnt++) {
47                 int ch = name[cnt];
48                 if (!ch || ch == '\n')
49                         return -1;
50                 fputc(ch, out);
51         }
52         return len;
53 }
54
55 static int show_path_truncated(FILE *out, const struct name_path *path)
56 {
57         int emitted, ours;
58
59         if (!path)
60                 return 0;
61         emitted = show_path_truncated(out, path->up);
62         if (emitted < 0)
63                 return emitted;
64         if (emitted)
65                 fputc('/', out);
66         ours = show_path_component_truncated(out, path->elem, path->elem_len);
67         if (ours < 0)
68                 return ours;
69         return ours || emitted;
70 }
71
72 void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component)
73 {
74         struct name_path leaf;
75         leaf.up = (struct name_path *)path;
76         leaf.elem = component;
77         leaf.elem_len = strlen(component);
78
79         fprintf(out, "%s ", sha1_to_hex(obj->sha1));
80         show_path_truncated(out, &leaf);
81         fputc('\n', out);
82 }
83
84 void add_object(struct object *obj,
85                 struct object_array *p,
86                 struct name_path *path,
87                 const char *name)
88 {
89         add_object_array(obj, path_name(path, name), p);
90 }
91
92 static void mark_blob_uninteresting(struct blob *blob)
93 {
94         if (!blob)
95                 return;
96         if (blob->object.flags & UNINTERESTING)
97                 return;
98         blob->object.flags |= UNINTERESTING;
99 }
100
101 void mark_tree_uninteresting(struct tree *tree)
102 {
103         struct tree_desc desc;
104         struct name_entry entry;
105         struct object *obj = &tree->object;
106
107         if (!tree)
108                 return;
109         if (obj->flags & UNINTERESTING)
110                 return;
111         obj->flags |= UNINTERESTING;
112         if (!has_sha1_file(obj->sha1))
113                 return;
114         if (parse_tree(tree) < 0)
115                 die("bad tree %s", sha1_to_hex(obj->sha1));
116
117         init_tree_desc(&desc, tree->buffer, tree->size);
118         while (tree_entry(&desc, &entry)) {
119                 switch (object_type(entry.mode)) {
120                 case OBJ_TREE:
121                         mark_tree_uninteresting(lookup_tree(entry.sha1));
122                         break;
123                 case OBJ_BLOB:
124                         mark_blob_uninteresting(lookup_blob(entry.sha1));
125                         break;
126                 default:
127                         /* Subproject commit - not in this repository */
128                         break;
129                 }
130         }
131
132         /*
133          * We don't care about the tree any more
134          * after it has been marked uninteresting.
135          */
136         free(tree->buffer);
137         tree->buffer = NULL;
138 }
139
140 void mark_parents_uninteresting(struct commit *commit)
141 {
142         struct commit_list *parents = NULL, *l;
143
144         for (l = commit->parents; l; l = l->next)
145                 commit_list_insert(l->item, &parents);
146
147         while (parents) {
148                 struct commit *commit = parents->item;
149                 l = parents;
150                 parents = parents->next;
151                 free(l);
152
153                 while (commit) {
154                         /*
155                          * A missing commit is ok iff its parent is marked
156                          * uninteresting.
157                          *
158                          * We just mark such a thing parsed, so that when
159                          * it is popped next time around, we won't be trying
160                          * to parse it and get an error.
161                          */
162                         if (!has_sha1_file(commit->object.sha1))
163                                 commit->object.parsed = 1;
164
165                         if (commit->object.flags & UNINTERESTING)
166                                 break;
167
168                         commit->object.flags |= UNINTERESTING;
169
170                         /*
171                          * Normally we haven't parsed the parent
172                          * yet, so we won't have a parent of a parent
173                          * here. However, it may turn out that we've
174                          * reached this commit some other way (where it
175                          * wasn't uninteresting), in which case we need
176                          * to mark its parents recursively too..
177                          */
178                         if (!commit->parents)
179                                 break;
180
181                         for (l = commit->parents->next; l; l = l->next)
182                                 commit_list_insert(l->item, &parents);
183                         commit = commit->parents->item;
184                 }
185         }
186 }
187
188 static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
189 {
190         if (!obj)
191                 return;
192         if (revs->no_walk && (obj->flags & UNINTERESTING))
193                 revs->no_walk = 0;
194         if (revs->reflog_info && obj->type == OBJ_COMMIT) {
195                 struct strbuf buf = STRBUF_INIT;
196                 int len = interpret_branch_name(name, &buf);
197                 int st;
198
199                 if (0 < len && name[len] && buf.len)
200                         strbuf_addstr(&buf, name + len);
201                 st = add_reflog_for_walk(revs->reflog_info,
202                                          (struct commit *)obj,
203                                          buf.buf[0] ? buf.buf: name);
204                 strbuf_release(&buf);
205                 if (st)
206                         return;
207         }
208         add_object_array_with_mode(obj, name, &revs->pending, mode);
209 }
210
211 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
212 {
213         add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
214 }
215
216 void add_head_to_pending(struct rev_info *revs)
217 {
218         unsigned char sha1[20];
219         struct object *obj;
220         if (get_sha1("HEAD", sha1))
221                 return;
222         obj = parse_object(sha1);
223         if (!obj)
224                 return;
225         add_pending_object(revs, obj, "HEAD");
226 }
227
228 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
229 {
230         struct object *object;
231
232         object = parse_object(sha1);
233         if (!object) {
234                 if (revs->ignore_missing)
235                         return object;
236                 die("bad object %s", name);
237         }
238         object->flags |= flags;
239         return object;
240 }
241
242 void add_pending_sha1(struct rev_info *revs, const char *name,
243                       const unsigned char *sha1, unsigned int flags)
244 {
245         struct object *object = get_reference(revs, name, sha1, flags);
246         add_pending_object(revs, object, name);
247 }
248
249 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
250 {
251         unsigned long flags = object->flags;
252
253         /*
254          * Tag object? Look what it points to..
255          */
256         while (object->type == OBJ_TAG) {
257                 struct tag *tag = (struct tag *) object;
258                 if (revs->tag_objects && !(flags & UNINTERESTING))
259                         add_pending_object(revs, object, tag->tag);
260                 if (!tag->tagged)
261                         die("bad tag");
262                 object = parse_object(tag->tagged->sha1);
263                 if (!object) {
264                         if (flags & UNINTERESTING)
265                                 return NULL;
266                         die("bad object %s", sha1_to_hex(tag->tagged->sha1));
267                 }
268         }
269
270         /*
271          * Commit object? Just return it, we'll do all the complex
272          * reachability crud.
273          */
274         if (object->type == OBJ_COMMIT) {
275                 struct commit *commit = (struct commit *)object;
276                 if (parse_commit(commit) < 0)
277                         die("unable to parse commit %s", name);
278                 if (flags & UNINTERESTING) {
279                         commit->object.flags |= UNINTERESTING;
280                         mark_parents_uninteresting(commit);
281                         revs->limited = 1;
282                 }
283                 if (revs->show_source && !commit->util)
284                         commit->util = (void *) name;
285                 return commit;
286         }
287
288         /*
289          * Tree object? Either mark it uninteresting, or add it
290          * to the list of objects to look at later..
291          */
292         if (object->type == OBJ_TREE) {
293                 struct tree *tree = (struct tree *)object;
294                 if (!revs->tree_objects)
295                         return NULL;
296                 if (flags & UNINTERESTING) {
297                         mark_tree_uninteresting(tree);
298                         return NULL;
299                 }
300                 add_pending_object(revs, object, "");
301                 return NULL;
302         }
303
304         /*
305          * Blob object? You know the drill by now..
306          */
307         if (object->type == OBJ_BLOB) {
308                 struct blob *blob = (struct blob *)object;
309                 if (!revs->blob_objects)
310                         return NULL;
311                 if (flags & UNINTERESTING) {
312                         mark_blob_uninteresting(blob);
313                         return NULL;
314                 }
315                 add_pending_object(revs, object, "");
316                 return NULL;
317         }
318         die("%s is unknown object", name);
319 }
320
321 static int everybody_uninteresting(struct commit_list *orig)
322 {
323         struct commit_list *list = orig;
324         while (list) {
325                 struct commit *commit = list->item;
326                 list = list->next;
327                 if (commit->object.flags & UNINTERESTING)
328                         continue;
329                 return 0;
330         }
331         return 1;
332 }
333
334 /*
335  * The goal is to get REV_TREE_NEW as the result only if the
336  * diff consists of all '+' (and no other changes), REV_TREE_OLD
337  * if the whole diff is removal of old data, and otherwise
338  * REV_TREE_DIFFERENT (of course if the trees are the same we
339  * want REV_TREE_SAME).
340  * That means that once we get to REV_TREE_DIFFERENT, we do not
341  * have to look any further.
342  */
343 static int tree_difference = REV_TREE_SAME;
344
345 static void file_add_remove(struct diff_options *options,
346                     int addremove, unsigned mode,
347                     const unsigned char *sha1,
348                     const char *fullpath, unsigned dirty_submodule)
349 {
350         int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
351
352         tree_difference |= diff;
353         if (tree_difference == REV_TREE_DIFFERENT)
354                 DIFF_OPT_SET(options, HAS_CHANGES);
355 }
356
357 static void file_change(struct diff_options *options,
358                  unsigned old_mode, unsigned new_mode,
359                  const unsigned char *old_sha1,
360                  const unsigned char *new_sha1,
361                  const char *fullpath,
362                  unsigned old_dirty_submodule, unsigned new_dirty_submodule)
363 {
364         tree_difference = REV_TREE_DIFFERENT;
365         DIFF_OPT_SET(options, HAS_CHANGES);
366 }
367
368 static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
369 {
370         struct tree *t1 = parent->tree;
371         struct tree *t2 = commit->tree;
372
373         if (!t1)
374                 return REV_TREE_NEW;
375         if (!t2)
376                 return REV_TREE_OLD;
377
378         if (revs->simplify_by_decoration) {
379                 /*
380                  * If we are simplifying by decoration, then the commit
381                  * is worth showing if it has a tag pointing at it.
382                  */
383                 if (lookup_decoration(&name_decoration, &commit->object))
384                         return REV_TREE_DIFFERENT;
385                 /*
386                  * A commit that is not pointed by a tag is uninteresting
387                  * if we are not limited by path.  This means that you will
388                  * see the usual "commits that touch the paths" plus any
389                  * tagged commit by specifying both --simplify-by-decoration
390                  * and pathspec.
391                  */
392                 if (!revs->prune_data.nr)
393                         return REV_TREE_SAME;
394         }
395
396         tree_difference = REV_TREE_SAME;
397         DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
398         if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
399                            &revs->pruning) < 0)
400                 return REV_TREE_DIFFERENT;
401         return tree_difference;
402 }
403
404 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
405 {
406         int retval;
407         void *tree;
408         unsigned long size;
409         struct tree_desc empty, real;
410         struct tree *t1 = commit->tree;
411
412         if (!t1)
413                 return 0;
414
415         tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
416         if (!tree)
417                 return 0;
418         init_tree_desc(&real, tree, size);
419         init_tree_desc(&empty, "", 0);
420
421         tree_difference = REV_TREE_SAME;
422         DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
423         retval = diff_tree(&empty, &real, "", &revs->pruning);
424         free(tree);
425
426         return retval >= 0 && (tree_difference == REV_TREE_SAME);
427 }
428
429 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
430 {
431         struct commit_list **pp, *parent;
432         int tree_changed = 0, tree_same = 0, nth_parent = 0;
433
434         /*
435          * If we don't do pruning, everything is interesting
436          */
437         if (!revs->prune)
438                 return;
439
440         if (!commit->tree)
441                 return;
442
443         if (!commit->parents) {
444                 if (rev_same_tree_as_empty(revs, commit))
445                         commit->object.flags |= TREESAME;
446                 return;
447         }
448
449         /*
450          * Normal non-merge commit? If we don't want to make the
451          * history dense, we consider it always to be a change..
452          */
453         if (!revs->dense && !commit->parents->next)
454                 return;
455
456         pp = &commit->parents;
457         while ((parent = *pp) != NULL) {
458                 struct commit *p = parent->item;
459
460                 /*
461                  * Do not compare with later parents when we care only about
462                  * the first parent chain, in order to avoid derailing the
463                  * traversal to follow a side branch that brought everything
464                  * in the path we are limited to by the pathspec.
465                  */
466                 if (revs->first_parent_only && nth_parent++)
467                         break;
468                 if (parse_commit(p) < 0)
469                         die("cannot simplify commit %s (because of %s)",
470                             sha1_to_hex(commit->object.sha1),
471                             sha1_to_hex(p->object.sha1));
472                 switch (rev_compare_tree(revs, p, commit)) {
473                 case REV_TREE_SAME:
474                         tree_same = 1;
475                         if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
476                                 /* Even if a merge with an uninteresting
477                                  * side branch brought the entire change
478                                  * we are interested in, we do not want
479                                  * to lose the other branches of this
480                                  * merge, so we just keep going.
481                                  */
482                                 pp = &parent->next;
483                                 continue;
484                         }
485                         parent->next = NULL;
486                         commit->parents = parent;
487                         commit->object.flags |= TREESAME;
488                         return;
489
490                 case REV_TREE_NEW:
491                         if (revs->remove_empty_trees &&
492                             rev_same_tree_as_empty(revs, p)) {
493                                 /* We are adding all the specified
494                                  * paths from this parent, so the
495                                  * history beyond this parent is not
496                                  * interesting.  Remove its parents
497                                  * (they are grandparents for us).
498                                  * IOW, we pretend this parent is a
499                                  * "root" commit.
500                                  */
501                                 if (parse_commit(p) < 0)
502                                         die("cannot simplify commit %s (invalid %s)",
503                                             sha1_to_hex(commit->object.sha1),
504                                             sha1_to_hex(p->object.sha1));
505                                 p->parents = NULL;
506                         }
507                 /* fallthrough */
508                 case REV_TREE_OLD:
509                 case REV_TREE_DIFFERENT:
510                         tree_changed = 1;
511                         pp = &parent->next;
512                         continue;
513                 }
514                 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
515         }
516         if (tree_changed && !tree_same)
517                 return;
518         commit->object.flags |= TREESAME;
519 }
520
521 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
522                     struct commit_list *cached_base, struct commit_list **cache)
523 {
524         struct commit_list *new_entry;
525
526         if (cached_base && p->date < cached_base->item->date)
527                 new_entry = commit_list_insert_by_date(p, &cached_base->next);
528         else
529                 new_entry = commit_list_insert_by_date(p, head);
530
531         if (cache && (!*cache || p->date < (*cache)->item->date))
532                 *cache = new_entry;
533 }
534
535 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
536                     struct commit_list **list, struct commit_list **cache_ptr)
537 {
538         struct commit_list *parent = commit->parents;
539         unsigned left_flag;
540         struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
541
542         if (commit->object.flags & ADDED)
543                 return 0;
544         commit->object.flags |= ADDED;
545
546         /*
547          * If the commit is uninteresting, don't try to
548          * prune parents - we want the maximal uninteresting
549          * set.
550          *
551          * Normally we haven't parsed the parent
552          * yet, so we won't have a parent of a parent
553          * here. However, it may turn out that we've
554          * reached this commit some other way (where it
555          * wasn't uninteresting), in which case we need
556          * to mark its parents recursively too..
557          */
558         if (commit->object.flags & UNINTERESTING) {
559                 while (parent) {
560                         struct commit *p = parent->item;
561                         parent = parent->next;
562                         if (p)
563                                 p->object.flags |= UNINTERESTING;
564                         if (parse_commit(p) < 0)
565                                 continue;
566                         if (p->parents)
567                                 mark_parents_uninteresting(p);
568                         if (p->object.flags & SEEN)
569                                 continue;
570                         p->object.flags |= SEEN;
571                         commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
572                 }
573                 return 0;
574         }
575
576         /*
577          * Ok, the commit wasn't uninteresting. Try to
578          * simplify the commit history and find the parent
579          * that has no differences in the path set if one exists.
580          */
581         try_to_simplify_commit(revs, commit);
582
583         if (revs->no_walk)
584                 return 0;
585
586         left_flag = (commit->object.flags & SYMMETRIC_LEFT);
587
588         for (parent = commit->parents; parent; parent = parent->next) {
589                 struct commit *p = parent->item;
590
591                 if (parse_commit(p) < 0)
592                         return -1;
593                 if (revs->show_source && !p->util)
594                         p->util = commit->util;
595                 p->object.flags |= left_flag;
596                 if (!(p->object.flags & SEEN)) {
597                         p->object.flags |= SEEN;
598                         commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
599                 }
600                 if (revs->first_parent_only)
601                         break;
602         }
603         return 0;
604 }
605
606 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
607 {
608         struct commit_list *p;
609         int left_count = 0, right_count = 0;
610         int left_first;
611         struct patch_ids ids;
612         unsigned cherry_flag;
613
614         /* First count the commits on the left and on the right */
615         for (p = list; p; p = p->next) {
616                 struct commit *commit = p->item;
617                 unsigned flags = commit->object.flags;
618                 if (flags & BOUNDARY)
619                         ;
620                 else if (flags & SYMMETRIC_LEFT)
621                         left_count++;
622                 else
623                         right_count++;
624         }
625
626         if (!left_count || !right_count)
627                 return;
628
629         left_first = left_count < right_count;
630         init_patch_ids(&ids);
631         ids.diffopts.pathspec = revs->diffopt.pathspec;
632
633         /* Compute patch-ids for one side */
634         for (p = list; p; p = p->next) {
635                 struct commit *commit = p->item;
636                 unsigned flags = commit->object.flags;
637
638                 if (flags & BOUNDARY)
639                         continue;
640                 /*
641                  * If we have fewer left, left_first is set and we omit
642                  * commits on the right branch in this loop.  If we have
643                  * fewer right, we skip the left ones.
644                  */
645                 if (left_first != !!(flags & SYMMETRIC_LEFT))
646                         continue;
647                 commit->util = add_commit_patch_id(commit, &ids);
648         }
649
650         /* either cherry_mark or cherry_pick are true */
651         cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
652
653         /* Check the other side */
654         for (p = list; p; p = p->next) {
655                 struct commit *commit = p->item;
656                 struct patch_id *id;
657                 unsigned flags = commit->object.flags;
658
659                 if (flags & BOUNDARY)
660                         continue;
661                 /*
662                  * If we have fewer left, left_first is set and we omit
663                  * commits on the left branch in this loop.
664                  */
665                 if (left_first == !!(flags & SYMMETRIC_LEFT))
666                         continue;
667
668                 /*
669                  * Have we seen the same patch id?
670                  */
671                 id = has_commit_patch_id(commit, &ids);
672                 if (!id)
673                         continue;
674                 id->seen = 1;
675                 commit->object.flags |= cherry_flag;
676         }
677
678         /* Now check the original side for seen ones */
679         for (p = list; p; p = p->next) {
680                 struct commit *commit = p->item;
681                 struct patch_id *ent;
682
683                 ent = commit->util;
684                 if (!ent)
685                         continue;
686                 if (ent->seen)
687                         commit->object.flags |= cherry_flag;
688                 commit->util = NULL;
689         }
690
691         free_patch_ids(&ids);
692 }
693
694 /* How many extra uninteresting commits we want to see.. */
695 #define SLOP 5
696
697 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
698 {
699         /*
700          * No source list at all? We're definitely done..
701          */
702         if (!src)
703                 return 0;
704
705         /*
706          * Does the destination list contain entries with a date
707          * before the source list? Definitely _not_ done.
708          */
709         if (date < src->item->date)
710                 return SLOP;
711
712         /*
713          * Does the source list still have interesting commits in
714          * it? Definitely not done..
715          */
716         if (!everybody_uninteresting(src))
717                 return SLOP;
718
719         /* Ok, we're closing in.. */
720         return slop-1;
721 }
722
723 /*
724  * "rev-list --ancestry-path A..B" computes commits that are ancestors
725  * of B but not ancestors of A but further limits the result to those
726  * that are descendants of A.  This takes the list of bottom commits and
727  * the result of "A..B" without --ancestry-path, and limits the latter
728  * further to the ones that can reach one of the commits in "bottom".
729  */
730 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
731 {
732         struct commit_list *p;
733         struct commit_list *rlist = NULL;
734         int made_progress;
735
736         /*
737          * Reverse the list so that it will be likely that we would
738          * process parents before children.
739          */
740         for (p = list; p; p = p->next)
741                 commit_list_insert(p->item, &rlist);
742
743         for (p = bottom; p; p = p->next)
744                 p->item->object.flags |= TMP_MARK;
745
746         /*
747          * Mark the ones that can reach bottom commits in "list",
748          * in a bottom-up fashion.
749          */
750         do {
751                 made_progress = 0;
752                 for (p = rlist; p; p = p->next) {
753                         struct commit *c = p->item;
754                         struct commit_list *parents;
755                         if (c->object.flags & (TMP_MARK | UNINTERESTING))
756                                 continue;
757                         for (parents = c->parents;
758                              parents;
759                              parents = parents->next) {
760                                 if (!(parents->item->object.flags & TMP_MARK))
761                                         continue;
762                                 c->object.flags |= TMP_MARK;
763                                 made_progress = 1;
764                                 break;
765                         }
766                 }
767         } while (made_progress);
768
769         /*
770          * NEEDSWORK: decide if we want to remove parents that are
771          * not marked with TMP_MARK from commit->parents for commits
772          * in the resulting list.  We may not want to do that, though.
773          */
774
775         /*
776          * The ones that are not marked with TMP_MARK are uninteresting
777          */
778         for (p = list; p; p = p->next) {
779                 struct commit *c = p->item;
780                 if (c->object.flags & TMP_MARK)
781                         continue;
782                 c->object.flags |= UNINTERESTING;
783         }
784
785         /* We are done with the TMP_MARK */
786         for (p = list; p; p = p->next)
787                 p->item->object.flags &= ~TMP_MARK;
788         for (p = bottom; p; p = p->next)
789                 p->item->object.flags &= ~TMP_MARK;
790         free_commit_list(rlist);
791 }
792
793 /*
794  * Before walking the history, keep the set of "negative" refs the
795  * caller has asked to exclude.
796  *
797  * This is used to compute "rev-list --ancestry-path A..B", as we need
798  * to filter the result of "A..B" further to the ones that can actually
799  * reach A.
800  */
801 static struct commit_list *collect_bottom_commits(struct rev_info *revs)
802 {
803         struct commit_list *bottom = NULL;
804         int i;
805         for (i = 0; i < revs->cmdline.nr; i++) {
806                 struct rev_cmdline_entry *elem = &revs->cmdline.rev[i];
807                 if ((elem->flags & UNINTERESTING) &&
808                     elem->item->type == OBJ_COMMIT)
809                         commit_list_insert((struct commit *)elem->item, &bottom);
810         }
811         return bottom;
812 }
813
814 /* Assumes either left_only or right_only is set */
815 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
816 {
817         struct commit_list *p;
818
819         for (p = list; p; p = p->next) {
820                 struct commit *commit = p->item;
821
822                 if (revs->right_only) {
823                         if (commit->object.flags & SYMMETRIC_LEFT)
824                                 commit->object.flags |= SHOWN;
825                 } else  /* revs->left_only is set */
826                         if (!(commit->object.flags & SYMMETRIC_LEFT))
827                                 commit->object.flags |= SHOWN;
828         }
829 }
830
831 static int limit_list(struct rev_info *revs)
832 {
833         int slop = SLOP;
834         unsigned long date = ~0ul;
835         struct commit_list *list = revs->commits;
836         struct commit_list *newlist = NULL;
837         struct commit_list **p = &newlist;
838         struct commit_list *bottom = NULL;
839
840         if (revs->ancestry_path) {
841                 bottom = collect_bottom_commits(revs);
842                 if (!bottom)
843                         die("--ancestry-path given but there are no bottom commits");
844         }
845
846         while (list) {
847                 struct commit_list *entry = list;
848                 struct commit *commit = list->item;
849                 struct object *obj = &commit->object;
850                 show_early_output_fn_t show;
851
852                 list = list->next;
853                 free(entry);
854
855                 if (revs->max_age != -1 && (commit->date < revs->max_age))
856                         obj->flags |= UNINTERESTING;
857                 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
858                         return -1;
859                 if (obj->flags & UNINTERESTING) {
860                         mark_parents_uninteresting(commit);
861                         if (revs->show_all)
862                                 p = &commit_list_insert(commit, p)->next;
863                         slop = still_interesting(list, date, slop);
864                         if (slop)
865                                 continue;
866                         /* If showing all, add the whole pending list to the end */
867                         if (revs->show_all)
868                                 *p = list;
869                         break;
870                 }
871                 if (revs->min_age != -1 && (commit->date > revs->min_age))
872                         continue;
873                 date = commit->date;
874                 p = &commit_list_insert(commit, p)->next;
875
876                 show = show_early_output;
877                 if (!show)
878                         continue;
879
880                 show(revs, newlist);
881                 show_early_output = NULL;
882         }
883         if (revs->cherry_pick || revs->cherry_mark)
884                 cherry_pick_list(newlist, revs);
885
886         if (revs->left_only || revs->right_only)
887                 limit_left_right(newlist, revs);
888
889         if (bottom) {
890                 limit_to_ancestry(bottom, newlist);
891                 free_commit_list(bottom);
892         }
893
894         revs->commits = newlist;
895         return 0;
896 }
897
898 static void add_rev_cmdline(struct rev_info *revs,
899                             struct object *item,
900                             const char *name,
901                             int whence,
902                             unsigned flags)
903 {
904         struct rev_cmdline_info *info = &revs->cmdline;
905         int nr = info->nr;
906
907         ALLOC_GROW(info->rev, nr + 1, info->alloc);
908         info->rev[nr].item = item;
909         info->rev[nr].name = name;
910         info->rev[nr].whence = whence;
911         info->rev[nr].flags = flags;
912         info->nr++;
913 }
914
915 struct all_refs_cb {
916         int all_flags;
917         int warned_bad_reflog;
918         struct rev_info *all_revs;
919         const char *name_for_errormsg;
920 };
921
922 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
923 {
924         struct all_refs_cb *cb = cb_data;
925         struct object *object = get_reference(cb->all_revs, path, sha1,
926                                               cb->all_flags);
927         add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
928         add_pending_sha1(cb->all_revs, path, sha1, cb->all_flags);
929         return 0;
930 }
931
932 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
933         unsigned flags)
934 {
935         cb->all_revs = revs;
936         cb->all_flags = flags;
937 }
938
939 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
940                 int (*for_each)(const char *, each_ref_fn, void *))
941 {
942         struct all_refs_cb cb;
943         init_all_refs_cb(&cb, revs, flags);
944         for_each(submodule, handle_one_ref, &cb);
945 }
946
947 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
948 {
949         struct all_refs_cb *cb = cb_data;
950         if (!is_null_sha1(sha1)) {
951                 struct object *o = parse_object(sha1);
952                 if (o) {
953                         o->flags |= cb->all_flags;
954                         /* ??? CMDLINEFLAGS ??? */
955                         add_pending_object(cb->all_revs, o, "");
956                 }
957                 else if (!cb->warned_bad_reflog) {
958                         warning("reflog of '%s' references pruned commits",
959                                 cb->name_for_errormsg);
960                         cb->warned_bad_reflog = 1;
961                 }
962         }
963 }
964
965 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
966                 const char *email, unsigned long timestamp, int tz,
967                 const char *message, void *cb_data)
968 {
969         handle_one_reflog_commit(osha1, cb_data);
970         handle_one_reflog_commit(nsha1, cb_data);
971         return 0;
972 }
973
974 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
975 {
976         struct all_refs_cb *cb = cb_data;
977         cb->warned_bad_reflog = 0;
978         cb->name_for_errormsg = path;
979         for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
980         return 0;
981 }
982
983 static void handle_reflog(struct rev_info *revs, unsigned flags)
984 {
985         struct all_refs_cb cb;
986         cb.all_revs = revs;
987         cb.all_flags = flags;
988         for_each_reflog(handle_one_reflog, &cb);
989 }
990
991 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
992 {
993         unsigned char sha1[20];
994         struct object *it;
995         struct commit *commit;
996         struct commit_list *parents;
997         const char *arg = arg_;
998
999         if (*arg == '^') {
1000                 flags ^= UNINTERESTING;
1001                 arg++;
1002         }
1003         if (get_sha1(arg, sha1))
1004                 return 0;
1005         while (1) {
1006                 it = get_reference(revs, arg, sha1, 0);
1007                 if (!it && revs->ignore_missing)
1008                         return 0;
1009                 if (it->type != OBJ_TAG)
1010                         break;
1011                 if (!((struct tag*)it)->tagged)
1012                         return 0;
1013                 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
1014         }
1015         if (it->type != OBJ_COMMIT)
1016                 return 0;
1017         commit = (struct commit *)it;
1018         for (parents = commit->parents; parents; parents = parents->next) {
1019                 it = &parents->item->object;
1020                 it->flags |= flags;
1021                 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1022                 add_pending_object(revs, it, arg);
1023         }
1024         return 1;
1025 }
1026
1027 void init_revisions(struct rev_info *revs, const char *prefix)
1028 {
1029         memset(revs, 0, sizeof(*revs));
1030
1031         revs->abbrev = DEFAULT_ABBREV;
1032         revs->ignore_merges = 1;
1033         revs->simplify_history = 1;
1034         DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1035         DIFF_OPT_SET(&revs->pruning, QUICK);
1036         revs->pruning.add_remove = file_add_remove;
1037         revs->pruning.change = file_change;
1038         revs->lifo = 1;
1039         revs->dense = 1;
1040         revs->prefix = prefix;
1041         revs->max_age = -1;
1042         revs->min_age = -1;
1043         revs->skip_count = -1;
1044         revs->max_count = -1;
1045         revs->max_parents = -1;
1046
1047         revs->commit_format = CMIT_FMT_DEFAULT;
1048
1049         revs->grep_filter.status_only = 1;
1050         revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
1051         revs->grep_filter.header_tail = &(revs->grep_filter.header_list);
1052         revs->grep_filter.regflags = REG_NEWLINE;
1053
1054         diff_setup(&revs->diffopt);
1055         if (prefix && !revs->diffopt.prefix) {
1056                 revs->diffopt.prefix = prefix;
1057                 revs->diffopt.prefix_length = strlen(prefix);
1058         }
1059
1060         revs->notes_opt.use_default_notes = -1;
1061 }
1062
1063 static void add_pending_commit_list(struct rev_info *revs,
1064                                     struct commit_list *commit_list,
1065                                     unsigned int flags)
1066 {
1067         while (commit_list) {
1068                 struct object *object = &commit_list->item->object;
1069                 object->flags |= flags;
1070                 add_pending_object(revs, object, sha1_to_hex(object->sha1));
1071                 commit_list = commit_list->next;
1072         }
1073 }
1074
1075 static void prepare_show_merge(struct rev_info *revs)
1076 {
1077         struct commit_list *bases;
1078         struct commit *head, *other;
1079         unsigned char sha1[20];
1080         const char **prune = NULL;
1081         int i, prune_num = 1; /* counting terminating NULL */
1082
1083         if (get_sha1("HEAD", sha1))
1084                 die("--merge without HEAD?");
1085         head = lookup_commit_or_die(sha1, "HEAD");
1086         if (get_sha1("MERGE_HEAD", sha1))
1087                 die("--merge without MERGE_HEAD?");
1088         other = lookup_commit_or_die(sha1, "MERGE_HEAD");
1089         add_pending_object(revs, &head->object, "HEAD");
1090         add_pending_object(revs, &other->object, "MERGE_HEAD");
1091         bases = get_merge_bases(head, other, 1);
1092         add_pending_commit_list(revs, bases, UNINTERESTING);
1093         free_commit_list(bases);
1094         head->object.flags |= SYMMETRIC_LEFT;
1095
1096         if (!active_nr)
1097                 read_cache();
1098         for (i = 0; i < active_nr; i++) {
1099                 struct cache_entry *ce = active_cache[i];
1100                 if (!ce_stage(ce))
1101                         continue;
1102                 if (ce_path_match(ce, &revs->prune_data)) {
1103                         prune_num++;
1104                         prune = xrealloc(prune, sizeof(*prune) * prune_num);
1105                         prune[prune_num-2] = ce->name;
1106                         prune[prune_num-1] = NULL;
1107                 }
1108                 while ((i+1 < active_nr) &&
1109                        ce_same_name(ce, active_cache[i+1]))
1110                         i++;
1111         }
1112         free_pathspec(&revs->prune_data);
1113         init_pathspec(&revs->prune_data, prune);
1114         revs->limited = 1;
1115 }
1116
1117 int handle_revision_arg(const char *arg_, struct rev_info *revs,
1118                         int flags,
1119                         int cant_be_filename)
1120 {
1121         unsigned mode;
1122         char *dotdot;
1123         struct object *object;
1124         unsigned char sha1[20];
1125         int local_flags;
1126         const char *arg = arg_;
1127
1128         dotdot = strstr(arg, "..");
1129         if (dotdot) {
1130                 unsigned char from_sha1[20];
1131                 const char *next = dotdot + 2;
1132                 const char *this = arg;
1133                 int symmetric = *next == '.';
1134                 unsigned int flags_exclude = flags ^ UNINTERESTING;
1135                 unsigned int a_flags;
1136
1137                 *dotdot = 0;
1138                 next += symmetric;
1139
1140                 if (!*next)
1141                         next = "HEAD";
1142                 if (dotdot == arg)
1143                         this = "HEAD";
1144                 if (!get_sha1(this, from_sha1) &&
1145                     !get_sha1(next, sha1)) {
1146                         struct commit *a, *b;
1147                         struct commit_list *exclude;
1148
1149                         a = lookup_commit_reference(from_sha1);
1150                         b = lookup_commit_reference(sha1);
1151                         if (!a || !b) {
1152                                 if (revs->ignore_missing)
1153                                         return 0;
1154                                 die(symmetric ?
1155                                     "Invalid symmetric difference expression %s...%s" :
1156                                     "Invalid revision range %s..%s",
1157                                     arg, next);
1158                         }
1159
1160                         if (!cant_be_filename) {
1161                                 *dotdot = '.';
1162                                 verify_non_filename(revs->prefix, arg);
1163                         }
1164
1165                         if (symmetric) {
1166                                 exclude = get_merge_bases(a, b, 1);
1167                                 add_pending_commit_list(revs, exclude,
1168                                                         flags_exclude);
1169                                 free_commit_list(exclude);
1170                                 a_flags = flags | SYMMETRIC_LEFT;
1171                         } else
1172                                 a_flags = flags_exclude;
1173                         a->object.flags |= a_flags;
1174                         b->object.flags |= flags;
1175                         add_rev_cmdline(revs, &a->object, this,
1176                                         REV_CMD_LEFT, a_flags);
1177                         add_rev_cmdline(revs, &b->object, next,
1178                                         REV_CMD_RIGHT, flags);
1179                         add_pending_object(revs, &a->object, this);
1180                         add_pending_object(revs, &b->object, next);
1181                         return 0;
1182                 }
1183                 *dotdot = '.';
1184         }
1185         dotdot = strstr(arg, "^@");
1186         if (dotdot && !dotdot[2]) {
1187                 *dotdot = 0;
1188                 if (add_parents_only(revs, arg, flags))
1189                         return 0;
1190                 *dotdot = '^';
1191         }
1192         dotdot = strstr(arg, "^!");
1193         if (dotdot && !dotdot[2]) {
1194                 *dotdot = 0;
1195                 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
1196                         *dotdot = '^';
1197         }
1198
1199         local_flags = 0;
1200         if (*arg == '^') {
1201                 local_flags = UNINTERESTING;
1202                 arg++;
1203         }
1204         if (get_sha1_with_mode(arg, sha1, &mode))
1205                 return revs->ignore_missing ? 0 : -1;
1206         if (!cant_be_filename)
1207                 verify_non_filename(revs->prefix, arg);
1208         object = get_reference(revs, arg, sha1, flags ^ local_flags);
1209         add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1210         add_pending_object_with_mode(revs, object, arg, mode);
1211         return 0;
1212 }
1213
1214 struct cmdline_pathspec {
1215         int alloc;
1216         int nr;
1217         const char **path;
1218 };
1219
1220 static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1221 {
1222         while (*av) {
1223                 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1224                 prune->path[prune->nr++] = *(av++);
1225         }
1226 }
1227
1228 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1229                                      struct cmdline_pathspec *prune)
1230 {
1231         while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1232                 int len = sb->len;
1233                 if (len && sb->buf[len - 1] == '\n')
1234                         sb->buf[--len] = '\0';
1235                 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1236                 prune->path[prune->nr++] = xstrdup(sb->buf);
1237         }
1238 }
1239
1240 static void read_revisions_from_stdin(struct rev_info *revs,
1241                                       struct cmdline_pathspec *prune)
1242 {
1243         struct strbuf sb;
1244         int seen_dashdash = 0;
1245
1246         strbuf_init(&sb, 1000);
1247         while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1248                 int len = sb.len;
1249                 if (len && sb.buf[len - 1] == '\n')
1250                         sb.buf[--len] = '\0';
1251                 if (!len)
1252                         break;
1253                 if (sb.buf[0] == '-') {
1254                         if (len == 2 && sb.buf[1] == '-') {
1255                                 seen_dashdash = 1;
1256                                 break;
1257                         }
1258                         die("options not supported in --stdin mode");
1259                 }
1260                 if (handle_revision_arg(sb.buf, revs, 0, 1))
1261                         die("bad revision '%s'", sb.buf);
1262         }
1263         if (seen_dashdash)
1264                 read_pathspec_from_stdin(revs, &sb, prune);
1265         strbuf_release(&sb);
1266 }
1267
1268 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1269 {
1270         append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1271 }
1272
1273 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1274 {
1275         append_header_grep_pattern(&revs->grep_filter, field, pattern);
1276 }
1277
1278 static void add_message_grep(struct rev_info *revs, const char *pattern)
1279 {
1280         add_grep(revs, pattern, GREP_PATTERN_BODY);
1281 }
1282
1283 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1284                                int *unkc, const char **unkv)
1285 {
1286         const char *arg = argv[0];
1287         const char *optarg;
1288         int argcount;
1289
1290         /* pseudo revision arguments */
1291         if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1292             !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1293             !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1294             !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1295             !strcmp(arg, "--bisect") || !prefixcmp(arg, "--glob=") ||
1296             !prefixcmp(arg, "--branches=") || !prefixcmp(arg, "--tags=") ||
1297             !prefixcmp(arg, "--remotes="))
1298         {
1299                 unkv[(*unkc)++] = arg;
1300                 return 1;
1301         }
1302
1303         if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1304                 revs->max_count = atoi(optarg);
1305                 revs->no_walk = 0;
1306                 return argcount;
1307         } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1308                 revs->skip_count = atoi(optarg);
1309                 return argcount;
1310         } else if ((*arg == '-') && isdigit(arg[1])) {
1311         /* accept -<digit>, like traditional "head" */
1312                 revs->max_count = atoi(arg + 1);
1313                 revs->no_walk = 0;
1314         } else if (!strcmp(arg, "-n")) {
1315                 if (argc <= 1)
1316                         return error("-n requires an argument");
1317                 revs->max_count = atoi(argv[1]);
1318                 revs->no_walk = 0;
1319                 return 2;
1320         } else if (!prefixcmp(arg, "-n")) {
1321                 revs->max_count = atoi(arg + 2);
1322                 revs->no_walk = 0;
1323         } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1324                 revs->max_age = atoi(optarg);
1325                 return argcount;
1326         } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1327                 revs->max_age = approxidate(optarg);
1328                 return argcount;
1329         } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1330                 revs->max_age = approxidate(optarg);
1331                 return argcount;
1332         } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1333                 revs->min_age = atoi(optarg);
1334                 return argcount;
1335         } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1336                 revs->min_age = approxidate(optarg);
1337                 return argcount;
1338         } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1339                 revs->min_age = approxidate(optarg);
1340                 return argcount;
1341         } else if (!strcmp(arg, "--first-parent")) {
1342                 revs->first_parent_only = 1;
1343         } else if (!strcmp(arg, "--ancestry-path")) {
1344                 revs->ancestry_path = 1;
1345                 revs->simplify_history = 0;
1346                 revs->limited = 1;
1347         } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1348                 init_reflog_walk(&revs->reflog_info);
1349         } else if (!strcmp(arg, "--default")) {
1350                 if (argc <= 1)
1351                         return error("bad --default argument");
1352                 revs->def = argv[1];
1353                 return 2;
1354         } else if (!strcmp(arg, "--merge")) {
1355                 revs->show_merge = 1;
1356         } else if (!strcmp(arg, "--topo-order")) {
1357                 revs->lifo = 1;
1358                 revs->topo_order = 1;
1359         } else if (!strcmp(arg, "--simplify-merges")) {
1360                 revs->simplify_merges = 1;
1361                 revs->rewrite_parents = 1;
1362                 revs->simplify_history = 0;
1363                 revs->limited = 1;
1364         } else if (!strcmp(arg, "--simplify-by-decoration")) {
1365                 revs->simplify_merges = 1;
1366                 revs->rewrite_parents = 1;
1367                 revs->simplify_history = 0;
1368                 revs->simplify_by_decoration = 1;
1369                 revs->limited = 1;
1370                 revs->prune = 1;
1371                 load_ref_decorations(DECORATE_SHORT_REFS);
1372         } else if (!strcmp(arg, "--date-order")) {
1373                 revs->lifo = 0;
1374                 revs->topo_order = 1;
1375         } else if (!prefixcmp(arg, "--early-output")) {
1376                 int count = 100;
1377                 switch (arg[14]) {
1378                 case '=':
1379                         count = atoi(arg+15);
1380                         /* Fallthrough */
1381                 case 0:
1382                         revs->topo_order = 1;
1383                        revs->early_output = count;
1384                 }
1385         } else if (!strcmp(arg, "--parents")) {
1386                 revs->rewrite_parents = 1;
1387                 revs->print_parents = 1;
1388         } else if (!strcmp(arg, "--dense")) {
1389                 revs->dense = 1;
1390         } else if (!strcmp(arg, "--sparse")) {
1391                 revs->dense = 0;
1392         } else if (!strcmp(arg, "--show-all")) {
1393                 revs->show_all = 1;
1394         } else if (!strcmp(arg, "--remove-empty")) {
1395                 revs->remove_empty_trees = 1;
1396         } else if (!strcmp(arg, "--merges")) {
1397                 revs->min_parents = 2;
1398         } else if (!strcmp(arg, "--no-merges")) {
1399                 revs->max_parents = 1;
1400         } else if (!prefixcmp(arg, "--min-parents=")) {
1401                 revs->min_parents = atoi(arg+14);
1402         } else if (!prefixcmp(arg, "--no-min-parents")) {
1403                 revs->min_parents = 0;
1404         } else if (!prefixcmp(arg, "--max-parents=")) {
1405                 revs->max_parents = atoi(arg+14);
1406         } else if (!prefixcmp(arg, "--no-max-parents")) {
1407                 revs->max_parents = -1;
1408         } else if (!strcmp(arg, "--boundary")) {
1409                 revs->boundary = 1;
1410         } else if (!strcmp(arg, "--left-right")) {
1411                 revs->left_right = 1;
1412         } else if (!strcmp(arg, "--left-only")) {
1413                 if (revs->right_only)
1414                         die("--left-only is incompatible with --right-only"
1415                             " or --cherry");
1416                 revs->left_only = 1;
1417         } else if (!strcmp(arg, "--right-only")) {
1418                 if (revs->left_only)
1419                         die("--right-only is incompatible with --left-only");
1420                 revs->right_only = 1;
1421         } else if (!strcmp(arg, "--cherry")) {
1422                 if (revs->left_only)
1423                         die("--cherry is incompatible with --left-only");
1424                 revs->cherry_mark = 1;
1425                 revs->right_only = 1;
1426                 revs->max_parents = 1;
1427                 revs->limited = 1;
1428         } else if (!strcmp(arg, "--count")) {
1429                 revs->count = 1;
1430         } else if (!strcmp(arg, "--cherry-mark")) {
1431                 if (revs->cherry_pick)
1432                         die("--cherry-mark is incompatible with --cherry-pick");
1433                 revs->cherry_mark = 1;
1434                 revs->limited = 1; /* needs limit_list() */
1435         } else if (!strcmp(arg, "--cherry-pick")) {
1436                 if (revs->cherry_mark)
1437                         die("--cherry-pick is incompatible with --cherry-mark");
1438                 revs->cherry_pick = 1;
1439                 revs->limited = 1;
1440         } else if (!strcmp(arg, "--objects")) {
1441                 revs->tag_objects = 1;
1442                 revs->tree_objects = 1;
1443                 revs->blob_objects = 1;
1444         } else if (!strcmp(arg, "--objects-edge")) {
1445                 revs->tag_objects = 1;
1446                 revs->tree_objects = 1;
1447                 revs->blob_objects = 1;
1448                 revs->edge_hint = 1;
1449         } else if (!strcmp(arg, "--verify-objects")) {
1450                 revs->tag_objects = 1;
1451                 revs->tree_objects = 1;
1452                 revs->blob_objects = 1;
1453                 revs->verify_objects = 1;
1454         } else if (!strcmp(arg, "--unpacked")) {
1455                 revs->unpacked = 1;
1456         } else if (!prefixcmp(arg, "--unpacked=")) {
1457                 die("--unpacked=<packfile> no longer supported.");
1458         } else if (!strcmp(arg, "-r")) {
1459                 revs->diff = 1;
1460                 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1461         } else if (!strcmp(arg, "-t")) {
1462                 revs->diff = 1;
1463                 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1464                 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1465         } else if (!strcmp(arg, "-m")) {
1466                 revs->ignore_merges = 0;
1467         } else if (!strcmp(arg, "-c")) {
1468                 revs->diff = 1;
1469                 revs->dense_combined_merges = 0;
1470                 revs->combine_merges = 1;
1471         } else if (!strcmp(arg, "--cc")) {
1472                 revs->diff = 1;
1473                 revs->dense_combined_merges = 1;
1474                 revs->combine_merges = 1;
1475         } else if (!strcmp(arg, "-v")) {
1476                 revs->verbose_header = 1;
1477         } else if (!strcmp(arg, "--pretty")) {
1478                 revs->verbose_header = 1;
1479                 revs->pretty_given = 1;
1480                 get_commit_format(arg+8, revs);
1481         } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
1482                 /*
1483                  * Detached form ("--pretty X" as opposed to "--pretty=X")
1484                  * not allowed, since the argument is optional.
1485                  */
1486                 revs->verbose_header = 1;
1487                 revs->pretty_given = 1;
1488                 get_commit_format(arg+9, revs);
1489         } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1490                 revs->show_notes = 1;
1491                 revs->show_notes_given = 1;
1492                 revs->notes_opt.use_default_notes = 1;
1493         } else if (!strcmp(arg, "--show-signature")) {
1494                 revs->show_signature = 1;
1495         } else if (!prefixcmp(arg, "--show-notes=") ||
1496                    !prefixcmp(arg, "--notes=")) {
1497                 struct strbuf buf = STRBUF_INIT;
1498                 revs->show_notes = 1;
1499                 revs->show_notes_given = 1;
1500                 if (!prefixcmp(arg, "--show-notes")) {
1501                         if (revs->notes_opt.use_default_notes < 0)
1502                                 revs->notes_opt.use_default_notes = 1;
1503                         strbuf_addstr(&buf, arg+13);
1504                 }
1505                 else
1506                         strbuf_addstr(&buf, arg+8);
1507                 expand_notes_ref(&buf);
1508                 string_list_append(&revs->notes_opt.extra_notes_refs,
1509                                    strbuf_detach(&buf, NULL));
1510         } else if (!strcmp(arg, "--no-notes")) {
1511                 revs->show_notes = 0;
1512                 revs->show_notes_given = 1;
1513                 revs->notes_opt.use_default_notes = -1;
1514                 /* we have been strdup'ing ourselves, so trick
1515                  * string_list into free()ing strings */
1516                 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1517                 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1518                 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1519         } else if (!strcmp(arg, "--standard-notes")) {
1520                 revs->show_notes_given = 1;
1521                 revs->notes_opt.use_default_notes = 1;
1522         } else if (!strcmp(arg, "--no-standard-notes")) {
1523                 revs->notes_opt.use_default_notes = 0;
1524         } else if (!strcmp(arg, "--oneline")) {
1525                 revs->verbose_header = 1;
1526                 get_commit_format("oneline", revs);
1527                 revs->pretty_given = 1;
1528                 revs->abbrev_commit = 1;
1529         } else if (!strcmp(arg, "--graph")) {
1530                 revs->topo_order = 1;
1531                 revs->rewrite_parents = 1;
1532                 revs->graph = graph_init(revs);
1533         } else if (!strcmp(arg, "--root")) {
1534                 revs->show_root_diff = 1;
1535         } else if (!strcmp(arg, "--no-commit-id")) {
1536                 revs->no_commit_id = 1;
1537         } else if (!strcmp(arg, "--always")) {
1538                 revs->always_show_header = 1;
1539         } else if (!strcmp(arg, "--no-abbrev")) {
1540                 revs->abbrev = 0;
1541         } else if (!strcmp(arg, "--abbrev")) {
1542                 revs->abbrev = DEFAULT_ABBREV;
1543         } else if (!prefixcmp(arg, "--abbrev=")) {
1544                 revs->abbrev = strtoul(arg + 9, NULL, 10);
1545                 if (revs->abbrev < MINIMUM_ABBREV)
1546                         revs->abbrev = MINIMUM_ABBREV;
1547                 else if (revs->abbrev > 40)
1548                         revs->abbrev = 40;
1549         } else if (!strcmp(arg, "--abbrev-commit")) {
1550                 revs->abbrev_commit = 1;
1551                 revs->abbrev_commit_given = 1;
1552         } else if (!strcmp(arg, "--no-abbrev-commit")) {
1553                 revs->abbrev_commit = 0;
1554         } else if (!strcmp(arg, "--full-diff")) {
1555                 revs->diff = 1;
1556                 revs->full_diff = 1;
1557         } else if (!strcmp(arg, "--full-history")) {
1558                 revs->simplify_history = 0;
1559         } else if (!strcmp(arg, "--relative-date")) {
1560                 revs->date_mode = DATE_RELATIVE;
1561                 revs->date_mode_explicit = 1;
1562         } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1563                 revs->date_mode = parse_date_format(optarg);
1564                 revs->date_mode_explicit = 1;
1565                 return argcount;
1566         } else if (!strcmp(arg, "--log-size")) {
1567                 revs->show_log_size = 1;
1568         }
1569         /*
1570          * Grepping the commit log
1571          */
1572         else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1573                 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1574                 return argcount;
1575         } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1576                 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1577                 return argcount;
1578         } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1579                 add_message_grep(revs, optarg);
1580                 return argcount;
1581         } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1582                 revs->grep_filter.regflags |= REG_EXTENDED;
1583         } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1584                 revs->grep_filter.regflags |= REG_ICASE;
1585                 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
1586         } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1587                 revs->grep_filter.fixed = 1;
1588         } else if (!strcmp(arg, "--all-match")) {
1589                 revs->grep_filter.all_match = 1;
1590         } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
1591                 if (strcmp(optarg, "none"))
1592                         git_log_output_encoding = xstrdup(optarg);
1593                 else
1594                         git_log_output_encoding = "";
1595                 return argcount;
1596         } else if (!strcmp(arg, "--reverse")) {
1597                 revs->reverse ^= 1;
1598         } else if (!strcmp(arg, "--children")) {
1599                 revs->children.name = "children";
1600                 revs->limited = 1;
1601         } else if (!strcmp(arg, "--ignore-missing")) {
1602                 revs->ignore_missing = 1;
1603         } else {
1604                 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1605                 if (!opts)
1606                         unkv[(*unkc)++] = arg;
1607                 return opts;
1608         }
1609
1610         return 1;
1611 }
1612
1613 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1614                         const struct option *options,
1615                         const char * const usagestr[])
1616 {
1617         int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1618                                     &ctx->cpidx, ctx->out);
1619         if (n <= 0) {
1620                 error("unknown option `%s'", ctx->argv[0]);
1621                 usage_with_options(usagestr, options);
1622         }
1623         ctx->argv += n;
1624         ctx->argc -= n;
1625 }
1626
1627 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1628 {
1629         return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
1630 }
1631
1632 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1633 {
1634         return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
1635 }
1636
1637 static int handle_revision_pseudo_opt(const char *submodule,
1638                                 struct rev_info *revs,
1639                                 int argc, const char **argv, int *flags)
1640 {
1641         const char *arg = argv[0];
1642         const char *optarg;
1643         int argcount;
1644
1645         /*
1646          * NOTE!
1647          *
1648          * Commands like "git shortlog" will not accept the options below
1649          * unless parse_revision_opt queues them (as opposed to erroring
1650          * out).
1651          *
1652          * When implementing your new pseudo-option, remember to
1653          * register it in the list at the top of handle_revision_opt.
1654          */
1655         if (!strcmp(arg, "--all")) {
1656                 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
1657                 handle_refs(submodule, revs, *flags, head_ref_submodule);
1658         } else if (!strcmp(arg, "--branches")) {
1659                 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
1660         } else if (!strcmp(arg, "--bisect")) {
1661                 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
1662                 handle_refs(submodule, revs, *flags ^ UNINTERESTING, for_each_good_bisect_ref);
1663                 revs->bisect = 1;
1664         } else if (!strcmp(arg, "--tags")) {
1665                 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
1666         } else if (!strcmp(arg, "--remotes")) {
1667                 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
1668         } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
1669                 struct all_refs_cb cb;
1670                 init_all_refs_cb(&cb, revs, *flags);
1671                 for_each_glob_ref(handle_one_ref, optarg, &cb);
1672                 return argcount;
1673         } else if (!prefixcmp(arg, "--branches=")) {
1674                 struct all_refs_cb cb;
1675                 init_all_refs_cb(&cb, revs, *flags);
1676                 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
1677         } else if (!prefixcmp(arg, "--tags=")) {
1678                 struct all_refs_cb cb;
1679                 init_all_refs_cb(&cb, revs, *flags);
1680                 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
1681         } else if (!prefixcmp(arg, "--remotes=")) {
1682                 struct all_refs_cb cb;
1683                 init_all_refs_cb(&cb, revs, *flags);
1684                 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
1685         } else if (!strcmp(arg, "--reflog")) {
1686                 handle_reflog(revs, *flags);
1687         } else if (!strcmp(arg, "--not")) {
1688                 *flags ^= UNINTERESTING;
1689         } else if (!strcmp(arg, "--no-walk")) {
1690                 revs->no_walk = 1;
1691         } else if (!strcmp(arg, "--do-walk")) {
1692                 revs->no_walk = 0;
1693         } else {
1694                 return 0;
1695         }
1696
1697         return 1;
1698 }
1699
1700 /*
1701  * Parse revision information, filling in the "rev_info" structure,
1702  * and removing the used arguments from the argument list.
1703  *
1704  * Returns the number of arguments left that weren't recognized
1705  * (which are also moved to the head of the argument list)
1706  */
1707 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
1708 {
1709         int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
1710         struct cmdline_pathspec prune_data;
1711         const char *submodule = NULL;
1712
1713         memset(&prune_data, 0, sizeof(prune_data));
1714         if (opt)
1715                 submodule = opt->submodule;
1716
1717         /* First, search for "--" */
1718         seen_dashdash = 0;
1719         for (i = 1; i < argc; i++) {
1720                 const char *arg = argv[i];
1721                 if (strcmp(arg, "--"))
1722                         continue;
1723                 argv[i] = NULL;
1724                 argc = i;
1725                 if (argv[i + 1])
1726                         append_prune_data(&prune_data, argv + i + 1);
1727                 seen_dashdash = 1;
1728                 break;
1729         }
1730
1731         /* Second, deal with arguments and options */
1732         flags = 0;
1733         read_from_stdin = 0;
1734         for (left = i = 1; i < argc; i++) {
1735                 const char *arg = argv[i];
1736                 if (*arg == '-') {
1737                         int opts;
1738
1739                         opts = handle_revision_pseudo_opt(submodule,
1740                                                 revs, argc - i, argv + i,
1741                                                 &flags);
1742                         if (opts > 0) {
1743                                 i += opts - 1;
1744                                 continue;
1745                         }
1746
1747                         if (!strcmp(arg, "--stdin")) {
1748                                 if (revs->disable_stdin) {
1749                                         argv[left++] = arg;
1750                                         continue;
1751                                 }
1752                                 if (read_from_stdin++)
1753                                         die("--stdin given twice?");
1754                                 read_revisions_from_stdin(revs, &prune_data);
1755                                 continue;
1756                         }
1757
1758                         opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1759                         if (opts > 0) {
1760                                 i += opts - 1;
1761                                 continue;
1762                         }
1763                         if (opts < 0)
1764                                 exit(128);
1765                         continue;
1766                 }
1767
1768                 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1769                         int j;
1770                         if (seen_dashdash || *arg == '^')
1771                                 die("bad revision '%s'", arg);
1772
1773                         /* If we didn't have a "--":
1774                          * (1) all filenames must exist;
1775                          * (2) all rev-args must not be interpretable
1776                          *     as a valid filename.
1777                          * but the latter we have checked in the main loop.
1778                          */
1779                         for (j = i; j < argc; j++)
1780                                 verify_filename(revs->prefix, argv[j]);
1781
1782                         append_prune_data(&prune_data, argv + i);
1783                         break;
1784                 }
1785                 else
1786                         got_rev_arg = 1;
1787         }
1788
1789         if (prune_data.nr) {
1790                 /*
1791                  * If we need to introduce the magic "a lone ':' means no
1792                  * pathspec whatsoever", here is the place to do so.
1793                  *
1794                  * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
1795                  *      prune_data.nr = 0;
1796                  *      prune_data.alloc = 0;
1797                  *      free(prune_data.path);
1798                  *      prune_data.path = NULL;
1799                  * } else {
1800                  *      terminate prune_data.alloc with NULL and
1801                  *      call init_pathspec() to set revs->prune_data here.
1802                  * }
1803                  */
1804                 ALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc);
1805                 prune_data.path[prune_data.nr++] = NULL;
1806                 init_pathspec(&revs->prune_data,
1807                               get_pathspec(revs->prefix, prune_data.path));
1808         }
1809
1810         if (revs->def == NULL)
1811                 revs->def = opt ? opt->def : NULL;
1812         if (opt && opt->tweak)
1813                 opt->tweak(revs, opt);
1814         if (revs->show_merge)
1815                 prepare_show_merge(revs);
1816         if (revs->def && !revs->pending.nr && !got_rev_arg) {
1817                 unsigned char sha1[20];
1818                 struct object *object;
1819                 unsigned mode;
1820                 if (get_sha1_with_mode(revs->def, sha1, &mode))
1821                         die("bad default revision '%s'", revs->def);
1822                 object = get_reference(revs, revs->def, sha1, 0);
1823                 add_pending_object_with_mode(revs, object, revs->def, mode);
1824         }
1825
1826         /* Did the user ask for any diff output? Run the diff! */
1827         if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1828                 revs->diff = 1;
1829
1830         /* Pickaxe, diff-filter and rename following need diffs */
1831         if (revs->diffopt.pickaxe ||
1832             revs->diffopt.filter ||
1833             DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1834                 revs->diff = 1;
1835
1836         if (revs->topo_order)
1837                 revs->limited = 1;
1838
1839         if (revs->prune_data.nr) {
1840                 diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning);
1841                 /* Can't prune commits with rename following: the paths change.. */
1842                 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1843                         revs->prune = 1;
1844                 if (!revs->full_diff)
1845                         diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt);
1846         }
1847         if (revs->combine_merges)
1848                 revs->ignore_merges = 0;
1849         revs->diffopt.abbrev = revs->abbrev;
1850         if (diff_setup_done(&revs->diffopt) < 0)
1851                 die("diff_setup_done failed");
1852
1853         compile_grep_patterns(&revs->grep_filter);
1854
1855         if (revs->reverse && revs->reflog_info)
1856                 die("cannot combine --reverse with --walk-reflogs");
1857         if (revs->rewrite_parents && revs->children.name)
1858                 die("cannot combine --parents and --children");
1859
1860         /*
1861          * Limitations on the graph functionality
1862          */
1863         if (revs->reverse && revs->graph)
1864                 die("cannot combine --reverse with --graph");
1865
1866         if (revs->reflog_info && revs->graph)
1867                 die("cannot combine --walk-reflogs with --graph");
1868
1869         return left;
1870 }
1871
1872 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1873 {
1874         struct commit_list *l = xcalloc(1, sizeof(*l));
1875
1876         l->item = child;
1877         l->next = add_decoration(&revs->children, &parent->object, l);
1878 }
1879
1880 static int remove_duplicate_parents(struct commit *commit)
1881 {
1882         struct commit_list **pp, *p;
1883         int surviving_parents;
1884
1885         /* Examine existing parents while marking ones we have seen... */
1886         pp = &commit->parents;
1887         while ((p = *pp) != NULL) {
1888                 struct commit *parent = p->item;
1889                 if (parent->object.flags & TMP_MARK) {
1890                         *pp = p->next;
1891                         continue;
1892                 }
1893                 parent->object.flags |= TMP_MARK;
1894                 pp = &p->next;
1895         }
1896         /* count them while clearing the temporary mark */
1897         surviving_parents = 0;
1898         for (p = commit->parents; p; p = p->next) {
1899                 p->item->object.flags &= ~TMP_MARK;
1900                 surviving_parents++;
1901         }
1902         return surviving_parents;
1903 }
1904
1905 struct merge_simplify_state {
1906         struct commit *simplified;
1907 };
1908
1909 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1910 {
1911         struct merge_simplify_state *st;
1912
1913         st = lookup_decoration(&revs->merge_simplification, &commit->object);
1914         if (!st) {
1915                 st = xcalloc(1, sizeof(*st));
1916                 add_decoration(&revs->merge_simplification, &commit->object, st);
1917         }
1918         return st;
1919 }
1920
1921 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1922 {
1923         struct commit_list *p;
1924         struct merge_simplify_state *st, *pst;
1925         int cnt;
1926
1927         st = locate_simplify_state(revs, commit);
1928
1929         /*
1930          * Have we handled this one?
1931          */
1932         if (st->simplified)
1933                 return tail;
1934
1935         /*
1936          * An UNINTERESTING commit simplifies to itself, so does a
1937          * root commit.  We do not rewrite parents of such commit
1938          * anyway.
1939          */
1940         if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
1941                 st->simplified = commit;
1942                 return tail;
1943         }
1944
1945         /*
1946          * Do we know what commit all of our parents should be rewritten to?
1947          * Otherwise we are not ready to rewrite this one yet.
1948          */
1949         for (cnt = 0, p = commit->parents; p; p = p->next) {
1950                 pst = locate_simplify_state(revs, p->item);
1951                 if (!pst->simplified) {
1952                         tail = &commit_list_insert(p->item, tail)->next;
1953                         cnt++;
1954                 }
1955         }
1956         if (cnt) {
1957                 tail = &commit_list_insert(commit, tail)->next;
1958                 return tail;
1959         }
1960
1961         /*
1962          * Rewrite our list of parents.
1963          */
1964         for (p = commit->parents; p; p = p->next) {
1965                 pst = locate_simplify_state(revs, p->item);
1966                 p->item = pst->simplified;
1967         }
1968         cnt = remove_duplicate_parents(commit);
1969
1970         /*
1971          * It is possible that we are a merge and one side branch
1972          * does not have any commit that touches the given paths;
1973          * in such a case, the immediate parents will be rewritten
1974          * to different commits.
1975          *
1976          *      o----X          X: the commit we are looking at;
1977          *     /    /           o: a commit that touches the paths;
1978          * ---o----'
1979          *
1980          * Further reduce the parents by removing redundant parents.
1981          */
1982         if (1 < cnt) {
1983                 struct commit_list *h = reduce_heads(commit->parents);
1984                 cnt = commit_list_count(h);
1985                 free_commit_list(commit->parents);
1986                 commit->parents = h;
1987         }
1988
1989         /*
1990          * A commit simplifies to itself if it is a root, if it is
1991          * UNINTERESTING, if it touches the given paths, or if it is a
1992          * merge and its parents simplifies to more than one commits
1993          * (the first two cases are already handled at the beginning of
1994          * this function).
1995          *
1996          * Otherwise, it simplifies to what its sole parent simplifies to.
1997          */
1998         if (!cnt ||
1999             (commit->object.flags & UNINTERESTING) ||
2000             !(commit->object.flags & TREESAME) ||
2001             (1 < cnt))
2002                 st->simplified = commit;
2003         else {
2004                 pst = locate_simplify_state(revs, commit->parents->item);
2005                 st->simplified = pst->simplified;
2006         }
2007         return tail;
2008 }
2009
2010 static void simplify_merges(struct rev_info *revs)
2011 {
2012         struct commit_list *list;
2013         struct commit_list *yet_to_do, **tail;
2014
2015         if (!revs->topo_order)
2016                 sort_in_topological_order(&revs->commits, revs->lifo);
2017         if (!revs->prune)
2018                 return;
2019
2020         /* feed the list reversed */
2021         yet_to_do = NULL;
2022         for (list = revs->commits; list; list = list->next)
2023                 commit_list_insert(list->item, &yet_to_do);
2024         while (yet_to_do) {
2025                 list = yet_to_do;
2026                 yet_to_do = NULL;
2027                 tail = &yet_to_do;
2028                 while (list) {
2029                         struct commit *commit = list->item;
2030                         struct commit_list *next = list->next;
2031                         free(list);
2032                         list = next;
2033                         tail = simplify_one(revs, commit, tail);
2034                 }
2035         }
2036
2037         /* clean up the result, removing the simplified ones */
2038         list = revs->commits;
2039         revs->commits = NULL;
2040         tail = &revs->commits;
2041         while (list) {
2042                 struct commit *commit = list->item;
2043                 struct commit_list *next = list->next;
2044                 struct merge_simplify_state *st;
2045                 free(list);
2046                 list = next;
2047                 st = locate_simplify_state(revs, commit);
2048                 if (st->simplified == commit)
2049                         tail = &commit_list_insert(commit, tail)->next;
2050         }
2051 }
2052
2053 static void set_children(struct rev_info *revs)
2054 {
2055         struct commit_list *l;
2056         for (l = revs->commits; l; l = l->next) {
2057                 struct commit *commit = l->item;
2058                 struct commit_list *p;
2059
2060                 for (p = commit->parents; p; p = p->next)
2061                         add_child(revs, p->item, commit);
2062         }
2063 }
2064
2065 int prepare_revision_walk(struct rev_info *revs)
2066 {
2067         int nr = revs->pending.nr;
2068         struct object_array_entry *e, *list;
2069
2070         e = list = revs->pending.objects;
2071         revs->pending.nr = 0;
2072         revs->pending.alloc = 0;
2073         revs->pending.objects = NULL;
2074         while (--nr >= 0) {
2075                 struct commit *commit = handle_commit(revs, e->item, e->name);
2076                 if (commit) {
2077                         if (!(commit->object.flags & SEEN)) {
2078                                 commit->object.flags |= SEEN;
2079                                 commit_list_insert_by_date(commit, &revs->commits);
2080                         }
2081                 }
2082                 e++;
2083         }
2084         if (!revs->leak_pending)
2085                 free(list);
2086
2087         if (revs->no_walk)
2088                 return 0;
2089         if (revs->limited)
2090                 if (limit_list(revs) < 0)
2091                         return -1;
2092         if (revs->topo_order)
2093                 sort_in_topological_order(&revs->commits, revs->lifo);
2094         if (revs->simplify_merges)
2095                 simplify_merges(revs);
2096         if (revs->children.name)
2097                 set_children(revs);
2098         return 0;
2099 }
2100
2101 enum rewrite_result {
2102         rewrite_one_ok,
2103         rewrite_one_noparents,
2104         rewrite_one_error
2105 };
2106
2107 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2108 {
2109         struct commit_list *cache = NULL;
2110
2111         for (;;) {
2112                 struct commit *p = *pp;
2113                 if (!revs->limited)
2114                         if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2115                                 return rewrite_one_error;
2116                 if (p->parents && p->parents->next)
2117                         return rewrite_one_ok;
2118                 if (p->object.flags & UNINTERESTING)
2119                         return rewrite_one_ok;
2120                 if (!(p->object.flags & TREESAME))
2121                         return rewrite_one_ok;
2122                 if (!p->parents)
2123                         return rewrite_one_noparents;
2124                 *pp = p->parents->item;
2125         }
2126 }
2127
2128 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
2129 {
2130         struct commit_list **pp = &commit->parents;
2131         while (*pp) {
2132                 struct commit_list *parent = *pp;
2133                 switch (rewrite_one(revs, &parent->item)) {
2134                 case rewrite_one_ok:
2135                         break;
2136                 case rewrite_one_noparents:
2137                         *pp = parent->next;
2138                         continue;
2139                 case rewrite_one_error:
2140                         return -1;
2141                 }
2142                 pp = &parent->next;
2143         }
2144         remove_duplicate_parents(commit);
2145         return 0;
2146 }
2147
2148 static int commit_match(struct commit *commit, struct rev_info *opt)
2149 {
2150         if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2151                 return 1;
2152         return grep_buffer(&opt->grep_filter,
2153                            commit->buffer, strlen(commit->buffer));
2154 }
2155
2156 static inline int want_ancestry(struct rev_info *revs)
2157 {
2158         return (revs->rewrite_parents || revs->children.name);
2159 }
2160
2161 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2162 {
2163         if (commit->object.flags & SHOWN)
2164                 return commit_ignore;
2165         if (revs->unpacked && has_sha1_pack(commit->object.sha1))
2166                 return commit_ignore;
2167         if (revs->show_all)
2168                 return commit_show;
2169         if (commit->object.flags & UNINTERESTING)
2170                 return commit_ignore;
2171         if (revs->min_age != -1 && (commit->date > revs->min_age))
2172                 return commit_ignore;
2173         if (revs->min_parents || (revs->max_parents >= 0)) {
2174                 int n = 0;
2175                 struct commit_list *p;
2176                 for (p = commit->parents; p; p = p->next)
2177                         n++;
2178                 if ((n < revs->min_parents) ||
2179                     ((revs->max_parents >= 0) && (n > revs->max_parents)))
2180                         return commit_ignore;
2181         }
2182         if (!commit_match(commit, revs))
2183                 return commit_ignore;
2184         if (revs->prune && revs->dense) {
2185                 /* Commit without changes? */
2186                 if (commit->object.flags & TREESAME) {
2187                         /* drop merges unless we want parenthood */
2188                         if (!want_ancestry(revs))
2189                                 return commit_ignore;
2190                         /* non-merge - always ignore it */
2191                         if (!commit->parents || !commit->parents->next)
2192                                 return commit_ignore;
2193                 }
2194         }
2195         return commit_show;
2196 }
2197
2198 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
2199 {
2200         enum commit_action action = get_commit_action(revs, commit);
2201
2202         if (action == commit_show &&
2203             !revs->show_all &&
2204             revs->prune && revs->dense && want_ancestry(revs)) {
2205                 if (rewrite_parents(revs, commit) < 0)
2206                         return commit_error;
2207         }
2208         return action;
2209 }
2210
2211 static struct commit *get_revision_1(struct rev_info *revs)
2212 {
2213         if (!revs->commits)
2214                 return NULL;
2215
2216         do {
2217                 struct commit_list *entry = revs->commits;
2218                 struct commit *commit = entry->item;
2219
2220                 revs->commits = entry->next;
2221                 free(entry);
2222
2223                 if (revs->reflog_info) {
2224                         fake_reflog_parent(revs->reflog_info, commit);
2225                         commit->object.flags &= ~(ADDED | SEEN | SHOWN);
2226                 }
2227
2228                 /*
2229                  * If we haven't done the list limiting, we need to look at
2230                  * the parents here. We also need to do the date-based limiting
2231                  * that we'd otherwise have done in limit_list().
2232                  */
2233                 if (!revs->limited) {
2234                         if (revs->max_age != -1 &&
2235                             (commit->date < revs->max_age))
2236                                 continue;
2237                         if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
2238                                 die("Failed to traverse parents of commit %s",
2239                                     sha1_to_hex(commit->object.sha1));
2240                 }
2241
2242                 switch (simplify_commit(revs, commit)) {
2243                 case commit_ignore:
2244                         continue;
2245                 case commit_error:
2246                         die("Failed to simplify parents of commit %s",
2247                             sha1_to_hex(commit->object.sha1));
2248                 default:
2249                         return commit;
2250                 }
2251         } while (revs->commits);
2252         return NULL;
2253 }
2254
2255 static void gc_boundary(struct object_array *array)
2256 {
2257         unsigned nr = array->nr;
2258         unsigned alloc = array->alloc;
2259         struct object_array_entry *objects = array->objects;
2260
2261         if (alloc <= nr) {
2262                 unsigned i, j;
2263                 for (i = j = 0; i < nr; i++) {
2264                         if (objects[i].item->flags & SHOWN)
2265                                 continue;
2266                         if (i != j)
2267                                 objects[j] = objects[i];
2268                         j++;
2269                 }
2270                 for (i = j; i < nr; i++)
2271                         objects[i].item = NULL;
2272                 array->nr = j;
2273         }
2274 }
2275
2276 static void create_boundary_commit_list(struct rev_info *revs)
2277 {
2278         unsigned i;
2279         struct commit *c;
2280         struct object_array *array = &revs->boundary_commits;
2281         struct object_array_entry *objects = array->objects;
2282
2283         /*
2284          * If revs->commits is non-NULL at this point, an error occurred in
2285          * get_revision_1().  Ignore the error and continue printing the
2286          * boundary commits anyway.  (This is what the code has always
2287          * done.)
2288          */
2289         if (revs->commits) {
2290                 free_commit_list(revs->commits);
2291                 revs->commits = NULL;
2292         }
2293
2294         /*
2295          * Put all of the actual boundary commits from revs->boundary_commits
2296          * into revs->commits
2297          */
2298         for (i = 0; i < array->nr; i++) {
2299                 c = (struct commit *)(objects[i].item);
2300                 if (!c)
2301                         continue;
2302                 if (!(c->object.flags & CHILD_SHOWN))
2303                         continue;
2304                 if (c->object.flags & (SHOWN | BOUNDARY))
2305                         continue;
2306                 c->object.flags |= BOUNDARY;
2307                 commit_list_insert(c, &revs->commits);
2308         }
2309
2310         /*
2311          * If revs->topo_order is set, sort the boundary commits
2312          * in topological order
2313          */
2314         sort_in_topological_order(&revs->commits, revs->lifo);
2315 }
2316
2317 static struct commit *get_revision_internal(struct rev_info *revs)
2318 {
2319         struct commit *c = NULL;
2320         struct commit_list *l;
2321
2322         if (revs->boundary == 2) {
2323                 /*
2324                  * All of the normal commits have already been returned,
2325                  * and we are now returning boundary commits.
2326                  * create_boundary_commit_list() has populated
2327                  * revs->commits with the remaining commits to return.
2328                  */
2329                 c = pop_commit(&revs->commits);
2330                 if (c)
2331                         c->object.flags |= SHOWN;
2332                 return c;
2333         }
2334
2335         /*
2336          * Now pick up what they want to give us
2337          */
2338         c = get_revision_1(revs);
2339         if (c) {
2340                 while (0 < revs->skip_count) {
2341                         revs->skip_count--;
2342                         c = get_revision_1(revs);
2343                         if (!c)
2344                                 break;
2345                 }
2346         }
2347
2348         /*
2349          * Check the max_count.
2350          */
2351         switch (revs->max_count) {
2352         case -1:
2353                 break;
2354         case 0:
2355                 c = NULL;
2356                 break;
2357         default:
2358                 revs->max_count--;
2359         }
2360
2361         if (c)
2362                 c->object.flags |= SHOWN;
2363
2364         if (!revs->boundary) {
2365                 return c;
2366         }
2367
2368         if (!c) {
2369                 /*
2370                  * get_revision_1() runs out the commits, and
2371                  * we are done computing the boundaries.
2372                  * switch to boundary commits output mode.
2373                  */
2374                 revs->boundary = 2;
2375
2376                 /*
2377                  * Update revs->commits to contain the list of
2378                  * boundary commits.
2379                  */
2380                 create_boundary_commit_list(revs);
2381
2382                 return get_revision_internal(revs);
2383         }
2384
2385         /*
2386          * boundary commits are the commits that are parents of the
2387          * ones we got from get_revision_1() but they themselves are
2388          * not returned from get_revision_1().  Before returning
2389          * 'c', we need to mark its parents that they could be boundaries.
2390          */
2391
2392         for (l = c->parents; l; l = l->next) {
2393                 struct object *p;
2394                 p = &(l->item->object);
2395                 if (p->flags & (CHILD_SHOWN | SHOWN))
2396                         continue;
2397                 p->flags |= CHILD_SHOWN;
2398                 gc_boundary(&revs->boundary_commits);
2399                 add_object_array(p, NULL, &revs->boundary_commits);
2400         }
2401
2402         return c;
2403 }
2404
2405 struct commit *get_revision(struct rev_info *revs)
2406 {
2407         struct commit *c;
2408         struct commit_list *reversed;
2409
2410         if (revs->reverse) {
2411                 reversed = NULL;
2412                 while ((c = get_revision_internal(revs))) {
2413                         commit_list_insert(c, &reversed);
2414                 }
2415                 revs->commits = reversed;
2416                 revs->reverse = 0;
2417                 revs->reverse_output_stage = 1;
2418         }
2419
2420         if (revs->reverse_output_stage)
2421                 return pop_commit(&revs->commits);
2422
2423         c = get_revision_internal(revs);
2424         if (c && revs->graph)
2425                 graph_update(revs->graph, c);
2426         return c;
2427 }
2428
2429 char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
2430 {
2431         if (commit->object.flags & BOUNDARY)
2432                 return "-";
2433         else if (commit->object.flags & UNINTERESTING)
2434                 return "^";
2435         else if (commit->object.flags & PATCHSAME)
2436                 return "=";
2437         else if (!revs || revs->left_right) {
2438                 if (commit->object.flags & SYMMETRIC_LEFT)
2439                         return "<";
2440                 else
2441                         return ">";
2442         } else if (revs->graph)
2443                 return "*";
2444         else if (revs->cherry_mark)
2445                 return "+";
2446         return "";
2447 }
2448
2449 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
2450 {
2451         char *mark = get_revision_mark(revs, commit);
2452         if (!strlen(mark))
2453                 return;
2454         fputs(mark, stdout);
2455         putchar(' ');
2456 }