Merge branch 'jx/pkt-line-doc-count-fix'
[git] / revision.c
1 #include "cache.h"
2 #include "object-store.h"
3 #include "tag.h"
4 #include "blob.h"
5 #include "tree.h"
6 #include "commit.h"
7 #include "diff.h"
8 #include "refs.h"
9 #include "revision.h"
10 #include "repository.h"
11 #include "graph.h"
12 #include "grep.h"
13 #include "reflog-walk.h"
14 #include "patch-ids.h"
15 #include "decorate.h"
16 #include "log-tree.h"
17 #include "string-list.h"
18 #include "line-log.h"
19 #include "mailmap.h"
20 #include "commit-slab.h"
21 #include "dir.h"
22 #include "cache-tree.h"
23 #include "bisect.h"
24 #include "packfile.h"
25 #include "worktree.h"
26 #include "argv-array.h"
27 #include "commit-reach.h"
28 #include "commit-graph.h"
29 #include "prio-queue.h"
30 #include "hashmap.h"
31 #include "utf8.h"
32 #include "bloom.h"
33 #include "json-writer.h"
34
35 volatile show_early_output_fn_t show_early_output;
36
37 static const char *term_bad;
38 static const char *term_good;
39
40 implement_shared_commit_slab(revision_sources, char *);
41
42 void show_object_with_name(FILE *out, struct object *obj, const char *name)
43 {
44         const char *p;
45
46         fprintf(out, "%s ", oid_to_hex(&obj->oid));
47         for (p = name; *p && *p != '\n'; p++)
48                 fputc(*p, out);
49         fputc('\n', out);
50 }
51
52 static void mark_blob_uninteresting(struct blob *blob)
53 {
54         if (!blob)
55                 return;
56         if (blob->object.flags & UNINTERESTING)
57                 return;
58         blob->object.flags |= UNINTERESTING;
59 }
60
61 static void mark_tree_contents_uninteresting(struct repository *r,
62                                              struct tree *tree)
63 {
64         struct tree_desc desc;
65         struct name_entry entry;
66
67         if (parse_tree_gently(tree, 1) < 0)
68                 return;
69
70         init_tree_desc(&desc, tree->buffer, tree->size);
71         while (tree_entry(&desc, &entry)) {
72                 switch (object_type(entry.mode)) {
73                 case OBJ_TREE:
74                         mark_tree_uninteresting(r, lookup_tree(r, &entry.oid));
75                         break;
76                 case OBJ_BLOB:
77                         mark_blob_uninteresting(lookup_blob(r, &entry.oid));
78                         break;
79                 default:
80                         /* Subproject commit - not in this repository */
81                         break;
82                 }
83         }
84
85         /*
86          * We don't care about the tree any more
87          * after it has been marked uninteresting.
88          */
89         free_tree_buffer(tree);
90 }
91
92 void mark_tree_uninteresting(struct repository *r, struct tree *tree)
93 {
94         struct object *obj;
95
96         if (!tree)
97                 return;
98
99         obj = &tree->object;
100         if (obj->flags & UNINTERESTING)
101                 return;
102         obj->flags |= UNINTERESTING;
103         mark_tree_contents_uninteresting(r, tree);
104 }
105
106 struct path_and_oids_entry {
107         struct hashmap_entry ent;
108         char *path;
109         struct oidset trees;
110 };
111
112 static int path_and_oids_cmp(const void *hashmap_cmp_fn_data,
113                              const struct hashmap_entry *eptr,
114                              const struct hashmap_entry *entry_or_key,
115                              const void *keydata)
116 {
117         const struct path_and_oids_entry *e1, *e2;
118
119         e1 = container_of(eptr, const struct path_and_oids_entry, ent);
120         e2 = container_of(entry_or_key, const struct path_and_oids_entry, ent);
121
122         return strcmp(e1->path, e2->path);
123 }
124
125 static void paths_and_oids_init(struct hashmap *map)
126 {
127         hashmap_init(map, path_and_oids_cmp, NULL, 0);
128 }
129
130 static void paths_and_oids_clear(struct hashmap *map)
131 {
132         struct hashmap_iter iter;
133         struct path_and_oids_entry *entry;
134
135         hashmap_for_each_entry(map, &iter, entry, ent /* member name */) {
136                 oidset_clear(&entry->trees);
137                 free(entry->path);
138         }
139
140         hashmap_free_entries(map, struct path_and_oids_entry, ent);
141 }
142
143 static void paths_and_oids_insert(struct hashmap *map,
144                                   const char *path,
145                                   const struct object_id *oid)
146 {
147         int hash = strhash(path);
148         struct path_and_oids_entry key;
149         struct path_and_oids_entry *entry;
150
151         hashmap_entry_init(&key.ent, hash);
152
153         /* use a shallow copy for the lookup */
154         key.path = (char *)path;
155         oidset_init(&key.trees, 0);
156
157         entry = hashmap_get_entry(map, &key, ent, NULL);
158         if (!entry) {
159                 entry = xcalloc(1, sizeof(struct path_and_oids_entry));
160                 hashmap_entry_init(&entry->ent, hash);
161                 entry->path = xstrdup(key.path);
162                 oidset_init(&entry->trees, 16);
163                 hashmap_put(map, &entry->ent);
164         }
165
166         oidset_insert(&entry->trees, oid);
167 }
168
169 static void add_children_by_path(struct repository *r,
170                                  struct tree *tree,
171                                  struct hashmap *map)
172 {
173         struct tree_desc desc;
174         struct name_entry entry;
175
176         if (!tree)
177                 return;
178
179         if (parse_tree_gently(tree, 1) < 0)
180                 return;
181
182         init_tree_desc(&desc, tree->buffer, tree->size);
183         while (tree_entry(&desc, &entry)) {
184                 switch (object_type(entry.mode)) {
185                 case OBJ_TREE:
186                         paths_and_oids_insert(map, entry.path, &entry.oid);
187
188                         if (tree->object.flags & UNINTERESTING) {
189                                 struct tree *child = lookup_tree(r, &entry.oid);
190                                 if (child)
191                                         child->object.flags |= UNINTERESTING;
192                         }
193                         break;
194                 case OBJ_BLOB:
195                         if (tree->object.flags & UNINTERESTING) {
196                                 struct blob *child = lookup_blob(r, &entry.oid);
197                                 if (child)
198                                         child->object.flags |= UNINTERESTING;
199                         }
200                         break;
201                 default:
202                         /* Subproject commit - not in this repository */
203                         break;
204                 }
205         }
206
207         free_tree_buffer(tree);
208 }
209
210 void mark_trees_uninteresting_sparse(struct repository *r,
211                                      struct oidset *trees)
212 {
213         unsigned has_interesting = 0, has_uninteresting = 0;
214         struct hashmap map;
215         struct hashmap_iter map_iter;
216         struct path_and_oids_entry *entry;
217         struct object_id *oid;
218         struct oidset_iter iter;
219
220         oidset_iter_init(trees, &iter);
221         while ((!has_interesting || !has_uninteresting) &&
222                (oid = oidset_iter_next(&iter))) {
223                 struct tree *tree = lookup_tree(r, oid);
224
225                 if (!tree)
226                         continue;
227
228                 if (tree->object.flags & UNINTERESTING)
229                         has_uninteresting = 1;
230                 else
231                         has_interesting = 1;
232         }
233
234         /* Do not walk unless we have both types of trees. */
235         if (!has_uninteresting || !has_interesting)
236                 return;
237
238         paths_and_oids_init(&map);
239
240         oidset_iter_init(trees, &iter);
241         while ((oid = oidset_iter_next(&iter))) {
242                 struct tree *tree = lookup_tree(r, oid);
243                 add_children_by_path(r, tree, &map);
244         }
245
246         hashmap_for_each_entry(&map, &map_iter, entry, ent /* member name */)
247                 mark_trees_uninteresting_sparse(r, &entry->trees);
248
249         paths_and_oids_clear(&map);
250 }
251
252 struct commit_stack {
253         struct commit **items;
254         size_t nr, alloc;
255 };
256 #define COMMIT_STACK_INIT { NULL, 0, 0 }
257
258 static void commit_stack_push(struct commit_stack *stack, struct commit *commit)
259 {
260         ALLOC_GROW(stack->items, stack->nr + 1, stack->alloc);
261         stack->items[stack->nr++] = commit;
262 }
263
264 static struct commit *commit_stack_pop(struct commit_stack *stack)
265 {
266         return stack->nr ? stack->items[--stack->nr] : NULL;
267 }
268
269 static void commit_stack_clear(struct commit_stack *stack)
270 {
271         FREE_AND_NULL(stack->items);
272         stack->nr = stack->alloc = 0;
273 }
274
275 static void mark_one_parent_uninteresting(struct commit *commit,
276                                           struct commit_stack *pending)
277 {
278         struct commit_list *l;
279
280         if (commit->object.flags & UNINTERESTING)
281                 return;
282         commit->object.flags |= UNINTERESTING;
283
284         /*
285          * Normally we haven't parsed the parent
286          * yet, so we won't have a parent of a parent
287          * here. However, it may turn out that we've
288          * reached this commit some other way (where it
289          * wasn't uninteresting), in which case we need
290          * to mark its parents recursively too..
291          */
292         for (l = commit->parents; l; l = l->next)
293                 commit_stack_push(pending, l->item);
294 }
295
296 void mark_parents_uninteresting(struct commit *commit)
297 {
298         struct commit_stack pending = COMMIT_STACK_INIT;
299         struct commit_list *l;
300
301         for (l = commit->parents; l; l = l->next)
302                 mark_one_parent_uninteresting(l->item, &pending);
303
304         while (pending.nr > 0)
305                 mark_one_parent_uninteresting(commit_stack_pop(&pending),
306                                               &pending);
307
308         commit_stack_clear(&pending);
309 }
310
311 static void add_pending_object_with_path(struct rev_info *revs,
312                                          struct object *obj,
313                                          const char *name, unsigned mode,
314                                          const char *path)
315 {
316         if (!obj)
317                 return;
318         if (revs->no_walk && (obj->flags & UNINTERESTING))
319                 revs->no_walk = 0;
320         if (revs->reflog_info && obj->type == OBJ_COMMIT) {
321                 struct strbuf buf = STRBUF_INIT;
322                 int len = interpret_branch_name(name, 0, &buf, 0);
323
324                 if (0 < len && name[len] && buf.len)
325                         strbuf_addstr(&buf, name + len);
326                 add_reflog_for_walk(revs->reflog_info,
327                                     (struct commit *)obj,
328                                     buf.buf[0] ? buf.buf: name);
329                 strbuf_release(&buf);
330                 return; /* do not add the commit itself */
331         }
332         add_object_array_with_path(obj, name, &revs->pending, mode, path);
333 }
334
335 static void add_pending_object_with_mode(struct rev_info *revs,
336                                          struct object *obj,
337                                          const char *name, unsigned mode)
338 {
339         add_pending_object_with_path(revs, obj, name, mode, NULL);
340 }
341
342 void add_pending_object(struct rev_info *revs,
343                         struct object *obj, const char *name)
344 {
345         add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
346 }
347
348 void add_head_to_pending(struct rev_info *revs)
349 {
350         struct object_id oid;
351         struct object *obj;
352         if (get_oid("HEAD", &oid))
353                 return;
354         obj = parse_object(revs->repo, &oid);
355         if (!obj)
356                 return;
357         add_pending_object(revs, obj, "HEAD");
358 }
359
360 static struct object *get_reference(struct rev_info *revs, const char *name,
361                                     const struct object_id *oid,
362                                     unsigned int flags)
363 {
364         struct object *object;
365
366         /*
367          * If the repository has commit graphs, repo_parse_commit() avoids
368          * reading the object buffer, so use it whenever possible.
369          */
370         if (oid_object_info(revs->repo, oid, NULL) == OBJ_COMMIT) {
371                 struct commit *c = lookup_commit(revs->repo, oid);
372                 if (!repo_parse_commit(revs->repo, c))
373                         object = (struct object *) c;
374                 else
375                         object = NULL;
376         } else {
377                 object = parse_object(revs->repo, oid);
378         }
379
380         if (!object) {
381                 if (revs->ignore_missing)
382                         return object;
383                 if (revs->exclude_promisor_objects && is_promisor_object(oid))
384                         return NULL;
385                 die("bad object %s", name);
386         }
387         object->flags |= flags;
388         return object;
389 }
390
391 void add_pending_oid(struct rev_info *revs, const char *name,
392                       const struct object_id *oid, unsigned int flags)
393 {
394         struct object *object = get_reference(revs, name, oid, flags);
395         add_pending_object(revs, object, name);
396 }
397
398 static struct commit *handle_commit(struct rev_info *revs,
399                                     struct object_array_entry *entry)
400 {
401         struct object *object = entry->item;
402         const char *name = entry->name;
403         const char *path = entry->path;
404         unsigned int mode = entry->mode;
405         unsigned long flags = object->flags;
406
407         /*
408          * Tag object? Look what it points to..
409          */
410         while (object->type == OBJ_TAG) {
411                 struct tag *tag = (struct tag *) object;
412                 if (revs->tag_objects && !(flags & UNINTERESTING))
413                         add_pending_object(revs, object, tag->tag);
414                 object = parse_object(revs->repo, get_tagged_oid(tag));
415                 if (!object) {
416                         if (revs->ignore_missing_links || (flags & UNINTERESTING))
417                                 return NULL;
418                         if (revs->exclude_promisor_objects &&
419                             is_promisor_object(&tag->tagged->oid))
420                                 return NULL;
421                         die("bad object %s", oid_to_hex(&tag->tagged->oid));
422                 }
423                 object->flags |= flags;
424                 /*
425                  * We'll handle the tagged object by looping or dropping
426                  * through to the non-tag handlers below. Do not
427                  * propagate path data from the tag's pending entry.
428                  */
429                 path = NULL;
430                 mode = 0;
431         }
432
433         /*
434          * Commit object? Just return it, we'll do all the complex
435          * reachability crud.
436          */
437         if (object->type == OBJ_COMMIT) {
438                 struct commit *commit = (struct commit *)object;
439
440                 if (parse_commit(commit) < 0)
441                         die("unable to parse commit %s", name);
442                 if (flags & UNINTERESTING) {
443                         mark_parents_uninteresting(commit);
444
445                         if (!revs->topo_order || !generation_numbers_enabled(the_repository))
446                                 revs->limited = 1;
447                 }
448                 if (revs->sources) {
449                         char **slot = revision_sources_at(revs->sources, commit);
450
451                         if (!*slot)
452                                 *slot = xstrdup(name);
453                 }
454                 return commit;
455         }
456
457         /*
458          * Tree object? Either mark it uninteresting, or add it
459          * to the list of objects to look at later..
460          */
461         if (object->type == OBJ_TREE) {
462                 struct tree *tree = (struct tree *)object;
463                 if (!revs->tree_objects)
464                         return NULL;
465                 if (flags & UNINTERESTING) {
466                         mark_tree_contents_uninteresting(revs->repo, tree);
467                         return NULL;
468                 }
469                 add_pending_object_with_path(revs, object, name, mode, path);
470                 return NULL;
471         }
472
473         /*
474          * Blob object? You know the drill by now..
475          */
476         if (object->type == OBJ_BLOB) {
477                 if (!revs->blob_objects)
478                         return NULL;
479                 if (flags & UNINTERESTING)
480                         return NULL;
481                 add_pending_object_with_path(revs, object, name, mode, path);
482                 return NULL;
483         }
484         die("%s is unknown object", name);
485 }
486
487 static int everybody_uninteresting(struct commit_list *orig,
488                                    struct commit **interesting_cache)
489 {
490         struct commit_list *list = orig;
491
492         if (*interesting_cache) {
493                 struct commit *commit = *interesting_cache;
494                 if (!(commit->object.flags & UNINTERESTING))
495                         return 0;
496         }
497
498         while (list) {
499                 struct commit *commit = list->item;
500                 list = list->next;
501                 if (commit->object.flags & UNINTERESTING)
502                         continue;
503
504                 *interesting_cache = commit;
505                 return 0;
506         }
507         return 1;
508 }
509
510 /*
511  * A definition of "relevant" commit that we can use to simplify limited graphs
512  * by eliminating side branches.
513  *
514  * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
515  * in our list), or that is a specified BOTTOM commit. Then after computing
516  * a limited list, during processing we can generally ignore boundary merges
517  * coming from outside the graph, (ie from irrelevant parents), and treat
518  * those merges as if they were single-parent. TREESAME is defined to consider
519  * only relevant parents, if any. If we are TREESAME to our on-graph parents,
520  * we don't care if we were !TREESAME to non-graph parents.
521  *
522  * Treating bottom commits as relevant ensures that a limited graph's
523  * connection to the actual bottom commit is not viewed as a side branch, but
524  * treated as part of the graph. For example:
525  *
526  *   ....Z...A---X---o---o---B
527  *        .     /
528  *         W---Y
529  *
530  * When computing "A..B", the A-X connection is at least as important as
531  * Y-X, despite A being flagged UNINTERESTING.
532  *
533  * And when computing --ancestry-path "A..B", the A-X connection is more
534  * important than Y-X, despite both A and Y being flagged UNINTERESTING.
535  */
536 static inline int relevant_commit(struct commit *commit)
537 {
538         return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
539 }
540
541 /*
542  * Return a single relevant commit from a parent list. If we are a TREESAME
543  * commit, and this selects one of our parents, then we can safely simplify to
544  * that parent.
545  */
546 static struct commit *one_relevant_parent(const struct rev_info *revs,
547                                           struct commit_list *orig)
548 {
549         struct commit_list *list = orig;
550         struct commit *relevant = NULL;
551
552         if (!orig)
553                 return NULL;
554
555         /*
556          * For 1-parent commits, or if first-parent-only, then return that
557          * first parent (even if not "relevant" by the above definition).
558          * TREESAME will have been set purely on that parent.
559          */
560         if (revs->first_parent_only || !orig->next)
561                 return orig->item;
562
563         /*
564          * For multi-parent commits, identify a sole relevant parent, if any.
565          * If we have only one relevant parent, then TREESAME will be set purely
566          * with regard to that parent, and we can simplify accordingly.
567          *
568          * If we have more than one relevant parent, or no relevant parents
569          * (and multiple irrelevant ones), then we can't select a parent here
570          * and return NULL.
571          */
572         while (list) {
573                 struct commit *commit = list->item;
574                 list = list->next;
575                 if (relevant_commit(commit)) {
576                         if (relevant)
577                                 return NULL;
578                         relevant = commit;
579                 }
580         }
581         return relevant;
582 }
583
584 /*
585  * The goal is to get REV_TREE_NEW as the result only if the
586  * diff consists of all '+' (and no other changes), REV_TREE_OLD
587  * if the whole diff is removal of old data, and otherwise
588  * REV_TREE_DIFFERENT (of course if the trees are the same we
589  * want REV_TREE_SAME).
590  *
591  * The only time we care about the distinction is when
592  * remove_empty_trees is in effect, in which case we care only about
593  * whether the whole change is REV_TREE_NEW, or if there's another type
594  * of change. Which means we can stop the diff early in either of these
595  * cases:
596  *
597  *   1. We're not using remove_empty_trees at all.
598  *
599  *   2. We saw anything except REV_TREE_NEW.
600  */
601 static int tree_difference = REV_TREE_SAME;
602
603 static void file_add_remove(struct diff_options *options,
604                     int addremove, unsigned mode,
605                     const struct object_id *oid,
606                     int oid_valid,
607                     const char *fullpath, unsigned dirty_submodule)
608 {
609         int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
610         struct rev_info *revs = options->change_fn_data;
611
612         tree_difference |= diff;
613         if (!revs->remove_empty_trees || tree_difference != REV_TREE_NEW)
614                 options->flags.has_changes = 1;
615 }
616
617 static void file_change(struct diff_options *options,
618                  unsigned old_mode, unsigned new_mode,
619                  const struct object_id *old_oid,
620                  const struct object_id *new_oid,
621                  int old_oid_valid, int new_oid_valid,
622                  const char *fullpath,
623                  unsigned old_dirty_submodule, unsigned new_dirty_submodule)
624 {
625         tree_difference = REV_TREE_DIFFERENT;
626         options->flags.has_changes = 1;
627 }
628
629 static int bloom_filter_atexit_registered;
630 static unsigned int count_bloom_filter_maybe;
631 static unsigned int count_bloom_filter_definitely_not;
632 static unsigned int count_bloom_filter_false_positive;
633 static unsigned int count_bloom_filter_not_present;
634 static unsigned int count_bloom_filter_length_zero;
635
636 static void trace2_bloom_filter_statistics_atexit(void)
637 {
638         struct json_writer jw = JSON_WRITER_INIT;
639
640         jw_object_begin(&jw, 0);
641         jw_object_intmax(&jw, "filter_not_present", count_bloom_filter_not_present);
642         jw_object_intmax(&jw, "zero_length_filter", count_bloom_filter_length_zero);
643         jw_object_intmax(&jw, "maybe", count_bloom_filter_maybe);
644         jw_object_intmax(&jw, "definitely_not", count_bloom_filter_definitely_not);
645         jw_object_intmax(&jw, "false_positive", count_bloom_filter_false_positive);
646         jw_end(&jw);
647
648         trace2_data_json("bloom", the_repository, "statistics", &jw);
649
650         jw_release(&jw);
651 }
652
653 static int forbid_bloom_filters(struct pathspec *spec)
654 {
655         if (spec->has_wildcard)
656                 return 1;
657         if (spec->nr > 1)
658                 return 1;
659         if (spec->magic & ~PATHSPEC_LITERAL)
660                 return 1;
661         if (spec->nr && (spec->items[0].magic & ~PATHSPEC_LITERAL))
662                 return 1;
663
664         return 0;
665 }
666
667 static void prepare_to_use_bloom_filter(struct rev_info *revs)
668 {
669         struct pathspec_item *pi;
670         char *path_alloc = NULL;
671         const char *path;
672         int last_index;
673         int len;
674
675         if (!revs->commits)
676                 return;
677
678         if (forbid_bloom_filters(&revs->prune_data))
679                 return;
680
681         repo_parse_commit(revs->repo, revs->commits->item);
682
683         if (!revs->repo->objects->commit_graph)
684                 return;
685
686         revs->bloom_filter_settings = revs->repo->objects->commit_graph->bloom_filter_settings;
687         if (!revs->bloom_filter_settings)
688                 return;
689
690         pi = &revs->pruning.pathspec.items[0];
691         last_index = pi->len - 1;
692
693         /* remove single trailing slash from path, if needed */
694         if (pi->match[last_index] == '/') {
695             path_alloc = xstrdup(pi->match);
696             path_alloc[last_index] = '\0';
697             path = path_alloc;
698         } else
699             path = pi->match;
700
701         len = strlen(path);
702
703         revs->bloom_key = xmalloc(sizeof(struct bloom_key));
704         fill_bloom_key(path, len, revs->bloom_key, revs->bloom_filter_settings);
705
706         if (trace2_is_enabled() && !bloom_filter_atexit_registered) {
707                 atexit(trace2_bloom_filter_statistics_atexit);
708                 bloom_filter_atexit_registered = 1;
709         }
710
711         free(path_alloc);
712 }
713
714 static int check_maybe_different_in_bloom_filter(struct rev_info *revs,
715                                                  struct commit *commit)
716 {
717         struct bloom_filter *filter;
718         int result;
719
720         if (!revs->repo->objects->commit_graph)
721                 return -1;
722
723         if (commit->generation == GENERATION_NUMBER_INFINITY)
724                 return -1;
725
726         filter = get_bloom_filter(revs->repo, commit, 0);
727
728         if (!filter) {
729                 count_bloom_filter_not_present++;
730                 return -1;
731         }
732
733         if (!filter->len) {
734                 count_bloom_filter_length_zero++;
735                 return -1;
736         }
737
738         result = bloom_filter_contains(filter,
739                                        revs->bloom_key,
740                                        revs->bloom_filter_settings);
741
742         if (result)
743                 count_bloom_filter_maybe++;
744         else
745                 count_bloom_filter_definitely_not++;
746
747         return result;
748 }
749
750 static int rev_compare_tree(struct rev_info *revs,
751                             struct commit *parent, struct commit *commit, int nth_parent)
752 {
753         struct tree *t1 = get_commit_tree(parent);
754         struct tree *t2 = get_commit_tree(commit);
755         int bloom_ret = 1;
756
757         if (!t1)
758                 return REV_TREE_NEW;
759         if (!t2)
760                 return REV_TREE_OLD;
761
762         if (revs->simplify_by_decoration) {
763                 /*
764                  * If we are simplifying by decoration, then the commit
765                  * is worth showing if it has a tag pointing at it.
766                  */
767                 if (get_name_decoration(&commit->object))
768                         return REV_TREE_DIFFERENT;
769                 /*
770                  * A commit that is not pointed by a tag is uninteresting
771                  * if we are not limited by path.  This means that you will
772                  * see the usual "commits that touch the paths" plus any
773                  * tagged commit by specifying both --simplify-by-decoration
774                  * and pathspec.
775                  */
776                 if (!revs->prune_data.nr)
777                         return REV_TREE_SAME;
778         }
779
780         if (revs->bloom_key && !nth_parent) {
781                 bloom_ret = check_maybe_different_in_bloom_filter(revs, commit);
782
783                 if (bloom_ret == 0)
784                         return REV_TREE_SAME;
785         }
786
787         tree_difference = REV_TREE_SAME;
788         revs->pruning.flags.has_changes = 0;
789         if (diff_tree_oid(&t1->object.oid, &t2->object.oid, "",
790                            &revs->pruning) < 0)
791                 return REV_TREE_DIFFERENT;
792
793         if (!nth_parent)
794                 if (bloom_ret == 1 && tree_difference == REV_TREE_SAME)
795                         count_bloom_filter_false_positive++;
796
797         return tree_difference;
798 }
799
800 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
801 {
802         int retval;
803         struct tree *t1 = get_commit_tree(commit);
804
805         if (!t1)
806                 return 0;
807
808         tree_difference = REV_TREE_SAME;
809         revs->pruning.flags.has_changes = 0;
810         retval = diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
811
812         return retval >= 0 && (tree_difference == REV_TREE_SAME);
813 }
814
815 struct treesame_state {
816         unsigned int nparents;
817         unsigned char treesame[FLEX_ARRAY];
818 };
819
820 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
821 {
822         unsigned n = commit_list_count(commit->parents);
823         struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
824         st->nparents = n;
825         add_decoration(&revs->treesame, &commit->object, st);
826         return st;
827 }
828
829 /*
830  * Must be called immediately after removing the nth_parent from a commit's
831  * parent list, if we are maintaining the per-parent treesame[] decoration.
832  * This does not recalculate the master TREESAME flag - update_treesame()
833  * should be called to update it after a sequence of treesame[] modifications
834  * that may have affected it.
835  */
836 static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
837 {
838         struct treesame_state *st;
839         int old_same;
840
841         if (!commit->parents) {
842                 /*
843                  * Have just removed the only parent from a non-merge.
844                  * Different handling, as we lack decoration.
845                  */
846                 if (nth_parent != 0)
847                         die("compact_treesame %u", nth_parent);
848                 old_same = !!(commit->object.flags & TREESAME);
849                 if (rev_same_tree_as_empty(revs, commit))
850                         commit->object.flags |= TREESAME;
851                 else
852                         commit->object.flags &= ~TREESAME;
853                 return old_same;
854         }
855
856         st = lookup_decoration(&revs->treesame, &commit->object);
857         if (!st || nth_parent >= st->nparents)
858                 die("compact_treesame %u", nth_parent);
859
860         old_same = st->treesame[nth_parent];
861         memmove(st->treesame + nth_parent,
862                 st->treesame + nth_parent + 1,
863                 st->nparents - nth_parent - 1);
864
865         /*
866          * If we've just become a non-merge commit, update TREESAME
867          * immediately, and remove the no-longer-needed decoration.
868          * If still a merge, defer update until update_treesame().
869          */
870         if (--st->nparents == 1) {
871                 if (commit->parents->next)
872                         die("compact_treesame parents mismatch");
873                 if (st->treesame[0] && revs->dense)
874                         commit->object.flags |= TREESAME;
875                 else
876                         commit->object.flags &= ~TREESAME;
877                 free(add_decoration(&revs->treesame, &commit->object, NULL));
878         }
879
880         return old_same;
881 }
882
883 static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
884 {
885         if (commit->parents && commit->parents->next) {
886                 unsigned n;
887                 struct treesame_state *st;
888                 struct commit_list *p;
889                 unsigned relevant_parents;
890                 unsigned relevant_change, irrelevant_change;
891
892                 st = lookup_decoration(&revs->treesame, &commit->object);
893                 if (!st)
894                         die("update_treesame %s", oid_to_hex(&commit->object.oid));
895                 relevant_parents = 0;
896                 relevant_change = irrelevant_change = 0;
897                 for (p = commit->parents, n = 0; p; n++, p = p->next) {
898                         if (relevant_commit(p->item)) {
899                                 relevant_change |= !st->treesame[n];
900                                 relevant_parents++;
901                         } else
902                                 irrelevant_change |= !st->treesame[n];
903                 }
904                 if (relevant_parents ? relevant_change : irrelevant_change)
905                         commit->object.flags &= ~TREESAME;
906                 else
907                         commit->object.flags |= TREESAME;
908         }
909
910         return commit->object.flags & TREESAME;
911 }
912
913 static inline int limiting_can_increase_treesame(const struct rev_info *revs)
914 {
915         /*
916          * TREESAME is irrelevant unless prune && dense;
917          * if simplify_history is set, we can't have a mixture of TREESAME and
918          *    !TREESAME INTERESTING parents (and we don't have treesame[]
919          *    decoration anyway);
920          * if first_parent_only is set, then the TREESAME flag is locked
921          *    against the first parent (and again we lack treesame[] decoration).
922          */
923         return revs->prune && revs->dense &&
924                !revs->simplify_history &&
925                !revs->first_parent_only;
926 }
927
928 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
929 {
930         struct commit_list **pp, *parent;
931         struct treesame_state *ts = NULL;
932         int relevant_change = 0, irrelevant_change = 0;
933         int relevant_parents, nth_parent;
934
935         /*
936          * If we don't do pruning, everything is interesting
937          */
938         if (!revs->prune)
939                 return;
940
941         if (!get_commit_tree(commit))
942                 return;
943
944         if (!commit->parents) {
945                 if (rev_same_tree_as_empty(revs, commit))
946                         commit->object.flags |= TREESAME;
947                 return;
948         }
949
950         /*
951          * Normal non-merge commit? If we don't want to make the
952          * history dense, we consider it always to be a change..
953          */
954         if (!revs->dense && !commit->parents->next)
955                 return;
956
957         for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
958              (parent = *pp) != NULL;
959              pp = &parent->next, nth_parent++) {
960                 struct commit *p = parent->item;
961                 if (relevant_commit(p))
962                         relevant_parents++;
963
964                 if (nth_parent == 1) {
965                         /*
966                          * This our second loop iteration - so we now know
967                          * we're dealing with a merge.
968                          *
969                          * Do not compare with later parents when we care only about
970                          * the first parent chain, in order to avoid derailing the
971                          * traversal to follow a side branch that brought everything
972                          * in the path we are limited to by the pathspec.
973                          */
974                         if (revs->first_parent_only)
975                                 break;
976                         /*
977                          * If this will remain a potentially-simplifiable
978                          * merge, remember per-parent treesame if needed.
979                          * Initialise the array with the comparison from our
980                          * first iteration.
981                          */
982                         if (revs->treesame.name &&
983                             !revs->simplify_history &&
984                             !(commit->object.flags & UNINTERESTING)) {
985                                 ts = initialise_treesame(revs, commit);
986                                 if (!(irrelevant_change || relevant_change))
987                                         ts->treesame[0] = 1;
988                         }
989                 }
990                 if (parse_commit(p) < 0)
991                         die("cannot simplify commit %s (because of %s)",
992                             oid_to_hex(&commit->object.oid),
993                             oid_to_hex(&p->object.oid));
994                 switch (rev_compare_tree(revs, p, commit, nth_parent)) {
995                 case REV_TREE_SAME:
996                         if (!revs->simplify_history || !relevant_commit(p)) {
997                                 /* Even if a merge with an uninteresting
998                                  * side branch brought the entire change
999                                  * we are interested in, we do not want
1000                                  * to lose the other branches of this
1001                                  * merge, so we just keep going.
1002                                  */
1003                                 if (ts)
1004                                         ts->treesame[nth_parent] = 1;
1005                                 continue;
1006                         }
1007                         parent->next = NULL;
1008                         commit->parents = parent;
1009
1010                         /*
1011                          * A merge commit is a "diversion" if it is not
1012                          * TREESAME to its first parent but is TREESAME
1013                          * to a later parent. In the simplified history,
1014                          * we "divert" the history walk to the later
1015                          * parent. These commits are shown when "show_pulls"
1016                          * is enabled, so do not mark the object as
1017                          * TREESAME here.
1018                          */
1019                         if (!revs->show_pulls || !nth_parent)
1020                                 commit->object.flags |= TREESAME;
1021
1022                         return;
1023
1024                 case REV_TREE_NEW:
1025                         if (revs->remove_empty_trees &&
1026                             rev_same_tree_as_empty(revs, p)) {
1027                                 /* We are adding all the specified
1028                                  * paths from this parent, so the
1029                                  * history beyond this parent is not
1030                                  * interesting.  Remove its parents
1031                                  * (they are grandparents for us).
1032                                  * IOW, we pretend this parent is a
1033                                  * "root" commit.
1034                                  */
1035                                 if (parse_commit(p) < 0)
1036                                         die("cannot simplify commit %s (invalid %s)",
1037                                             oid_to_hex(&commit->object.oid),
1038                                             oid_to_hex(&p->object.oid));
1039                                 p->parents = NULL;
1040                         }
1041                 /* fallthrough */
1042                 case REV_TREE_OLD:
1043                 case REV_TREE_DIFFERENT:
1044                         if (relevant_commit(p))
1045                                 relevant_change = 1;
1046                         else
1047                                 irrelevant_change = 1;
1048
1049                         if (!nth_parent)
1050                                 commit->object.flags |= PULL_MERGE;
1051
1052                         continue;
1053                 }
1054                 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
1055         }
1056
1057         /*
1058          * TREESAME is straightforward for single-parent commits. For merge
1059          * commits, it is most useful to define it so that "irrelevant"
1060          * parents cannot make us !TREESAME - if we have any relevant
1061          * parents, then we only consider TREESAMEness with respect to them,
1062          * allowing irrelevant merges from uninteresting branches to be
1063          * simplified away. Only if we have only irrelevant parents do we
1064          * base TREESAME on them. Note that this logic is replicated in
1065          * update_treesame, which should be kept in sync.
1066          */
1067         if (relevant_parents ? !relevant_change : !irrelevant_change)
1068                 commit->object.flags |= TREESAME;
1069 }
1070
1071 static int process_parents(struct rev_info *revs, struct commit *commit,
1072                            struct commit_list **list, struct prio_queue *queue)
1073 {
1074         struct commit_list *parent = commit->parents;
1075         unsigned left_flag;
1076
1077         if (commit->object.flags & ADDED)
1078                 return 0;
1079         commit->object.flags |= ADDED;
1080
1081         if (revs->include_check &&
1082             !revs->include_check(commit, revs->include_check_data))
1083                 return 0;
1084
1085         /*
1086          * If the commit is uninteresting, don't try to
1087          * prune parents - we want the maximal uninteresting
1088          * set.
1089          *
1090          * Normally we haven't parsed the parent
1091          * yet, so we won't have a parent of a parent
1092          * here. However, it may turn out that we've
1093          * reached this commit some other way (where it
1094          * wasn't uninteresting), in which case we need
1095          * to mark its parents recursively too..
1096          */
1097         if (commit->object.flags & UNINTERESTING) {
1098                 while (parent) {
1099                         struct commit *p = parent->item;
1100                         parent = parent->next;
1101                         if (p)
1102                                 p->object.flags |= UNINTERESTING;
1103                         if (parse_commit_gently(p, 1) < 0)
1104                                 continue;
1105                         if (p->parents)
1106                                 mark_parents_uninteresting(p);
1107                         if (p->object.flags & SEEN)
1108                                 continue;
1109                         p->object.flags |= SEEN;
1110                         if (list)
1111                                 commit_list_insert_by_date(p, list);
1112                         if (queue)
1113                                 prio_queue_put(queue, p);
1114                 }
1115                 return 0;
1116         }
1117
1118         /*
1119          * Ok, the commit wasn't uninteresting. Try to
1120          * simplify the commit history and find the parent
1121          * that has no differences in the path set if one exists.
1122          */
1123         try_to_simplify_commit(revs, commit);
1124
1125         if (revs->no_walk)
1126                 return 0;
1127
1128         left_flag = (commit->object.flags & SYMMETRIC_LEFT);
1129
1130         for (parent = commit->parents; parent; parent = parent->next) {
1131                 struct commit *p = parent->item;
1132                 int gently = revs->ignore_missing_links ||
1133                              revs->exclude_promisor_objects;
1134                 if (parse_commit_gently(p, gently) < 0) {
1135                         if (revs->exclude_promisor_objects &&
1136                             is_promisor_object(&p->object.oid)) {
1137                                 if (revs->first_parent_only)
1138                                         break;
1139                                 continue;
1140                         }
1141                         return -1;
1142                 }
1143                 if (revs->sources) {
1144                         char **slot = revision_sources_at(revs->sources, p);
1145
1146                         if (!*slot)
1147                                 *slot = *revision_sources_at(revs->sources, commit);
1148                 }
1149                 p->object.flags |= left_flag;
1150                 if (!(p->object.flags & SEEN)) {
1151                         p->object.flags |= SEEN;
1152                         if (list)
1153                                 commit_list_insert_by_date(p, list);
1154                         if (queue)
1155                                 prio_queue_put(queue, p);
1156                 }
1157                 if (revs->first_parent_only)
1158                         break;
1159         }
1160         return 0;
1161 }
1162
1163 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
1164 {
1165         struct commit_list *p;
1166         int left_count = 0, right_count = 0;
1167         int left_first;
1168         struct patch_ids ids;
1169         unsigned cherry_flag;
1170
1171         /* First count the commits on the left and on the right */
1172         for (p = list; p; p = p->next) {
1173                 struct commit *commit = p->item;
1174                 unsigned flags = commit->object.flags;
1175                 if (flags & BOUNDARY)
1176                         ;
1177                 else if (flags & SYMMETRIC_LEFT)
1178                         left_count++;
1179                 else
1180                         right_count++;
1181         }
1182
1183         if (!left_count || !right_count)
1184                 return;
1185
1186         left_first = left_count < right_count;
1187         init_patch_ids(revs->repo, &ids);
1188         ids.diffopts.pathspec = revs->diffopt.pathspec;
1189
1190         /* Compute patch-ids for one side */
1191         for (p = list; p; p = p->next) {
1192                 struct commit *commit = p->item;
1193                 unsigned flags = commit->object.flags;
1194
1195                 if (flags & BOUNDARY)
1196                         continue;
1197                 /*
1198                  * If we have fewer left, left_first is set and we omit
1199                  * commits on the right branch in this loop.  If we have
1200                  * fewer right, we skip the left ones.
1201                  */
1202                 if (left_first != !!(flags & SYMMETRIC_LEFT))
1203                         continue;
1204                 add_commit_patch_id(commit, &ids);
1205         }
1206
1207         /* either cherry_mark or cherry_pick are true */
1208         cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
1209
1210         /* Check the other side */
1211         for (p = list; p; p = p->next) {
1212                 struct commit *commit = p->item;
1213                 struct patch_id *id;
1214                 unsigned flags = commit->object.flags;
1215
1216                 if (flags & BOUNDARY)
1217                         continue;
1218                 /*
1219                  * If we have fewer left, left_first is set and we omit
1220                  * commits on the left branch in this loop.
1221                  */
1222                 if (left_first == !!(flags & SYMMETRIC_LEFT))
1223                         continue;
1224
1225                 /*
1226                  * Have we seen the same patch id?
1227                  */
1228                 id = has_commit_patch_id(commit, &ids);
1229                 if (!id)
1230                         continue;
1231
1232                 commit->object.flags |= cherry_flag;
1233                 id->commit->object.flags |= cherry_flag;
1234         }
1235
1236         free_patch_ids(&ids);
1237 }
1238
1239 /* How many extra uninteresting commits we want to see.. */
1240 #define SLOP 5
1241
1242 static int still_interesting(struct commit_list *src, timestamp_t date, int slop,
1243                              struct commit **interesting_cache)
1244 {
1245         /*
1246          * No source list at all? We're definitely done..
1247          */
1248         if (!src)
1249                 return 0;
1250
1251         /*
1252          * Does the destination list contain entries with a date
1253          * before the source list? Definitely _not_ done.
1254          */
1255         if (date <= src->item->date)
1256                 return SLOP;
1257
1258         /*
1259          * Does the source list still have interesting commits in
1260          * it? Definitely not done..
1261          */
1262         if (!everybody_uninteresting(src, interesting_cache))
1263                 return SLOP;
1264
1265         /* Ok, we're closing in.. */
1266         return slop-1;
1267 }
1268
1269 /*
1270  * "rev-list --ancestry-path A..B" computes commits that are ancestors
1271  * of B but not ancestors of A but further limits the result to those
1272  * that are descendants of A.  This takes the list of bottom commits and
1273  * the result of "A..B" without --ancestry-path, and limits the latter
1274  * further to the ones that can reach one of the commits in "bottom".
1275  */
1276 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
1277 {
1278         struct commit_list *p;
1279         struct commit_list *rlist = NULL;
1280         int made_progress;
1281
1282         /*
1283          * Reverse the list so that it will be likely that we would
1284          * process parents before children.
1285          */
1286         for (p = list; p; p = p->next)
1287                 commit_list_insert(p->item, &rlist);
1288
1289         for (p = bottom; p; p = p->next)
1290                 p->item->object.flags |= TMP_MARK;
1291
1292         /*
1293          * Mark the ones that can reach bottom commits in "list",
1294          * in a bottom-up fashion.
1295          */
1296         do {
1297                 made_progress = 0;
1298                 for (p = rlist; p; p = p->next) {
1299                         struct commit *c = p->item;
1300                         struct commit_list *parents;
1301                         if (c->object.flags & (TMP_MARK | UNINTERESTING))
1302                                 continue;
1303                         for (parents = c->parents;
1304                              parents;
1305                              parents = parents->next) {
1306                                 if (!(parents->item->object.flags & TMP_MARK))
1307                                         continue;
1308                                 c->object.flags |= TMP_MARK;
1309                                 made_progress = 1;
1310                                 break;
1311                         }
1312                 }
1313         } while (made_progress);
1314
1315         /*
1316          * NEEDSWORK: decide if we want to remove parents that are
1317          * not marked with TMP_MARK from commit->parents for commits
1318          * in the resulting list.  We may not want to do that, though.
1319          */
1320
1321         /*
1322          * The ones that are not marked with TMP_MARK are uninteresting
1323          */
1324         for (p = list; p; p = p->next) {
1325                 struct commit *c = p->item;
1326                 if (c->object.flags & TMP_MARK)
1327                         continue;
1328                 c->object.flags |= UNINTERESTING;
1329         }
1330
1331         /* We are done with the TMP_MARK */
1332         for (p = list; p; p = p->next)
1333                 p->item->object.flags &= ~TMP_MARK;
1334         for (p = bottom; p; p = p->next)
1335                 p->item->object.flags &= ~TMP_MARK;
1336         free_commit_list(rlist);
1337 }
1338
1339 /*
1340  * Before walking the history, keep the set of "negative" refs the
1341  * caller has asked to exclude.
1342  *
1343  * This is used to compute "rev-list --ancestry-path A..B", as we need
1344  * to filter the result of "A..B" further to the ones that can actually
1345  * reach A.
1346  */
1347 static struct commit_list *collect_bottom_commits(struct commit_list *list)
1348 {
1349         struct commit_list *elem, *bottom = NULL;
1350         for (elem = list; elem; elem = elem->next)
1351                 if (elem->item->object.flags & BOTTOM)
1352                         commit_list_insert(elem->item, &bottom);
1353         return bottom;
1354 }
1355
1356 /* Assumes either left_only or right_only is set */
1357 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1358 {
1359         struct commit_list *p;
1360
1361         for (p = list; p; p = p->next) {
1362                 struct commit *commit = p->item;
1363
1364                 if (revs->right_only) {
1365                         if (commit->object.flags & SYMMETRIC_LEFT)
1366                                 commit->object.flags |= SHOWN;
1367                 } else  /* revs->left_only is set */
1368                         if (!(commit->object.flags & SYMMETRIC_LEFT))
1369                                 commit->object.flags |= SHOWN;
1370         }
1371 }
1372
1373 static int limit_list(struct rev_info *revs)
1374 {
1375         int slop = SLOP;
1376         timestamp_t date = TIME_MAX;
1377         struct commit_list *list = revs->commits;
1378         struct commit_list *newlist = NULL;
1379         struct commit_list **p = &newlist;
1380         struct commit_list *bottom = NULL;
1381         struct commit *interesting_cache = NULL;
1382
1383         if (revs->ancestry_path) {
1384                 bottom = collect_bottom_commits(list);
1385                 if (!bottom)
1386                         die("--ancestry-path given but there are no bottom commits");
1387         }
1388
1389         while (list) {
1390                 struct commit *commit = pop_commit(&list);
1391                 struct object *obj = &commit->object;
1392                 show_early_output_fn_t show;
1393
1394                 if (commit == interesting_cache)
1395                         interesting_cache = NULL;
1396
1397                 if (revs->max_age != -1 && (commit->date < revs->max_age))
1398                         obj->flags |= UNINTERESTING;
1399                 if (process_parents(revs, commit, &list, NULL) < 0)
1400                         return -1;
1401                 if (obj->flags & UNINTERESTING) {
1402                         mark_parents_uninteresting(commit);
1403                         slop = still_interesting(list, date, slop, &interesting_cache);
1404                         if (slop)
1405                                 continue;
1406                         break;
1407                 }
1408                 if (revs->min_age != -1 && (commit->date > revs->min_age))
1409                         continue;
1410                 date = commit->date;
1411                 p = &commit_list_insert(commit, p)->next;
1412
1413                 show = show_early_output;
1414                 if (!show)
1415                         continue;
1416
1417                 show(revs, newlist);
1418                 show_early_output = NULL;
1419         }
1420         if (revs->cherry_pick || revs->cherry_mark)
1421                 cherry_pick_list(newlist, revs);
1422
1423         if (revs->left_only || revs->right_only)
1424                 limit_left_right(newlist, revs);
1425
1426         if (bottom) {
1427                 limit_to_ancestry(bottom, newlist);
1428                 free_commit_list(bottom);
1429         }
1430
1431         /*
1432          * Check if any commits have become TREESAME by some of their parents
1433          * becoming UNINTERESTING.
1434          */
1435         if (limiting_can_increase_treesame(revs))
1436                 for (list = newlist; list; list = list->next) {
1437                         struct commit *c = list->item;
1438                         if (c->object.flags & (UNINTERESTING | TREESAME))
1439                                 continue;
1440                         update_treesame(revs, c);
1441                 }
1442
1443         revs->commits = newlist;
1444         return 0;
1445 }
1446
1447 /*
1448  * Add an entry to refs->cmdline with the specified information.
1449  * *name is copied.
1450  */
1451 static void add_rev_cmdline(struct rev_info *revs,
1452                             struct object *item,
1453                             const char *name,
1454                             int whence,
1455                             unsigned flags)
1456 {
1457         struct rev_cmdline_info *info = &revs->cmdline;
1458         unsigned int nr = info->nr;
1459
1460         ALLOC_GROW(info->rev, nr + 1, info->alloc);
1461         info->rev[nr].item = item;
1462         info->rev[nr].name = xstrdup(name);
1463         info->rev[nr].whence = whence;
1464         info->rev[nr].flags = flags;
1465         info->nr++;
1466 }
1467
1468 static void add_rev_cmdline_list(struct rev_info *revs,
1469                                  struct commit_list *commit_list,
1470                                  int whence,
1471                                  unsigned flags)
1472 {
1473         while (commit_list) {
1474                 struct object *object = &commit_list->item->object;
1475                 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1476                                 whence, flags);
1477                 commit_list = commit_list->next;
1478         }
1479 }
1480
1481 struct all_refs_cb {
1482         int all_flags;
1483         int warned_bad_reflog;
1484         struct rev_info *all_revs;
1485         const char *name_for_errormsg;
1486         struct worktree *wt;
1487 };
1488
1489 int ref_excluded(struct string_list *ref_excludes, const char *path)
1490 {
1491         struct string_list_item *item;
1492
1493         if (!ref_excludes)
1494                 return 0;
1495         for_each_string_list_item(item, ref_excludes) {
1496                 if (!wildmatch(item->string, path, 0))
1497                         return 1;
1498         }
1499         return 0;
1500 }
1501
1502 static int handle_one_ref(const char *path, const struct object_id *oid,
1503                           int flag, void *cb_data)
1504 {
1505         struct all_refs_cb *cb = cb_data;
1506         struct object *object;
1507
1508         if (ref_excluded(cb->all_revs->ref_excludes, path))
1509             return 0;
1510
1511         object = get_reference(cb->all_revs, path, oid, cb->all_flags);
1512         add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1513         add_pending_oid(cb->all_revs, path, oid, cb->all_flags);
1514         return 0;
1515 }
1516
1517 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1518         unsigned flags)
1519 {
1520         cb->all_revs = revs;
1521         cb->all_flags = flags;
1522         revs->rev_input_given = 1;
1523         cb->wt = NULL;
1524 }
1525
1526 void clear_ref_exclusion(struct string_list **ref_excludes_p)
1527 {
1528         if (*ref_excludes_p) {
1529                 string_list_clear(*ref_excludes_p, 0);
1530                 free(*ref_excludes_p);
1531         }
1532         *ref_excludes_p = NULL;
1533 }
1534
1535 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1536 {
1537         if (!*ref_excludes_p) {
1538                 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1539                 (*ref_excludes_p)->strdup_strings = 1;
1540         }
1541         string_list_append(*ref_excludes_p, exclude);
1542 }
1543
1544 static void handle_refs(struct ref_store *refs,
1545                         struct rev_info *revs, unsigned flags,
1546                         int (*for_each)(struct ref_store *, each_ref_fn, void *))
1547 {
1548         struct all_refs_cb cb;
1549
1550         if (!refs) {
1551                 /* this could happen with uninitialized submodules */
1552                 return;
1553         }
1554
1555         init_all_refs_cb(&cb, revs, flags);
1556         for_each(refs, handle_one_ref, &cb);
1557 }
1558
1559 static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
1560 {
1561         struct all_refs_cb *cb = cb_data;
1562         if (!is_null_oid(oid)) {
1563                 struct object *o = parse_object(cb->all_revs->repo, oid);
1564                 if (o) {
1565                         o->flags |= cb->all_flags;
1566                         /* ??? CMDLINEFLAGS ??? */
1567                         add_pending_object(cb->all_revs, o, "");
1568                 }
1569                 else if (!cb->warned_bad_reflog) {
1570                         warning("reflog of '%s' references pruned commits",
1571                                 cb->name_for_errormsg);
1572                         cb->warned_bad_reflog = 1;
1573                 }
1574         }
1575 }
1576
1577 static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
1578                 const char *email, timestamp_t timestamp, int tz,
1579                 const char *message, void *cb_data)
1580 {
1581         handle_one_reflog_commit(ooid, cb_data);
1582         handle_one_reflog_commit(noid, cb_data);
1583         return 0;
1584 }
1585
1586 static int handle_one_reflog(const char *refname_in_wt,
1587                              const struct object_id *oid,
1588                              int flag, void *cb_data)
1589 {
1590         struct all_refs_cb *cb = cb_data;
1591         struct strbuf refname = STRBUF_INIT;
1592
1593         cb->warned_bad_reflog = 0;
1594         strbuf_worktree_ref(cb->wt, &refname, refname_in_wt);
1595         cb->name_for_errormsg = refname.buf;
1596         refs_for_each_reflog_ent(get_main_ref_store(the_repository),
1597                                  refname.buf,
1598                                  handle_one_reflog_ent, cb_data);
1599         strbuf_release(&refname);
1600         return 0;
1601 }
1602
1603 static void add_other_reflogs_to_pending(struct all_refs_cb *cb)
1604 {
1605         struct worktree **worktrees, **p;
1606
1607         worktrees = get_worktrees(0);
1608         for (p = worktrees; *p; p++) {
1609                 struct worktree *wt = *p;
1610
1611                 if (wt->is_current)
1612                         continue;
1613
1614                 cb->wt = wt;
1615                 refs_for_each_reflog(get_worktree_ref_store(wt),
1616                                      handle_one_reflog,
1617                                      cb);
1618         }
1619         free_worktrees(worktrees);
1620 }
1621
1622 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1623 {
1624         struct all_refs_cb cb;
1625
1626         cb.all_revs = revs;
1627         cb.all_flags = flags;
1628         cb.wt = NULL;
1629         for_each_reflog(handle_one_reflog, &cb);
1630
1631         if (!revs->single_worktree)
1632                 add_other_reflogs_to_pending(&cb);
1633 }
1634
1635 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1636                            struct strbuf *path, unsigned int flags)
1637 {
1638         size_t baselen = path->len;
1639         int i;
1640
1641         if (it->entry_count >= 0) {
1642                 struct tree *tree = lookup_tree(revs->repo, &it->oid);
1643                 tree->object.flags |= flags;
1644                 add_pending_object_with_path(revs, &tree->object, "",
1645                                              040000, path->buf);
1646         }
1647
1648         for (i = 0; i < it->subtree_nr; i++) {
1649                 struct cache_tree_sub *sub = it->down[i];
1650                 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1651                 add_cache_tree(sub->cache_tree, revs, path, flags);
1652                 strbuf_setlen(path, baselen);
1653         }
1654
1655 }
1656
1657 static void do_add_index_objects_to_pending(struct rev_info *revs,
1658                                             struct index_state *istate,
1659                                             unsigned int flags)
1660 {
1661         int i;
1662
1663         for (i = 0; i < istate->cache_nr; i++) {
1664                 struct cache_entry *ce = istate->cache[i];
1665                 struct blob *blob;
1666
1667                 if (S_ISGITLINK(ce->ce_mode))
1668                         continue;
1669
1670                 blob = lookup_blob(revs->repo, &ce->oid);
1671                 if (!blob)
1672                         die("unable to add index blob to traversal");
1673                 blob->object.flags |= flags;
1674                 add_pending_object_with_path(revs, &blob->object, "",
1675                                              ce->ce_mode, ce->name);
1676         }
1677
1678         if (istate->cache_tree) {
1679                 struct strbuf path = STRBUF_INIT;
1680                 add_cache_tree(istate->cache_tree, revs, &path, flags);
1681                 strbuf_release(&path);
1682         }
1683 }
1684
1685 void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
1686 {
1687         struct worktree **worktrees, **p;
1688
1689         repo_read_index(revs->repo);
1690         do_add_index_objects_to_pending(revs, revs->repo->index, flags);
1691
1692         if (revs->single_worktree)
1693                 return;
1694
1695         worktrees = get_worktrees(0);
1696         for (p = worktrees; *p; p++) {
1697                 struct worktree *wt = *p;
1698                 struct index_state istate = { NULL };
1699
1700                 if (wt->is_current)
1701                         continue; /* current index already taken care of */
1702
1703                 if (read_index_from(&istate,
1704                                     worktree_git_path(wt, "index"),
1705                                     get_worktree_git_dir(wt)) > 0)
1706                         do_add_index_objects_to_pending(revs, &istate, flags);
1707                 discard_index(&istate);
1708         }
1709         free_worktrees(worktrees);
1710 }
1711
1712 struct add_alternate_refs_data {
1713         struct rev_info *revs;
1714         unsigned int flags;
1715 };
1716
1717 static void add_one_alternate_ref(const struct object_id *oid,
1718                                   void *vdata)
1719 {
1720         const char *name = ".alternate";
1721         struct add_alternate_refs_data *data = vdata;
1722         struct object *obj;
1723
1724         obj = get_reference(data->revs, name, oid, data->flags);
1725         add_rev_cmdline(data->revs, obj, name, REV_CMD_REV, data->flags);
1726         add_pending_object(data->revs, obj, name);
1727 }
1728
1729 static void add_alternate_refs_to_pending(struct rev_info *revs,
1730                                           unsigned int flags)
1731 {
1732         struct add_alternate_refs_data data;
1733         data.revs = revs;
1734         data.flags = flags;
1735         for_each_alternate_ref(add_one_alternate_ref, &data);
1736 }
1737
1738 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1739                             int exclude_parent)
1740 {
1741         struct object_id oid;
1742         struct object *it;
1743         struct commit *commit;
1744         struct commit_list *parents;
1745         int parent_number;
1746         const char *arg = arg_;
1747
1748         if (*arg == '^') {
1749                 flags ^= UNINTERESTING | BOTTOM;
1750                 arg++;
1751         }
1752         if (get_oid_committish(arg, &oid))
1753                 return 0;
1754         while (1) {
1755                 it = get_reference(revs, arg, &oid, 0);
1756                 if (!it && revs->ignore_missing)
1757                         return 0;
1758                 if (it->type != OBJ_TAG)
1759                         break;
1760                 if (!((struct tag*)it)->tagged)
1761                         return 0;
1762                 oidcpy(&oid, &((struct tag*)it)->tagged->oid);
1763         }
1764         if (it->type != OBJ_COMMIT)
1765                 return 0;
1766         commit = (struct commit *)it;
1767         if (exclude_parent &&
1768             exclude_parent > commit_list_count(commit->parents))
1769                 return 0;
1770         for (parents = commit->parents, parent_number = 1;
1771              parents;
1772              parents = parents->next, parent_number++) {
1773                 if (exclude_parent && parent_number != exclude_parent)
1774                         continue;
1775
1776                 it = &parents->item->object;
1777                 it->flags |= flags;
1778                 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1779                 add_pending_object(revs, it, arg);
1780         }
1781         return 1;
1782 }
1783
1784 void repo_init_revisions(struct repository *r,
1785                          struct rev_info *revs,
1786                          const char *prefix)
1787 {
1788         memset(revs, 0, sizeof(*revs));
1789
1790         revs->repo = r;
1791         revs->abbrev = DEFAULT_ABBREV;
1792         revs->ignore_merges = 1;
1793         revs->simplify_history = 1;
1794         revs->pruning.repo = r;
1795         revs->pruning.flags.recursive = 1;
1796         revs->pruning.flags.quick = 1;
1797         revs->pruning.add_remove = file_add_remove;
1798         revs->pruning.change = file_change;
1799         revs->pruning.change_fn_data = revs;
1800         revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1801         revs->dense = 1;
1802         revs->prefix = prefix;
1803         revs->max_age = -1;
1804         revs->min_age = -1;
1805         revs->skip_count = -1;
1806         revs->max_count = -1;
1807         revs->max_parents = -1;
1808         revs->expand_tabs_in_log = -1;
1809
1810         revs->commit_format = CMIT_FMT_DEFAULT;
1811         revs->expand_tabs_in_log_default = 8;
1812
1813         init_grep_defaults(revs->repo);
1814         grep_init(&revs->grep_filter, revs->repo, prefix);
1815         revs->grep_filter.status_only = 1;
1816
1817         repo_diff_setup(revs->repo, &revs->diffopt);
1818         if (prefix && !revs->diffopt.prefix) {
1819                 revs->diffopt.prefix = prefix;
1820                 revs->diffopt.prefix_length = strlen(prefix);
1821         }
1822
1823         init_display_notes(&revs->notes_opt);
1824 }
1825
1826 static void add_pending_commit_list(struct rev_info *revs,
1827                                     struct commit_list *commit_list,
1828                                     unsigned int flags)
1829 {
1830         while (commit_list) {
1831                 struct object *object = &commit_list->item->object;
1832                 object->flags |= flags;
1833                 add_pending_object(revs, object, oid_to_hex(&object->oid));
1834                 commit_list = commit_list->next;
1835         }
1836 }
1837
1838 static void prepare_show_merge(struct rev_info *revs)
1839 {
1840         struct commit_list *bases;
1841         struct commit *head, *other;
1842         struct object_id oid;
1843         const char **prune = NULL;
1844         int i, prune_num = 1; /* counting terminating NULL */
1845         struct index_state *istate = revs->repo->index;
1846
1847         if (get_oid("HEAD", &oid))
1848                 die("--merge without HEAD?");
1849         head = lookup_commit_or_die(&oid, "HEAD");
1850         if (get_oid("MERGE_HEAD", &oid))
1851                 die("--merge without MERGE_HEAD?");
1852         other = lookup_commit_or_die(&oid, "MERGE_HEAD");
1853         add_pending_object(revs, &head->object, "HEAD");
1854         add_pending_object(revs, &other->object, "MERGE_HEAD");
1855         bases = get_merge_bases(head, other);
1856         add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1857         add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1858         free_commit_list(bases);
1859         head->object.flags |= SYMMETRIC_LEFT;
1860
1861         if (!istate->cache_nr)
1862                 repo_read_index(revs->repo);
1863         for (i = 0; i < istate->cache_nr; i++) {
1864                 const struct cache_entry *ce = istate->cache[i];
1865                 if (!ce_stage(ce))
1866                         continue;
1867                 if (ce_path_match(istate, ce, &revs->prune_data, NULL)) {
1868                         prune_num++;
1869                         REALLOC_ARRAY(prune, prune_num);
1870                         prune[prune_num-2] = ce->name;
1871                         prune[prune_num-1] = NULL;
1872                 }
1873                 while ((i+1 < istate->cache_nr) &&
1874                        ce_same_name(ce, istate->cache[i+1]))
1875                         i++;
1876         }
1877         clear_pathspec(&revs->prune_data);
1878         parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1879                        PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1880         revs->limited = 1;
1881 }
1882
1883 static int dotdot_missing(const char *arg, char *dotdot,
1884                           struct rev_info *revs, int symmetric)
1885 {
1886         if (revs->ignore_missing)
1887                 return 0;
1888         /* de-munge so we report the full argument */
1889         *dotdot = '.';
1890         die(symmetric
1891             ? "Invalid symmetric difference expression %s"
1892             : "Invalid revision range %s", arg);
1893 }
1894
1895 static int handle_dotdot_1(const char *arg, char *dotdot,
1896                            struct rev_info *revs, int flags,
1897                            int cant_be_filename,
1898                            struct object_context *a_oc,
1899                            struct object_context *b_oc)
1900 {
1901         const char *a_name, *b_name;
1902         struct object_id a_oid, b_oid;
1903         struct object *a_obj, *b_obj;
1904         unsigned int a_flags, b_flags;
1905         int symmetric = 0;
1906         unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1907         unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH;
1908
1909         a_name = arg;
1910         if (!*a_name)
1911                 a_name = "HEAD";
1912
1913         b_name = dotdot + 2;
1914         if (*b_name == '.') {
1915                 symmetric = 1;
1916                 b_name++;
1917         }
1918         if (!*b_name)
1919                 b_name = "HEAD";
1920
1921         if (get_oid_with_context(revs->repo, a_name, oc_flags, &a_oid, a_oc) ||
1922             get_oid_with_context(revs->repo, b_name, oc_flags, &b_oid, b_oc))
1923                 return -1;
1924
1925         if (!cant_be_filename) {
1926                 *dotdot = '.';
1927                 verify_non_filename(revs->prefix, arg);
1928                 *dotdot = '\0';
1929         }
1930
1931         a_obj = parse_object(revs->repo, &a_oid);
1932         b_obj = parse_object(revs->repo, &b_oid);
1933         if (!a_obj || !b_obj)
1934                 return dotdot_missing(arg, dotdot, revs, symmetric);
1935
1936         if (!symmetric) {
1937                 /* just A..B */
1938                 b_flags = flags;
1939                 a_flags = flags_exclude;
1940         } else {
1941                 /* A...B -- find merge bases between the two */
1942                 struct commit *a, *b;
1943                 struct commit_list *exclude;
1944
1945                 a = lookup_commit_reference(revs->repo, &a_obj->oid);
1946                 b = lookup_commit_reference(revs->repo, &b_obj->oid);
1947                 if (!a || !b)
1948                         return dotdot_missing(arg, dotdot, revs, symmetric);
1949
1950                 exclude = get_merge_bases(a, b);
1951                 add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE,
1952                                      flags_exclude);
1953                 add_pending_commit_list(revs, exclude, flags_exclude);
1954                 free_commit_list(exclude);
1955
1956                 b_flags = flags;
1957                 a_flags = flags | SYMMETRIC_LEFT;
1958         }
1959
1960         a_obj->flags |= a_flags;
1961         b_obj->flags |= b_flags;
1962         add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
1963         add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
1964         add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path);
1965         add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path);
1966         return 0;
1967 }
1968
1969 static int handle_dotdot(const char *arg,
1970                          struct rev_info *revs, int flags,
1971                          int cant_be_filename)
1972 {
1973         struct object_context a_oc, b_oc;
1974         char *dotdot = strstr(arg, "..");
1975         int ret;
1976
1977         if (!dotdot)
1978                 return -1;
1979
1980         memset(&a_oc, 0, sizeof(a_oc));
1981         memset(&b_oc, 0, sizeof(b_oc));
1982
1983         *dotdot = '\0';
1984         ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename,
1985                               &a_oc, &b_oc);
1986         *dotdot = '.';
1987
1988         free(a_oc.path);
1989         free(b_oc.path);
1990
1991         return ret;
1992 }
1993
1994 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1995 {
1996         struct object_context oc;
1997         char *mark;
1998         struct object *object;
1999         struct object_id oid;
2000         int local_flags;
2001         const char *arg = arg_;
2002         int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
2003         unsigned get_sha1_flags = GET_OID_RECORD_PATH;
2004
2005         flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
2006
2007         if (!cant_be_filename && !strcmp(arg, "..")) {
2008                 /*
2009                  * Just ".."?  That is not a range but the
2010                  * pathspec for the parent directory.
2011                  */
2012                 return -1;
2013         }
2014
2015         if (!handle_dotdot(arg, revs, flags, revarg_opt))
2016                 return 0;
2017
2018         mark = strstr(arg, "^@");
2019         if (mark && !mark[2]) {
2020                 *mark = 0;
2021                 if (add_parents_only(revs, arg, flags, 0))
2022                         return 0;
2023                 *mark = '^';
2024         }
2025         mark = strstr(arg, "^!");
2026         if (mark && !mark[2]) {
2027                 *mark = 0;
2028                 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0))
2029                         *mark = '^';
2030         }
2031         mark = strstr(arg, "^-");
2032         if (mark) {
2033                 int exclude_parent = 1;
2034
2035                 if (mark[2]) {
2036                         char *end;
2037                         exclude_parent = strtoul(mark + 2, &end, 10);
2038                         if (*end != '\0' || !exclude_parent)
2039                                 return -1;
2040                 }
2041
2042                 *mark = 0;
2043                 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent))
2044                         *mark = '^';
2045         }
2046
2047         local_flags = 0;
2048         if (*arg == '^') {
2049                 local_flags = UNINTERESTING | BOTTOM;
2050                 arg++;
2051         }
2052
2053         if (revarg_opt & REVARG_COMMITTISH)
2054                 get_sha1_flags |= GET_OID_COMMITTISH;
2055
2056         if (get_oid_with_context(revs->repo, arg, get_sha1_flags, &oid, &oc))
2057                 return revs->ignore_missing ? 0 : -1;
2058         if (!cant_be_filename)
2059                 verify_non_filename(revs->prefix, arg);
2060         object = get_reference(revs, arg, &oid, flags ^ local_flags);
2061         if (!object)
2062                 return revs->ignore_missing ? 0 : -1;
2063         add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
2064         add_pending_object_with_path(revs, object, arg, oc.mode, oc.path);
2065         free(oc.path);
2066         return 0;
2067 }
2068
2069 static void read_pathspec_from_stdin(struct strbuf *sb,
2070                                      struct argv_array *prune)
2071 {
2072         while (strbuf_getline(sb, stdin) != EOF)
2073                 argv_array_push(prune, sb->buf);
2074 }
2075
2076 static void read_revisions_from_stdin(struct rev_info *revs,
2077                                       struct argv_array *prune)
2078 {
2079         struct strbuf sb;
2080         int seen_dashdash = 0;
2081         int save_warning;
2082
2083         save_warning = warn_on_object_refname_ambiguity;
2084         warn_on_object_refname_ambiguity = 0;
2085
2086         strbuf_init(&sb, 1000);
2087         while (strbuf_getline(&sb, stdin) != EOF) {
2088                 int len = sb.len;
2089                 if (!len)
2090                         break;
2091                 if (sb.buf[0] == '-') {
2092                         if (len == 2 && sb.buf[1] == '-') {
2093                                 seen_dashdash = 1;
2094                                 break;
2095                         }
2096                         die("options not supported in --stdin mode");
2097                 }
2098                 if (handle_revision_arg(sb.buf, revs, 0,
2099                                         REVARG_CANNOT_BE_FILENAME))
2100                         die("bad revision '%s'", sb.buf);
2101         }
2102         if (seen_dashdash)
2103                 read_pathspec_from_stdin(&sb, prune);
2104
2105         strbuf_release(&sb);
2106         warn_on_object_refname_ambiguity = save_warning;
2107 }
2108
2109 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
2110 {
2111         append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
2112 }
2113
2114 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
2115 {
2116         append_header_grep_pattern(&revs->grep_filter, field, pattern);
2117 }
2118
2119 static void add_message_grep(struct rev_info *revs, const char *pattern)
2120 {
2121         add_grep(revs, pattern, GREP_PATTERN_BODY);
2122 }
2123
2124 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
2125                                int *unkc, const char **unkv,
2126                                const struct setup_revision_opt* opt)
2127 {
2128         const char *arg = argv[0];
2129         const char *optarg;
2130         int argcount;
2131         const unsigned hexsz = the_hash_algo->hexsz;
2132
2133         /* pseudo revision arguments */
2134         if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
2135             !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
2136             !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
2137             !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
2138             !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
2139             !strcmp(arg, "--indexed-objects") ||
2140             !strcmp(arg, "--alternate-refs") ||
2141             starts_with(arg, "--exclude=") ||
2142             starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
2143             starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
2144         {
2145                 unkv[(*unkc)++] = arg;
2146                 return 1;
2147         }
2148
2149         if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
2150                 revs->max_count = atoi(optarg);
2151                 revs->no_walk = 0;
2152                 return argcount;
2153         } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
2154                 revs->skip_count = atoi(optarg);
2155                 return argcount;
2156         } else if ((*arg == '-') && isdigit(arg[1])) {
2157                 /* accept -<digit>, like traditional "head" */
2158                 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
2159                     revs->max_count < 0)
2160                         die("'%s': not a non-negative integer", arg + 1);
2161                 revs->no_walk = 0;
2162         } else if (!strcmp(arg, "-n")) {
2163                 if (argc <= 1)
2164                         return error("-n requires an argument");
2165                 revs->max_count = atoi(argv[1]);
2166                 revs->no_walk = 0;
2167                 return 2;
2168         } else if (skip_prefix(arg, "-n", &optarg)) {
2169                 revs->max_count = atoi(optarg);
2170                 revs->no_walk = 0;
2171         } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
2172                 revs->max_age = atoi(optarg);
2173                 return argcount;
2174         } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
2175                 revs->max_age = approxidate(optarg);
2176                 return argcount;
2177         } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
2178                 revs->max_age = approxidate(optarg);
2179                 return argcount;
2180         } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
2181                 revs->min_age = atoi(optarg);
2182                 return argcount;
2183         } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
2184                 revs->min_age = approxidate(optarg);
2185                 return argcount;
2186         } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
2187                 revs->min_age = approxidate(optarg);
2188                 return argcount;
2189         } else if (!strcmp(arg, "--first-parent")) {
2190                 revs->first_parent_only = 1;
2191         } else if (!strcmp(arg, "--ancestry-path")) {
2192                 revs->ancestry_path = 1;
2193                 revs->simplify_history = 0;
2194                 revs->limited = 1;
2195         } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
2196                 init_reflog_walk(&revs->reflog_info);
2197         } else if (!strcmp(arg, "--default")) {
2198                 if (argc <= 1)
2199                         return error("bad --default argument");
2200                 revs->def = argv[1];
2201                 return 2;
2202         } else if (!strcmp(arg, "--merge")) {
2203                 revs->show_merge = 1;
2204         } else if (!strcmp(arg, "--topo-order")) {
2205                 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
2206                 revs->topo_order = 1;
2207         } else if (!strcmp(arg, "--simplify-merges")) {
2208                 revs->simplify_merges = 1;
2209                 revs->topo_order = 1;
2210                 revs->rewrite_parents = 1;
2211                 revs->simplify_history = 0;
2212                 revs->limited = 1;
2213         } else if (!strcmp(arg, "--simplify-by-decoration")) {
2214                 revs->simplify_merges = 1;
2215                 revs->topo_order = 1;
2216                 revs->rewrite_parents = 1;
2217                 revs->simplify_history = 0;
2218                 revs->simplify_by_decoration = 1;
2219                 revs->limited = 1;
2220                 revs->prune = 1;
2221         } else if (!strcmp(arg, "--date-order")) {
2222                 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
2223                 revs->topo_order = 1;
2224         } else if (!strcmp(arg, "--author-date-order")) {
2225                 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
2226                 revs->topo_order = 1;
2227         } else if (!strcmp(arg, "--early-output")) {
2228                 revs->early_output = 100;
2229                 revs->topo_order = 1;
2230         } else if (skip_prefix(arg, "--early-output=", &optarg)) {
2231                 if (strtoul_ui(optarg, 10, &revs->early_output) < 0)
2232                         die("'%s': not a non-negative integer", optarg);
2233                 revs->topo_order = 1;
2234         } else if (!strcmp(arg, "--parents")) {
2235                 revs->rewrite_parents = 1;
2236                 revs->print_parents = 1;
2237         } else if (!strcmp(arg, "--dense")) {
2238                 revs->dense = 1;
2239         } else if (!strcmp(arg, "--sparse")) {
2240                 revs->dense = 0;
2241         } else if (!strcmp(arg, "--in-commit-order")) {
2242                 revs->tree_blobs_in_commit_order = 1;
2243         } else if (!strcmp(arg, "--remove-empty")) {
2244                 revs->remove_empty_trees = 1;
2245         } else if (!strcmp(arg, "--merges")) {
2246                 revs->min_parents = 2;
2247         } else if (!strcmp(arg, "--no-merges")) {
2248                 revs->max_parents = 1;
2249         } else if (skip_prefix(arg, "--min-parents=", &optarg)) {
2250                 revs->min_parents = atoi(optarg);
2251         } else if (!strcmp(arg, "--no-min-parents")) {
2252                 revs->min_parents = 0;
2253         } else if (skip_prefix(arg, "--max-parents=", &optarg)) {
2254                 revs->max_parents = atoi(optarg);
2255         } else if (!strcmp(arg, "--no-max-parents")) {
2256                 revs->max_parents = -1;
2257         } else if (!strcmp(arg, "--boundary")) {
2258                 revs->boundary = 1;
2259         } else if (!strcmp(arg, "--left-right")) {
2260                 revs->left_right = 1;
2261         } else if (!strcmp(arg, "--left-only")) {
2262                 if (revs->right_only)
2263                         die("--left-only is incompatible with --right-only"
2264                             " or --cherry");
2265                 revs->left_only = 1;
2266         } else if (!strcmp(arg, "--right-only")) {
2267                 if (revs->left_only)
2268                         die("--right-only is incompatible with --left-only");
2269                 revs->right_only = 1;
2270         } else if (!strcmp(arg, "--cherry")) {
2271                 if (revs->left_only)
2272                         die("--cherry is incompatible with --left-only");
2273                 revs->cherry_mark = 1;
2274                 revs->right_only = 1;
2275                 revs->max_parents = 1;
2276                 revs->limited = 1;
2277         } else if (!strcmp(arg, "--count")) {
2278                 revs->count = 1;
2279         } else if (!strcmp(arg, "--cherry-mark")) {
2280                 if (revs->cherry_pick)
2281                         die("--cherry-mark is incompatible with --cherry-pick");
2282                 revs->cherry_mark = 1;
2283                 revs->limited = 1; /* needs limit_list() */
2284         } else if (!strcmp(arg, "--cherry-pick")) {
2285                 if (revs->cherry_mark)
2286                         die("--cherry-pick is incompatible with --cherry-mark");
2287                 revs->cherry_pick = 1;
2288                 revs->limited = 1;
2289         } else if (!strcmp(arg, "--objects")) {
2290                 revs->tag_objects = 1;
2291                 revs->tree_objects = 1;
2292                 revs->blob_objects = 1;
2293         } else if (!strcmp(arg, "--objects-edge")) {
2294                 revs->tag_objects = 1;
2295                 revs->tree_objects = 1;
2296                 revs->blob_objects = 1;
2297                 revs->edge_hint = 1;
2298         } else if (!strcmp(arg, "--objects-edge-aggressive")) {
2299                 revs->tag_objects = 1;
2300                 revs->tree_objects = 1;
2301                 revs->blob_objects = 1;
2302                 revs->edge_hint = 1;
2303                 revs->edge_hint_aggressive = 1;
2304         } else if (!strcmp(arg, "--verify-objects")) {
2305                 revs->tag_objects = 1;
2306                 revs->tree_objects = 1;
2307                 revs->blob_objects = 1;
2308                 revs->verify_objects = 1;
2309         } else if (!strcmp(arg, "--unpacked")) {
2310                 revs->unpacked = 1;
2311         } else if (starts_with(arg, "--unpacked=")) {
2312                 die("--unpacked=<packfile> no longer supported.");
2313         } else if (!strcmp(arg, "-r")) {
2314                 revs->diff = 1;
2315                 revs->diffopt.flags.recursive = 1;
2316         } else if (!strcmp(arg, "-t")) {
2317                 revs->diff = 1;
2318                 revs->diffopt.flags.recursive = 1;
2319                 revs->diffopt.flags.tree_in_recursive = 1;
2320         } else if (!strcmp(arg, "-m")) {
2321                 revs->ignore_merges = 0;
2322         } else if (!strcmp(arg, "-c")) {
2323                 revs->diff = 1;
2324                 revs->dense_combined_merges = 0;
2325                 revs->combine_merges = 1;
2326         } else if (!strcmp(arg, "--combined-all-paths")) {
2327                 revs->diff = 1;
2328                 revs->combined_all_paths = 1;
2329         } else if (!strcmp(arg, "--cc")) {
2330                 revs->diff = 1;
2331                 revs->dense_combined_merges = 1;
2332                 revs->combine_merges = 1;
2333         } else if (!strcmp(arg, "-v")) {
2334                 revs->verbose_header = 1;
2335         } else if (!strcmp(arg, "--pretty")) {
2336                 revs->verbose_header = 1;
2337                 revs->pretty_given = 1;
2338                 get_commit_format(NULL, revs);
2339         } else if (skip_prefix(arg, "--pretty=", &optarg) ||
2340                    skip_prefix(arg, "--format=", &optarg)) {
2341                 /*
2342                  * Detached form ("--pretty X" as opposed to "--pretty=X")
2343                  * not allowed, since the argument is optional.
2344                  */
2345                 revs->verbose_header = 1;
2346                 revs->pretty_given = 1;
2347                 get_commit_format(optarg, revs);
2348         } else if (!strcmp(arg, "--expand-tabs")) {
2349                 revs->expand_tabs_in_log = 8;
2350         } else if (!strcmp(arg, "--no-expand-tabs")) {
2351                 revs->expand_tabs_in_log = 0;
2352         } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
2353                 int val;
2354                 if (strtol_i(arg, 10, &val) < 0 || val < 0)
2355                         die("'%s': not a non-negative integer", arg);
2356                 revs->expand_tabs_in_log = val;
2357         } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
2358                 enable_default_display_notes(&revs->notes_opt, &revs->show_notes);
2359                 revs->show_notes_given = 1;
2360         } else if (!strcmp(arg, "--show-signature")) {
2361                 revs->show_signature = 1;
2362         } else if (!strcmp(arg, "--no-show-signature")) {
2363                 revs->show_signature = 0;
2364         } else if (!strcmp(arg, "--show-linear-break")) {
2365                 revs->break_bar = "                    ..........";
2366                 revs->track_linear = 1;
2367                 revs->track_first_time = 1;
2368         } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) {
2369                 revs->break_bar = xstrdup(optarg);
2370                 revs->track_linear = 1;
2371                 revs->track_first_time = 1;
2372         } else if (skip_prefix(arg, "--show-notes=", &optarg) ||
2373                    skip_prefix(arg, "--notes=", &optarg)) {
2374                 if (starts_with(arg, "--show-notes=") &&
2375                     revs->notes_opt.use_default_notes < 0)
2376                         revs->notes_opt.use_default_notes = 1;
2377                 enable_ref_display_notes(&revs->notes_opt, &revs->show_notes, optarg);
2378                 revs->show_notes_given = 1;
2379         } else if (!strcmp(arg, "--no-notes")) {
2380                 disable_display_notes(&revs->notes_opt, &revs->show_notes);
2381                 revs->show_notes_given = 1;
2382         } else if (!strcmp(arg, "--standard-notes")) {
2383                 revs->show_notes_given = 1;
2384                 revs->notes_opt.use_default_notes = 1;
2385         } else if (!strcmp(arg, "--no-standard-notes")) {
2386                 revs->notes_opt.use_default_notes = 0;
2387         } else if (!strcmp(arg, "--oneline")) {
2388                 revs->verbose_header = 1;
2389                 get_commit_format("oneline", revs);
2390                 revs->pretty_given = 1;
2391                 revs->abbrev_commit = 1;
2392         } else if (!strcmp(arg, "--graph")) {
2393                 revs->topo_order = 1;
2394                 revs->rewrite_parents = 1;
2395                 revs->graph = graph_init(revs);
2396         } else if (!strcmp(arg, "--encode-email-headers")) {
2397                 revs->encode_email_headers = 1;
2398         } else if (!strcmp(arg, "--no-encode-email-headers")) {
2399                 revs->encode_email_headers = 0;
2400         } else if (!strcmp(arg, "--root")) {
2401                 revs->show_root_diff = 1;
2402         } else if (!strcmp(arg, "--no-commit-id")) {
2403                 revs->no_commit_id = 1;
2404         } else if (!strcmp(arg, "--always")) {
2405                 revs->always_show_header = 1;
2406         } else if (!strcmp(arg, "--no-abbrev")) {
2407                 revs->abbrev = 0;
2408         } else if (!strcmp(arg, "--abbrev")) {
2409                 revs->abbrev = DEFAULT_ABBREV;
2410         } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
2411                 revs->abbrev = strtoul(optarg, NULL, 10);
2412                 if (revs->abbrev < MINIMUM_ABBREV)
2413                         revs->abbrev = MINIMUM_ABBREV;
2414                 else if (revs->abbrev > hexsz)
2415                         revs->abbrev = hexsz;
2416         } else if (!strcmp(arg, "--abbrev-commit")) {
2417                 revs->abbrev_commit = 1;
2418                 revs->abbrev_commit_given = 1;
2419         } else if (!strcmp(arg, "--no-abbrev-commit")) {
2420                 revs->abbrev_commit = 0;
2421         } else if (!strcmp(arg, "--full-diff")) {
2422                 revs->diff = 1;
2423                 revs->full_diff = 1;
2424         } else if (!strcmp(arg, "--show-pulls")) {
2425                 revs->show_pulls = 1;
2426         } else if (!strcmp(arg, "--full-history")) {
2427                 revs->simplify_history = 0;
2428         } else if (!strcmp(arg, "--relative-date")) {
2429                 revs->date_mode.type = DATE_RELATIVE;
2430                 revs->date_mode_explicit = 1;
2431         } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
2432                 parse_date_format(optarg, &revs->date_mode);
2433                 revs->date_mode_explicit = 1;
2434                 return argcount;
2435         } else if (!strcmp(arg, "--log-size")) {
2436                 revs->show_log_size = 1;
2437         }
2438         /*
2439          * Grepping the commit log
2440          */
2441         else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2442                 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2443                 return argcount;
2444         } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2445                 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2446                 return argcount;
2447         } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2448                 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2449                 return argcount;
2450         } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2451                 add_message_grep(revs, optarg);
2452                 return argcount;
2453         } else if (!strcmp(arg, "--grep-debug")) {
2454                 revs->grep_filter.debug = 1;
2455         } else if (!strcmp(arg, "--basic-regexp")) {
2456                 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
2457         } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2458                 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
2459         } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2460                 revs->grep_filter.ignore_case = 1;
2461                 revs->diffopt.pickaxe_opts |= DIFF_PICKAXE_IGNORE_CASE;
2462         } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2463                 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
2464         } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) {
2465                 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
2466         } else if (!strcmp(arg, "--all-match")) {
2467                 revs->grep_filter.all_match = 1;
2468         } else if (!strcmp(arg, "--invert-grep")) {
2469                 revs->invert_grep = 1;
2470         } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2471                 if (strcmp(optarg, "none"))
2472                         git_log_output_encoding = xstrdup(optarg);
2473                 else
2474                         git_log_output_encoding = "";
2475                 return argcount;
2476         } else if (!strcmp(arg, "--reverse")) {
2477                 revs->reverse ^= 1;
2478         } else if (!strcmp(arg, "--children")) {
2479                 revs->children.name = "children";
2480                 revs->limited = 1;
2481         } else if (!strcmp(arg, "--ignore-missing")) {
2482                 revs->ignore_missing = 1;
2483         } else if (opt && opt->allow_exclude_promisor_objects &&
2484                    !strcmp(arg, "--exclude-promisor-objects")) {
2485                 if (fetch_if_missing)
2486                         BUG("exclude_promisor_objects can only be used when fetch_if_missing is 0");
2487                 revs->exclude_promisor_objects = 1;
2488         } else {
2489                 int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
2490                 if (!opts)
2491                         unkv[(*unkc)++] = arg;
2492                 return opts;
2493         }
2494         if (revs->graph && revs->track_linear)
2495                 die("--show-linear-break and --graph are incompatible");
2496
2497         return 1;
2498 }
2499
2500 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2501                         const struct option *options,
2502                         const char * const usagestr[])
2503 {
2504         int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2505                                     &ctx->cpidx, ctx->out, NULL);
2506         if (n <= 0) {
2507                 error("unknown option `%s'", ctx->argv[0]);
2508                 usage_with_options(usagestr, options);
2509         }
2510         ctx->argv += n;
2511         ctx->argc -= n;
2512 }
2513
2514 static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn,
2515                                void *cb_data, const char *term)
2516 {
2517         struct strbuf bisect_refs = STRBUF_INIT;
2518         int status;
2519         strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2520         status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data, 0);
2521         strbuf_release(&bisect_refs);
2522         return status;
2523 }
2524
2525 static int for_each_bad_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
2526 {
2527         return for_each_bisect_ref(refs, fn, cb_data, term_bad);
2528 }
2529
2530 static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
2531 {
2532         return for_each_bisect_ref(refs, fn, cb_data, term_good);
2533 }
2534
2535 static int handle_revision_pseudo_opt(const char *submodule,
2536                                 struct rev_info *revs,
2537                                 int argc, const char **argv, int *flags)
2538 {
2539         const char *arg = argv[0];
2540         const char *optarg;
2541         struct ref_store *refs;
2542         int argcount;
2543
2544         if (submodule) {
2545                 /*
2546                  * We need some something like get_submodule_worktrees()
2547                  * before we can go through all worktrees of a submodule,
2548                  * .e.g with adding all HEADs from --all, which is not
2549                  * supported right now, so stick to single worktree.
2550                  */
2551                 if (!revs->single_worktree)
2552                         BUG("--single-worktree cannot be used together with submodule");
2553                 refs = get_submodule_ref_store(submodule);
2554         } else
2555                 refs = get_main_ref_store(revs->repo);
2556
2557         /*
2558          * NOTE!
2559          *
2560          * Commands like "git shortlog" will not accept the options below
2561          * unless parse_revision_opt queues them (as opposed to erroring
2562          * out).
2563          *
2564          * When implementing your new pseudo-option, remember to
2565          * register it in the list at the top of handle_revision_opt.
2566          */
2567         if (!strcmp(arg, "--all")) {
2568                 handle_refs(refs, revs, *flags, refs_for_each_ref);
2569                 handle_refs(refs, revs, *flags, refs_head_ref);
2570                 if (!revs->single_worktree) {
2571                         struct all_refs_cb cb;
2572
2573                         init_all_refs_cb(&cb, revs, *flags);
2574                         other_head_refs(handle_one_ref, &cb);
2575                 }
2576                 clear_ref_exclusion(&revs->ref_excludes);
2577         } else if (!strcmp(arg, "--branches")) {
2578                 handle_refs(refs, revs, *flags, refs_for_each_branch_ref);
2579                 clear_ref_exclusion(&revs->ref_excludes);
2580         } else if (!strcmp(arg, "--bisect")) {
2581                 read_bisect_terms(&term_bad, &term_good);
2582                 handle_refs(refs, revs, *flags, for_each_bad_bisect_ref);
2583                 handle_refs(refs, revs, *flags ^ (UNINTERESTING | BOTTOM),
2584                             for_each_good_bisect_ref);
2585                 revs->bisect = 1;
2586         } else if (!strcmp(arg, "--tags")) {
2587                 handle_refs(refs, revs, *flags, refs_for_each_tag_ref);
2588                 clear_ref_exclusion(&revs->ref_excludes);
2589         } else if (!strcmp(arg, "--remotes")) {
2590                 handle_refs(refs, revs, *flags, refs_for_each_remote_ref);
2591                 clear_ref_exclusion(&revs->ref_excludes);
2592         } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2593                 struct all_refs_cb cb;
2594                 init_all_refs_cb(&cb, revs, *flags);
2595                 for_each_glob_ref(handle_one_ref, optarg, &cb);
2596                 clear_ref_exclusion(&revs->ref_excludes);
2597                 return argcount;
2598         } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2599                 add_ref_exclusion(&revs->ref_excludes, optarg);
2600                 return argcount;
2601         } else if (skip_prefix(arg, "--branches=", &optarg)) {
2602                 struct all_refs_cb cb;
2603                 init_all_refs_cb(&cb, revs, *flags);
2604                 for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb);
2605                 clear_ref_exclusion(&revs->ref_excludes);
2606         } else if (skip_prefix(arg, "--tags=", &optarg)) {
2607                 struct all_refs_cb cb;
2608                 init_all_refs_cb(&cb, revs, *flags);
2609                 for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb);
2610                 clear_ref_exclusion(&revs->ref_excludes);
2611         } else if (skip_prefix(arg, "--remotes=", &optarg)) {
2612                 struct all_refs_cb cb;
2613                 init_all_refs_cb(&cb, revs, *flags);
2614                 for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb);
2615                 clear_ref_exclusion(&revs->ref_excludes);
2616         } else if (!strcmp(arg, "--reflog")) {
2617                 add_reflogs_to_pending(revs, *flags);
2618         } else if (!strcmp(arg, "--indexed-objects")) {
2619                 add_index_objects_to_pending(revs, *flags);
2620         } else if (!strcmp(arg, "--alternate-refs")) {
2621                 add_alternate_refs_to_pending(revs, *flags);
2622         } else if (!strcmp(arg, "--not")) {
2623                 *flags ^= UNINTERESTING | BOTTOM;
2624         } else if (!strcmp(arg, "--no-walk")) {
2625                 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2626         } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
2627                 /*
2628                  * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2629                  * not allowed, since the argument is optional.
2630                  */
2631                 if (!strcmp(optarg, "sorted"))
2632                         revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2633                 else if (!strcmp(optarg, "unsorted"))
2634                         revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2635                 else
2636                         return error("invalid argument to --no-walk");
2637         } else if (!strcmp(arg, "--do-walk")) {
2638                 revs->no_walk = 0;
2639         } else if (!strcmp(arg, "--single-worktree")) {
2640                 revs->single_worktree = 1;
2641         } else {
2642                 return 0;
2643         }
2644
2645         return 1;
2646 }
2647
2648 static void NORETURN diagnose_missing_default(const char *def)
2649 {
2650         int flags;
2651         const char *refname;
2652
2653         refname = resolve_ref_unsafe(def, 0, NULL, &flags);
2654         if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2655                 die(_("your current branch appears to be broken"));
2656
2657         skip_prefix(refname, "refs/heads/", &refname);
2658         die(_("your current branch '%s' does not have any commits yet"),
2659             refname);
2660 }
2661
2662 /*
2663  * Parse revision information, filling in the "rev_info" structure,
2664  * and removing the used arguments from the argument list.
2665  *
2666  * Returns the number of arguments left that weren't recognized
2667  * (which are also moved to the head of the argument list)
2668  */
2669 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2670 {
2671         int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt;
2672         struct argv_array prune_data = ARGV_ARRAY_INIT;
2673         const char *submodule = NULL;
2674         int seen_end_of_options = 0;
2675
2676         if (opt)
2677                 submodule = opt->submodule;
2678
2679         /* First, search for "--" */
2680         if (opt && opt->assume_dashdash) {
2681                 seen_dashdash = 1;
2682         } else {
2683                 seen_dashdash = 0;
2684                 for (i = 1; i < argc; i++) {
2685                         const char *arg = argv[i];
2686                         if (strcmp(arg, "--"))
2687                                 continue;
2688                         argv[i] = NULL;
2689                         argc = i;
2690                         if (argv[i + 1])
2691                                 argv_array_pushv(&prune_data, argv + i + 1);
2692                         seen_dashdash = 1;
2693                         break;
2694                 }
2695         }
2696
2697         /* Second, deal with arguments and options */
2698         flags = 0;
2699         revarg_opt = opt ? opt->revarg_opt : 0;
2700         if (seen_dashdash)
2701                 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2702         for (left = i = 1; i < argc; i++) {
2703                 const char *arg = argv[i];
2704                 if (!seen_end_of_options && *arg == '-') {
2705                         int opts;
2706
2707                         opts = handle_revision_pseudo_opt(submodule,
2708                                                 revs, argc - i, argv + i,
2709                                                 &flags);
2710                         if (opts > 0) {
2711                                 i += opts - 1;
2712                                 continue;
2713                         }
2714
2715                         if (!strcmp(arg, "--stdin")) {
2716                                 if (revs->disable_stdin) {
2717                                         argv[left++] = arg;
2718                                         continue;
2719                                 }
2720                                 if (revs->read_from_stdin++)
2721                                         die("--stdin given twice?");
2722                                 read_revisions_from_stdin(revs, &prune_data);
2723                                 continue;
2724                         }
2725
2726                         if (!strcmp(arg, "--end-of-options")) {
2727                                 seen_end_of_options = 1;
2728                                 continue;
2729                         }
2730
2731                         opts = handle_revision_opt(revs, argc - i, argv + i,
2732                                                    &left, argv, opt);
2733                         if (opts > 0) {
2734                                 i += opts - 1;
2735                                 continue;
2736                         }
2737                         if (opts < 0)
2738                                 exit(128);
2739                         continue;
2740                 }
2741
2742
2743                 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2744                         int j;
2745                         if (seen_dashdash || *arg == '^')
2746                                 die("bad revision '%s'", arg);
2747
2748                         /* If we didn't have a "--":
2749                          * (1) all filenames must exist;
2750                          * (2) all rev-args must not be interpretable
2751                          *     as a valid filename.
2752                          * but the latter we have checked in the main loop.
2753                          */
2754                         for (j = i; j < argc; j++)
2755                                 verify_filename(revs->prefix, argv[j], j == i);
2756
2757                         argv_array_pushv(&prune_data, argv + i);
2758                         break;
2759                 }
2760                 else
2761                         got_rev_arg = 1;
2762         }
2763
2764         if (prune_data.argc) {
2765                 /*
2766                  * If we need to introduce the magic "a lone ':' means no
2767                  * pathspec whatsoever", here is the place to do so.
2768                  *
2769                  * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2770                  *      prune_data.nr = 0;
2771                  *      prune_data.alloc = 0;
2772                  *      free(prune_data.path);
2773                  *      prune_data.path = NULL;
2774                  * } else {
2775                  *      terminate prune_data.alloc with NULL and
2776                  *      call init_pathspec() to set revs->prune_data here.
2777                  * }
2778                  */
2779                 parse_pathspec(&revs->prune_data, 0, 0,
2780                                revs->prefix, prune_data.argv);
2781         }
2782         argv_array_clear(&prune_data);
2783
2784         if (revs->def == NULL)
2785                 revs->def = opt ? opt->def : NULL;
2786         if (opt && opt->tweak)
2787                 opt->tweak(revs, opt);
2788         if (revs->show_merge)
2789                 prepare_show_merge(revs);
2790         if (revs->def && !revs->pending.nr && !revs->rev_input_given && !got_rev_arg) {
2791                 struct object_id oid;
2792                 struct object *object;
2793                 struct object_context oc;
2794                 if (get_oid_with_context(revs->repo, revs->def, 0, &oid, &oc))
2795                         diagnose_missing_default(revs->def);
2796                 object = get_reference(revs, revs->def, &oid, 0);
2797                 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2798         }
2799
2800         /* Did the user ask for any diff output? Run the diff! */
2801         if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2802                 revs->diff = 1;
2803
2804         /* Pickaxe, diff-filter and rename following need diffs */
2805         if ((revs->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
2806             revs->diffopt.filter ||
2807             revs->diffopt.flags.follow_renames)
2808                 revs->diff = 1;
2809
2810         if (revs->diffopt.objfind)
2811                 revs->simplify_history = 0;
2812
2813         if (revs->topo_order && !generation_numbers_enabled(the_repository))
2814                 revs->limited = 1;
2815
2816         if (revs->prune_data.nr) {
2817                 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2818                 /* Can't prune commits with rename following: the paths change.. */
2819                 if (!revs->diffopt.flags.follow_renames)
2820                         revs->prune = 1;
2821                 if (!revs->full_diff)
2822                         copy_pathspec(&revs->diffopt.pathspec,
2823                                       &revs->prune_data);
2824         }
2825         if (revs->combine_merges)
2826                 revs->ignore_merges = 0;
2827         if (revs->combined_all_paths && !revs->combine_merges)
2828                 die("--combined-all-paths makes no sense without -c or --cc");
2829
2830         revs->diffopt.abbrev = revs->abbrev;
2831
2832         if (revs->line_level_traverse) {
2833                 revs->limited = 1;
2834                 revs->topo_order = 1;
2835         }
2836
2837         diff_setup_done(&revs->diffopt);
2838
2839         grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2840                                  &revs->grep_filter);
2841         if (!is_encoding_utf8(get_log_output_encoding()))
2842                 revs->grep_filter.ignore_locale = 1;
2843         compile_grep_patterns(&revs->grep_filter);
2844
2845         if (revs->reverse && revs->reflog_info)
2846                 die("cannot combine --reverse with --walk-reflogs");
2847         if (revs->reflog_info && revs->limited)
2848                 die("cannot combine --walk-reflogs with history-limiting options");
2849         if (revs->rewrite_parents && revs->children.name)
2850                 die("cannot combine --parents and --children");
2851
2852         /*
2853          * Limitations on the graph functionality
2854          */
2855         if (revs->reverse && revs->graph)
2856                 die("cannot combine --reverse with --graph");
2857
2858         if (revs->reflog_info && revs->graph)
2859                 die("cannot combine --walk-reflogs with --graph");
2860         if (revs->no_walk && revs->graph)
2861                 die("cannot combine --no-walk with --graph");
2862         if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2863                 die("cannot use --grep-reflog without --walk-reflogs");
2864
2865         if (revs->first_parent_only && revs->bisect)
2866                 die(_("--first-parent is incompatible with --bisect"));
2867
2868         if (revs->line_level_traverse &&
2869             (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT)))
2870                 die(_("-L does not yet support diff formats besides -p and -s"));
2871
2872         if (revs->expand_tabs_in_log < 0)
2873                 revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2874
2875         return left;
2876 }
2877
2878 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2879 {
2880         struct commit_list *l = xcalloc(1, sizeof(*l));
2881
2882         l->item = child;
2883         l->next = add_decoration(&revs->children, &parent->object, l);
2884 }
2885
2886 static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2887 {
2888         struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2889         struct commit_list **pp, *p;
2890         int surviving_parents;
2891
2892         /* Examine existing parents while marking ones we have seen... */
2893         pp = &commit->parents;
2894         surviving_parents = 0;
2895         while ((p = *pp) != NULL) {
2896                 struct commit *parent = p->item;
2897                 if (parent->object.flags & TMP_MARK) {
2898                         *pp = p->next;
2899                         if (ts)
2900                                 compact_treesame(revs, commit, surviving_parents);
2901                         continue;
2902                 }
2903                 parent->object.flags |= TMP_MARK;
2904                 surviving_parents++;
2905                 pp = &p->next;
2906         }
2907         /* clear the temporary mark */
2908         for (p = commit->parents; p; p = p->next) {
2909                 p->item->object.flags &= ~TMP_MARK;
2910         }
2911         /* no update_treesame() - removing duplicates can't affect TREESAME */
2912         return surviving_parents;
2913 }
2914
2915 struct merge_simplify_state {
2916         struct commit *simplified;
2917 };
2918
2919 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2920 {
2921         struct merge_simplify_state *st;
2922
2923         st = lookup_decoration(&revs->merge_simplification, &commit->object);
2924         if (!st) {
2925                 st = xcalloc(1, sizeof(*st));
2926                 add_decoration(&revs->merge_simplification, &commit->object, st);
2927         }
2928         return st;
2929 }
2930
2931 static int mark_redundant_parents(struct commit *commit)
2932 {
2933         struct commit_list *h = reduce_heads(commit->parents);
2934         int i = 0, marked = 0;
2935         struct commit_list *po, *pn;
2936
2937         /* Want these for sanity-checking only */
2938         int orig_cnt = commit_list_count(commit->parents);
2939         int cnt = commit_list_count(h);
2940
2941         /*
2942          * Not ready to remove items yet, just mark them for now, based
2943          * on the output of reduce_heads(). reduce_heads outputs the reduced
2944          * set in its original order, so this isn't too hard.
2945          */
2946         po = commit->parents;
2947         pn = h;
2948         while (po) {
2949                 if (pn && po->item == pn->item) {
2950                         pn = pn->next;
2951                         i++;
2952                 } else {
2953                         po->item->object.flags |= TMP_MARK;
2954                         marked++;
2955                 }
2956                 po=po->next;
2957         }
2958
2959         if (i != cnt || cnt+marked != orig_cnt)
2960                 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2961
2962         free_commit_list(h);
2963
2964         return marked;
2965 }
2966
2967 static int mark_treesame_root_parents(struct commit *commit)
2968 {
2969         struct commit_list *p;
2970         int marked = 0;
2971
2972         for (p = commit->parents; p; p = p->next) {
2973                 struct commit *parent = p->item;
2974                 if (!parent->parents && (parent->object.flags & TREESAME)) {
2975                         parent->object.flags |= TMP_MARK;
2976                         marked++;
2977                 }
2978         }
2979
2980         return marked;
2981 }
2982
2983 /*
2984  * Awkward naming - this means one parent we are TREESAME to.
2985  * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2986  * empty tree). Better name suggestions?
2987  */
2988 static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2989 {
2990         struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2991         struct commit *unmarked = NULL, *marked = NULL;
2992         struct commit_list *p;
2993         unsigned n;
2994
2995         for (p = commit->parents, n = 0; p; p = p->next, n++) {
2996                 if (ts->treesame[n]) {
2997                         if (p->item->object.flags & TMP_MARK) {
2998                                 if (!marked)
2999                                         marked = p->item;
3000                         } else {
3001                                 if (!unmarked) {
3002                                         unmarked = p->item;
3003                                         break;
3004                                 }
3005                         }
3006                 }
3007         }
3008
3009         /*
3010          * If we are TREESAME to a marked-for-deletion parent, but not to any
3011          * unmarked parents, unmark the first TREESAME parent. This is the
3012          * parent that the default simplify_history==1 scan would have followed,
3013          * and it doesn't make sense to omit that path when asking for a
3014          * simplified full history. Retaining it improves the chances of
3015          * understanding odd missed merges that took an old version of a file.
3016          *
3017          * Example:
3018          *
3019          *   I--------*X       A modified the file, but mainline merge X used
3020          *    \       /        "-s ours", so took the version from I. X is
3021          *     `-*A--'         TREESAME to I and !TREESAME to A.
3022          *
3023          * Default log from X would produce "I". Without this check,
3024          * --full-history --simplify-merges would produce "I-A-X", showing
3025          * the merge commit X and that it changed A, but not making clear that
3026          * it had just taken the I version. With this check, the topology above
3027          * is retained.
3028          *
3029          * Note that it is possible that the simplification chooses a different
3030          * TREESAME parent from the default, in which case this test doesn't
3031          * activate, and we _do_ drop the default parent. Example:
3032          *
3033          *   I------X         A modified the file, but it was reverted in B,
3034          *    \    /          meaning mainline merge X is TREESAME to both
3035          *    *A-*B           parents.
3036          *
3037          * Default log would produce "I" by following the first parent;
3038          * --full-history --simplify-merges will produce "I-A-B". But this is a
3039          * reasonable result - it presents a logical full history leading from
3040          * I to X, and X is not an important merge.
3041          */
3042         if (!unmarked && marked) {
3043                 marked->object.flags &= ~TMP_MARK;
3044                 return 1;
3045         }
3046
3047         return 0;
3048 }
3049
3050 static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
3051 {
3052         struct commit_list **pp, *p;
3053         int nth_parent, removed = 0;
3054
3055         pp = &commit->parents;
3056         nth_parent = 0;
3057         while ((p = *pp) != NULL) {
3058                 struct commit *parent = p->item;
3059                 if (parent->object.flags & TMP_MARK) {
3060                         parent->object.flags &= ~TMP_MARK;
3061                         *pp = p->next;
3062                         free(p);
3063                         removed++;
3064                         compact_treesame(revs, commit, nth_parent);
3065                         continue;
3066                 }
3067                 pp = &p->next;
3068                 nth_parent++;
3069         }
3070
3071         /* Removing parents can only increase TREESAMEness */
3072         if (removed && !(commit->object.flags & TREESAME))
3073                 update_treesame(revs, commit);
3074
3075         return nth_parent;
3076 }
3077
3078 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
3079 {
3080         struct commit_list *p;
3081         struct commit *parent;
3082         struct merge_simplify_state *st, *pst;
3083         int cnt;
3084
3085         st = locate_simplify_state(revs, commit);
3086
3087         /*
3088          * Have we handled this one?
3089          */
3090         if (st->simplified)
3091                 return tail;
3092
3093         /*
3094          * An UNINTERESTING commit simplifies to itself, so does a
3095          * root commit.  We do not rewrite parents of such commit
3096          * anyway.
3097          */
3098         if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
3099                 st->simplified = commit;
3100                 return tail;
3101         }
3102
3103         /*
3104          * Do we know what commit all of our parents that matter
3105          * should be rewritten to?  Otherwise we are not ready to
3106          * rewrite this one yet.
3107          */
3108         for (cnt = 0, p = commit->parents; p; p = p->next) {
3109                 pst = locate_simplify_state(revs, p->item);
3110                 if (!pst->simplified) {
3111                         tail = &commit_list_insert(p->item, tail)->next;
3112                         cnt++;
3113                 }
3114                 if (revs->first_parent_only)
3115                         break;
3116         }
3117         if (cnt) {
3118                 tail = &commit_list_insert(commit, tail)->next;
3119                 return tail;
3120         }
3121
3122         /*
3123          * Rewrite our list of parents. Note that this cannot
3124          * affect our TREESAME flags in any way - a commit is
3125          * always TREESAME to its simplification.
3126          */
3127         for (p = commit->parents; p; p = p->next) {
3128                 pst = locate_simplify_state(revs, p->item);
3129                 p->item = pst->simplified;
3130                 if (revs->first_parent_only)
3131                         break;
3132         }
3133
3134         if (revs->first_parent_only)
3135                 cnt = 1;
3136         else
3137                 cnt = remove_duplicate_parents(revs, commit);
3138
3139         /*
3140          * It is possible that we are a merge and one side branch
3141          * does not have any commit that touches the given paths;
3142          * in such a case, the immediate parent from that branch
3143          * will be rewritten to be the merge base.
3144          *
3145          *      o----X          X: the commit we are looking at;
3146          *     /    /           o: a commit that touches the paths;
3147          * ---o----'
3148          *
3149          * Further, a merge of an independent branch that doesn't
3150          * touch the path will reduce to a treesame root parent:
3151          *
3152          *  ----o----X          X: the commit we are looking at;
3153          *          /           o: a commit that touches the paths;
3154          *         r            r: a root commit not touching the paths
3155          *
3156          * Detect and simplify both cases.
3157          */
3158         if (1 < cnt) {
3159                 int marked = mark_redundant_parents(commit);
3160                 marked += mark_treesame_root_parents(commit);
3161                 if (marked)
3162                         marked -= leave_one_treesame_to_parent(revs, commit);
3163                 if (marked)
3164                         cnt = remove_marked_parents(revs, commit);
3165         }
3166
3167         /*
3168          * A commit simplifies to itself if it is a root, if it is
3169          * UNINTERESTING, if it touches the given paths, or if it is a
3170          * merge and its parents don't simplify to one relevant commit
3171          * (the first two cases are already handled at the beginning of
3172          * this function).
3173          *
3174          * Otherwise, it simplifies to what its sole relevant parent
3175          * simplifies to.
3176          */
3177         if (!cnt ||
3178             (commit->object.flags & UNINTERESTING) ||
3179             !(commit->object.flags & TREESAME) ||
3180             (parent = one_relevant_parent(revs, commit->parents)) == NULL ||
3181             (revs->show_pulls && (commit->object.flags & PULL_MERGE)))
3182                 st->simplified = commit;
3183         else {
3184                 pst = locate_simplify_state(revs, parent);
3185                 st->simplified = pst->simplified;
3186         }
3187         return tail;
3188 }
3189
3190 static void simplify_merges(struct rev_info *revs)
3191 {
3192         struct commit_list *list, *next;
3193         struct commit_list *yet_to_do, **tail;
3194         struct commit *commit;
3195
3196         if (!revs->prune)
3197                 return;
3198
3199         /* feed the list reversed */
3200         yet_to_do = NULL;
3201         for (list = revs->commits; list; list = next) {
3202                 commit = list->item;
3203                 next = list->next;
3204                 /*
3205                  * Do not free(list) here yet; the original list
3206                  * is used later in this function.
3207                  */
3208                 commit_list_insert(commit, &yet_to_do);
3209         }
3210         while (yet_to_do) {
3211                 list = yet_to_do;
3212                 yet_to_do = NULL;
3213                 tail = &yet_to_do;
3214                 while (list) {
3215                         commit = pop_commit(&list);
3216                         tail = simplify_one(revs, commit, tail);
3217                 }
3218         }
3219
3220         /* clean up the result, removing the simplified ones */
3221         list = revs->commits;
3222         revs->commits = NULL;
3223         tail = &revs->commits;
3224         while (list) {
3225                 struct merge_simplify_state *st;
3226
3227                 commit = pop_commit(&list);
3228                 st = locate_simplify_state(revs, commit);
3229                 if (st->simplified == commit)
3230                         tail = &commit_list_insert(commit, tail)->next;
3231         }
3232 }
3233
3234 static void set_children(struct rev_info *revs)
3235 {
3236         struct commit_list *l;
3237         for (l = revs->commits; l; l = l->next) {
3238                 struct commit *commit = l->item;
3239                 struct commit_list *p;
3240
3241                 for (p = commit->parents; p; p = p->next)
3242                         add_child(revs, p->item, commit);
3243         }
3244 }
3245
3246 void reset_revision_walk(void)
3247 {
3248         clear_object_flags(SEEN | ADDED | SHOWN | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE);
3249 }
3250
3251 static int mark_uninteresting(const struct object_id *oid,
3252                               struct packed_git *pack,
3253                               uint32_t pos,
3254                               void *cb)
3255 {
3256         struct rev_info *revs = cb;
3257         struct object *o = parse_object(revs->repo, oid);
3258         o->flags |= UNINTERESTING | SEEN;
3259         return 0;
3260 }
3261
3262 define_commit_slab(indegree_slab, int);
3263 define_commit_slab(author_date_slab, timestamp_t);
3264
3265 struct topo_walk_info {
3266         uint32_t min_generation;
3267         struct prio_queue explore_queue;
3268         struct prio_queue indegree_queue;
3269         struct prio_queue topo_queue;
3270         struct indegree_slab indegree;
3271         struct author_date_slab author_date;
3272 };
3273
3274 static inline void test_flag_and_insert(struct prio_queue *q, struct commit *c, int flag)
3275 {
3276         if (c->object.flags & flag)
3277                 return;
3278
3279         c->object.flags |= flag;
3280         prio_queue_put(q, c);
3281 }
3282
3283 static void explore_walk_step(struct rev_info *revs)
3284 {
3285         struct topo_walk_info *info = revs->topo_walk_info;
3286         struct commit_list *p;
3287         struct commit *c = prio_queue_get(&info->explore_queue);
3288
3289         if (!c)
3290                 return;
3291
3292         if (parse_commit_gently(c, 1) < 0)
3293                 return;
3294
3295         if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
3296                 record_author_date(&info->author_date, c);
3297
3298         if (revs->max_age != -1 && (c->date < revs->max_age))
3299                 c->object.flags |= UNINTERESTING;
3300
3301         if (process_parents(revs, c, NULL, NULL) < 0)
3302                 return;
3303
3304         if (c->object.flags & UNINTERESTING)
3305                 mark_parents_uninteresting(c);
3306
3307         for (p = c->parents; p; p = p->next)
3308                 test_flag_and_insert(&info->explore_queue, p->item, TOPO_WALK_EXPLORED);
3309 }
3310
3311 static void explore_to_depth(struct rev_info *revs,
3312                              uint32_t gen_cutoff)
3313 {
3314         struct topo_walk_info *info = revs->topo_walk_info;
3315         struct commit *c;
3316         while ((c = prio_queue_peek(&info->explore_queue)) &&
3317                c->generation >= gen_cutoff)
3318                 explore_walk_step(revs);
3319 }
3320
3321 static void indegree_walk_step(struct rev_info *revs)
3322 {
3323         struct commit_list *p;
3324         struct topo_walk_info *info = revs->topo_walk_info;
3325         struct commit *c = prio_queue_get(&info->indegree_queue);
3326
3327         if (!c)
3328                 return;
3329
3330         if (parse_commit_gently(c, 1) < 0)
3331                 return;
3332
3333         explore_to_depth(revs, c->generation);
3334
3335         for (p = c->parents; p; p = p->next) {
3336                 struct commit *parent = p->item;
3337                 int *pi = indegree_slab_at(&info->indegree, parent);
3338
3339                 if (*pi)
3340                         (*pi)++;
3341                 else
3342                         *pi = 2;
3343
3344                 test_flag_and_insert(&info->indegree_queue, parent, TOPO_WALK_INDEGREE);
3345
3346                 if (revs->first_parent_only)
3347                         return;
3348         }
3349 }
3350
3351 static void compute_indegrees_to_depth(struct rev_info *revs,
3352                                        uint32_t gen_cutoff)
3353 {
3354         struct topo_walk_info *info = revs->topo_walk_info;
3355         struct commit *c;
3356         while ((c = prio_queue_peek(&info->indegree_queue)) &&
3357                c->generation >= gen_cutoff)
3358                 indegree_walk_step(revs);
3359 }
3360
3361 static void reset_topo_walk(struct rev_info *revs)
3362 {
3363         struct topo_walk_info *info = revs->topo_walk_info;
3364
3365         clear_prio_queue(&info->explore_queue);
3366         clear_prio_queue(&info->indegree_queue);
3367         clear_prio_queue(&info->topo_queue);
3368         clear_indegree_slab(&info->indegree);
3369         clear_author_date_slab(&info->author_date);
3370
3371         FREE_AND_NULL(revs->topo_walk_info);
3372 }
3373
3374 static void init_topo_walk(struct rev_info *revs)
3375 {
3376         struct topo_walk_info *info;
3377         struct commit_list *list;
3378         if (revs->topo_walk_info)
3379                 reset_topo_walk(revs);
3380
3381         revs->topo_walk_info = xmalloc(sizeof(struct topo_walk_info));
3382         info = revs->topo_walk_info;
3383         memset(info, 0, sizeof(struct topo_walk_info));
3384
3385         init_indegree_slab(&info->indegree);
3386         memset(&info->explore_queue, 0, sizeof(info->explore_queue));
3387         memset(&info->indegree_queue, 0, sizeof(info->indegree_queue));
3388         memset(&info->topo_queue, 0, sizeof(info->topo_queue));
3389
3390         switch (revs->sort_order) {
3391         default: /* REV_SORT_IN_GRAPH_ORDER */
3392                 info->topo_queue.compare = NULL;
3393                 break;
3394         case REV_SORT_BY_COMMIT_DATE:
3395                 info->topo_queue.compare = compare_commits_by_commit_date;
3396                 break;
3397         case REV_SORT_BY_AUTHOR_DATE:
3398                 init_author_date_slab(&info->author_date);
3399                 info->topo_queue.compare = compare_commits_by_author_date;
3400                 info->topo_queue.cb_data = &info->author_date;
3401                 break;
3402         }
3403
3404         info->explore_queue.compare = compare_commits_by_gen_then_commit_date;
3405         info->indegree_queue.compare = compare_commits_by_gen_then_commit_date;
3406
3407         info->min_generation = GENERATION_NUMBER_INFINITY;
3408         for (list = revs->commits; list; list = list->next) {
3409                 struct commit *c = list->item;
3410
3411                 if (parse_commit_gently(c, 1))
3412                         continue;
3413
3414                 test_flag_and_insert(&info->explore_queue, c, TOPO_WALK_EXPLORED);
3415                 test_flag_and_insert(&info->indegree_queue, c, TOPO_WALK_INDEGREE);
3416
3417                 if (c->generation < info->min_generation)
3418                         info->min_generation = c->generation;
3419
3420                 *(indegree_slab_at(&info->indegree, c)) = 1;
3421
3422                 if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
3423                         record_author_date(&info->author_date, c);
3424         }
3425         compute_indegrees_to_depth(revs, info->min_generation);
3426
3427         for (list = revs->commits; list; list = list->next) {
3428                 struct commit *c = list->item;
3429
3430                 if (*(indegree_slab_at(&info->indegree, c)) == 1)
3431                         prio_queue_put(&info->topo_queue, c);
3432         }
3433
3434         /*
3435          * This is unfortunate; the initial tips need to be shown
3436          * in the order given from the revision traversal machinery.
3437          */
3438         if (revs->sort_order == REV_SORT_IN_GRAPH_ORDER)
3439                 prio_queue_reverse(&info->topo_queue);
3440 }
3441
3442 static struct commit *next_topo_commit(struct rev_info *revs)
3443 {
3444         struct commit *c;
3445         struct topo_walk_info *info = revs->topo_walk_info;
3446
3447         /* pop next off of topo_queue */
3448         c = prio_queue_get(&info->topo_queue);
3449
3450         if (c)
3451                 *(indegree_slab_at(&info->indegree, c)) = 0;
3452
3453         return c;
3454 }
3455
3456 static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
3457 {
3458         struct commit_list *p;
3459         struct topo_walk_info *info = revs->topo_walk_info;
3460         if (process_parents(revs, commit, NULL, NULL) < 0) {
3461                 if (!revs->ignore_missing_links)
3462                         die("Failed to traverse parents of commit %s",
3463                             oid_to_hex(&commit->object.oid));
3464         }
3465
3466         for (p = commit->parents; p; p = p->next) {
3467                 struct commit *parent = p->item;
3468                 int *pi;
3469
3470                 if (parent->object.flags & UNINTERESTING)
3471                         continue;
3472
3473                 if (parse_commit_gently(parent, 1) < 0)
3474                         continue;
3475
3476                 if (parent->generation < info->min_generation) {
3477                         info->min_generation = parent->generation;
3478                         compute_indegrees_to_depth(revs, info->min_generation);
3479                 }
3480
3481                 pi = indegree_slab_at(&info->indegree, parent);
3482
3483                 (*pi)--;
3484                 if (*pi == 1)
3485                         prio_queue_put(&info->topo_queue, parent);
3486
3487                 if (revs->first_parent_only)
3488                         return;
3489         }
3490 }
3491
3492 int prepare_revision_walk(struct rev_info *revs)
3493 {
3494         int i;
3495         struct object_array old_pending;
3496         struct commit_list **next = &revs->commits;
3497
3498         memcpy(&old_pending, &revs->pending, sizeof(old_pending));
3499         revs->pending.nr = 0;
3500         revs->pending.alloc = 0;
3501         revs->pending.objects = NULL;
3502         for (i = 0; i < old_pending.nr; i++) {
3503                 struct object_array_entry *e = old_pending.objects + i;
3504                 struct commit *commit = handle_commit(revs, e);
3505                 if (commit) {
3506                         if (!(commit->object.flags & SEEN)) {
3507                                 commit->object.flags |= SEEN;
3508                                 next = commit_list_append(commit, next);
3509                         }
3510                 }
3511         }
3512         object_array_clear(&old_pending);
3513
3514         /* Signal whether we need per-parent treesame decoration */
3515         if (revs->simplify_merges ||
3516             (revs->limited && limiting_can_increase_treesame(revs)))
3517                 revs->treesame.name = "treesame";
3518
3519         if (revs->exclude_promisor_objects) {
3520                 for_each_packed_object(mark_uninteresting, revs,
3521                                        FOR_EACH_OBJECT_PROMISOR_ONLY);
3522         }
3523
3524         if (revs->pruning.pathspec.nr == 1 && !revs->reflog_info)
3525                 prepare_to_use_bloom_filter(revs);
3526         if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
3527                 commit_list_sort_by_date(&revs->commits);
3528         if (revs->no_walk)
3529                 return 0;
3530         if (revs->limited) {
3531                 if (limit_list(revs) < 0)
3532                         return -1;
3533                 if (revs->topo_order)
3534                         sort_in_topological_order(&revs->commits, revs->sort_order);
3535         } else if (revs->topo_order)
3536                 init_topo_walk(revs);
3537         if (revs->line_level_traverse)
3538                 line_log_filter(revs);
3539         if (revs->simplify_merges)
3540                 simplify_merges(revs);
3541         if (revs->children.name)
3542                 set_children(revs);
3543
3544         return 0;
3545 }
3546
3547 static enum rewrite_result rewrite_one_1(struct rev_info *revs,
3548                                          struct commit **pp,
3549                                          struct prio_queue *queue)
3550 {
3551         for (;;) {
3552                 struct commit *p = *pp;
3553                 if (!revs->limited)
3554                         if (process_parents(revs, p, NULL, queue) < 0)
3555                                 return rewrite_one_error;
3556                 if (p->object.flags & UNINTERESTING)
3557                         return rewrite_one_ok;
3558                 if (!(p->object.flags & TREESAME))
3559                         return rewrite_one_ok;
3560                 if (!p->parents)
3561                         return rewrite_one_noparents;
3562                 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
3563                         return rewrite_one_ok;
3564                 *pp = p;
3565         }
3566 }
3567
3568 static void merge_queue_into_list(struct prio_queue *q, struct commit_list **list)
3569 {
3570         while (q->nr) {
3571                 struct commit *item = prio_queue_peek(q);
3572                 struct commit_list *p = *list;
3573
3574                 if (p && p->item->date >= item->date)
3575                         list = &p->next;
3576                 else {
3577                         p = commit_list_insert(item, list);
3578                         list = &p->next; /* skip newly added item */
3579                         prio_queue_get(q); /* pop item */
3580                 }
3581         }
3582 }
3583
3584 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
3585 {
3586         struct prio_queue queue = { compare_commits_by_commit_date };
3587         enum rewrite_result ret = rewrite_one_1(revs, pp, &queue);
3588         merge_queue_into_list(&queue, &revs->commits);
3589         clear_prio_queue(&queue);
3590         return ret;
3591 }
3592
3593 int rewrite_parents(struct rev_info *revs, struct commit *commit,
3594         rewrite_parent_fn_t rewrite_parent)
3595 {
3596         struct commit_list **pp = &commit->parents;
3597         while (*pp) {
3598                 struct commit_list *parent = *pp;
3599                 switch (rewrite_parent(revs, &parent->item)) {
3600                 case rewrite_one_ok:
3601                         break;
3602                 case rewrite_one_noparents:
3603                         *pp = parent->next;
3604                         continue;
3605                 case rewrite_one_error:
3606                         return -1;
3607                 }
3608                 pp = &parent->next;
3609         }
3610         remove_duplicate_parents(revs, commit);
3611         return 0;
3612 }
3613
3614 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
3615 {
3616         char *person, *endp;
3617         size_t len, namelen, maillen;
3618         const char *name;
3619         const char *mail;
3620         struct ident_split ident;
3621
3622         person = strstr(buf->buf, what);
3623         if (!person)
3624                 return 0;
3625
3626         person += strlen(what);
3627         endp = strchr(person, '\n');
3628         if (!endp)
3629                 return 0;
3630
3631         len = endp - person;
3632
3633         if (split_ident_line(&ident, person, len))
3634                 return 0;
3635
3636         mail = ident.mail_begin;
3637         maillen = ident.mail_end - ident.mail_begin;
3638         name = ident.name_begin;
3639         namelen = ident.name_end - ident.name_begin;
3640
3641         if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
3642                 struct strbuf namemail = STRBUF_INIT;
3643
3644                 strbuf_addf(&namemail, "%.*s <%.*s>",
3645                             (int)namelen, name, (int)maillen, mail);
3646
3647                 strbuf_splice(buf, ident.name_begin - buf->buf,
3648                               ident.mail_end - ident.name_begin + 1,
3649                               namemail.buf, namemail.len);
3650
3651                 strbuf_release(&namemail);
3652
3653                 return 1;
3654         }
3655
3656         return 0;
3657 }
3658
3659 static int commit_match(struct commit *commit, struct rev_info *opt)
3660 {
3661         int retval;
3662         const char *encoding;
3663         const char *message;
3664         struct strbuf buf = STRBUF_INIT;
3665
3666         if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
3667                 return 1;
3668
3669         /* Prepend "fake" headers as needed */
3670         if (opt->grep_filter.use_reflog_filter) {
3671                 strbuf_addstr(&buf, "reflog ");
3672                 get_reflog_message(&buf, opt->reflog_info);
3673                 strbuf_addch(&buf, '\n');
3674         }
3675
3676         /*
3677          * We grep in the user's output encoding, under the assumption that it
3678          * is the encoding they are most likely to write their grep pattern
3679          * for. In addition, it means we will match the "notes" encoding below,
3680          * so we will not end up with a buffer that has two different encodings
3681          * in it.
3682          */
3683         encoding = get_log_output_encoding();
3684         message = logmsg_reencode(commit, NULL, encoding);
3685
3686         /* Copy the commit to temporary if we are using "fake" headers */
3687         if (buf.len)
3688                 strbuf_addstr(&buf, message);
3689
3690         if (opt->grep_filter.header_list && opt->mailmap) {
3691                 if (!buf.len)
3692                         strbuf_addstr(&buf, message);
3693
3694                 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
3695                 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
3696         }
3697
3698         /* Append "fake" message parts as needed */
3699         if (opt->show_notes) {
3700                 if (!buf.len)
3701                         strbuf_addstr(&buf, message);
3702                 format_display_notes(&commit->object.oid, &buf, encoding, 1);
3703         }
3704
3705         /*
3706          * Find either in the original commit message, or in the temporary.
3707          * Note that we cast away the constness of "message" here. It is
3708          * const because it may come from the cached commit buffer. That's OK,
3709          * because we know that it is modifiable heap memory, and that while
3710          * grep_buffer may modify it for speed, it will restore any
3711          * changes before returning.
3712          */
3713         if (buf.len)
3714                 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
3715         else
3716                 retval = grep_buffer(&opt->grep_filter,
3717                                      (char *)message, strlen(message));
3718         strbuf_release(&buf);
3719         unuse_commit_buffer(commit, message);
3720         return opt->invert_grep ? !retval : retval;
3721 }
3722
3723 static inline int want_ancestry(const struct rev_info *revs)
3724 {
3725         return (revs->rewrite_parents || revs->children.name);
3726 }
3727
3728 /*
3729  * Return a timestamp to be used for --since/--until comparisons for this
3730  * commit, based on the revision options.
3731  */
3732 static timestamp_t comparison_date(const struct rev_info *revs,
3733                                    struct commit *commit)
3734 {
3735         return revs->reflog_info ?
3736                 get_reflog_timestamp(revs->reflog_info) :
3737                 commit->date;
3738 }
3739
3740 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
3741 {
3742         if (commit->object.flags & SHOWN)
3743                 return commit_ignore;
3744         if (revs->unpacked && has_object_pack(&commit->object.oid))
3745                 return commit_ignore;
3746         if (commit->object.flags & UNINTERESTING)
3747                 return commit_ignore;
3748         if (revs->min_age != -1 &&
3749             comparison_date(revs, commit) > revs->min_age)
3750                         return commit_ignore;
3751         if (revs->min_parents || (revs->max_parents >= 0)) {
3752                 int n = commit_list_count(commit->parents);
3753                 if ((n < revs->min_parents) ||
3754                     ((revs->max_parents >= 0) && (n > revs->max_parents)))
3755                         return commit_ignore;
3756         }
3757         if (!commit_match(commit, revs))
3758                 return commit_ignore;
3759         if (revs->prune && revs->dense) {
3760                 /* Commit without changes? */
3761                 if (commit->object.flags & TREESAME) {
3762                         int n;
3763                         struct commit_list *p;
3764                         /* drop merges unless we want parenthood */
3765                         if (!want_ancestry(revs))
3766                                 return commit_ignore;
3767
3768                         if (revs->show_pulls && (commit->object.flags & PULL_MERGE))
3769                                 return commit_show;
3770
3771                         /*
3772                          * If we want ancestry, then need to keep any merges
3773                          * between relevant commits to tie together topology.
3774                          * For consistency with TREESAME and simplification
3775                          * use "relevant" here rather than just INTERESTING,
3776                          * to treat bottom commit(s) as part of the topology.
3777                          */
3778                         for (n = 0, p = commit->parents; p; p = p->next)
3779                                 if (relevant_commit(p->item))
3780                                         if (++n >= 2)
3781                                                 return commit_show;
3782                         return commit_ignore;
3783                 }
3784         }
3785         return commit_show;
3786 }
3787
3788 define_commit_slab(saved_parents, struct commit_list *);
3789
3790 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3791
3792 /*
3793  * You may only call save_parents() once per commit (this is checked
3794  * for non-root commits).
3795  */
3796 static void save_parents(struct rev_info *revs, struct commit *commit)
3797 {
3798         struct commit_list **pp;
3799
3800         if (!revs->saved_parents_slab) {
3801                 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3802                 init_saved_parents(revs->saved_parents_slab);
3803         }
3804
3805         pp = saved_parents_at(revs->saved_parents_slab, commit);
3806
3807         /*
3808          * When walking with reflogs, we may visit the same commit
3809          * several times: once for each appearance in the reflog.
3810          *
3811          * In this case, save_parents() will be called multiple times.
3812          * We want to keep only the first set of parents.  We need to
3813          * store a sentinel value for an empty (i.e., NULL) parent
3814          * list to distinguish it from a not-yet-saved list, however.
3815          */
3816         if (*pp)
3817                 return;
3818         if (commit->parents)
3819                 *pp = copy_commit_list(commit->parents);
3820         else
3821                 *pp = EMPTY_PARENT_LIST;
3822 }
3823
3824 static void free_saved_parents(struct rev_info *revs)
3825 {
3826         if (revs->saved_parents_slab)
3827                 clear_saved_parents(revs->saved_parents_slab);
3828 }
3829
3830 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3831 {
3832         struct commit_list *parents;
3833
3834         if (!revs->saved_parents_slab)
3835                 return commit->parents;
3836
3837         parents = *saved_parents_at(revs->saved_parents_slab, commit);
3838         if (parents == EMPTY_PARENT_LIST)
3839                 return NULL;
3840         return parents;
3841 }
3842
3843 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3844 {
3845         enum commit_action action = get_commit_action(revs, commit);
3846
3847         if (action == commit_show &&
3848             revs->prune && revs->dense && want_ancestry(revs)) {
3849                 /*
3850                  * --full-diff on simplified parents is no good: it
3851                  * will show spurious changes from the commits that
3852                  * were elided.  So we save the parents on the side
3853                  * when --full-diff is in effect.
3854                  */
3855                 if (revs->full_diff)
3856                         save_parents(revs, commit);
3857                 if (rewrite_parents(revs, commit, rewrite_one) < 0)
3858                         return commit_error;
3859         }
3860         return action;
3861 }
3862
3863 static void track_linear(struct rev_info *revs, struct commit *commit)
3864 {
3865         if (revs->track_first_time) {
3866                 revs->linear = 1;
3867                 revs->track_first_time = 0;
3868         } else {
3869                 struct commit_list *p;
3870                 for (p = revs->previous_parents; p; p = p->next)
3871                         if (p->item == NULL || /* first commit */
3872                             oideq(&p->item->object.oid, &commit->object.oid))
3873                                 break;
3874                 revs->linear = p != NULL;
3875         }
3876         if (revs->reverse) {
3877                 if (revs->linear)
3878                         commit->object.flags |= TRACK_LINEAR;
3879         }
3880         free_commit_list(revs->previous_parents);
3881         revs->previous_parents = copy_commit_list(commit->parents);
3882 }
3883
3884 static struct commit *get_revision_1(struct rev_info *revs)
3885 {
3886         while (1) {
3887                 struct commit *commit;
3888
3889                 if (revs->reflog_info)
3890                         commit = next_reflog_entry(revs->reflog_info);
3891                 else if (revs->topo_walk_info)
3892                         commit = next_topo_commit(revs);
3893                 else
3894                         commit = pop_commit(&revs->commits);
3895
3896                 if (!commit)
3897                         return NULL;
3898
3899                 if (revs->reflog_info)
3900                         commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3901
3902                 /*
3903                  * If we haven't done the list limiting, we need to look at
3904                  * the parents here. We also need to do the date-based limiting
3905                  * that we'd otherwise have done in limit_list().
3906                  */
3907                 if (!revs->limited) {
3908                         if (revs->max_age != -1 &&
3909                             comparison_date(revs, commit) < revs->max_age)
3910                                 continue;
3911
3912                         if (revs->reflog_info)
3913                                 try_to_simplify_commit(revs, commit);
3914                         else if (revs->topo_walk_info)
3915                                 expand_topo_walk(revs, commit);
3916                         else if (process_parents(revs, commit, &revs->commits, NULL) < 0) {
3917                                 if (!revs->ignore_missing_links)
3918                                         die("Failed to traverse parents of commit %s",
3919                                                 oid_to_hex(&commit->object.oid));
3920                         }
3921                 }
3922
3923                 switch (simplify_commit(revs, commit)) {
3924                 case commit_ignore:
3925                         continue;
3926                 case commit_error:
3927                         die("Failed to simplify parents of commit %s",
3928                             oid_to_hex(&commit->object.oid));
3929                 default:
3930                         if (revs->track_linear)
3931                                 track_linear(revs, commit);
3932                         return commit;
3933                 }
3934         }
3935 }
3936
3937 /*
3938  * Return true for entries that have not yet been shown.  (This is an
3939  * object_array_each_func_t.)
3940  */
3941 static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3942 {
3943         return !(entry->item->flags & SHOWN);
3944 }
3945
3946 /*
3947  * If array is on the verge of a realloc, garbage-collect any entries
3948  * that have already been shown to try to free up some space.
3949  */
3950 static void gc_boundary(struct object_array *array)
3951 {
3952         if (array->nr == array->alloc)
3953                 object_array_filter(array, entry_unshown, NULL);
3954 }
3955
3956 static void create_boundary_commit_list(struct rev_info *revs)
3957 {
3958         unsigned i;
3959         struct commit *c;
3960         struct object_array *array = &revs->boundary_commits;
3961         struct object_array_entry *objects = array->objects;
3962
3963         /*
3964          * If revs->commits is non-NULL at this point, an error occurred in
3965          * get_revision_1().  Ignore the error and continue printing the
3966          * boundary commits anyway.  (This is what the code has always
3967          * done.)
3968          */
3969         if (revs->commits) {
3970                 free_commit_list(revs->commits);
3971                 revs->commits = NULL;
3972         }
3973
3974         /*
3975          * Put all of the actual boundary commits from revs->boundary_commits
3976          * into revs->commits
3977          */
3978         for (i = 0; i < array->nr; i++) {
3979                 c = (struct commit *)(objects[i].item);
3980                 if (!c)
3981                         continue;
3982                 if (!(c->object.flags & CHILD_SHOWN))
3983                         continue;
3984                 if (c->object.flags & (SHOWN | BOUNDARY))
3985                         continue;
3986                 c->object.flags |= BOUNDARY;
3987                 commit_list_insert(c, &revs->commits);
3988         }
3989
3990         /*
3991          * If revs->topo_order is set, sort the boundary commits
3992          * in topological order
3993          */
3994         sort_in_topological_order(&revs->commits, revs->sort_order);
3995 }
3996
3997 static struct commit *get_revision_internal(struct rev_info *revs)
3998 {
3999         struct commit *c = NULL;
4000         struct commit_list *l;
4001
4002         if (revs->boundary == 2) {
4003                 /*
4004                  * All of the normal commits have already been returned,
4005                  * and we are now returning boundary commits.
4006                  * create_boundary_commit_list() has populated
4007                  * revs->commits with the remaining commits to return.
4008                  */
4009                 c = pop_commit(&revs->commits);
4010                 if (c)
4011                         c->object.flags |= SHOWN;
4012                 return c;
4013         }
4014
4015         /*
4016          * If our max_count counter has reached zero, then we are done. We
4017          * don't simply return NULL because we still might need to show
4018          * boundary commits. But we want to avoid calling get_revision_1, which
4019          * might do a considerable amount of work finding the next commit only
4020          * for us to throw it away.
4021          *
4022          * If it is non-zero, then either we don't have a max_count at all
4023          * (-1), or it is still counting, in which case we decrement.
4024          */
4025         if (revs->max_count) {
4026                 c = get_revision_1(revs);
4027                 if (c) {
4028                         while (revs->skip_count > 0) {
4029                                 revs->skip_count--;
4030                                 c = get_revision_1(revs);
4031                                 if (!c)
4032                                         break;
4033                         }
4034                 }
4035
4036                 if (revs->max_count > 0)
4037                         revs->max_count--;
4038         }
4039
4040         if (c)
4041                 c->object.flags |= SHOWN;
4042
4043         if (!revs->boundary)
4044                 return c;
4045
4046         if (!c) {
4047                 /*
4048                  * get_revision_1() runs out the commits, and
4049                  * we are done computing the boundaries.
4050                  * switch to boundary commits output mode.
4051                  */
4052                 revs->boundary = 2;
4053
4054                 /*
4055                  * Update revs->commits to contain the list of
4056                  * boundary commits.
4057                  */
4058                 create_boundary_commit_list(revs);
4059
4060                 return get_revision_internal(revs);
4061         }
4062
4063         /*
4064          * boundary commits are the commits that are parents of the
4065          * ones we got from get_revision_1() but they themselves are
4066          * not returned from get_revision_1().  Before returning
4067          * 'c', we need to mark its parents that they could be boundaries.
4068          */
4069
4070         for (l = c->parents; l; l = l->next) {
4071                 struct object *p;
4072                 p = &(l->item->object);
4073                 if (p->flags & (CHILD_SHOWN | SHOWN))
4074                         continue;
4075                 p->flags |= CHILD_SHOWN;
4076                 gc_boundary(&revs->boundary_commits);
4077                 add_object_array(p, NULL, &revs->boundary_commits);
4078         }
4079
4080         return c;
4081 }
4082
4083 struct commit *get_revision(struct rev_info *revs)
4084 {
4085         struct commit *c;
4086         struct commit_list *reversed;
4087
4088         if (revs->reverse) {
4089                 reversed = NULL;
4090                 while ((c = get_revision_internal(revs)))
4091                         commit_list_insert(c, &reversed);
4092                 revs->commits = reversed;
4093                 revs->reverse = 0;
4094                 revs->reverse_output_stage = 1;
4095         }
4096
4097         if (revs->reverse_output_stage) {
4098                 c = pop_commit(&revs->commits);
4099                 if (revs->track_linear)
4100                         revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
4101                 return c;
4102         }
4103
4104         c = get_revision_internal(revs);
4105         if (c && revs->graph)
4106                 graph_update(revs->graph, c);
4107         if (!c) {
4108                 free_saved_parents(revs);
4109                 if (revs->previous_parents) {
4110                         free_commit_list(revs->previous_parents);
4111                         revs->previous_parents = NULL;
4112                 }
4113         }
4114         return c;
4115 }
4116
4117 const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
4118 {
4119         if (commit->object.flags & BOUNDARY)
4120                 return "-";
4121         else if (commit->object.flags & UNINTERESTING)
4122                 return "^";
4123         else if (commit->object.flags & PATCHSAME)
4124                 return "=";
4125         else if (!revs || revs->left_right) {
4126                 if (commit->object.flags & SYMMETRIC_LEFT)
4127                         return "<";
4128                 else
4129                         return ">";
4130         } else if (revs->graph)
4131                 return "*";
4132         else if (revs->cherry_mark)
4133                 return "+";
4134         return "";
4135 }
4136
4137 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
4138 {
4139         const char *mark = get_revision_mark(revs, commit);
4140         if (!strlen(mark))
4141                 return;
4142         fputs(mark, stdout);
4143         putchar(' ');
4144 }