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