Merge branch 'nd/dir-exclude-cleanup'
[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 "line-log.h"
17 #include "mailmap.h"
18 #include "commit-slab.h"
19 #include "dir.h"
20 #include "cache-tree.h"
21 #include "bisect.h"
22
23 volatile show_early_output_fn_t show_early_output;
24
25 static const char *term_bad;
26 static const char *term_good;
27
28 char *path_name(const struct name_path *path, const char *name)
29 {
30         const struct name_path *p;
31         char *n, *m;
32         int nlen = strlen(name);
33         int len = nlen + 1;
34
35         for (p = path; p; p = p->up) {
36                 if (p->elem_len)
37                         len += p->elem_len + 1;
38         }
39         n = xmalloc(len);
40         m = n + len - (nlen + 1);
41         memcpy(m, name, nlen + 1);
42         for (p = path; p; p = p->up) {
43                 if (p->elem_len) {
44                         m -= p->elem_len + 1;
45                         memcpy(m, p->elem, p->elem_len);
46                         m[p->elem_len] = '/';
47                 }
48         }
49         return n;
50 }
51
52 static int show_path_component_truncated(FILE *out, const char *name, int len)
53 {
54         int cnt;
55         for (cnt = 0; cnt < len; cnt++) {
56                 int ch = name[cnt];
57                 if (!ch || ch == '\n')
58                         return -1;
59                 fputc(ch, out);
60         }
61         return len;
62 }
63
64 static int show_path_truncated(FILE *out, const struct name_path *path)
65 {
66         int emitted, ours;
67
68         if (!path)
69                 return 0;
70         emitted = show_path_truncated(out, path->up);
71         if (emitted < 0)
72                 return emitted;
73         if (emitted)
74                 fputc('/', out);
75         ours = show_path_component_truncated(out, path->elem, path->elem_len);
76         if (ours < 0)
77                 return ours;
78         return ours || emitted;
79 }
80
81 void show_object_with_name(FILE *out, struct object *obj,
82                            const struct name_path *path, const char *component)
83 {
84         struct name_path leaf;
85         leaf.up = (struct name_path *)path;
86         leaf.elem = component;
87         leaf.elem_len = strlen(component);
88
89         fprintf(out, "%s ", oid_to_hex(&obj->oid));
90         show_path_truncated(out, &leaf);
91         fputc('\n', out);
92 }
93
94 static void mark_blob_uninteresting(struct blob *blob)
95 {
96         if (!blob)
97                 return;
98         if (blob->object.flags & UNINTERESTING)
99                 return;
100         blob->object.flags |= UNINTERESTING;
101 }
102
103 static void mark_tree_contents_uninteresting(struct tree *tree)
104 {
105         struct tree_desc desc;
106         struct name_entry entry;
107         struct object *obj = &tree->object;
108
109         if (!has_object_file(&obj->oid))
110                 return;
111         if (parse_tree(tree) < 0)
112                 die("bad tree %s", oid_to_hex(&obj->oid));
113
114         init_tree_desc(&desc, tree->buffer, tree->size);
115         while (tree_entry(&desc, &entry)) {
116                 switch (object_type(entry.mode)) {
117                 case OBJ_TREE:
118                         mark_tree_uninteresting(lookup_tree(entry.sha1));
119                         break;
120                 case OBJ_BLOB:
121                         mark_blob_uninteresting(lookup_blob(entry.sha1));
122                         break;
123                 default:
124                         /* Subproject commit - not in this repository */
125                         break;
126                 }
127         }
128
129         /*
130          * We don't care about the tree any more
131          * after it has been marked uninteresting.
132          */
133         free_tree_buffer(tree);
134 }
135
136 void mark_tree_uninteresting(struct tree *tree)
137 {
138         struct object *obj;
139
140         if (!tree)
141                 return;
142
143         obj = &tree->object;
144         if (obj->flags & UNINTERESTING)
145                 return;
146         obj->flags |= UNINTERESTING;
147         mark_tree_contents_uninteresting(tree);
148 }
149
150 void mark_parents_uninteresting(struct commit *commit)
151 {
152         struct commit_list *parents = NULL, *l;
153
154         for (l = commit->parents; l; l = l->next)
155                 commit_list_insert(l->item, &parents);
156
157         while (parents) {
158                 struct commit *commit = pop_commit(&parents);
159
160                 while (commit) {
161                         /*
162                          * A missing commit is ok iff its parent is marked
163                          * uninteresting.
164                          *
165                          * We just mark such a thing parsed, so that when
166                          * it is popped next time around, we won't be trying
167                          * to parse it and get an error.
168                          */
169                         if (!has_object_file(&commit->object.oid))
170                                 commit->object.parsed = 1;
171
172                         if (commit->object.flags & UNINTERESTING)
173                                 break;
174
175                         commit->object.flags |= UNINTERESTING;
176
177                         /*
178                          * Normally we haven't parsed the parent
179                          * yet, so we won't have a parent of a parent
180                          * here. However, it may turn out that we've
181                          * reached this commit some other way (where it
182                          * wasn't uninteresting), in which case we need
183                          * to mark its parents recursively too..
184                          */
185                         if (!commit->parents)
186                                 break;
187
188                         for (l = commit->parents->next; l; l = l->next)
189                                 commit_list_insert(l->item, &parents);
190                         commit = commit->parents->item;
191                 }
192         }
193 }
194
195 static void add_pending_object_with_path(struct rev_info *revs,
196                                          struct object *obj,
197                                          const char *name, unsigned mode,
198                                          const char *path)
199 {
200         if (!obj)
201                 return;
202         if (revs->no_walk && (obj->flags & UNINTERESTING))
203                 revs->no_walk = 0;
204         if (revs->reflog_info && obj->type == OBJ_COMMIT) {
205                 struct strbuf buf = STRBUF_INIT;
206                 int len = interpret_branch_name(name, 0, &buf);
207                 int st;
208
209                 if (0 < len && name[len] && buf.len)
210                         strbuf_addstr(&buf, name + len);
211                 st = add_reflog_for_walk(revs->reflog_info,
212                                          (struct commit *)obj,
213                                          buf.buf[0] ? buf.buf: name);
214                 strbuf_release(&buf);
215                 if (st)
216                         return;
217         }
218         add_object_array_with_path(obj, name, &revs->pending, mode, path);
219 }
220
221 static void add_pending_object_with_mode(struct rev_info *revs,
222                                          struct object *obj,
223                                          const char *name, unsigned mode)
224 {
225         add_pending_object_with_path(revs, obj, name, mode, NULL);
226 }
227
228 void add_pending_object(struct rev_info *revs,
229                         struct object *obj, const char *name)
230 {
231         add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
232 }
233
234 void add_head_to_pending(struct rev_info *revs)
235 {
236         unsigned char sha1[20];
237         struct object *obj;
238         if (get_sha1("HEAD", sha1))
239                 return;
240         obj = parse_object(sha1);
241         if (!obj)
242                 return;
243         add_pending_object(revs, obj, "HEAD");
244 }
245
246 static struct object *get_reference(struct rev_info *revs, const char *name,
247                                     const unsigned char *sha1,
248                                     unsigned int flags)
249 {
250         struct object *object;
251
252         object = parse_object(sha1);
253         if (!object) {
254                 if (revs->ignore_missing)
255                         return object;
256                 die("bad object %s", name);
257         }
258         object->flags |= flags;
259         return object;
260 }
261
262 void add_pending_sha1(struct rev_info *revs, const char *name,
263                       const unsigned char *sha1, unsigned int flags)
264 {
265         struct object *object = get_reference(revs, name, sha1, flags);
266         add_pending_object(revs, object, name);
267 }
268
269 static struct commit *handle_commit(struct rev_info *revs,
270                                     struct object_array_entry *entry)
271 {
272         struct object *object = entry->item;
273         const char *name = entry->name;
274         const char *path = entry->path;
275         unsigned int mode = entry->mode;
276         unsigned long flags = object->flags;
277
278         /*
279          * Tag object? Look what it points to..
280          */
281         while (object->type == OBJ_TAG) {
282                 struct tag *tag = (struct tag *) object;
283                 if (revs->tag_objects && !(flags & UNINTERESTING))
284                         add_pending_object(revs, object, tag->tag);
285                 if (!tag->tagged)
286                         die("bad tag");
287                 object = parse_object(tag->tagged->oid.hash);
288                 if (!object) {
289                         if (flags & UNINTERESTING)
290                                 return NULL;
291                         die("bad object %s", oid_to_hex(&tag->tagged->oid));
292                 }
293                 object->flags |= flags;
294                 /*
295                  * We'll handle the tagged object by looping or dropping
296                  * through to the non-tag handlers below. Do not
297                  * propagate path data from the tag's pending entry.
298                  */
299                 path = NULL;
300                 mode = 0;
301         }
302
303         /*
304          * Commit object? Just return it, we'll do all the complex
305          * reachability crud.
306          */
307         if (object->type == OBJ_COMMIT) {
308                 struct commit *commit = (struct commit *)object;
309                 if (parse_commit(commit) < 0)
310                         die("unable to parse commit %s", name);
311                 if (flags & UNINTERESTING) {
312                         mark_parents_uninteresting(commit);
313                         revs->limited = 1;
314                 }
315                 if (revs->show_source && !commit->util)
316                         commit->util = xstrdup(name);
317                 return commit;
318         }
319
320         /*
321          * Tree object? Either mark it uninteresting, or add it
322          * to the list of objects to look at later..
323          */
324         if (object->type == OBJ_TREE) {
325                 struct tree *tree = (struct tree *)object;
326                 if (!revs->tree_objects)
327                         return NULL;
328                 if (flags & UNINTERESTING) {
329                         mark_tree_contents_uninteresting(tree);
330                         return NULL;
331                 }
332                 add_pending_object_with_path(revs, object, name, mode, path);
333                 return NULL;
334         }
335
336         /*
337          * Blob object? You know the drill by now..
338          */
339         if (object->type == OBJ_BLOB) {
340                 if (!revs->blob_objects)
341                         return NULL;
342                 if (flags & UNINTERESTING)
343                         return NULL;
344                 add_pending_object_with_path(revs, object, name, mode, path);
345                 return NULL;
346         }
347         die("%s is unknown object", name);
348 }
349
350 static int everybody_uninteresting(struct commit_list *orig,
351                                    struct commit **interesting_cache)
352 {
353         struct commit_list *list = orig;
354
355         if (*interesting_cache) {
356                 struct commit *commit = *interesting_cache;
357                 if (!(commit->object.flags & UNINTERESTING))
358                         return 0;
359         }
360
361         while (list) {
362                 struct commit *commit = list->item;
363                 list = list->next;
364                 if (commit->object.flags & UNINTERESTING)
365                         continue;
366
367                 *interesting_cache = commit;
368                 return 0;
369         }
370         return 1;
371 }
372
373 /*
374  * A definition of "relevant" commit that we can use to simplify limited graphs
375  * by eliminating side branches.
376  *
377  * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
378  * in our list), or that is a specified BOTTOM commit. Then after computing
379  * a limited list, during processing we can generally ignore boundary merges
380  * coming from outside the graph, (ie from irrelevant parents), and treat
381  * those merges as if they were single-parent. TREESAME is defined to consider
382  * only relevant parents, if any. If we are TREESAME to our on-graph parents,
383  * we don't care if we were !TREESAME to non-graph parents.
384  *
385  * Treating bottom commits as relevant ensures that a limited graph's
386  * connection to the actual bottom commit is not viewed as a side branch, but
387  * treated as part of the graph. For example:
388  *
389  *   ....Z...A---X---o---o---B
390  *        .     /
391  *         W---Y
392  *
393  * When computing "A..B", the A-X connection is at least as important as
394  * Y-X, despite A being flagged UNINTERESTING.
395  *
396  * And when computing --ancestry-path "A..B", the A-X connection is more
397  * important than Y-X, despite both A and Y being flagged UNINTERESTING.
398  */
399 static inline int relevant_commit(struct commit *commit)
400 {
401         return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
402 }
403
404 /*
405  * Return a single relevant commit from a parent list. If we are a TREESAME
406  * commit, and this selects one of our parents, then we can safely simplify to
407  * that parent.
408  */
409 static struct commit *one_relevant_parent(const struct rev_info *revs,
410                                           struct commit_list *orig)
411 {
412         struct commit_list *list = orig;
413         struct commit *relevant = NULL;
414
415         if (!orig)
416                 return NULL;
417
418         /*
419          * For 1-parent commits, or if first-parent-only, then return that
420          * first parent (even if not "relevant" by the above definition).
421          * TREESAME will have been set purely on that parent.
422          */
423         if (revs->first_parent_only || !orig->next)
424                 return orig->item;
425
426         /*
427          * For multi-parent commits, identify a sole relevant parent, if any.
428          * If we have only one relevant parent, then TREESAME will be set purely
429          * with regard to that parent, and we can simplify accordingly.
430          *
431          * If we have more than one relevant parent, or no relevant parents
432          * (and multiple irrelevant ones), then we can't select a parent here
433          * and return NULL.
434          */
435         while (list) {
436                 struct commit *commit = list->item;
437                 list = list->next;
438                 if (relevant_commit(commit)) {
439                         if (relevant)
440                                 return NULL;
441                         relevant = commit;
442                 }
443         }
444         return relevant;
445 }
446
447 /*
448  * The goal is to get REV_TREE_NEW as the result only if the
449  * diff consists of all '+' (and no other changes), REV_TREE_OLD
450  * if the whole diff is removal of old data, and otherwise
451  * REV_TREE_DIFFERENT (of course if the trees are the same we
452  * want REV_TREE_SAME).
453  * That means that once we get to REV_TREE_DIFFERENT, we do not
454  * have to look any further.
455  */
456 static int tree_difference = REV_TREE_SAME;
457
458 static void file_add_remove(struct diff_options *options,
459                     int addremove, unsigned mode,
460                     const unsigned char *sha1,
461                     int sha1_valid,
462                     const char *fullpath, unsigned dirty_submodule)
463 {
464         int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
465
466         tree_difference |= diff;
467         if (tree_difference == REV_TREE_DIFFERENT)
468                 DIFF_OPT_SET(options, HAS_CHANGES);
469 }
470
471 static void file_change(struct diff_options *options,
472                  unsigned old_mode, unsigned new_mode,
473                  const unsigned char *old_sha1,
474                  const unsigned char *new_sha1,
475                  int old_sha1_valid, int new_sha1_valid,
476                  const char *fullpath,
477                  unsigned old_dirty_submodule, unsigned new_dirty_submodule)
478 {
479         tree_difference = REV_TREE_DIFFERENT;
480         DIFF_OPT_SET(options, HAS_CHANGES);
481 }
482
483 static int rev_compare_tree(struct rev_info *revs,
484                             struct commit *parent, struct commit *commit)
485 {
486         struct tree *t1 = parent->tree;
487         struct tree *t2 = commit->tree;
488
489         if (!t1)
490                 return REV_TREE_NEW;
491         if (!t2)
492                 return REV_TREE_OLD;
493
494         if (revs->simplify_by_decoration) {
495                 /*
496                  * If we are simplifying by decoration, then the commit
497                  * is worth showing if it has a tag pointing at it.
498                  */
499                 if (get_name_decoration(&commit->object))
500                         return REV_TREE_DIFFERENT;
501                 /*
502                  * A commit that is not pointed by a tag is uninteresting
503                  * if we are not limited by path.  This means that you will
504                  * see the usual "commits that touch the paths" plus any
505                  * tagged commit by specifying both --simplify-by-decoration
506                  * and pathspec.
507                  */
508                 if (!revs->prune_data.nr)
509                         return REV_TREE_SAME;
510         }
511
512         tree_difference = REV_TREE_SAME;
513         DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
514         if (diff_tree_sha1(t1->object.oid.hash, t2->object.oid.hash, "",
515                            &revs->pruning) < 0)
516                 return REV_TREE_DIFFERENT;
517         return tree_difference;
518 }
519
520 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
521 {
522         int retval;
523         struct tree *t1 = commit->tree;
524
525         if (!t1)
526                 return 0;
527
528         tree_difference = REV_TREE_SAME;
529         DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
530         retval = diff_tree_sha1(NULL, t1->object.oid.hash, "", &revs->pruning);
531
532         return retval >= 0 && (tree_difference == REV_TREE_SAME);
533 }
534
535 struct treesame_state {
536         unsigned int nparents;
537         unsigned char treesame[FLEX_ARRAY];
538 };
539
540 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
541 {
542         unsigned n = commit_list_count(commit->parents);
543         struct treesame_state *st = xcalloc(1, sizeof(*st) + n);
544         st->nparents = n;
545         add_decoration(&revs->treesame, &commit->object, st);
546         return st;
547 }
548
549 /*
550  * Must be called immediately after removing the nth_parent from a commit's
551  * parent list, if we are maintaining the per-parent treesame[] decoration.
552  * This does not recalculate the master TREESAME flag - update_treesame()
553  * should be called to update it after a sequence of treesame[] modifications
554  * that may have affected it.
555  */
556 static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
557 {
558         struct treesame_state *st;
559         int old_same;
560
561         if (!commit->parents) {
562                 /*
563                  * Have just removed the only parent from a non-merge.
564                  * Different handling, as we lack decoration.
565                  */
566                 if (nth_parent != 0)
567                         die("compact_treesame %u", nth_parent);
568                 old_same = !!(commit->object.flags & TREESAME);
569                 if (rev_same_tree_as_empty(revs, commit))
570                         commit->object.flags |= TREESAME;
571                 else
572                         commit->object.flags &= ~TREESAME;
573                 return old_same;
574         }
575
576         st = lookup_decoration(&revs->treesame, &commit->object);
577         if (!st || nth_parent >= st->nparents)
578                 die("compact_treesame %u", nth_parent);
579
580         old_same = st->treesame[nth_parent];
581         memmove(st->treesame + nth_parent,
582                 st->treesame + nth_parent + 1,
583                 st->nparents - nth_parent - 1);
584
585         /*
586          * If we've just become a non-merge commit, update TREESAME
587          * immediately, and remove the no-longer-needed decoration.
588          * If still a merge, defer update until update_treesame().
589          */
590         if (--st->nparents == 1) {
591                 if (commit->parents->next)
592                         die("compact_treesame parents mismatch");
593                 if (st->treesame[0] && revs->dense)
594                         commit->object.flags |= TREESAME;
595                 else
596                         commit->object.flags &= ~TREESAME;
597                 free(add_decoration(&revs->treesame, &commit->object, NULL));
598         }
599
600         return old_same;
601 }
602
603 static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
604 {
605         if (commit->parents && commit->parents->next) {
606                 unsigned n;
607                 struct treesame_state *st;
608                 struct commit_list *p;
609                 unsigned relevant_parents;
610                 unsigned relevant_change, irrelevant_change;
611
612                 st = lookup_decoration(&revs->treesame, &commit->object);
613                 if (!st)
614                         die("update_treesame %s", oid_to_hex(&commit->object.oid));
615                 relevant_parents = 0;
616                 relevant_change = irrelevant_change = 0;
617                 for (p = commit->parents, n = 0; p; n++, p = p->next) {
618                         if (relevant_commit(p->item)) {
619                                 relevant_change |= !st->treesame[n];
620                                 relevant_parents++;
621                         } else
622                                 irrelevant_change |= !st->treesame[n];
623                 }
624                 if (relevant_parents ? relevant_change : irrelevant_change)
625                         commit->object.flags &= ~TREESAME;
626                 else
627                         commit->object.flags |= TREESAME;
628         }
629
630         return commit->object.flags & TREESAME;
631 }
632
633 static inline int limiting_can_increase_treesame(const struct rev_info *revs)
634 {
635         /*
636          * TREESAME is irrelevant unless prune && dense;
637          * if simplify_history is set, we can't have a mixture of TREESAME and
638          *    !TREESAME INTERESTING parents (and we don't have treesame[]
639          *    decoration anyway);
640          * if first_parent_only is set, then the TREESAME flag is locked
641          *    against the first parent (and again we lack treesame[] decoration).
642          */
643         return revs->prune && revs->dense &&
644                !revs->simplify_history &&
645                !revs->first_parent_only;
646 }
647
648 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
649 {
650         struct commit_list **pp, *parent;
651         struct treesame_state *ts = NULL;
652         int relevant_change = 0, irrelevant_change = 0;
653         int relevant_parents, nth_parent;
654
655         /*
656          * If we don't do pruning, everything is interesting
657          */
658         if (!revs->prune)
659                 return;
660
661         if (!commit->tree)
662                 return;
663
664         if (!commit->parents) {
665                 if (rev_same_tree_as_empty(revs, commit))
666                         commit->object.flags |= TREESAME;
667                 return;
668         }
669
670         /*
671          * Normal non-merge commit? If we don't want to make the
672          * history dense, we consider it always to be a change..
673          */
674         if (!revs->dense && !commit->parents->next)
675                 return;
676
677         for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
678              (parent = *pp) != NULL;
679              pp = &parent->next, nth_parent++) {
680                 struct commit *p = parent->item;
681                 if (relevant_commit(p))
682                         relevant_parents++;
683
684                 if (nth_parent == 1) {
685                         /*
686                          * This our second loop iteration - so we now know
687                          * we're dealing with a merge.
688                          *
689                          * Do not compare with later parents when we care only about
690                          * the first parent chain, in order to avoid derailing the
691                          * traversal to follow a side branch that brought everything
692                          * in the path we are limited to by the pathspec.
693                          */
694                         if (revs->first_parent_only)
695                                 break;
696                         /*
697                          * If this will remain a potentially-simplifiable
698                          * merge, remember per-parent treesame if needed.
699                          * Initialise the array with the comparison from our
700                          * first iteration.
701                          */
702                         if (revs->treesame.name &&
703                             !revs->simplify_history &&
704                             !(commit->object.flags & UNINTERESTING)) {
705                                 ts = initialise_treesame(revs, commit);
706                                 if (!(irrelevant_change || relevant_change))
707                                         ts->treesame[0] = 1;
708                         }
709                 }
710                 if (parse_commit(p) < 0)
711                         die("cannot simplify commit %s (because of %s)",
712                             oid_to_hex(&commit->object.oid),
713                             oid_to_hex(&p->object.oid));
714                 switch (rev_compare_tree(revs, p, commit)) {
715                 case REV_TREE_SAME:
716                         if (!revs->simplify_history || !relevant_commit(p)) {
717                                 /* Even if a merge with an uninteresting
718                                  * side branch brought the entire change
719                                  * we are interested in, we do not want
720                                  * to lose the other branches of this
721                                  * merge, so we just keep going.
722                                  */
723                                 if (ts)
724                                         ts->treesame[nth_parent] = 1;
725                                 continue;
726                         }
727                         parent->next = NULL;
728                         commit->parents = parent;
729                         commit->object.flags |= TREESAME;
730                         return;
731
732                 case REV_TREE_NEW:
733                         if (revs->remove_empty_trees &&
734                             rev_same_tree_as_empty(revs, p)) {
735                                 /* We are adding all the specified
736                                  * paths from this parent, so the
737                                  * history beyond this parent is not
738                                  * interesting.  Remove its parents
739                                  * (they are grandparents for us).
740                                  * IOW, we pretend this parent is a
741                                  * "root" commit.
742                                  */
743                                 if (parse_commit(p) < 0)
744                                         die("cannot simplify commit %s (invalid %s)",
745                                             oid_to_hex(&commit->object.oid),
746                                             oid_to_hex(&p->object.oid));
747                                 p->parents = NULL;
748                         }
749                 /* fallthrough */
750                 case REV_TREE_OLD:
751                 case REV_TREE_DIFFERENT:
752                         if (relevant_commit(p))
753                                 relevant_change = 1;
754                         else
755                                 irrelevant_change = 1;
756                         continue;
757                 }
758                 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
759         }
760
761         /*
762          * TREESAME is straightforward for single-parent commits. For merge
763          * commits, it is most useful to define it so that "irrelevant"
764          * parents cannot make us !TREESAME - if we have any relevant
765          * parents, then we only consider TREESAMEness with respect to them,
766          * allowing irrelevant merges from uninteresting branches to be
767          * simplified away. Only if we have only irrelevant parents do we
768          * base TREESAME on them. Note that this logic is replicated in
769          * update_treesame, which should be kept in sync.
770          */
771         if (relevant_parents ? !relevant_change : !irrelevant_change)
772                 commit->object.flags |= TREESAME;
773 }
774
775 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
776                     struct commit_list *cached_base, struct commit_list **cache)
777 {
778         struct commit_list *new_entry;
779
780         if (cached_base && p->date < cached_base->item->date)
781                 new_entry = commit_list_insert_by_date(p, &cached_base->next);
782         else
783                 new_entry = commit_list_insert_by_date(p, head);
784
785         if (cache && (!*cache || p->date < (*cache)->item->date))
786                 *cache = new_entry;
787 }
788
789 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
790                     struct commit_list **list, struct commit_list **cache_ptr)
791 {
792         struct commit_list *parent = commit->parents;
793         unsigned left_flag;
794         struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
795
796         if (commit->object.flags & ADDED)
797                 return 0;
798         commit->object.flags |= ADDED;
799
800         if (revs->include_check &&
801             !revs->include_check(commit, revs->include_check_data))
802                 return 0;
803
804         /*
805          * If the commit is uninteresting, don't try to
806          * prune parents - we want the maximal uninteresting
807          * set.
808          *
809          * Normally we haven't parsed the parent
810          * yet, so we won't have a parent of a parent
811          * here. However, it may turn out that we've
812          * reached this commit some other way (where it
813          * wasn't uninteresting), in which case we need
814          * to mark its parents recursively too..
815          */
816         if (commit->object.flags & UNINTERESTING) {
817                 while (parent) {
818                         struct commit *p = parent->item;
819                         parent = parent->next;
820                         if (p)
821                                 p->object.flags |= UNINTERESTING;
822                         if (parse_commit_gently(p, 1) < 0)
823                                 continue;
824                         if (p->parents)
825                                 mark_parents_uninteresting(p);
826                         if (p->object.flags & SEEN)
827                                 continue;
828                         p->object.flags |= SEEN;
829                         commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
830                 }
831                 return 0;
832         }
833
834         /*
835          * Ok, the commit wasn't uninteresting. Try to
836          * simplify the commit history and find the parent
837          * that has no differences in the path set if one exists.
838          */
839         try_to_simplify_commit(revs, commit);
840
841         if (revs->no_walk)
842                 return 0;
843
844         left_flag = (commit->object.flags & SYMMETRIC_LEFT);
845
846         for (parent = commit->parents; parent; parent = parent->next) {
847                 struct commit *p = parent->item;
848
849                 if (parse_commit_gently(p, revs->ignore_missing_links) < 0)
850                         return -1;
851                 if (revs->show_source && !p->util)
852                         p->util = commit->util;
853                 p->object.flags |= left_flag;
854                 if (!(p->object.flags & SEEN)) {
855                         p->object.flags |= SEEN;
856                         commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
857                 }
858                 if (revs->first_parent_only)
859                         break;
860         }
861         return 0;
862 }
863
864 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
865 {
866         struct commit_list *p;
867         int left_count = 0, right_count = 0;
868         int left_first;
869         struct patch_ids ids;
870         unsigned cherry_flag;
871
872         /* First count the commits on the left and on the right */
873         for (p = list; p; p = p->next) {
874                 struct commit *commit = p->item;
875                 unsigned flags = commit->object.flags;
876                 if (flags & BOUNDARY)
877                         ;
878                 else if (flags & SYMMETRIC_LEFT)
879                         left_count++;
880                 else
881                         right_count++;
882         }
883
884         if (!left_count || !right_count)
885                 return;
886
887         left_first = left_count < right_count;
888         init_patch_ids(&ids);
889         ids.diffopts.pathspec = revs->diffopt.pathspec;
890
891         /* Compute patch-ids for one side */
892         for (p = list; p; p = p->next) {
893                 struct commit *commit = p->item;
894                 unsigned flags = commit->object.flags;
895
896                 if (flags & BOUNDARY)
897                         continue;
898                 /*
899                  * If we have fewer left, left_first is set and we omit
900                  * commits on the right branch in this loop.  If we have
901                  * fewer right, we skip the left ones.
902                  */
903                 if (left_first != !!(flags & SYMMETRIC_LEFT))
904                         continue;
905                 commit->util = add_commit_patch_id(commit, &ids);
906         }
907
908         /* either cherry_mark or cherry_pick are true */
909         cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
910
911         /* Check the other side */
912         for (p = list; p; p = p->next) {
913                 struct commit *commit = p->item;
914                 struct patch_id *id;
915                 unsigned flags = commit->object.flags;
916
917                 if (flags & BOUNDARY)
918                         continue;
919                 /*
920                  * If we have fewer left, left_first is set and we omit
921                  * commits on the left branch in this loop.
922                  */
923                 if (left_first == !!(flags & SYMMETRIC_LEFT))
924                         continue;
925
926                 /*
927                  * Have we seen the same patch id?
928                  */
929                 id = has_commit_patch_id(commit, &ids);
930                 if (!id)
931                         continue;
932                 id->seen = 1;
933                 commit->object.flags |= cherry_flag;
934         }
935
936         /* Now check the original side for seen ones */
937         for (p = list; p; p = p->next) {
938                 struct commit *commit = p->item;
939                 struct patch_id *ent;
940
941                 ent = commit->util;
942                 if (!ent)
943                         continue;
944                 if (ent->seen)
945                         commit->object.flags |= cherry_flag;
946                 commit->util = NULL;
947         }
948
949         free_patch_ids(&ids);
950 }
951
952 /* How many extra uninteresting commits we want to see.. */
953 #define SLOP 5
954
955 static int still_interesting(struct commit_list *src, unsigned long date, int slop,
956                              struct commit **interesting_cache)
957 {
958         /*
959          * No source list at all? We're definitely done..
960          */
961         if (!src)
962                 return 0;
963
964         /*
965          * Does the destination list contain entries with a date
966          * before the source list? Definitely _not_ done.
967          */
968         if (date <= src->item->date)
969                 return SLOP;
970
971         /*
972          * Does the source list still have interesting commits in
973          * it? Definitely not done..
974          */
975         if (!everybody_uninteresting(src, interesting_cache))
976                 return SLOP;
977
978         /* Ok, we're closing in.. */
979         return slop-1;
980 }
981
982 /*
983  * "rev-list --ancestry-path A..B" computes commits that are ancestors
984  * of B but not ancestors of A but further limits the result to those
985  * that are descendants of A.  This takes the list of bottom commits and
986  * the result of "A..B" without --ancestry-path, and limits the latter
987  * further to the ones that can reach one of the commits in "bottom".
988  */
989 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
990 {
991         struct commit_list *p;
992         struct commit_list *rlist = NULL;
993         int made_progress;
994
995         /*
996          * Reverse the list so that it will be likely that we would
997          * process parents before children.
998          */
999         for (p = list; p; p = p->next)
1000                 commit_list_insert(p->item, &rlist);
1001
1002         for (p = bottom; p; p = p->next)
1003                 p->item->object.flags |= TMP_MARK;
1004
1005         /*
1006          * Mark the ones that can reach bottom commits in "list",
1007          * in a bottom-up fashion.
1008          */
1009         do {
1010                 made_progress = 0;
1011                 for (p = rlist; p; p = p->next) {
1012                         struct commit *c = p->item;
1013                         struct commit_list *parents;
1014                         if (c->object.flags & (TMP_MARK | UNINTERESTING))
1015                                 continue;
1016                         for (parents = c->parents;
1017                              parents;
1018                              parents = parents->next) {
1019                                 if (!(parents->item->object.flags & TMP_MARK))
1020                                         continue;
1021                                 c->object.flags |= TMP_MARK;
1022                                 made_progress = 1;
1023                                 break;
1024                         }
1025                 }
1026         } while (made_progress);
1027
1028         /*
1029          * NEEDSWORK: decide if we want to remove parents that are
1030          * not marked with TMP_MARK from commit->parents for commits
1031          * in the resulting list.  We may not want to do that, though.
1032          */
1033
1034         /*
1035          * The ones that are not marked with TMP_MARK are uninteresting
1036          */
1037         for (p = list; p; p = p->next) {
1038                 struct commit *c = p->item;
1039                 if (c->object.flags & TMP_MARK)
1040                         continue;
1041                 c->object.flags |= UNINTERESTING;
1042         }
1043
1044         /* We are done with the TMP_MARK */
1045         for (p = list; p; p = p->next)
1046                 p->item->object.flags &= ~TMP_MARK;
1047         for (p = bottom; p; p = p->next)
1048                 p->item->object.flags &= ~TMP_MARK;
1049         free_commit_list(rlist);
1050 }
1051
1052 /*
1053  * Before walking the history, keep the set of "negative" refs the
1054  * caller has asked to exclude.
1055  *
1056  * This is used to compute "rev-list --ancestry-path A..B", as we need
1057  * to filter the result of "A..B" further to the ones that can actually
1058  * reach A.
1059  */
1060 static struct commit_list *collect_bottom_commits(struct commit_list *list)
1061 {
1062         struct commit_list *elem, *bottom = NULL;
1063         for (elem = list; elem; elem = elem->next)
1064                 if (elem->item->object.flags & BOTTOM)
1065                         commit_list_insert(elem->item, &bottom);
1066         return bottom;
1067 }
1068
1069 /* Assumes either left_only or right_only is set */
1070 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1071 {
1072         struct commit_list *p;
1073
1074         for (p = list; p; p = p->next) {
1075                 struct commit *commit = p->item;
1076
1077                 if (revs->right_only) {
1078                         if (commit->object.flags & SYMMETRIC_LEFT)
1079                                 commit->object.flags |= SHOWN;
1080                 } else  /* revs->left_only is set */
1081                         if (!(commit->object.flags & SYMMETRIC_LEFT))
1082                                 commit->object.flags |= SHOWN;
1083         }
1084 }
1085
1086 static int limit_list(struct rev_info *revs)
1087 {
1088         int slop = SLOP;
1089         unsigned long date = ~0ul;
1090         struct commit_list *list = revs->commits;
1091         struct commit_list *newlist = NULL;
1092         struct commit_list **p = &newlist;
1093         struct commit_list *bottom = NULL;
1094         struct commit *interesting_cache = NULL;
1095
1096         if (revs->ancestry_path) {
1097                 bottom = collect_bottom_commits(list);
1098                 if (!bottom)
1099                         die("--ancestry-path given but there are no bottom commits");
1100         }
1101
1102         while (list) {
1103                 struct commit *commit = pop_commit(&list);
1104                 struct object *obj = &commit->object;
1105                 show_early_output_fn_t show;
1106
1107                 if (commit == interesting_cache)
1108                         interesting_cache = NULL;
1109
1110                 if (revs->max_age != -1 && (commit->date < revs->max_age))
1111                         obj->flags |= UNINTERESTING;
1112                 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
1113                         return -1;
1114                 if (obj->flags & UNINTERESTING) {
1115                         mark_parents_uninteresting(commit);
1116                         if (revs->show_all)
1117                                 p = &commit_list_insert(commit, p)->next;
1118                         slop = still_interesting(list, date, slop, &interesting_cache);
1119                         if (slop)
1120                                 continue;
1121                         /* If showing all, add the whole pending list to the end */
1122                         if (revs->show_all)
1123                                 *p = list;
1124                         break;
1125                 }
1126                 if (revs->min_age != -1 && (commit->date > revs->min_age))
1127                         continue;
1128                 date = commit->date;
1129                 p = &commit_list_insert(commit, p)->next;
1130
1131                 show = show_early_output;
1132                 if (!show)
1133                         continue;
1134
1135                 show(revs, newlist);
1136                 show_early_output = NULL;
1137         }
1138         if (revs->cherry_pick || revs->cherry_mark)
1139                 cherry_pick_list(newlist, revs);
1140
1141         if (revs->left_only || revs->right_only)
1142                 limit_left_right(newlist, revs);
1143
1144         if (bottom) {
1145                 limit_to_ancestry(bottom, newlist);
1146                 free_commit_list(bottom);
1147         }
1148
1149         /*
1150          * Check if any commits have become TREESAME by some of their parents
1151          * becoming UNINTERESTING.
1152          */
1153         if (limiting_can_increase_treesame(revs))
1154                 for (list = newlist; list; list = list->next) {
1155                         struct commit *c = list->item;
1156                         if (c->object.flags & (UNINTERESTING | TREESAME))
1157                                 continue;
1158                         update_treesame(revs, c);
1159                 }
1160
1161         revs->commits = newlist;
1162         return 0;
1163 }
1164
1165 /*
1166  * Add an entry to refs->cmdline with the specified information.
1167  * *name is copied.
1168  */
1169 static void add_rev_cmdline(struct rev_info *revs,
1170                             struct object *item,
1171                             const char *name,
1172                             int whence,
1173                             unsigned flags)
1174 {
1175         struct rev_cmdline_info *info = &revs->cmdline;
1176         int nr = info->nr;
1177
1178         ALLOC_GROW(info->rev, nr + 1, info->alloc);
1179         info->rev[nr].item = item;
1180         info->rev[nr].name = xstrdup(name);
1181         info->rev[nr].whence = whence;
1182         info->rev[nr].flags = flags;
1183         info->nr++;
1184 }
1185
1186 static void add_rev_cmdline_list(struct rev_info *revs,
1187                                  struct commit_list *commit_list,
1188                                  int whence,
1189                                  unsigned flags)
1190 {
1191         while (commit_list) {
1192                 struct object *object = &commit_list->item->object;
1193                 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1194                                 whence, flags);
1195                 commit_list = commit_list->next;
1196         }
1197 }
1198
1199 struct all_refs_cb {
1200         int all_flags;
1201         int warned_bad_reflog;
1202         struct rev_info *all_revs;
1203         const char *name_for_errormsg;
1204 };
1205
1206 int ref_excluded(struct string_list *ref_excludes, const char *path)
1207 {
1208         struct string_list_item *item;
1209
1210         if (!ref_excludes)
1211                 return 0;
1212         for_each_string_list_item(item, ref_excludes) {
1213                 if (!wildmatch(item->string, path, 0, NULL))
1214                         return 1;
1215         }
1216         return 0;
1217 }
1218
1219 static int handle_one_ref(const char *path, const struct object_id *oid,
1220                           int flag, void *cb_data)
1221 {
1222         struct all_refs_cb *cb = cb_data;
1223         struct object *object;
1224
1225         if (ref_excluded(cb->all_revs->ref_excludes, path))
1226             return 0;
1227
1228         object = get_reference(cb->all_revs, path, oid->hash, cb->all_flags);
1229         add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1230         add_pending_sha1(cb->all_revs, path, oid->hash, cb->all_flags);
1231         return 0;
1232 }
1233
1234 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1235         unsigned flags)
1236 {
1237         cb->all_revs = revs;
1238         cb->all_flags = flags;
1239 }
1240
1241 void clear_ref_exclusion(struct string_list **ref_excludes_p)
1242 {
1243         if (*ref_excludes_p) {
1244                 string_list_clear(*ref_excludes_p, 0);
1245                 free(*ref_excludes_p);
1246         }
1247         *ref_excludes_p = NULL;
1248 }
1249
1250 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1251 {
1252         if (!*ref_excludes_p) {
1253                 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1254                 (*ref_excludes_p)->strdup_strings = 1;
1255         }
1256         string_list_append(*ref_excludes_p, exclude);
1257 }
1258
1259 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1260                 int (*for_each)(const char *, each_ref_fn, void *))
1261 {
1262         struct all_refs_cb cb;
1263         init_all_refs_cb(&cb, revs, flags);
1264         for_each(submodule, handle_one_ref, &cb);
1265 }
1266
1267 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
1268 {
1269         struct all_refs_cb *cb = cb_data;
1270         if (!is_null_sha1(sha1)) {
1271                 struct object *o = parse_object(sha1);
1272                 if (o) {
1273                         o->flags |= cb->all_flags;
1274                         /* ??? CMDLINEFLAGS ??? */
1275                         add_pending_object(cb->all_revs, o, "");
1276                 }
1277                 else if (!cb->warned_bad_reflog) {
1278                         warning("reflog of '%s' references pruned commits",
1279                                 cb->name_for_errormsg);
1280                         cb->warned_bad_reflog = 1;
1281                 }
1282         }
1283 }
1284
1285 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
1286                 const char *email, unsigned long timestamp, int tz,
1287                 const char *message, void *cb_data)
1288 {
1289         handle_one_reflog_commit(osha1, cb_data);
1290         handle_one_reflog_commit(nsha1, cb_data);
1291         return 0;
1292 }
1293
1294 static int handle_one_reflog(const char *path, const struct object_id *oid,
1295                              int flag, void *cb_data)
1296 {
1297         struct all_refs_cb *cb = cb_data;
1298         cb->warned_bad_reflog = 0;
1299         cb->name_for_errormsg = path;
1300         for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1301         return 0;
1302 }
1303
1304 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1305 {
1306         struct all_refs_cb cb;
1307
1308         cb.all_revs = revs;
1309         cb.all_flags = flags;
1310         for_each_reflog(handle_one_reflog, &cb);
1311 }
1312
1313 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1314                            struct strbuf *path)
1315 {
1316         size_t baselen = path->len;
1317         int i;
1318
1319         if (it->entry_count >= 0) {
1320                 struct tree *tree = lookup_tree(it->sha1);
1321                 add_pending_object_with_path(revs, &tree->object, "",
1322                                              040000, path->buf);
1323         }
1324
1325         for (i = 0; i < it->subtree_nr; i++) {
1326                 struct cache_tree_sub *sub = it->down[i];
1327                 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1328                 add_cache_tree(sub->cache_tree, revs, path);
1329                 strbuf_setlen(path, baselen);
1330         }
1331
1332 }
1333
1334 void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
1335 {
1336         int i;
1337
1338         read_cache();
1339         for (i = 0; i < active_nr; i++) {
1340                 struct cache_entry *ce = active_cache[i];
1341                 struct blob *blob;
1342
1343                 if (S_ISGITLINK(ce->ce_mode))
1344                         continue;
1345
1346                 blob = lookup_blob(ce->sha1);
1347                 if (!blob)
1348                         die("unable to add index blob to traversal");
1349                 add_pending_object_with_path(revs, &blob->object, "",
1350                                              ce->ce_mode, ce->name);
1351         }
1352
1353         if (active_cache_tree) {
1354                 struct strbuf path = STRBUF_INIT;
1355                 add_cache_tree(active_cache_tree, revs, &path);
1356                 strbuf_release(&path);
1357         }
1358 }
1359
1360 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
1361 {
1362         unsigned char sha1[20];
1363         struct object *it;
1364         struct commit *commit;
1365         struct commit_list *parents;
1366         const char *arg = arg_;
1367
1368         if (*arg == '^') {
1369                 flags ^= UNINTERESTING | BOTTOM;
1370                 arg++;
1371         }
1372         if (get_sha1_committish(arg, sha1))
1373                 return 0;
1374         while (1) {
1375                 it = get_reference(revs, arg, sha1, 0);
1376                 if (!it && revs->ignore_missing)
1377                         return 0;
1378                 if (it->type != OBJ_TAG)
1379                         break;
1380                 if (!((struct tag*)it)->tagged)
1381                         return 0;
1382                 hashcpy(sha1, ((struct tag*)it)->tagged->oid.hash);
1383         }
1384         if (it->type != OBJ_COMMIT)
1385                 return 0;
1386         commit = (struct commit *)it;
1387         for (parents = commit->parents; parents; parents = parents->next) {
1388                 it = &parents->item->object;
1389                 it->flags |= flags;
1390                 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1391                 add_pending_object(revs, it, arg);
1392         }
1393         return 1;
1394 }
1395
1396 void init_revisions(struct rev_info *revs, const char *prefix)
1397 {
1398         memset(revs, 0, sizeof(*revs));
1399
1400         revs->abbrev = DEFAULT_ABBREV;
1401         revs->ignore_merges = 1;
1402         revs->simplify_history = 1;
1403         DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1404         DIFF_OPT_SET(&revs->pruning, QUICK);
1405         revs->pruning.add_remove = file_add_remove;
1406         revs->pruning.change = file_change;
1407         revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1408         revs->dense = 1;
1409         revs->prefix = prefix;
1410         revs->max_age = -1;
1411         revs->min_age = -1;
1412         revs->skip_count = -1;
1413         revs->max_count = -1;
1414         revs->max_parents = -1;
1415
1416         revs->commit_format = CMIT_FMT_DEFAULT;
1417
1418         init_grep_defaults();
1419         grep_init(&revs->grep_filter, prefix);
1420         revs->grep_filter.status_only = 1;
1421         revs->grep_filter.regflags = REG_NEWLINE;
1422
1423         diff_setup(&revs->diffopt);
1424         if (prefix && !revs->diffopt.prefix) {
1425                 revs->diffopt.prefix = prefix;
1426                 revs->diffopt.prefix_length = strlen(prefix);
1427         }
1428
1429         revs->notes_opt.use_default_notes = -1;
1430 }
1431
1432 static void add_pending_commit_list(struct rev_info *revs,
1433                                     struct commit_list *commit_list,
1434                                     unsigned int flags)
1435 {
1436         while (commit_list) {
1437                 struct object *object = &commit_list->item->object;
1438                 object->flags |= flags;
1439                 add_pending_object(revs, object, oid_to_hex(&object->oid));
1440                 commit_list = commit_list->next;
1441         }
1442 }
1443
1444 static void prepare_show_merge(struct rev_info *revs)
1445 {
1446         struct commit_list *bases;
1447         struct commit *head, *other;
1448         unsigned char sha1[20];
1449         const char **prune = NULL;
1450         int i, prune_num = 1; /* counting terminating NULL */
1451
1452         if (get_sha1("HEAD", sha1))
1453                 die("--merge without HEAD?");
1454         head = lookup_commit_or_die(sha1, "HEAD");
1455         if (get_sha1("MERGE_HEAD", sha1))
1456                 die("--merge without MERGE_HEAD?");
1457         other = lookup_commit_or_die(sha1, "MERGE_HEAD");
1458         add_pending_object(revs, &head->object, "HEAD");
1459         add_pending_object(revs, &other->object, "MERGE_HEAD");
1460         bases = get_merge_bases(head, other);
1461         add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1462         add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1463         free_commit_list(bases);
1464         head->object.flags |= SYMMETRIC_LEFT;
1465
1466         if (!active_nr)
1467                 read_cache();
1468         for (i = 0; i < active_nr; i++) {
1469                 const struct cache_entry *ce = active_cache[i];
1470                 if (!ce_stage(ce))
1471                         continue;
1472                 if (ce_path_match(ce, &revs->prune_data, NULL)) {
1473                         prune_num++;
1474                         REALLOC_ARRAY(prune, prune_num);
1475                         prune[prune_num-2] = ce->name;
1476                         prune[prune_num-1] = NULL;
1477                 }
1478                 while ((i+1 < active_nr) &&
1479                        ce_same_name(ce, active_cache[i+1]))
1480                         i++;
1481         }
1482         free_pathspec(&revs->prune_data);
1483         parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1484                        PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1485         revs->limited = 1;
1486 }
1487
1488 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1489 {
1490         struct object_context oc;
1491         char *dotdot;
1492         struct object *object;
1493         unsigned char sha1[20];
1494         int local_flags;
1495         const char *arg = arg_;
1496         int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1497         unsigned get_sha1_flags = 0;
1498
1499         flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1500
1501         dotdot = strstr(arg, "..");
1502         if (dotdot) {
1503                 unsigned char from_sha1[20];
1504                 const char *next = dotdot + 2;
1505                 const char *this = arg;
1506                 int symmetric = *next == '.';
1507                 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1508                 static const char head_by_default[] = "HEAD";
1509                 unsigned int a_flags;
1510
1511                 *dotdot = 0;
1512                 next += symmetric;
1513
1514                 if (!*next)
1515                         next = head_by_default;
1516                 if (dotdot == arg)
1517                         this = head_by_default;
1518                 if (this == head_by_default && next == head_by_default &&
1519                     !symmetric) {
1520                         /*
1521                          * Just ".."?  That is not a range but the
1522                          * pathspec for the parent directory.
1523                          */
1524                         if (!cant_be_filename) {
1525                                 *dotdot = '.';
1526                                 return -1;
1527                         }
1528                 }
1529                 if (!get_sha1_committish(this, from_sha1) &&
1530                     !get_sha1_committish(next, sha1)) {
1531                         struct object *a_obj, *b_obj;
1532
1533                         if (!cant_be_filename) {
1534                                 *dotdot = '.';
1535                                 verify_non_filename(revs->prefix, arg);
1536                         }
1537
1538                         a_obj = parse_object(from_sha1);
1539                         b_obj = parse_object(sha1);
1540                         if (!a_obj || !b_obj) {
1541                         missing:
1542                                 if (revs->ignore_missing)
1543                                         return 0;
1544                                 die(symmetric
1545                                     ? "Invalid symmetric difference expression %s"
1546                                     : "Invalid revision range %s", arg);
1547                         }
1548
1549                         if (!symmetric) {
1550                                 /* just A..B */
1551                                 a_flags = flags_exclude;
1552                         } else {
1553                                 /* A...B -- find merge bases between the two */
1554                                 struct commit *a, *b;
1555                                 struct commit_list *exclude;
1556
1557                                 a = (a_obj->type == OBJ_COMMIT
1558                                      ? (struct commit *)a_obj
1559                                      : lookup_commit_reference(a_obj->oid.hash));
1560                                 b = (b_obj->type == OBJ_COMMIT
1561                                      ? (struct commit *)b_obj
1562                                      : lookup_commit_reference(b_obj->oid.hash));
1563                                 if (!a || !b)
1564                                         goto missing;
1565                                 exclude = get_merge_bases(a, b);
1566                                 add_rev_cmdline_list(revs, exclude,
1567                                                      REV_CMD_MERGE_BASE,
1568                                                      flags_exclude);
1569                                 add_pending_commit_list(revs, exclude,
1570                                                         flags_exclude);
1571                                 free_commit_list(exclude);
1572
1573                                 a_flags = flags | SYMMETRIC_LEFT;
1574                         }
1575
1576                         a_obj->flags |= a_flags;
1577                         b_obj->flags |= flags;
1578                         add_rev_cmdline(revs, a_obj, this,
1579                                         REV_CMD_LEFT, a_flags);
1580                         add_rev_cmdline(revs, b_obj, next,
1581                                         REV_CMD_RIGHT, flags);
1582                         add_pending_object(revs, a_obj, this);
1583                         add_pending_object(revs, b_obj, next);
1584                         return 0;
1585                 }
1586                 *dotdot = '.';
1587         }
1588         dotdot = strstr(arg, "^@");
1589         if (dotdot && !dotdot[2]) {
1590                 *dotdot = 0;
1591                 if (add_parents_only(revs, arg, flags))
1592                         return 0;
1593                 *dotdot = '^';
1594         }
1595         dotdot = strstr(arg, "^!");
1596         if (dotdot && !dotdot[2]) {
1597                 *dotdot = 0;
1598                 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM)))
1599                         *dotdot = '^';
1600         }
1601
1602         local_flags = 0;
1603         if (*arg == '^') {
1604                 local_flags = UNINTERESTING | BOTTOM;
1605                 arg++;
1606         }
1607
1608         if (revarg_opt & REVARG_COMMITTISH)
1609                 get_sha1_flags = GET_SHA1_COMMITTISH;
1610
1611         if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
1612                 return revs->ignore_missing ? 0 : -1;
1613         if (!cant_be_filename)
1614                 verify_non_filename(revs->prefix, arg);
1615         object = get_reference(revs, arg, sha1, flags ^ local_flags);
1616         add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1617         add_pending_object_with_mode(revs, object, arg, oc.mode);
1618         return 0;
1619 }
1620
1621 struct cmdline_pathspec {
1622         int alloc;
1623         int nr;
1624         const char **path;
1625 };
1626
1627 static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1628 {
1629         while (*av) {
1630                 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1631                 prune->path[prune->nr++] = *(av++);
1632         }
1633 }
1634
1635 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1636                                      struct cmdline_pathspec *prune)
1637 {
1638         while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1639                 int len = sb->len;
1640                 if (len && sb->buf[len - 1] == '\n')
1641                         sb->buf[--len] = '\0';
1642                 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1643                 prune->path[prune->nr++] = xstrdup(sb->buf);
1644         }
1645 }
1646
1647 static void read_revisions_from_stdin(struct rev_info *revs,
1648                                       struct cmdline_pathspec *prune)
1649 {
1650         struct strbuf sb;
1651         int seen_dashdash = 0;
1652         int save_warning;
1653
1654         save_warning = warn_on_object_refname_ambiguity;
1655         warn_on_object_refname_ambiguity = 0;
1656
1657         strbuf_init(&sb, 1000);
1658         while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1659                 int len = sb.len;
1660                 if (len && sb.buf[len - 1] == '\n')
1661                         sb.buf[--len] = '\0';
1662                 if (!len)
1663                         break;
1664                 if (sb.buf[0] == '-') {
1665                         if (len == 2 && sb.buf[1] == '-') {
1666                                 seen_dashdash = 1;
1667                                 break;
1668                         }
1669                         die("options not supported in --stdin mode");
1670                 }
1671                 if (handle_revision_arg(sb.buf, revs, 0,
1672                                         REVARG_CANNOT_BE_FILENAME))
1673                         die("bad revision '%s'", sb.buf);
1674         }
1675         if (seen_dashdash)
1676                 read_pathspec_from_stdin(revs, &sb, prune);
1677
1678         strbuf_release(&sb);
1679         warn_on_object_refname_ambiguity = save_warning;
1680 }
1681
1682 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1683 {
1684         append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1685 }
1686
1687 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1688 {
1689         append_header_grep_pattern(&revs->grep_filter, field, pattern);
1690 }
1691
1692 static void add_message_grep(struct rev_info *revs, const char *pattern)
1693 {
1694         add_grep(revs, pattern, GREP_PATTERN_BODY);
1695 }
1696
1697 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1698                                int *unkc, const char **unkv)
1699 {
1700         const char *arg = argv[0];
1701         const char *optarg;
1702         int argcount;
1703
1704         /* pseudo revision arguments */
1705         if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1706             !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1707             !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1708             !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1709             !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
1710             !strcmp(arg, "--indexed-objects") ||
1711             starts_with(arg, "--exclude=") ||
1712             starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1713             starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
1714         {
1715                 unkv[(*unkc)++] = arg;
1716                 return 1;
1717         }
1718
1719         if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1720                 revs->max_count = atoi(optarg);
1721                 revs->no_walk = 0;
1722                 return argcount;
1723         } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1724                 revs->skip_count = atoi(optarg);
1725                 return argcount;
1726         } else if ((*arg == '-') && isdigit(arg[1])) {
1727                 /* accept -<digit>, like traditional "head" */
1728                 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1729                     revs->max_count < 0)
1730                         die("'%s': not a non-negative integer", arg + 1);
1731                 revs->no_walk = 0;
1732         } else if (!strcmp(arg, "-n")) {
1733                 if (argc <= 1)
1734                         return error("-n requires an argument");
1735                 revs->max_count = atoi(argv[1]);
1736                 revs->no_walk = 0;
1737                 return 2;
1738         } else if (starts_with(arg, "-n")) {
1739                 revs->max_count = atoi(arg + 2);
1740                 revs->no_walk = 0;
1741         } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1742                 revs->max_age = atoi(optarg);
1743                 return argcount;
1744         } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1745                 revs->max_age = approxidate(optarg);
1746                 return argcount;
1747         } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1748                 revs->max_age = approxidate(optarg);
1749                 return argcount;
1750         } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1751                 revs->min_age = atoi(optarg);
1752                 return argcount;
1753         } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1754                 revs->min_age = approxidate(optarg);
1755                 return argcount;
1756         } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1757                 revs->min_age = approxidate(optarg);
1758                 return argcount;
1759         } else if (!strcmp(arg, "--first-parent")) {
1760                 revs->first_parent_only = 1;
1761         } else if (!strcmp(arg, "--ancestry-path")) {
1762                 revs->ancestry_path = 1;
1763                 revs->simplify_history = 0;
1764                 revs->limited = 1;
1765         } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1766                 init_reflog_walk(&revs->reflog_info);
1767         } else if (!strcmp(arg, "--default")) {
1768                 if (argc <= 1)
1769                         return error("bad --default argument");
1770                 revs->def = argv[1];
1771                 return 2;
1772         } else if (!strcmp(arg, "--merge")) {
1773                 revs->show_merge = 1;
1774         } else if (!strcmp(arg, "--topo-order")) {
1775                 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1776                 revs->topo_order = 1;
1777         } else if (!strcmp(arg, "--simplify-merges")) {
1778                 revs->simplify_merges = 1;
1779                 revs->topo_order = 1;
1780                 revs->rewrite_parents = 1;
1781                 revs->simplify_history = 0;
1782                 revs->limited = 1;
1783         } else if (!strcmp(arg, "--simplify-by-decoration")) {
1784                 revs->simplify_merges = 1;
1785                 revs->topo_order = 1;
1786                 revs->rewrite_parents = 1;
1787                 revs->simplify_history = 0;
1788                 revs->simplify_by_decoration = 1;
1789                 revs->limited = 1;
1790                 revs->prune = 1;
1791                 load_ref_decorations(DECORATE_SHORT_REFS);
1792         } else if (!strcmp(arg, "--date-order")) {
1793                 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
1794                 revs->topo_order = 1;
1795         } else if (!strcmp(arg, "--author-date-order")) {
1796                 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
1797                 revs->topo_order = 1;
1798         } else if (starts_with(arg, "--early-output")) {
1799                 int count = 100;
1800                 switch (arg[14]) {
1801                 case '=':
1802                         count = atoi(arg+15);
1803                         /* Fallthrough */
1804                 case 0:
1805                         revs->topo_order = 1;
1806                        revs->early_output = count;
1807                 }
1808         } else if (!strcmp(arg, "--parents")) {
1809                 revs->rewrite_parents = 1;
1810                 revs->print_parents = 1;
1811         } else if (!strcmp(arg, "--dense")) {
1812                 revs->dense = 1;
1813         } else if (!strcmp(arg, "--sparse")) {
1814                 revs->dense = 0;
1815         } else if (!strcmp(arg, "--show-all")) {
1816                 revs->show_all = 1;
1817         } else if (!strcmp(arg, "--remove-empty")) {
1818                 revs->remove_empty_trees = 1;
1819         } else if (!strcmp(arg, "--merges")) {
1820                 revs->min_parents = 2;
1821         } else if (!strcmp(arg, "--no-merges")) {
1822                 revs->max_parents = 1;
1823         } else if (starts_with(arg, "--min-parents=")) {
1824                 revs->min_parents = atoi(arg+14);
1825         } else if (starts_with(arg, "--no-min-parents")) {
1826                 revs->min_parents = 0;
1827         } else if (starts_with(arg, "--max-parents=")) {
1828                 revs->max_parents = atoi(arg+14);
1829         } else if (starts_with(arg, "--no-max-parents")) {
1830                 revs->max_parents = -1;
1831         } else if (!strcmp(arg, "--boundary")) {
1832                 revs->boundary = 1;
1833         } else if (!strcmp(arg, "--left-right")) {
1834                 revs->left_right = 1;
1835         } else if (!strcmp(arg, "--left-only")) {
1836                 if (revs->right_only)
1837                         die("--left-only is incompatible with --right-only"
1838                             " or --cherry");
1839                 revs->left_only = 1;
1840         } else if (!strcmp(arg, "--right-only")) {
1841                 if (revs->left_only)
1842                         die("--right-only is incompatible with --left-only");
1843                 revs->right_only = 1;
1844         } else if (!strcmp(arg, "--cherry")) {
1845                 if (revs->left_only)
1846                         die("--cherry is incompatible with --left-only");
1847                 revs->cherry_mark = 1;
1848                 revs->right_only = 1;
1849                 revs->max_parents = 1;
1850                 revs->limited = 1;
1851         } else if (!strcmp(arg, "--count")) {
1852                 revs->count = 1;
1853         } else if (!strcmp(arg, "--cherry-mark")) {
1854                 if (revs->cherry_pick)
1855                         die("--cherry-mark is incompatible with --cherry-pick");
1856                 revs->cherry_mark = 1;
1857                 revs->limited = 1; /* needs limit_list() */
1858         } else if (!strcmp(arg, "--cherry-pick")) {
1859                 if (revs->cherry_mark)
1860                         die("--cherry-pick is incompatible with --cherry-mark");
1861                 revs->cherry_pick = 1;
1862                 revs->limited = 1;
1863         } else if (!strcmp(arg, "--objects")) {
1864                 revs->tag_objects = 1;
1865                 revs->tree_objects = 1;
1866                 revs->blob_objects = 1;
1867         } else if (!strcmp(arg, "--objects-edge")) {
1868                 revs->tag_objects = 1;
1869                 revs->tree_objects = 1;
1870                 revs->blob_objects = 1;
1871                 revs->edge_hint = 1;
1872         } else if (!strcmp(arg, "--objects-edge-aggressive")) {
1873                 revs->tag_objects = 1;
1874                 revs->tree_objects = 1;
1875                 revs->blob_objects = 1;
1876                 revs->edge_hint = 1;
1877                 revs->edge_hint_aggressive = 1;
1878         } else if (!strcmp(arg, "--verify-objects")) {
1879                 revs->tag_objects = 1;
1880                 revs->tree_objects = 1;
1881                 revs->blob_objects = 1;
1882                 revs->verify_objects = 1;
1883         } else if (!strcmp(arg, "--unpacked")) {
1884                 revs->unpacked = 1;
1885         } else if (starts_with(arg, "--unpacked=")) {
1886                 die("--unpacked=<packfile> no longer supported.");
1887         } else if (!strcmp(arg, "-r")) {
1888                 revs->diff = 1;
1889                 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1890         } else if (!strcmp(arg, "-t")) {
1891                 revs->diff = 1;
1892                 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1893                 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1894         } else if (!strcmp(arg, "-m")) {
1895                 revs->ignore_merges = 0;
1896         } else if (!strcmp(arg, "-c")) {
1897                 revs->diff = 1;
1898                 revs->dense_combined_merges = 0;
1899                 revs->combine_merges = 1;
1900         } else if (!strcmp(arg, "--cc")) {
1901                 revs->diff = 1;
1902                 revs->dense_combined_merges = 1;
1903                 revs->combine_merges = 1;
1904         } else if (!strcmp(arg, "-v")) {
1905                 revs->verbose_header = 1;
1906         } else if (!strcmp(arg, "--pretty")) {
1907                 revs->verbose_header = 1;
1908                 revs->pretty_given = 1;
1909                 get_commit_format(NULL, revs);
1910         } else if (starts_with(arg, "--pretty=") || starts_with(arg, "--format=")) {
1911                 /*
1912                  * Detached form ("--pretty X" as opposed to "--pretty=X")
1913                  * not allowed, since the argument is optional.
1914                  */
1915                 revs->verbose_header = 1;
1916                 revs->pretty_given = 1;
1917                 get_commit_format(arg+9, revs);
1918         } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1919                 revs->show_notes = 1;
1920                 revs->show_notes_given = 1;
1921                 revs->notes_opt.use_default_notes = 1;
1922         } else if (!strcmp(arg, "--show-signature")) {
1923                 revs->show_signature = 1;
1924         } else if (!strcmp(arg, "--show-linear-break") ||
1925                    starts_with(arg, "--show-linear-break=")) {
1926                 if (starts_with(arg, "--show-linear-break="))
1927                         revs->break_bar = xstrdup(arg + 20);
1928                 else
1929                         revs->break_bar = "                    ..........";
1930                 revs->track_linear = 1;
1931                 revs->track_first_time = 1;
1932         } else if (starts_with(arg, "--show-notes=") ||
1933                    starts_with(arg, "--notes=")) {
1934                 struct strbuf buf = STRBUF_INIT;
1935                 revs->show_notes = 1;
1936                 revs->show_notes_given = 1;
1937                 if (starts_with(arg, "--show-notes")) {
1938                         if (revs->notes_opt.use_default_notes < 0)
1939                                 revs->notes_opt.use_default_notes = 1;
1940                         strbuf_addstr(&buf, arg+13);
1941                 }
1942                 else
1943                         strbuf_addstr(&buf, arg+8);
1944                 expand_notes_ref(&buf);
1945                 string_list_append(&revs->notes_opt.extra_notes_refs,
1946                                    strbuf_detach(&buf, NULL));
1947         } else if (!strcmp(arg, "--no-notes")) {
1948                 revs->show_notes = 0;
1949                 revs->show_notes_given = 1;
1950                 revs->notes_opt.use_default_notes = -1;
1951                 /* we have been strdup'ing ourselves, so trick
1952                  * string_list into free()ing strings */
1953                 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1954                 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1955                 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1956         } else if (!strcmp(arg, "--standard-notes")) {
1957                 revs->show_notes_given = 1;
1958                 revs->notes_opt.use_default_notes = 1;
1959         } else if (!strcmp(arg, "--no-standard-notes")) {
1960                 revs->notes_opt.use_default_notes = 0;
1961         } else if (!strcmp(arg, "--oneline")) {
1962                 revs->verbose_header = 1;
1963                 get_commit_format("oneline", revs);
1964                 revs->pretty_given = 1;
1965                 revs->abbrev_commit = 1;
1966         } else if (!strcmp(arg, "--graph")) {
1967                 revs->topo_order = 1;
1968                 revs->rewrite_parents = 1;
1969                 revs->graph = graph_init(revs);
1970         } else if (!strcmp(arg, "--root")) {
1971                 revs->show_root_diff = 1;
1972         } else if (!strcmp(arg, "--no-commit-id")) {
1973                 revs->no_commit_id = 1;
1974         } else if (!strcmp(arg, "--always")) {
1975                 revs->always_show_header = 1;
1976         } else if (!strcmp(arg, "--no-abbrev")) {
1977                 revs->abbrev = 0;
1978         } else if (!strcmp(arg, "--abbrev")) {
1979                 revs->abbrev = DEFAULT_ABBREV;
1980         } else if (starts_with(arg, "--abbrev=")) {
1981                 revs->abbrev = strtoul(arg + 9, NULL, 10);
1982                 if (revs->abbrev < MINIMUM_ABBREV)
1983                         revs->abbrev = MINIMUM_ABBREV;
1984                 else if (revs->abbrev > 40)
1985                         revs->abbrev = 40;
1986         } else if (!strcmp(arg, "--abbrev-commit")) {
1987                 revs->abbrev_commit = 1;
1988                 revs->abbrev_commit_given = 1;
1989         } else if (!strcmp(arg, "--no-abbrev-commit")) {
1990                 revs->abbrev_commit = 0;
1991         } else if (!strcmp(arg, "--full-diff")) {
1992                 revs->diff = 1;
1993                 revs->full_diff = 1;
1994         } else if (!strcmp(arg, "--full-history")) {
1995                 revs->simplify_history = 0;
1996         } else if (!strcmp(arg, "--relative-date")) {
1997                 revs->date_mode.type = DATE_RELATIVE;
1998                 revs->date_mode_explicit = 1;
1999         } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
2000                 parse_date_format(optarg, &revs->date_mode);
2001                 revs->date_mode_explicit = 1;
2002                 return argcount;
2003         } else if (!strcmp(arg, "--log-size")) {
2004                 revs->show_log_size = 1;
2005         }
2006         /*
2007          * Grepping the commit log
2008          */
2009         else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2010                 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2011                 return argcount;
2012         } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2013                 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2014                 return argcount;
2015         } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2016                 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2017                 return argcount;
2018         } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2019                 add_message_grep(revs, optarg);
2020                 return argcount;
2021         } else if (!strcmp(arg, "--grep-debug")) {
2022                 revs->grep_filter.debug = 1;
2023         } else if (!strcmp(arg, "--basic-regexp")) {
2024                 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE, &revs->grep_filter);
2025         } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2026                 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter);
2027         } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2028                 revs->grep_filter.regflags |= REG_ICASE;
2029                 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
2030         } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2031                 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter);
2032         } else if (!strcmp(arg, "--perl-regexp")) {
2033                 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE, &revs->grep_filter);
2034         } else if (!strcmp(arg, "--all-match")) {
2035                 revs->grep_filter.all_match = 1;
2036         } else if (!strcmp(arg, "--invert-grep")) {
2037                 revs->invert_grep = 1;
2038         } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2039                 if (strcmp(optarg, "none"))
2040                         git_log_output_encoding = xstrdup(optarg);
2041                 else
2042                         git_log_output_encoding = "";
2043                 return argcount;
2044         } else if (!strcmp(arg, "--reverse")) {
2045                 revs->reverse ^= 1;
2046         } else if (!strcmp(arg, "--children")) {
2047                 revs->children.name = "children";
2048                 revs->limited = 1;
2049         } else if (!strcmp(arg, "--ignore-missing")) {
2050                 revs->ignore_missing = 1;
2051         } else {
2052                 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
2053                 if (!opts)
2054                         unkv[(*unkc)++] = arg;
2055                 return opts;
2056         }
2057         if (revs->graph && revs->track_linear)
2058                 die("--show-linear-break and --graph are incompatible");
2059
2060         return 1;
2061 }
2062
2063 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2064                         const struct option *options,
2065                         const char * const usagestr[])
2066 {
2067         int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2068                                     &ctx->cpidx, ctx->out);
2069         if (n <= 0) {
2070                 error("unknown option `%s'", ctx->argv[0]);
2071                 usage_with_options(usagestr, options);
2072         }
2073         ctx->argv += n;
2074         ctx->argc -= n;
2075 }
2076
2077 static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
2078         struct strbuf bisect_refs = STRBUF_INIT;
2079         int status;
2080         strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2081         status = for_each_ref_in_submodule(submodule, bisect_refs.buf, fn, cb_data);
2082         strbuf_release(&bisect_refs);
2083         return status;
2084 }
2085
2086 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2087 {
2088         return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
2089 }
2090
2091 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2092 {
2093         return for_each_bisect_ref(submodule, fn, cb_data, term_good);
2094 }
2095
2096 static int handle_revision_pseudo_opt(const char *submodule,
2097                                 struct rev_info *revs,
2098                                 int argc, const char **argv, int *flags)
2099 {
2100         const char *arg = argv[0];
2101         const char *optarg;
2102         int argcount;
2103
2104         /*
2105          * NOTE!
2106          *
2107          * Commands like "git shortlog" will not accept the options below
2108          * unless parse_revision_opt queues them (as opposed to erroring
2109          * out).
2110          *
2111          * When implementing your new pseudo-option, remember to
2112          * register it in the list at the top of handle_revision_opt.
2113          */
2114         if (!strcmp(arg, "--all")) {
2115                 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2116                 handle_refs(submodule, revs, *flags, head_ref_submodule);
2117                 clear_ref_exclusion(&revs->ref_excludes);
2118         } else if (!strcmp(arg, "--branches")) {
2119                 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
2120                 clear_ref_exclusion(&revs->ref_excludes);
2121         } else if (!strcmp(arg, "--bisect")) {
2122                 read_bisect_terms(&term_bad, &term_good);
2123                 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
2124                 handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
2125                 revs->bisect = 1;
2126         } else if (!strcmp(arg, "--tags")) {
2127                 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
2128                 clear_ref_exclusion(&revs->ref_excludes);
2129         } else if (!strcmp(arg, "--remotes")) {
2130                 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
2131                 clear_ref_exclusion(&revs->ref_excludes);
2132         } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2133                 struct all_refs_cb cb;
2134                 init_all_refs_cb(&cb, revs, *flags);
2135                 for_each_glob_ref(handle_one_ref, optarg, &cb);
2136                 clear_ref_exclusion(&revs->ref_excludes);
2137                 return argcount;
2138         } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2139                 add_ref_exclusion(&revs->ref_excludes, optarg);
2140                 return argcount;
2141         } else if (starts_with(arg, "--branches=")) {
2142                 struct all_refs_cb cb;
2143                 init_all_refs_cb(&cb, revs, *flags);
2144                 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
2145                 clear_ref_exclusion(&revs->ref_excludes);
2146         } else if (starts_with(arg, "--tags=")) {
2147                 struct all_refs_cb cb;
2148                 init_all_refs_cb(&cb, revs, *flags);
2149                 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
2150                 clear_ref_exclusion(&revs->ref_excludes);
2151         } else if (starts_with(arg, "--remotes=")) {
2152                 struct all_refs_cb cb;
2153                 init_all_refs_cb(&cb, revs, *flags);
2154                 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
2155                 clear_ref_exclusion(&revs->ref_excludes);
2156         } else if (!strcmp(arg, "--reflog")) {
2157                 add_reflogs_to_pending(revs, *flags);
2158         } else if (!strcmp(arg, "--indexed-objects")) {
2159                 add_index_objects_to_pending(revs, *flags);
2160         } else if (!strcmp(arg, "--not")) {
2161                 *flags ^= UNINTERESTING | BOTTOM;
2162         } else if (!strcmp(arg, "--no-walk")) {
2163                 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2164         } else if (starts_with(arg, "--no-walk=")) {
2165                 /*
2166                  * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2167                  * not allowed, since the argument is optional.
2168                  */
2169                 if (!strcmp(arg + 10, "sorted"))
2170                         revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2171                 else if (!strcmp(arg + 10, "unsorted"))
2172                         revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2173                 else
2174                         return error("invalid argument to --no-walk");
2175         } else if (!strcmp(arg, "--do-walk")) {
2176                 revs->no_walk = 0;
2177         } else {
2178                 return 0;
2179         }
2180
2181         return 1;
2182 }
2183
2184 static void NORETURN diagnose_missing_default(const char *def)
2185 {
2186         unsigned char sha1[20];
2187         int flags;
2188         const char *refname;
2189
2190         refname = resolve_ref_unsafe(def, 0, sha1, &flags);
2191         if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2192                 die(_("your current branch appears to be broken"));
2193
2194         skip_prefix(refname, "refs/heads/", &refname);
2195         die(_("your current branch '%s' does not have any commits yet"),
2196             refname);
2197 }
2198
2199 /*
2200  * Parse revision information, filling in the "rev_info" structure,
2201  * and removing the used arguments from the argument list.
2202  *
2203  * Returns the number of arguments left that weren't recognized
2204  * (which are also moved to the head of the argument list)
2205  */
2206 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2207 {
2208         int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
2209         struct cmdline_pathspec prune_data;
2210         const char *submodule = NULL;
2211
2212         memset(&prune_data, 0, sizeof(prune_data));
2213         if (opt)
2214                 submodule = opt->submodule;
2215
2216         /* First, search for "--" */
2217         if (opt && opt->assume_dashdash) {
2218                 seen_dashdash = 1;
2219         } else {
2220                 seen_dashdash = 0;
2221                 for (i = 1; i < argc; i++) {
2222                         const char *arg = argv[i];
2223                         if (strcmp(arg, "--"))
2224                                 continue;
2225                         argv[i] = NULL;
2226                         argc = i;
2227                         if (argv[i + 1])
2228                                 append_prune_data(&prune_data, argv + i + 1);
2229                         seen_dashdash = 1;
2230                         break;
2231                 }
2232         }
2233
2234         /* Second, deal with arguments and options */
2235         flags = 0;
2236         revarg_opt = opt ? opt->revarg_opt : 0;
2237         if (seen_dashdash)
2238                 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2239         read_from_stdin = 0;
2240         for (left = i = 1; i < argc; i++) {
2241                 const char *arg = argv[i];
2242                 if (*arg == '-') {
2243                         int opts;
2244
2245                         opts = handle_revision_pseudo_opt(submodule,
2246                                                 revs, argc - i, argv + i,
2247                                                 &flags);
2248                         if (opts > 0) {
2249                                 i += opts - 1;
2250                                 continue;
2251                         }
2252
2253                         if (!strcmp(arg, "--stdin")) {
2254                                 if (revs->disable_stdin) {
2255                                         argv[left++] = arg;
2256                                         continue;
2257                                 }
2258                                 if (read_from_stdin++)
2259                                         die("--stdin given twice?");
2260                                 read_revisions_from_stdin(revs, &prune_data);
2261                                 continue;
2262                         }
2263
2264                         opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
2265                         if (opts > 0) {
2266                                 i += opts - 1;
2267                                 continue;
2268                         }
2269                         if (opts < 0)
2270                                 exit(128);
2271                         continue;
2272                 }
2273
2274
2275                 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2276                         int j;
2277                         if (seen_dashdash || *arg == '^')
2278                                 die("bad revision '%s'", arg);
2279
2280                         /* If we didn't have a "--":
2281                          * (1) all filenames must exist;
2282                          * (2) all rev-args must not be interpretable
2283                          *     as a valid filename.
2284                          * but the latter we have checked in the main loop.
2285                          */
2286                         for (j = i; j < argc; j++)
2287                                 verify_filename(revs->prefix, argv[j], j == i);
2288
2289                         append_prune_data(&prune_data, argv + i);
2290                         break;
2291                 }
2292                 else
2293                         got_rev_arg = 1;
2294         }
2295
2296         if (prune_data.nr) {
2297                 /*
2298                  * If we need to introduce the magic "a lone ':' means no
2299                  * pathspec whatsoever", here is the place to do so.
2300                  *
2301                  * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2302                  *      prune_data.nr = 0;
2303                  *      prune_data.alloc = 0;
2304                  *      free(prune_data.path);
2305                  *      prune_data.path = NULL;
2306                  * } else {
2307                  *      terminate prune_data.alloc with NULL and
2308                  *      call init_pathspec() to set revs->prune_data here.
2309                  * }
2310                  */
2311                 ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
2312                 prune_data.path[prune_data.nr++] = NULL;
2313                 parse_pathspec(&revs->prune_data, 0, 0,
2314                                revs->prefix, prune_data.path);
2315         }
2316
2317         if (revs->def == NULL)
2318                 revs->def = opt ? opt->def : NULL;
2319         if (opt && opt->tweak)
2320                 opt->tweak(revs, opt);
2321         if (revs->show_merge)
2322                 prepare_show_merge(revs);
2323         if (revs->def && !revs->pending.nr && !got_rev_arg) {
2324                 unsigned char sha1[20];
2325                 struct object *object;
2326                 struct object_context oc;
2327                 if (get_sha1_with_context(revs->def, 0, sha1, &oc))
2328                         diagnose_missing_default(revs->def);
2329                 object = get_reference(revs, revs->def, sha1, 0);
2330                 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2331         }
2332
2333         /* Did the user ask for any diff output? Run the diff! */
2334         if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2335                 revs->diff = 1;
2336
2337         /* Pickaxe, diff-filter and rename following need diffs */
2338         if (revs->diffopt.pickaxe ||
2339             revs->diffopt.filter ||
2340             DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2341                 revs->diff = 1;
2342
2343         if (revs->topo_order)
2344                 revs->limited = 1;
2345
2346         if (revs->prune_data.nr) {
2347                 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2348                 /* Can't prune commits with rename following: the paths change.. */
2349                 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2350                         revs->prune = 1;
2351                 if (!revs->full_diff)
2352                         copy_pathspec(&revs->diffopt.pathspec,
2353                                       &revs->prune_data);
2354         }
2355         if (revs->combine_merges)
2356                 revs->ignore_merges = 0;
2357         revs->diffopt.abbrev = revs->abbrev;
2358
2359         if (revs->line_level_traverse) {
2360                 revs->limited = 1;
2361                 revs->topo_order = 1;
2362         }
2363
2364         diff_setup_done(&revs->diffopt);
2365
2366         grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2367                                  &revs->grep_filter);
2368         compile_grep_patterns(&revs->grep_filter);
2369
2370         if (revs->reverse && revs->reflog_info)
2371                 die("cannot combine --reverse with --walk-reflogs");
2372         if (revs->rewrite_parents && revs->children.name)
2373                 die("cannot combine --parents and --children");
2374
2375         /*
2376          * Limitations on the graph functionality
2377          */
2378         if (revs->reverse && revs->graph)
2379                 die("cannot combine --reverse with --graph");
2380
2381         if (revs->reflog_info && revs->graph)
2382                 die("cannot combine --walk-reflogs with --graph");
2383         if (revs->no_walk && revs->graph)
2384                 die("cannot combine --no-walk with --graph");
2385         if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2386                 die("cannot use --grep-reflog without --walk-reflogs");
2387
2388         if (revs->first_parent_only && revs->bisect)
2389                 die(_("--first-parent is incompatible with --bisect"));
2390
2391         return left;
2392 }
2393
2394 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2395 {
2396         struct commit_list *l = xcalloc(1, sizeof(*l));
2397
2398         l->item = child;
2399         l->next = add_decoration(&revs->children, &parent->object, l);
2400 }
2401
2402 static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2403 {
2404         struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2405         struct commit_list **pp, *p;
2406         int surviving_parents;
2407
2408         /* Examine existing parents while marking ones we have seen... */
2409         pp = &commit->parents;
2410         surviving_parents = 0;
2411         while ((p = *pp) != NULL) {
2412                 struct commit *parent = p->item;
2413                 if (parent->object.flags & TMP_MARK) {
2414                         *pp = p->next;
2415                         if (ts)
2416                                 compact_treesame(revs, commit, surviving_parents);
2417                         continue;
2418                 }
2419                 parent->object.flags |= TMP_MARK;
2420                 surviving_parents++;
2421                 pp = &p->next;
2422         }
2423         /* clear the temporary mark */
2424         for (p = commit->parents; p; p = p->next) {
2425                 p->item->object.flags &= ~TMP_MARK;
2426         }
2427         /* no update_treesame() - removing duplicates can't affect TREESAME */
2428         return surviving_parents;
2429 }
2430
2431 struct merge_simplify_state {
2432         struct commit *simplified;
2433 };
2434
2435 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2436 {
2437         struct merge_simplify_state *st;
2438
2439         st = lookup_decoration(&revs->merge_simplification, &commit->object);
2440         if (!st) {
2441                 st = xcalloc(1, sizeof(*st));
2442                 add_decoration(&revs->merge_simplification, &commit->object, st);
2443         }
2444         return st;
2445 }
2446
2447 static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2448 {
2449         struct commit_list *h = reduce_heads(commit->parents);
2450         int i = 0, marked = 0;
2451         struct commit_list *po, *pn;
2452
2453         /* Want these for sanity-checking only */
2454         int orig_cnt = commit_list_count(commit->parents);
2455         int cnt = commit_list_count(h);
2456
2457         /*
2458          * Not ready to remove items yet, just mark them for now, based
2459          * on the output of reduce_heads(). reduce_heads outputs the reduced
2460          * set in its original order, so this isn't too hard.
2461          */
2462         po = commit->parents;
2463         pn = h;
2464         while (po) {
2465                 if (pn && po->item == pn->item) {
2466                         pn = pn->next;
2467                         i++;
2468                 } else {
2469                         po->item->object.flags |= TMP_MARK;
2470                         marked++;
2471                 }
2472                 po=po->next;
2473         }
2474
2475         if (i != cnt || cnt+marked != orig_cnt)
2476                 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2477
2478         free_commit_list(h);
2479
2480         return marked;
2481 }
2482
2483 static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2484 {
2485         struct commit_list *p;
2486         int marked = 0;
2487
2488         for (p = commit->parents; p; p = p->next) {
2489                 struct commit *parent = p->item;
2490                 if (!parent->parents && (parent->object.flags & TREESAME)) {
2491                         parent->object.flags |= TMP_MARK;
2492                         marked++;
2493                 }
2494         }
2495
2496         return marked;
2497 }
2498
2499 /*
2500  * Awkward naming - this means one parent we are TREESAME to.
2501  * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2502  * empty tree). Better name suggestions?
2503  */
2504 static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2505 {
2506         struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2507         struct commit *unmarked = NULL, *marked = NULL;
2508         struct commit_list *p;
2509         unsigned n;
2510
2511         for (p = commit->parents, n = 0; p; p = p->next, n++) {
2512                 if (ts->treesame[n]) {
2513                         if (p->item->object.flags & TMP_MARK) {
2514                                 if (!marked)
2515                                         marked = p->item;
2516                         } else {
2517                                 if (!unmarked) {
2518                                         unmarked = p->item;
2519                                         break;
2520                                 }
2521                         }
2522                 }
2523         }
2524
2525         /*
2526          * If we are TREESAME to a marked-for-deletion parent, but not to any
2527          * unmarked parents, unmark the first TREESAME parent. This is the
2528          * parent that the default simplify_history==1 scan would have followed,
2529          * and it doesn't make sense to omit that path when asking for a
2530          * simplified full history. Retaining it improves the chances of
2531          * understanding odd missed merges that took an old version of a file.
2532          *
2533          * Example:
2534          *
2535          *   I--------*X       A modified the file, but mainline merge X used
2536          *    \       /        "-s ours", so took the version from I. X is
2537          *     `-*A--'         TREESAME to I and !TREESAME to A.
2538          *
2539          * Default log from X would produce "I". Without this check,
2540          * --full-history --simplify-merges would produce "I-A-X", showing
2541          * the merge commit X and that it changed A, but not making clear that
2542          * it had just taken the I version. With this check, the topology above
2543          * is retained.
2544          *
2545          * Note that it is possible that the simplification chooses a different
2546          * TREESAME parent from the default, in which case this test doesn't
2547          * activate, and we _do_ drop the default parent. Example:
2548          *
2549          *   I------X         A modified the file, but it was reverted in B,
2550          *    \    /          meaning mainline merge X is TREESAME to both
2551          *    *A-*B           parents.
2552          *
2553          * Default log would produce "I" by following the first parent;
2554          * --full-history --simplify-merges will produce "I-A-B". But this is a
2555          * reasonable result - it presents a logical full history leading from
2556          * I to X, and X is not an important merge.
2557          */
2558         if (!unmarked && marked) {
2559                 marked->object.flags &= ~TMP_MARK;
2560                 return 1;
2561         }
2562
2563         return 0;
2564 }
2565
2566 static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2567 {
2568         struct commit_list **pp, *p;
2569         int nth_parent, removed = 0;
2570
2571         pp = &commit->parents;
2572         nth_parent = 0;
2573         while ((p = *pp) != NULL) {
2574                 struct commit *parent = p->item;
2575                 if (parent->object.flags & TMP_MARK) {
2576                         parent->object.flags &= ~TMP_MARK;
2577                         *pp = p->next;
2578                         free(p);
2579                         removed++;
2580                         compact_treesame(revs, commit, nth_parent);
2581                         continue;
2582                 }
2583                 pp = &p->next;
2584                 nth_parent++;
2585         }
2586
2587         /* Removing parents can only increase TREESAMEness */
2588         if (removed && !(commit->object.flags & TREESAME))
2589                 update_treesame(revs, commit);
2590
2591         return nth_parent;
2592 }
2593
2594 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
2595 {
2596         struct commit_list *p;
2597         struct commit *parent;
2598         struct merge_simplify_state *st, *pst;
2599         int cnt;
2600
2601         st = locate_simplify_state(revs, commit);
2602
2603         /*
2604          * Have we handled this one?
2605          */
2606         if (st->simplified)
2607                 return tail;
2608
2609         /*
2610          * An UNINTERESTING commit simplifies to itself, so does a
2611          * root commit.  We do not rewrite parents of such commit
2612          * anyway.
2613          */
2614         if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
2615                 st->simplified = commit;
2616                 return tail;
2617         }
2618
2619         /*
2620          * Do we know what commit all of our parents that matter
2621          * should be rewritten to?  Otherwise we are not ready to
2622          * rewrite this one yet.
2623          */
2624         for (cnt = 0, p = commit->parents; p; p = p->next) {
2625                 pst = locate_simplify_state(revs, p->item);
2626                 if (!pst->simplified) {
2627                         tail = &commit_list_insert(p->item, tail)->next;
2628                         cnt++;
2629                 }
2630                 if (revs->first_parent_only)
2631                         break;
2632         }
2633         if (cnt) {
2634                 tail = &commit_list_insert(commit, tail)->next;
2635                 return tail;
2636         }
2637
2638         /*
2639          * Rewrite our list of parents. Note that this cannot
2640          * affect our TREESAME flags in any way - a commit is
2641          * always TREESAME to its simplification.
2642          */
2643         for (p = commit->parents; p; p = p->next) {
2644                 pst = locate_simplify_state(revs, p->item);
2645                 p->item = pst->simplified;
2646                 if (revs->first_parent_only)
2647                         break;
2648         }
2649
2650         if (revs->first_parent_only)
2651                 cnt = 1;
2652         else
2653                 cnt = remove_duplicate_parents(revs, commit);
2654
2655         /*
2656          * It is possible that we are a merge and one side branch
2657          * does not have any commit that touches the given paths;
2658          * in such a case, the immediate parent from that branch
2659          * will be rewritten to be the merge base.
2660          *
2661          *      o----X          X: the commit we are looking at;
2662          *     /    /           o: a commit that touches the paths;
2663          * ---o----'
2664          *
2665          * Further, a merge of an independent branch that doesn't
2666          * touch the path will reduce to a treesame root parent:
2667          *
2668          *  ----o----X          X: the commit we are looking at;
2669          *          /           o: a commit that touches the paths;
2670          *         r            r: a root commit not touching the paths
2671          *
2672          * Detect and simplify both cases.
2673          */
2674         if (1 < cnt) {
2675                 int marked = mark_redundant_parents(revs, commit);
2676                 marked += mark_treesame_root_parents(revs, commit);
2677                 if (marked)
2678                         marked -= leave_one_treesame_to_parent(revs, commit);
2679                 if (marked)
2680                         cnt = remove_marked_parents(revs, commit);
2681         }
2682
2683         /*
2684          * A commit simplifies to itself if it is a root, if it is
2685          * UNINTERESTING, if it touches the given paths, or if it is a
2686          * merge and its parents don't simplify to one relevant commit
2687          * (the first two cases are already handled at the beginning of
2688          * this function).
2689          *
2690          * Otherwise, it simplifies to what its sole relevant parent
2691          * simplifies to.
2692          */
2693         if (!cnt ||
2694             (commit->object.flags & UNINTERESTING) ||
2695             !(commit->object.flags & TREESAME) ||
2696             (parent = one_relevant_parent(revs, commit->parents)) == NULL)
2697                 st->simplified = commit;
2698         else {
2699                 pst = locate_simplify_state(revs, parent);
2700                 st->simplified = pst->simplified;
2701         }
2702         return tail;
2703 }
2704
2705 static void simplify_merges(struct rev_info *revs)
2706 {
2707         struct commit_list *list, *next;
2708         struct commit_list *yet_to_do, **tail;
2709         struct commit *commit;
2710
2711         if (!revs->prune)
2712                 return;
2713
2714         /* feed the list reversed */
2715         yet_to_do = NULL;
2716         for (list = revs->commits; list; list = next) {
2717                 commit = list->item;
2718                 next = list->next;
2719                 /*
2720                  * Do not free(list) here yet; the original list
2721                  * is used later in this function.
2722                  */
2723                 commit_list_insert(commit, &yet_to_do);
2724         }
2725         while (yet_to_do) {
2726                 list = yet_to_do;
2727                 yet_to_do = NULL;
2728                 tail = &yet_to_do;
2729                 while (list) {
2730                         commit = pop_commit(&list);
2731                         tail = simplify_one(revs, commit, tail);
2732                 }
2733         }
2734
2735         /* clean up the result, removing the simplified ones */
2736         list = revs->commits;
2737         revs->commits = NULL;
2738         tail = &revs->commits;
2739         while (list) {
2740                 struct merge_simplify_state *st;
2741
2742                 commit = pop_commit(&list);
2743                 st = locate_simplify_state(revs, commit);
2744                 if (st->simplified == commit)
2745                         tail = &commit_list_insert(commit, tail)->next;
2746         }
2747 }
2748
2749 static void set_children(struct rev_info *revs)
2750 {
2751         struct commit_list *l;
2752         for (l = revs->commits; l; l = l->next) {
2753                 struct commit *commit = l->item;
2754                 struct commit_list *p;
2755
2756                 for (p = commit->parents; p; p = p->next)
2757                         add_child(revs, p->item, commit);
2758         }
2759 }
2760
2761 void reset_revision_walk(void)
2762 {
2763         clear_object_flags(SEEN | ADDED | SHOWN);
2764 }
2765
2766 int prepare_revision_walk(struct rev_info *revs)
2767 {
2768         int i;
2769         struct object_array old_pending;
2770         struct commit_list **next = &revs->commits;
2771
2772         memcpy(&old_pending, &revs->pending, sizeof(old_pending));
2773         revs->pending.nr = 0;
2774         revs->pending.alloc = 0;
2775         revs->pending.objects = NULL;
2776         for (i = 0; i < old_pending.nr; i++) {
2777                 struct object_array_entry *e = old_pending.objects + i;
2778                 struct commit *commit = handle_commit(revs, e);
2779                 if (commit) {
2780                         if (!(commit->object.flags & SEEN)) {
2781                                 commit->object.flags |= SEEN;
2782                                 next = commit_list_append(commit, next);
2783                         }
2784                 }
2785         }
2786         if (!revs->leak_pending)
2787                 object_array_clear(&old_pending);
2788
2789         /* Signal whether we need per-parent treesame decoration */
2790         if (revs->simplify_merges ||
2791             (revs->limited && limiting_can_increase_treesame(revs)))
2792                 revs->treesame.name = "treesame";
2793
2794         if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2795                 commit_list_sort_by_date(&revs->commits);
2796         if (revs->no_walk)
2797                 return 0;
2798         if (revs->limited)
2799                 if (limit_list(revs) < 0)
2800                         return -1;
2801         if (revs->topo_order)
2802                 sort_in_topological_order(&revs->commits, revs->sort_order);
2803         if (revs->line_level_traverse)
2804                 line_log_filter(revs);
2805         if (revs->simplify_merges)
2806                 simplify_merges(revs);
2807         if (revs->children.name)
2808                 set_children(revs);
2809         return 0;
2810 }
2811
2812 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2813 {
2814         struct commit_list *cache = NULL;
2815
2816         for (;;) {
2817                 struct commit *p = *pp;
2818                 if (!revs->limited)
2819                         if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2820                                 return rewrite_one_error;
2821                 if (p->object.flags & UNINTERESTING)
2822                         return rewrite_one_ok;
2823                 if (!(p->object.flags & TREESAME))
2824                         return rewrite_one_ok;
2825                 if (!p->parents)
2826                         return rewrite_one_noparents;
2827                 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2828                         return rewrite_one_ok;
2829                 *pp = p;
2830         }
2831 }
2832
2833 int rewrite_parents(struct rev_info *revs, struct commit *commit,
2834         rewrite_parent_fn_t rewrite_parent)
2835 {
2836         struct commit_list **pp = &commit->parents;
2837         while (*pp) {
2838                 struct commit_list *parent = *pp;
2839                 switch (rewrite_parent(revs, &parent->item)) {
2840                 case rewrite_one_ok:
2841                         break;
2842                 case rewrite_one_noparents:
2843                         *pp = parent->next;
2844                         continue;
2845                 case rewrite_one_error:
2846                         return -1;
2847                 }
2848                 pp = &parent->next;
2849         }
2850         remove_duplicate_parents(revs, commit);
2851         return 0;
2852 }
2853
2854 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2855 {
2856         char *person, *endp;
2857         size_t len, namelen, maillen;
2858         const char *name;
2859         const char *mail;
2860         struct ident_split ident;
2861
2862         person = strstr(buf->buf, what);
2863         if (!person)
2864                 return 0;
2865
2866         person += strlen(what);
2867         endp = strchr(person, '\n');
2868         if (!endp)
2869                 return 0;
2870
2871         len = endp - person;
2872
2873         if (split_ident_line(&ident, person, len))
2874                 return 0;
2875
2876         mail = ident.mail_begin;
2877         maillen = ident.mail_end - ident.mail_begin;
2878         name = ident.name_begin;
2879         namelen = ident.name_end - ident.name_begin;
2880
2881         if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2882                 struct strbuf namemail = STRBUF_INIT;
2883
2884                 strbuf_addf(&namemail, "%.*s <%.*s>",
2885                             (int)namelen, name, (int)maillen, mail);
2886
2887                 strbuf_splice(buf, ident.name_begin - buf->buf,
2888                               ident.mail_end - ident.name_begin + 1,
2889                               namemail.buf, namemail.len);
2890
2891                 strbuf_release(&namemail);
2892
2893                 return 1;
2894         }
2895
2896         return 0;
2897 }
2898
2899 static int commit_match(struct commit *commit, struct rev_info *opt)
2900 {
2901         int retval;
2902         const char *encoding;
2903         const char *message;
2904         struct strbuf buf = STRBUF_INIT;
2905
2906         if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2907                 return 1;
2908
2909         /* Prepend "fake" headers as needed */
2910         if (opt->grep_filter.use_reflog_filter) {
2911                 strbuf_addstr(&buf, "reflog ");
2912                 get_reflog_message(&buf, opt->reflog_info);
2913                 strbuf_addch(&buf, '\n');
2914         }
2915
2916         /*
2917          * We grep in the user's output encoding, under the assumption that it
2918          * is the encoding they are most likely to write their grep pattern
2919          * for. In addition, it means we will match the "notes" encoding below,
2920          * so we will not end up with a buffer that has two different encodings
2921          * in it.
2922          */
2923         encoding = get_log_output_encoding();
2924         message = logmsg_reencode(commit, NULL, encoding);
2925
2926         /* Copy the commit to temporary if we are using "fake" headers */
2927         if (buf.len)
2928                 strbuf_addstr(&buf, message);
2929
2930         if (opt->grep_filter.header_list && opt->mailmap) {
2931                 if (!buf.len)
2932                         strbuf_addstr(&buf, message);
2933
2934                 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2935                 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2936         }
2937
2938         /* Append "fake" message parts as needed */
2939         if (opt->show_notes) {
2940                 if (!buf.len)
2941                         strbuf_addstr(&buf, message);
2942                 format_display_notes(commit->object.oid.hash, &buf, encoding, 1);
2943         }
2944
2945         /*
2946          * Find either in the original commit message, or in the temporary.
2947          * Note that we cast away the constness of "message" here. It is
2948          * const because it may come from the cached commit buffer. That's OK,
2949          * because we know that it is modifiable heap memory, and that while
2950          * grep_buffer may modify it for speed, it will restore any
2951          * changes before returning.
2952          */
2953         if (buf.len)
2954                 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2955         else
2956                 retval = grep_buffer(&opt->grep_filter,
2957                                      (char *)message, strlen(message));
2958         strbuf_release(&buf);
2959         unuse_commit_buffer(commit, message);
2960         return opt->invert_grep ? !retval : retval;
2961 }
2962
2963 static inline int want_ancestry(const struct rev_info *revs)
2964 {
2965         return (revs->rewrite_parents || revs->children.name);
2966 }
2967
2968 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2969 {
2970         if (commit->object.flags & SHOWN)
2971                 return commit_ignore;
2972         if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))
2973                 return commit_ignore;
2974         if (revs->show_all)
2975                 return commit_show;
2976         if (commit->object.flags & UNINTERESTING)
2977                 return commit_ignore;
2978         if (revs->min_age != -1 && (commit->date > revs->min_age))
2979                 return commit_ignore;
2980         if (revs->min_parents || (revs->max_parents >= 0)) {
2981                 int n = commit_list_count(commit->parents);
2982                 if ((n < revs->min_parents) ||
2983                     ((revs->max_parents >= 0) && (n > revs->max_parents)))
2984                         return commit_ignore;
2985         }
2986         if (!commit_match(commit, revs))
2987                 return commit_ignore;
2988         if (revs->prune && revs->dense) {
2989                 /* Commit without changes? */
2990                 if (commit->object.flags & TREESAME) {
2991                         int n;
2992                         struct commit_list *p;
2993                         /* drop merges unless we want parenthood */
2994                         if (!want_ancestry(revs))
2995                                 return commit_ignore;
2996                         /*
2997                          * If we want ancestry, then need to keep any merges
2998                          * between relevant commits to tie together topology.
2999                          * For consistency with TREESAME and simplification
3000                          * use "relevant" here rather than just INTERESTING,
3001                          * to treat bottom commit(s) as part of the topology.
3002                          */
3003                         for (n = 0, p = commit->parents; p; p = p->next)
3004                                 if (relevant_commit(p->item))
3005                                         if (++n >= 2)
3006                                                 return commit_show;
3007                         return commit_ignore;
3008                 }
3009         }
3010         return commit_show;
3011 }
3012
3013 define_commit_slab(saved_parents, struct commit_list *);
3014
3015 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3016
3017 /*
3018  * You may only call save_parents() once per commit (this is checked
3019  * for non-root commits).
3020  */
3021 static void save_parents(struct rev_info *revs, struct commit *commit)
3022 {
3023         struct commit_list **pp;
3024
3025         if (!revs->saved_parents_slab) {
3026                 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3027                 init_saved_parents(revs->saved_parents_slab);
3028         }
3029
3030         pp = saved_parents_at(revs->saved_parents_slab, commit);
3031
3032         /*
3033          * When walking with reflogs, we may visit the same commit
3034          * several times: once for each appearance in the reflog.
3035          *
3036          * In this case, save_parents() will be called multiple times.
3037          * We want to keep only the first set of parents.  We need to
3038          * store a sentinel value for an empty (i.e., NULL) parent
3039          * list to distinguish it from a not-yet-saved list, however.
3040          */
3041         if (*pp)
3042                 return;
3043         if (commit->parents)
3044                 *pp = copy_commit_list(commit->parents);
3045         else
3046                 *pp = EMPTY_PARENT_LIST;
3047 }
3048
3049 static void free_saved_parents(struct rev_info *revs)
3050 {
3051         if (revs->saved_parents_slab)
3052                 clear_saved_parents(revs->saved_parents_slab);
3053 }
3054
3055 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3056 {
3057         struct commit_list *parents;
3058
3059         if (!revs->saved_parents_slab)
3060                 return commit->parents;
3061
3062         parents = *saved_parents_at(revs->saved_parents_slab, commit);
3063         if (parents == EMPTY_PARENT_LIST)
3064                 return NULL;
3065         return parents;
3066 }
3067
3068 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3069 {
3070         enum commit_action action = get_commit_action(revs, commit);
3071
3072         if (action == commit_show &&
3073             !revs->show_all &&
3074             revs->prune && revs->dense && want_ancestry(revs)) {
3075                 /*
3076                  * --full-diff on simplified parents is no good: it
3077                  * will show spurious changes from the commits that
3078                  * were elided.  So we save the parents on the side
3079                  * when --full-diff is in effect.
3080                  */
3081                 if (revs->full_diff)
3082                         save_parents(revs, commit);
3083                 if (rewrite_parents(revs, commit, rewrite_one) < 0)
3084                         return commit_error;
3085         }
3086         return action;
3087 }
3088
3089 static void track_linear(struct rev_info *revs, struct commit *commit)
3090 {
3091         if (revs->track_first_time) {
3092                 revs->linear = 1;
3093                 revs->track_first_time = 0;
3094         } else {
3095                 struct commit_list *p;
3096                 for (p = revs->previous_parents; p; p = p->next)
3097                         if (p->item == NULL || /* first commit */
3098                             !oidcmp(&p->item->object.oid, &commit->object.oid))
3099                                 break;
3100                 revs->linear = p != NULL;
3101         }
3102         if (revs->reverse) {
3103                 if (revs->linear)
3104                         commit->object.flags |= TRACK_LINEAR;
3105         }
3106         free_commit_list(revs->previous_parents);
3107         revs->previous_parents = copy_commit_list(commit->parents);
3108 }
3109
3110 static struct commit *get_revision_1(struct rev_info *revs)
3111 {
3112         if (!revs->commits)
3113                 return NULL;
3114
3115         do {
3116                 struct commit *commit = pop_commit(&revs->commits);
3117
3118                 if (revs->reflog_info) {
3119                         save_parents(revs, commit);
3120                         fake_reflog_parent(revs->reflog_info, commit);
3121                         commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3122                 }
3123
3124                 /*
3125                  * If we haven't done the list limiting, we need to look at
3126                  * the parents here. We also need to do the date-based limiting
3127                  * that we'd otherwise have done in limit_list().
3128                  */
3129                 if (!revs->limited) {
3130                         if (revs->max_age != -1 &&
3131                             (commit->date < revs->max_age))
3132                                 continue;
3133                         if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3134                                 if (!revs->ignore_missing_links)
3135                                         die("Failed to traverse parents of commit %s",
3136                                                 oid_to_hex(&commit->object.oid));
3137                         }
3138                 }
3139
3140                 switch (simplify_commit(revs, commit)) {
3141                 case commit_ignore:
3142                         continue;
3143                 case commit_error:
3144                         die("Failed to simplify parents of commit %s",
3145                             oid_to_hex(&commit->object.oid));
3146                 default:
3147                         if (revs->track_linear)
3148                                 track_linear(revs, commit);
3149                         return commit;
3150                 }
3151         } while (revs->commits);
3152         return NULL;
3153 }
3154
3155 /*
3156  * Return true for entries that have not yet been shown.  (This is an
3157  * object_array_each_func_t.)
3158  */
3159 static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3160 {
3161         return !(entry->item->flags & SHOWN);
3162 }
3163
3164 /*
3165  * If array is on the verge of a realloc, garbage-collect any entries
3166  * that have already been shown to try to free up some space.
3167  */
3168 static void gc_boundary(struct object_array *array)
3169 {
3170         if (array->nr == array->alloc)
3171                 object_array_filter(array, entry_unshown, NULL);
3172 }
3173
3174 static void create_boundary_commit_list(struct rev_info *revs)
3175 {
3176         unsigned i;
3177         struct commit *c;
3178         struct object_array *array = &revs->boundary_commits;
3179         struct object_array_entry *objects = array->objects;
3180
3181         /*
3182          * If revs->commits is non-NULL at this point, an error occurred in
3183          * get_revision_1().  Ignore the error and continue printing the
3184          * boundary commits anyway.  (This is what the code has always
3185          * done.)
3186          */
3187         if (revs->commits) {
3188                 free_commit_list(revs->commits);
3189                 revs->commits = NULL;
3190         }
3191
3192         /*
3193          * Put all of the actual boundary commits from revs->boundary_commits
3194          * into revs->commits
3195          */
3196         for (i = 0; i < array->nr; i++) {
3197                 c = (struct commit *)(objects[i].item);
3198                 if (!c)
3199                         continue;
3200                 if (!(c->object.flags & CHILD_SHOWN))
3201                         continue;
3202                 if (c->object.flags & (SHOWN | BOUNDARY))
3203                         continue;
3204                 c->object.flags |= BOUNDARY;
3205                 commit_list_insert(c, &revs->commits);
3206         }
3207
3208         /*
3209          * If revs->topo_order is set, sort the boundary commits
3210          * in topological order
3211          */
3212         sort_in_topological_order(&revs->commits, revs->sort_order);
3213 }
3214
3215 static struct commit *get_revision_internal(struct rev_info *revs)
3216 {
3217         struct commit *c = NULL;
3218         struct commit_list *l;
3219
3220         if (revs->boundary == 2) {
3221                 /*
3222                  * All of the normal commits have already been returned,
3223                  * and we are now returning boundary commits.
3224                  * create_boundary_commit_list() has populated
3225                  * revs->commits with the remaining commits to return.
3226                  */
3227                 c = pop_commit(&revs->commits);
3228                 if (c)
3229                         c->object.flags |= SHOWN;
3230                 return c;
3231         }
3232
3233         /*
3234          * If our max_count counter has reached zero, then we are done. We
3235          * don't simply return NULL because we still might need to show
3236          * boundary commits. But we want to avoid calling get_revision_1, which
3237          * might do a considerable amount of work finding the next commit only
3238          * for us to throw it away.
3239          *
3240          * If it is non-zero, then either we don't have a max_count at all
3241          * (-1), or it is still counting, in which case we decrement.
3242          */
3243         if (revs->max_count) {
3244                 c = get_revision_1(revs);
3245                 if (c) {
3246                         while (revs->skip_count > 0) {
3247                                 revs->skip_count--;
3248                                 c = get_revision_1(revs);
3249                                 if (!c)
3250                                         break;
3251                         }
3252                 }
3253
3254                 if (revs->max_count > 0)
3255                         revs->max_count--;
3256         }
3257
3258         if (c)
3259                 c->object.flags |= SHOWN;
3260
3261         if (!revs->boundary)
3262                 return c;
3263
3264         if (!c) {
3265                 /*
3266                  * get_revision_1() runs out the commits, and
3267                  * we are done computing the boundaries.
3268                  * switch to boundary commits output mode.
3269                  */
3270                 revs->boundary = 2;
3271
3272                 /*
3273                  * Update revs->commits to contain the list of
3274                  * boundary commits.
3275                  */
3276                 create_boundary_commit_list(revs);
3277
3278                 return get_revision_internal(revs);
3279         }
3280
3281         /*
3282          * boundary commits are the commits that are parents of the
3283          * ones we got from get_revision_1() but they themselves are
3284          * not returned from get_revision_1().  Before returning
3285          * 'c', we need to mark its parents that they could be boundaries.
3286          */
3287
3288         for (l = c->parents; l; l = l->next) {
3289                 struct object *p;
3290                 p = &(l->item->object);
3291                 if (p->flags & (CHILD_SHOWN | SHOWN))
3292                         continue;
3293                 p->flags |= CHILD_SHOWN;
3294                 gc_boundary(&revs->boundary_commits);
3295                 add_object_array(p, NULL, &revs->boundary_commits);
3296         }
3297
3298         return c;
3299 }
3300
3301 struct commit *get_revision(struct rev_info *revs)
3302 {
3303         struct commit *c;
3304         struct commit_list *reversed;
3305
3306         if (revs->reverse) {
3307                 reversed = NULL;
3308                 while ((c = get_revision_internal(revs)))
3309                         commit_list_insert(c, &reversed);
3310                 revs->commits = reversed;
3311                 revs->reverse = 0;
3312                 revs->reverse_output_stage = 1;
3313         }
3314
3315         if (revs->reverse_output_stage) {
3316                 c = pop_commit(&revs->commits);
3317                 if (revs->track_linear)
3318                         revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3319                 return c;
3320         }
3321
3322         c = get_revision_internal(revs);
3323         if (c && revs->graph)
3324                 graph_update(revs->graph, c);
3325         if (!c) {
3326                 free_saved_parents(revs);
3327                 if (revs->previous_parents) {
3328                         free_commit_list(revs->previous_parents);
3329                         revs->previous_parents = NULL;
3330                 }
3331         }
3332         return c;
3333 }
3334
3335 char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3336 {
3337         if (commit->object.flags & BOUNDARY)
3338                 return "-";
3339         else if (commit->object.flags & UNINTERESTING)
3340                 return "^";
3341         else if (commit->object.flags & PATCHSAME)
3342                 return "=";
3343         else if (!revs || revs->left_right) {
3344                 if (commit->object.flags & SYMMETRIC_LEFT)
3345                         return "<";
3346                 else
3347                         return ">";
3348         } else if (revs->graph)
3349                 return "*";
3350         else if (revs->cherry_mark)
3351                 return "+";
3352         return "";
3353 }
3354
3355 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3356 {
3357         char *mark = get_revision_mark(revs, commit);
3358         if (!strlen(mark))
3359                 return;
3360         fputs(mark, stdout);
3361         putchar(' ');
3362 }