2 #include "object-store.h"
10 #include "repository.h"
13 #include "reflog-walk.h"
14 #include "patch-ids.h"
17 #include "string-list.h"
20 #include "commit-slab.h"
22 #include "cache-tree.h"
26 #include "argv-array.h"
27 #include "commit-reach.h"
28 #include "commit-graph.h"
29 #include "prio-queue.h"
33 #include "json-writer.h"
35 volatile show_early_output_fn_t show_early_output;
37 static const char *term_bad;
38 static const char *term_good;
40 implement_shared_commit_slab(revision_sources, char *);
42 static inline int want_ancestry(const struct rev_info *revs);
44 void show_object_with_name(FILE *out, struct object *obj, const char *name)
48 fprintf(out, "%s ", oid_to_hex(&obj->oid));
49 for (p = name; *p && *p != '\n'; p++)
54 static void mark_blob_uninteresting(struct blob *blob)
58 if (blob->object.flags & UNINTERESTING)
60 blob->object.flags |= UNINTERESTING;
63 static void mark_tree_contents_uninteresting(struct repository *r,
66 struct tree_desc desc;
67 struct name_entry entry;
69 if (parse_tree_gently(tree, 1) < 0)
72 init_tree_desc(&desc, tree->buffer, tree->size);
73 while (tree_entry(&desc, &entry)) {
74 switch (object_type(entry.mode)) {
76 mark_tree_uninteresting(r, lookup_tree(r, &entry.oid));
79 mark_blob_uninteresting(lookup_blob(r, &entry.oid));
82 /* Subproject commit - not in this repository */
88 * We don't care about the tree any more
89 * after it has been marked uninteresting.
91 free_tree_buffer(tree);
94 void mark_tree_uninteresting(struct repository *r, struct tree *tree)
102 if (obj->flags & UNINTERESTING)
104 obj->flags |= UNINTERESTING;
105 mark_tree_contents_uninteresting(r, tree);
108 struct path_and_oids_entry {
109 struct hashmap_entry ent;
114 static int path_and_oids_cmp(const void *hashmap_cmp_fn_data,
115 const struct hashmap_entry *eptr,
116 const struct hashmap_entry *entry_or_key,
119 const struct path_and_oids_entry *e1, *e2;
121 e1 = container_of(eptr, const struct path_and_oids_entry, ent);
122 e2 = container_of(entry_or_key, const struct path_and_oids_entry, ent);
124 return strcmp(e1->path, e2->path);
127 static void paths_and_oids_init(struct hashmap *map)
129 hashmap_init(map, path_and_oids_cmp, NULL, 0);
132 static void paths_and_oids_clear(struct hashmap *map)
134 struct hashmap_iter iter;
135 struct path_and_oids_entry *entry;
137 hashmap_for_each_entry(map, &iter, entry, ent /* member name */) {
138 oidset_clear(&entry->trees);
142 hashmap_free_entries(map, struct path_and_oids_entry, ent);
145 static void paths_and_oids_insert(struct hashmap *map,
147 const struct object_id *oid)
149 int hash = strhash(path);
150 struct path_and_oids_entry key;
151 struct path_and_oids_entry *entry;
153 hashmap_entry_init(&key.ent, hash);
155 /* use a shallow copy for the lookup */
156 key.path = (char *)path;
157 oidset_init(&key.trees, 0);
159 entry = hashmap_get_entry(map, &key, ent, NULL);
161 entry = xcalloc(1, sizeof(struct path_and_oids_entry));
162 hashmap_entry_init(&entry->ent, hash);
163 entry->path = xstrdup(key.path);
164 oidset_init(&entry->trees, 16);
165 hashmap_put(map, &entry->ent);
168 oidset_insert(&entry->trees, oid);
171 static void add_children_by_path(struct repository *r,
175 struct tree_desc desc;
176 struct name_entry entry;
181 if (parse_tree_gently(tree, 1) < 0)
184 init_tree_desc(&desc, tree->buffer, tree->size);
185 while (tree_entry(&desc, &entry)) {
186 switch (object_type(entry.mode)) {
188 paths_and_oids_insert(map, entry.path, &entry.oid);
190 if (tree->object.flags & UNINTERESTING) {
191 struct tree *child = lookup_tree(r, &entry.oid);
193 child->object.flags |= UNINTERESTING;
197 if (tree->object.flags & UNINTERESTING) {
198 struct blob *child = lookup_blob(r, &entry.oid);
200 child->object.flags |= UNINTERESTING;
204 /* Subproject commit - not in this repository */
209 free_tree_buffer(tree);
212 void mark_trees_uninteresting_sparse(struct repository *r,
213 struct oidset *trees)
215 unsigned has_interesting = 0, has_uninteresting = 0;
217 struct hashmap_iter map_iter;
218 struct path_and_oids_entry *entry;
219 struct object_id *oid;
220 struct oidset_iter iter;
222 oidset_iter_init(trees, &iter);
223 while ((!has_interesting || !has_uninteresting) &&
224 (oid = oidset_iter_next(&iter))) {
225 struct tree *tree = lookup_tree(r, oid);
230 if (tree->object.flags & UNINTERESTING)
231 has_uninteresting = 1;
236 /* Do not walk unless we have both types of trees. */
237 if (!has_uninteresting || !has_interesting)
240 paths_and_oids_init(&map);
242 oidset_iter_init(trees, &iter);
243 while ((oid = oidset_iter_next(&iter))) {
244 struct tree *tree = lookup_tree(r, oid);
245 add_children_by_path(r, tree, &map);
248 hashmap_for_each_entry(&map, &map_iter, entry, ent /* member name */)
249 mark_trees_uninteresting_sparse(r, &entry->trees);
251 paths_and_oids_clear(&map);
254 struct commit_stack {
255 struct commit **items;
258 #define COMMIT_STACK_INIT { NULL, 0, 0 }
260 static void commit_stack_push(struct commit_stack *stack, struct commit *commit)
262 ALLOC_GROW(stack->items, stack->nr + 1, stack->alloc);
263 stack->items[stack->nr++] = commit;
266 static struct commit *commit_stack_pop(struct commit_stack *stack)
268 return stack->nr ? stack->items[--stack->nr] : NULL;
271 static void commit_stack_clear(struct commit_stack *stack)
273 FREE_AND_NULL(stack->items);
274 stack->nr = stack->alloc = 0;
277 static void mark_one_parent_uninteresting(struct commit *commit,
278 struct commit_stack *pending)
280 struct commit_list *l;
282 if (commit->object.flags & UNINTERESTING)
284 commit->object.flags |= UNINTERESTING;
287 * Normally we haven't parsed the parent
288 * yet, so we won't have a parent of a parent
289 * here. However, it may turn out that we've
290 * reached this commit some other way (where it
291 * wasn't uninteresting), in which case we need
292 * to mark its parents recursively too..
294 for (l = commit->parents; l; l = l->next)
295 commit_stack_push(pending, l->item);
298 void mark_parents_uninteresting(struct commit *commit)
300 struct commit_stack pending = COMMIT_STACK_INIT;
301 struct commit_list *l;
303 for (l = commit->parents; l; l = l->next)
304 mark_one_parent_uninteresting(l->item, &pending);
306 while (pending.nr > 0)
307 mark_one_parent_uninteresting(commit_stack_pop(&pending),
310 commit_stack_clear(&pending);
313 static void add_pending_object_with_path(struct rev_info *revs,
315 const char *name, unsigned mode,
318 struct interpret_branch_name_options options = { 0 };
321 if (revs->no_walk && (obj->flags & UNINTERESTING))
323 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
324 struct strbuf buf = STRBUF_INIT;
325 int len = interpret_branch_name(name, 0, &buf, &options);
327 if (0 < len && name[len] && buf.len)
328 strbuf_addstr(&buf, name + len);
329 add_reflog_for_walk(revs->reflog_info,
330 (struct commit *)obj,
331 buf.buf[0] ? buf.buf: name);
332 strbuf_release(&buf);
333 return; /* do not add the commit itself */
335 add_object_array_with_path(obj, name, &revs->pending, mode, path);
338 static void add_pending_object_with_mode(struct rev_info *revs,
340 const char *name, unsigned mode)
342 add_pending_object_with_path(revs, obj, name, mode, NULL);
345 void add_pending_object(struct rev_info *revs,
346 struct object *obj, const char *name)
348 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
351 void add_head_to_pending(struct rev_info *revs)
353 struct object_id oid;
355 if (get_oid("HEAD", &oid))
357 obj = parse_object(revs->repo, &oid);
360 add_pending_object(revs, obj, "HEAD");
363 static struct object *get_reference(struct rev_info *revs, const char *name,
364 const struct object_id *oid,
367 struct object *object;
370 * If the repository has commit graphs, repo_parse_commit() avoids
371 * reading the object buffer, so use it whenever possible.
373 if (oid_object_info(revs->repo, oid, NULL) == OBJ_COMMIT) {
374 struct commit *c = lookup_commit(revs->repo, oid);
375 if (!repo_parse_commit(revs->repo, c))
376 object = (struct object *) c;
380 object = parse_object(revs->repo, oid);
384 if (revs->ignore_missing)
386 if (revs->exclude_promisor_objects && is_promisor_object(oid))
388 die("bad object %s", name);
390 object->flags |= flags;
394 void add_pending_oid(struct rev_info *revs, const char *name,
395 const struct object_id *oid, unsigned int flags)
397 struct object *object = get_reference(revs, name, oid, flags);
398 add_pending_object(revs, object, name);
401 static struct commit *handle_commit(struct rev_info *revs,
402 struct object_array_entry *entry)
404 struct object *object = entry->item;
405 const char *name = entry->name;
406 const char *path = entry->path;
407 unsigned int mode = entry->mode;
408 unsigned long flags = object->flags;
411 * Tag object? Look what it points to..
413 while (object->type == OBJ_TAG) {
414 struct tag *tag = (struct tag *) object;
415 if (revs->tag_objects && !(flags & UNINTERESTING))
416 add_pending_object(revs, object, tag->tag);
417 object = parse_object(revs->repo, get_tagged_oid(tag));
419 if (revs->ignore_missing_links || (flags & UNINTERESTING))
421 if (revs->exclude_promisor_objects &&
422 is_promisor_object(&tag->tagged->oid))
424 die("bad object %s", oid_to_hex(&tag->tagged->oid));
426 object->flags |= flags;
428 * We'll handle the tagged object by looping or dropping
429 * through to the non-tag handlers below. Do not
430 * propagate path data from the tag's pending entry.
437 * Commit object? Just return it, we'll do all the complex
440 if (object->type == OBJ_COMMIT) {
441 struct commit *commit = (struct commit *)object;
443 if (parse_commit(commit) < 0)
444 die("unable to parse commit %s", name);
445 if (flags & UNINTERESTING) {
446 mark_parents_uninteresting(commit);
448 if (!revs->topo_order || !generation_numbers_enabled(the_repository))
452 char **slot = revision_sources_at(revs->sources, commit);
455 *slot = xstrdup(name);
461 * Tree object? Either mark it uninteresting, or add it
462 * to the list of objects to look at later..
464 if (object->type == OBJ_TREE) {
465 struct tree *tree = (struct tree *)object;
466 if (!revs->tree_objects)
468 if (flags & UNINTERESTING) {
469 mark_tree_contents_uninteresting(revs->repo, tree);
472 add_pending_object_with_path(revs, object, name, mode, path);
477 * Blob object? You know the drill by now..
479 if (object->type == OBJ_BLOB) {
480 if (!revs->blob_objects)
482 if (flags & UNINTERESTING)
484 add_pending_object_with_path(revs, object, name, mode, path);
487 die("%s is unknown object", name);
490 static int everybody_uninteresting(struct commit_list *orig,
491 struct commit **interesting_cache)
493 struct commit_list *list = orig;
495 if (*interesting_cache) {
496 struct commit *commit = *interesting_cache;
497 if (!(commit->object.flags & UNINTERESTING))
502 struct commit *commit = list->item;
504 if (commit->object.flags & UNINTERESTING)
507 *interesting_cache = commit;
514 * A definition of "relevant" commit that we can use to simplify limited graphs
515 * by eliminating side branches.
517 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
518 * in our list), or that is a specified BOTTOM commit. Then after computing
519 * a limited list, during processing we can generally ignore boundary merges
520 * coming from outside the graph, (ie from irrelevant parents), and treat
521 * those merges as if they were single-parent. TREESAME is defined to consider
522 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
523 * we don't care if we were !TREESAME to non-graph parents.
525 * Treating bottom commits as relevant ensures that a limited graph's
526 * connection to the actual bottom commit is not viewed as a side branch, but
527 * treated as part of the graph. For example:
529 * ....Z...A---X---o---o---B
533 * When computing "A..B", the A-X connection is at least as important as
534 * Y-X, despite A being flagged UNINTERESTING.
536 * And when computing --ancestry-path "A..B", the A-X connection is more
537 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
539 static inline int relevant_commit(struct commit *commit)
541 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
545 * Return a single relevant commit from a parent list. If we are a TREESAME
546 * commit, and this selects one of our parents, then we can safely simplify to
549 static struct commit *one_relevant_parent(const struct rev_info *revs,
550 struct commit_list *orig)
552 struct commit_list *list = orig;
553 struct commit *relevant = NULL;
559 * For 1-parent commits, or if first-parent-only, then return that
560 * first parent (even if not "relevant" by the above definition).
561 * TREESAME will have been set purely on that parent.
563 if (revs->first_parent_only || !orig->next)
567 * For multi-parent commits, identify a sole relevant parent, if any.
568 * If we have only one relevant parent, then TREESAME will be set purely
569 * with regard to that parent, and we can simplify accordingly.
571 * If we have more than one relevant parent, or no relevant parents
572 * (and multiple irrelevant ones), then we can't select a parent here
576 struct commit *commit = list->item;
578 if (relevant_commit(commit)) {
588 * The goal is to get REV_TREE_NEW as the result only if the
589 * diff consists of all '+' (and no other changes), REV_TREE_OLD
590 * if the whole diff is removal of old data, and otherwise
591 * REV_TREE_DIFFERENT (of course if the trees are the same we
592 * want REV_TREE_SAME).
594 * The only time we care about the distinction is when
595 * remove_empty_trees is in effect, in which case we care only about
596 * whether the whole change is REV_TREE_NEW, or if there's another type
597 * of change. Which means we can stop the diff early in either of these
600 * 1. We're not using remove_empty_trees at all.
602 * 2. We saw anything except REV_TREE_NEW.
604 static int tree_difference = REV_TREE_SAME;
606 static void file_add_remove(struct diff_options *options,
607 int addremove, unsigned mode,
608 const struct object_id *oid,
610 const char *fullpath, unsigned dirty_submodule)
612 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
613 struct rev_info *revs = options->change_fn_data;
615 tree_difference |= diff;
616 if (!revs->remove_empty_trees || tree_difference != REV_TREE_NEW)
617 options->flags.has_changes = 1;
620 static void file_change(struct diff_options *options,
621 unsigned old_mode, unsigned new_mode,
622 const struct object_id *old_oid,
623 const struct object_id *new_oid,
624 int old_oid_valid, int new_oid_valid,
625 const char *fullpath,
626 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
628 tree_difference = REV_TREE_DIFFERENT;
629 options->flags.has_changes = 1;
632 static int bloom_filter_atexit_registered;
633 static unsigned int count_bloom_filter_maybe;
634 static unsigned int count_bloom_filter_definitely_not;
635 static unsigned int count_bloom_filter_false_positive;
636 static unsigned int count_bloom_filter_not_present;
637 static unsigned int count_bloom_filter_length_zero;
639 static void trace2_bloom_filter_statistics_atexit(void)
641 struct json_writer jw = JSON_WRITER_INIT;
643 jw_object_begin(&jw, 0);
644 jw_object_intmax(&jw, "filter_not_present", count_bloom_filter_not_present);
645 jw_object_intmax(&jw, "zero_length_filter", count_bloom_filter_length_zero);
646 jw_object_intmax(&jw, "maybe", count_bloom_filter_maybe);
647 jw_object_intmax(&jw, "definitely_not", count_bloom_filter_definitely_not);
648 jw_object_intmax(&jw, "false_positive", count_bloom_filter_false_positive);
651 trace2_data_json("bloom", the_repository, "statistics", &jw);
656 static int forbid_bloom_filters(struct pathspec *spec)
658 if (spec->has_wildcard)
662 if (spec->magic & ~PATHSPEC_LITERAL)
664 if (spec->nr && (spec->items[0].magic & ~PATHSPEC_LITERAL))
670 static void prepare_to_use_bloom_filter(struct rev_info *revs)
672 struct pathspec_item *pi;
673 char *path_alloc = NULL;
681 if (forbid_bloom_filters(&revs->prune_data))
684 repo_parse_commit(revs->repo, revs->commits->item);
686 if (!revs->repo->objects->commit_graph)
689 revs->bloom_filter_settings = revs->repo->objects->commit_graph->bloom_filter_settings;
690 if (!revs->bloom_filter_settings)
693 if (!revs->pruning.pathspec.nr)
696 pi = &revs->pruning.pathspec.items[0];
697 last_index = pi->len - 1;
699 /* remove single trailing slash from path, if needed */
700 if (pi->match[last_index] == '/') {
701 path_alloc = xstrdup(pi->match);
702 path_alloc[last_index] = '\0';
709 revs->bloom_key = xmalloc(sizeof(struct bloom_key));
710 fill_bloom_key(path, len, revs->bloom_key, revs->bloom_filter_settings);
712 if (trace2_is_enabled() && !bloom_filter_atexit_registered) {
713 atexit(trace2_bloom_filter_statistics_atexit);
714 bloom_filter_atexit_registered = 1;
720 static int check_maybe_different_in_bloom_filter(struct rev_info *revs,
721 struct commit *commit)
723 struct bloom_filter *filter;
726 if (!revs->repo->objects->commit_graph)
729 if (commit_graph_generation(commit) == GENERATION_NUMBER_INFINITY)
732 filter = get_bloom_filter(revs->repo, commit, 0);
735 count_bloom_filter_not_present++;
740 count_bloom_filter_length_zero++;
744 result = bloom_filter_contains(filter,
746 revs->bloom_filter_settings);
749 count_bloom_filter_maybe++;
751 count_bloom_filter_definitely_not++;
756 static int rev_compare_tree(struct rev_info *revs,
757 struct commit *parent, struct commit *commit, int nth_parent)
759 struct tree *t1 = get_commit_tree(parent);
760 struct tree *t2 = get_commit_tree(commit);
768 if (revs->simplify_by_decoration) {
770 * If we are simplifying by decoration, then the commit
771 * is worth showing if it has a tag pointing at it.
773 if (get_name_decoration(&commit->object))
774 return REV_TREE_DIFFERENT;
776 * A commit that is not pointed by a tag is uninteresting
777 * if we are not limited by path. This means that you will
778 * see the usual "commits that touch the paths" plus any
779 * tagged commit by specifying both --simplify-by-decoration
782 if (!revs->prune_data.nr)
783 return REV_TREE_SAME;
786 if (revs->bloom_key && !nth_parent) {
787 bloom_ret = check_maybe_different_in_bloom_filter(revs, commit);
790 return REV_TREE_SAME;
793 tree_difference = REV_TREE_SAME;
794 revs->pruning.flags.has_changes = 0;
795 if (diff_tree_oid(&t1->object.oid, &t2->object.oid, "",
797 return REV_TREE_DIFFERENT;
800 if (bloom_ret == 1 && tree_difference == REV_TREE_SAME)
801 count_bloom_filter_false_positive++;
803 return tree_difference;
806 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
809 struct tree *t1 = get_commit_tree(commit);
814 tree_difference = REV_TREE_SAME;
815 revs->pruning.flags.has_changes = 0;
816 retval = diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
818 return retval >= 0 && (tree_difference == REV_TREE_SAME);
821 struct treesame_state {
822 unsigned int nparents;
823 unsigned char treesame[FLEX_ARRAY];
826 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
828 unsigned n = commit_list_count(commit->parents);
829 struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
831 add_decoration(&revs->treesame, &commit->object, st);
836 * Must be called immediately after removing the nth_parent from a commit's
837 * parent list, if we are maintaining the per-parent treesame[] decoration.
838 * This does not recalculate the master TREESAME flag - update_treesame()
839 * should be called to update it after a sequence of treesame[] modifications
840 * that may have affected it.
842 static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
844 struct treesame_state *st;
847 if (!commit->parents) {
849 * Have just removed the only parent from a non-merge.
850 * Different handling, as we lack decoration.
853 die("compact_treesame %u", nth_parent);
854 old_same = !!(commit->object.flags & TREESAME);
855 if (rev_same_tree_as_empty(revs, commit))
856 commit->object.flags |= TREESAME;
858 commit->object.flags &= ~TREESAME;
862 st = lookup_decoration(&revs->treesame, &commit->object);
863 if (!st || nth_parent >= st->nparents)
864 die("compact_treesame %u", nth_parent);
866 old_same = st->treesame[nth_parent];
867 memmove(st->treesame + nth_parent,
868 st->treesame + nth_parent + 1,
869 st->nparents - nth_parent - 1);
872 * If we've just become a non-merge commit, update TREESAME
873 * immediately, and remove the no-longer-needed decoration.
874 * If still a merge, defer update until update_treesame().
876 if (--st->nparents == 1) {
877 if (commit->parents->next)
878 die("compact_treesame parents mismatch");
879 if (st->treesame[0] && revs->dense)
880 commit->object.flags |= TREESAME;
882 commit->object.flags &= ~TREESAME;
883 free(add_decoration(&revs->treesame, &commit->object, NULL));
889 static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
891 if (commit->parents && commit->parents->next) {
893 struct treesame_state *st;
894 struct commit_list *p;
895 unsigned relevant_parents;
896 unsigned relevant_change, irrelevant_change;
898 st = lookup_decoration(&revs->treesame, &commit->object);
900 die("update_treesame %s", oid_to_hex(&commit->object.oid));
901 relevant_parents = 0;
902 relevant_change = irrelevant_change = 0;
903 for (p = commit->parents, n = 0; p; n++, p = p->next) {
904 if (relevant_commit(p->item)) {
905 relevant_change |= !st->treesame[n];
908 irrelevant_change |= !st->treesame[n];
910 if (relevant_parents ? relevant_change : irrelevant_change)
911 commit->object.flags &= ~TREESAME;
913 commit->object.flags |= TREESAME;
916 return commit->object.flags & TREESAME;
919 static inline int limiting_can_increase_treesame(const struct rev_info *revs)
922 * TREESAME is irrelevant unless prune && dense;
923 * if simplify_history is set, we can't have a mixture of TREESAME and
924 * !TREESAME INTERESTING parents (and we don't have treesame[]
925 * decoration anyway);
926 * if first_parent_only is set, then the TREESAME flag is locked
927 * against the first parent (and again we lack treesame[] decoration).
929 return revs->prune && revs->dense &&
930 !revs->simplify_history &&
931 !revs->first_parent_only;
934 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
936 struct commit_list **pp, *parent;
937 struct treesame_state *ts = NULL;
938 int relevant_change = 0, irrelevant_change = 0;
939 int relevant_parents, nth_parent;
942 * If we don't do pruning, everything is interesting
947 if (!get_commit_tree(commit))
950 if (!commit->parents) {
951 if (rev_same_tree_as_empty(revs, commit))
952 commit->object.flags |= TREESAME;
957 * Normal non-merge commit? If we don't want to make the
958 * history dense, we consider it always to be a change..
960 if (!revs->dense && !commit->parents->next)
963 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
964 (parent = *pp) != NULL;
965 pp = &parent->next, nth_parent++) {
966 struct commit *p = parent->item;
967 if (relevant_commit(p))
970 if (nth_parent == 1) {
972 * This our second loop iteration - so we now know
973 * we're dealing with a merge.
975 * Do not compare with later parents when we care only about
976 * the first parent chain, in order to avoid derailing the
977 * traversal to follow a side branch that brought everything
978 * in the path we are limited to by the pathspec.
980 if (revs->first_parent_only)
983 * If this will remain a potentially-simplifiable
984 * merge, remember per-parent treesame if needed.
985 * Initialise the array with the comparison from our
988 if (revs->treesame.name &&
989 !revs->simplify_history &&
990 !(commit->object.flags & UNINTERESTING)) {
991 ts = initialise_treesame(revs, commit);
992 if (!(irrelevant_change || relevant_change))
996 if (parse_commit(p) < 0)
997 die("cannot simplify commit %s (because of %s)",
998 oid_to_hex(&commit->object.oid),
999 oid_to_hex(&p->object.oid));
1000 switch (rev_compare_tree(revs, p, commit, nth_parent)) {
1002 if (!revs->simplify_history || !relevant_commit(p)) {
1003 /* Even if a merge with an uninteresting
1004 * side branch brought the entire change
1005 * we are interested in, we do not want
1006 * to lose the other branches of this
1007 * merge, so we just keep going.
1010 ts->treesame[nth_parent] = 1;
1013 parent->next = NULL;
1014 commit->parents = parent;
1017 * A merge commit is a "diversion" if it is not
1018 * TREESAME to its first parent but is TREESAME
1019 * to a later parent. In the simplified history,
1020 * we "divert" the history walk to the later
1021 * parent. These commits are shown when "show_pulls"
1022 * is enabled, so do not mark the object as
1025 if (!revs->show_pulls || !nth_parent)
1026 commit->object.flags |= TREESAME;
1031 if (revs->remove_empty_trees &&
1032 rev_same_tree_as_empty(revs, p)) {
1033 /* We are adding all the specified
1034 * paths from this parent, so the
1035 * history beyond this parent is not
1036 * interesting. Remove its parents
1037 * (they are grandparents for us).
1038 * IOW, we pretend this parent is a
1041 if (parse_commit(p) < 0)
1042 die("cannot simplify commit %s (invalid %s)",
1043 oid_to_hex(&commit->object.oid),
1044 oid_to_hex(&p->object.oid));
1049 case REV_TREE_DIFFERENT:
1050 if (relevant_commit(p))
1051 relevant_change = 1;
1053 irrelevant_change = 1;
1056 commit->object.flags |= PULL_MERGE;
1060 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
1064 * TREESAME is straightforward for single-parent commits. For merge
1065 * commits, it is most useful to define it so that "irrelevant"
1066 * parents cannot make us !TREESAME - if we have any relevant
1067 * parents, then we only consider TREESAMEness with respect to them,
1068 * allowing irrelevant merges from uninteresting branches to be
1069 * simplified away. Only if we have only irrelevant parents do we
1070 * base TREESAME on them. Note that this logic is replicated in
1071 * update_treesame, which should be kept in sync.
1073 if (relevant_parents ? !relevant_change : !irrelevant_change)
1074 commit->object.flags |= TREESAME;
1077 static int process_parents(struct rev_info *revs, struct commit *commit,
1078 struct commit_list **list, struct prio_queue *queue)
1080 struct commit_list *parent = commit->parents;
1083 if (commit->object.flags & ADDED)
1085 commit->object.flags |= ADDED;
1087 if (revs->include_check &&
1088 !revs->include_check(commit, revs->include_check_data))
1092 * If the commit is uninteresting, don't try to
1093 * prune parents - we want the maximal uninteresting
1096 * Normally we haven't parsed the parent
1097 * yet, so we won't have a parent of a parent
1098 * here. However, it may turn out that we've
1099 * reached this commit some other way (where it
1100 * wasn't uninteresting), in which case we need
1101 * to mark its parents recursively too..
1103 if (commit->object.flags & UNINTERESTING) {
1105 struct commit *p = parent->item;
1106 parent = parent->next;
1108 p->object.flags |= UNINTERESTING;
1109 if (parse_commit_gently(p, 1) < 0)
1112 mark_parents_uninteresting(p);
1113 if (p->object.flags & SEEN)
1115 p->object.flags |= SEEN;
1117 commit_list_insert_by_date(p, list);
1119 prio_queue_put(queue, p);
1125 * Ok, the commit wasn't uninteresting. Try to
1126 * simplify the commit history and find the parent
1127 * that has no differences in the path set if one exists.
1129 try_to_simplify_commit(revs, commit);
1134 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
1136 for (parent = commit->parents; parent; parent = parent->next) {
1137 struct commit *p = parent->item;
1138 int gently = revs->ignore_missing_links ||
1139 revs->exclude_promisor_objects;
1140 if (parse_commit_gently(p, gently) < 0) {
1141 if (revs->exclude_promisor_objects &&
1142 is_promisor_object(&p->object.oid)) {
1143 if (revs->first_parent_only)
1149 if (revs->sources) {
1150 char **slot = revision_sources_at(revs->sources, p);
1153 *slot = *revision_sources_at(revs->sources, commit);
1155 p->object.flags |= left_flag;
1156 if (!(p->object.flags & SEEN)) {
1157 p->object.flags |= SEEN;
1159 commit_list_insert_by_date(p, list);
1161 prio_queue_put(queue, p);
1163 if (revs->first_parent_only)
1169 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
1171 struct commit_list *p;
1172 int left_count = 0, right_count = 0;
1174 struct patch_ids ids;
1175 unsigned cherry_flag;
1177 /* First count the commits on the left and on the right */
1178 for (p = list; p; p = p->next) {
1179 struct commit *commit = p->item;
1180 unsigned flags = commit->object.flags;
1181 if (flags & BOUNDARY)
1183 else if (flags & SYMMETRIC_LEFT)
1189 if (!left_count || !right_count)
1192 left_first = left_count < right_count;
1193 init_patch_ids(revs->repo, &ids);
1194 ids.diffopts.pathspec = revs->diffopt.pathspec;
1196 /* Compute patch-ids for one side */
1197 for (p = list; p; p = p->next) {
1198 struct commit *commit = p->item;
1199 unsigned flags = commit->object.flags;
1201 if (flags & BOUNDARY)
1204 * If we have fewer left, left_first is set and we omit
1205 * commits on the right branch in this loop. If we have
1206 * fewer right, we skip the left ones.
1208 if (left_first != !!(flags & SYMMETRIC_LEFT))
1210 add_commit_patch_id(commit, &ids);
1213 /* either cherry_mark or cherry_pick are true */
1214 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
1216 /* Check the other side */
1217 for (p = list; p; p = p->next) {
1218 struct commit *commit = p->item;
1219 struct patch_id *id;
1220 unsigned flags = commit->object.flags;
1222 if (flags & BOUNDARY)
1225 * If we have fewer left, left_first is set and we omit
1226 * commits on the left branch in this loop.
1228 if (left_first == !!(flags & SYMMETRIC_LEFT))
1232 * Have we seen the same patch id?
1234 id = has_commit_patch_id(commit, &ids);
1238 commit->object.flags |= cherry_flag;
1239 id->commit->object.flags |= cherry_flag;
1242 free_patch_ids(&ids);
1245 /* How many extra uninteresting commits we want to see.. */
1248 static int still_interesting(struct commit_list *src, timestamp_t date, int slop,
1249 struct commit **interesting_cache)
1252 * No source list at all? We're definitely done..
1258 * Does the destination list contain entries with a date
1259 * before the source list? Definitely _not_ done.
1261 if (date <= src->item->date)
1265 * Does the source list still have interesting commits in
1266 * it? Definitely not done..
1268 if (!everybody_uninteresting(src, interesting_cache))
1271 /* Ok, we're closing in.. */
1276 * "rev-list --ancestry-path A..B" computes commits that are ancestors
1277 * of B but not ancestors of A but further limits the result to those
1278 * that are descendants of A. This takes the list of bottom commits and
1279 * the result of "A..B" without --ancestry-path, and limits the latter
1280 * further to the ones that can reach one of the commits in "bottom".
1282 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
1284 struct commit_list *p;
1285 struct commit_list *rlist = NULL;
1289 * Reverse the list so that it will be likely that we would
1290 * process parents before children.
1292 for (p = list; p; p = p->next)
1293 commit_list_insert(p->item, &rlist);
1295 for (p = bottom; p; p = p->next)
1296 p->item->object.flags |= TMP_MARK;
1299 * Mark the ones that can reach bottom commits in "list",
1300 * in a bottom-up fashion.
1304 for (p = rlist; p; p = p->next) {
1305 struct commit *c = p->item;
1306 struct commit_list *parents;
1307 if (c->object.flags & (TMP_MARK | UNINTERESTING))
1309 for (parents = c->parents;
1311 parents = parents->next) {
1312 if (!(parents->item->object.flags & TMP_MARK))
1314 c->object.flags |= TMP_MARK;
1319 } while (made_progress);
1322 * NEEDSWORK: decide if we want to remove parents that are
1323 * not marked with TMP_MARK from commit->parents for commits
1324 * in the resulting list. We may not want to do that, though.
1328 * The ones that are not marked with TMP_MARK are uninteresting
1330 for (p = list; p; p = p->next) {
1331 struct commit *c = p->item;
1332 if (c->object.flags & TMP_MARK)
1334 c->object.flags |= UNINTERESTING;
1337 /* We are done with the TMP_MARK */
1338 for (p = list; p; p = p->next)
1339 p->item->object.flags &= ~TMP_MARK;
1340 for (p = bottom; p; p = p->next)
1341 p->item->object.flags &= ~TMP_MARK;
1342 free_commit_list(rlist);
1346 * Before walking the history, keep the set of "negative" refs the
1347 * caller has asked to exclude.
1349 * This is used to compute "rev-list --ancestry-path A..B", as we need
1350 * to filter the result of "A..B" further to the ones that can actually
1353 static struct commit_list *collect_bottom_commits(struct commit_list *list)
1355 struct commit_list *elem, *bottom = NULL;
1356 for (elem = list; elem; elem = elem->next)
1357 if (elem->item->object.flags & BOTTOM)
1358 commit_list_insert(elem->item, &bottom);
1362 /* Assumes either left_only or right_only is set */
1363 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1365 struct commit_list *p;
1367 for (p = list; p; p = p->next) {
1368 struct commit *commit = p->item;
1370 if (revs->right_only) {
1371 if (commit->object.flags & SYMMETRIC_LEFT)
1372 commit->object.flags |= SHOWN;
1373 } else /* revs->left_only is set */
1374 if (!(commit->object.flags & SYMMETRIC_LEFT))
1375 commit->object.flags |= SHOWN;
1379 static int limit_list(struct rev_info *revs)
1382 timestamp_t date = TIME_MAX;
1383 struct commit_list *list = revs->commits;
1384 struct commit_list *newlist = NULL;
1385 struct commit_list **p = &newlist;
1386 struct commit_list *bottom = NULL;
1387 struct commit *interesting_cache = NULL;
1389 if (revs->ancestry_path) {
1390 bottom = collect_bottom_commits(list);
1392 die("--ancestry-path given but there are no bottom commits");
1396 struct commit *commit = pop_commit(&list);
1397 struct object *obj = &commit->object;
1398 show_early_output_fn_t show;
1400 if (commit == interesting_cache)
1401 interesting_cache = NULL;
1403 if (revs->max_age != -1 && (commit->date < revs->max_age))
1404 obj->flags |= UNINTERESTING;
1405 if (process_parents(revs, commit, &list, NULL) < 0)
1407 if (obj->flags & UNINTERESTING) {
1408 mark_parents_uninteresting(commit);
1409 slop = still_interesting(list, date, slop, &interesting_cache);
1414 if (revs->min_age != -1 && (commit->date > revs->min_age) &&
1415 !revs->line_level_traverse)
1417 date = commit->date;
1418 p = &commit_list_insert(commit, p)->next;
1420 show = show_early_output;
1424 show(revs, newlist);
1425 show_early_output = NULL;
1427 if (revs->cherry_pick || revs->cherry_mark)
1428 cherry_pick_list(newlist, revs);
1430 if (revs->left_only || revs->right_only)
1431 limit_left_right(newlist, revs);
1434 limit_to_ancestry(bottom, newlist);
1435 free_commit_list(bottom);
1439 * Check if any commits have become TREESAME by some of their parents
1440 * becoming UNINTERESTING.
1442 if (limiting_can_increase_treesame(revs))
1443 for (list = newlist; list; list = list->next) {
1444 struct commit *c = list->item;
1445 if (c->object.flags & (UNINTERESTING | TREESAME))
1447 update_treesame(revs, c);
1450 revs->commits = newlist;
1455 * Add an entry to refs->cmdline with the specified information.
1458 static void add_rev_cmdline(struct rev_info *revs,
1459 struct object *item,
1464 struct rev_cmdline_info *info = &revs->cmdline;
1465 unsigned int nr = info->nr;
1467 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1468 info->rev[nr].item = item;
1469 info->rev[nr].name = xstrdup(name);
1470 info->rev[nr].whence = whence;
1471 info->rev[nr].flags = flags;
1475 static void add_rev_cmdline_list(struct rev_info *revs,
1476 struct commit_list *commit_list,
1480 while (commit_list) {
1481 struct object *object = &commit_list->item->object;
1482 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1484 commit_list = commit_list->next;
1488 struct all_refs_cb {
1490 int warned_bad_reflog;
1491 struct rev_info *all_revs;
1492 const char *name_for_errormsg;
1493 struct worktree *wt;
1496 int ref_excluded(struct string_list *ref_excludes, const char *path)
1498 struct string_list_item *item;
1502 for_each_string_list_item(item, ref_excludes) {
1503 if (!wildmatch(item->string, path, 0))
1509 static int handle_one_ref(const char *path, const struct object_id *oid,
1510 int flag, void *cb_data)
1512 struct all_refs_cb *cb = cb_data;
1513 struct object *object;
1515 if (ref_excluded(cb->all_revs->ref_excludes, path))
1518 object = get_reference(cb->all_revs, path, oid, cb->all_flags);
1519 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1520 add_pending_oid(cb->all_revs, path, oid, cb->all_flags);
1524 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1527 cb->all_revs = revs;
1528 cb->all_flags = flags;
1529 revs->rev_input_given = 1;
1533 void clear_ref_exclusion(struct string_list **ref_excludes_p)
1535 if (*ref_excludes_p) {
1536 string_list_clear(*ref_excludes_p, 0);
1537 free(*ref_excludes_p);
1539 *ref_excludes_p = NULL;
1542 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1544 if (!*ref_excludes_p) {
1545 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1546 (*ref_excludes_p)->strdup_strings = 1;
1548 string_list_append(*ref_excludes_p, exclude);
1551 static void handle_refs(struct ref_store *refs,
1552 struct rev_info *revs, unsigned flags,
1553 int (*for_each)(struct ref_store *, each_ref_fn, void *))
1555 struct all_refs_cb cb;
1558 /* this could happen with uninitialized submodules */
1562 init_all_refs_cb(&cb, revs, flags);
1563 for_each(refs, handle_one_ref, &cb);
1566 static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
1568 struct all_refs_cb *cb = cb_data;
1569 if (!is_null_oid(oid)) {
1570 struct object *o = parse_object(cb->all_revs->repo, oid);
1572 o->flags |= cb->all_flags;
1573 /* ??? CMDLINEFLAGS ??? */
1574 add_pending_object(cb->all_revs, o, "");
1576 else if (!cb->warned_bad_reflog) {
1577 warning("reflog of '%s' references pruned commits",
1578 cb->name_for_errormsg);
1579 cb->warned_bad_reflog = 1;
1584 static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
1585 const char *email, timestamp_t timestamp, int tz,
1586 const char *message, void *cb_data)
1588 handle_one_reflog_commit(ooid, cb_data);
1589 handle_one_reflog_commit(noid, cb_data);
1593 static int handle_one_reflog(const char *refname_in_wt,
1594 const struct object_id *oid,
1595 int flag, void *cb_data)
1597 struct all_refs_cb *cb = cb_data;
1598 struct strbuf refname = STRBUF_INIT;
1600 cb->warned_bad_reflog = 0;
1601 strbuf_worktree_ref(cb->wt, &refname, refname_in_wt);
1602 cb->name_for_errormsg = refname.buf;
1603 refs_for_each_reflog_ent(get_main_ref_store(the_repository),
1605 handle_one_reflog_ent, cb_data);
1606 strbuf_release(&refname);
1610 static void add_other_reflogs_to_pending(struct all_refs_cb *cb)
1612 struct worktree **worktrees, **p;
1614 worktrees = get_worktrees();
1615 for (p = worktrees; *p; p++) {
1616 struct worktree *wt = *p;
1622 refs_for_each_reflog(get_worktree_ref_store(wt),
1626 free_worktrees(worktrees);
1629 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1631 struct all_refs_cb cb;
1634 cb.all_flags = flags;
1636 for_each_reflog(handle_one_reflog, &cb);
1638 if (!revs->single_worktree)
1639 add_other_reflogs_to_pending(&cb);
1642 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1643 struct strbuf *path, unsigned int flags)
1645 size_t baselen = path->len;
1648 if (it->entry_count >= 0) {
1649 struct tree *tree = lookup_tree(revs->repo, &it->oid);
1650 tree->object.flags |= flags;
1651 add_pending_object_with_path(revs, &tree->object, "",
1655 for (i = 0; i < it->subtree_nr; i++) {
1656 struct cache_tree_sub *sub = it->down[i];
1657 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1658 add_cache_tree(sub->cache_tree, revs, path, flags);
1659 strbuf_setlen(path, baselen);
1664 static void do_add_index_objects_to_pending(struct rev_info *revs,
1665 struct index_state *istate,
1670 for (i = 0; i < istate->cache_nr; i++) {
1671 struct cache_entry *ce = istate->cache[i];
1674 if (S_ISGITLINK(ce->ce_mode))
1677 blob = lookup_blob(revs->repo, &ce->oid);
1679 die("unable to add index blob to traversal");
1680 blob->object.flags |= flags;
1681 add_pending_object_with_path(revs, &blob->object, "",
1682 ce->ce_mode, ce->name);
1685 if (istate->cache_tree) {
1686 struct strbuf path = STRBUF_INIT;
1687 add_cache_tree(istate->cache_tree, revs, &path, flags);
1688 strbuf_release(&path);
1692 void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
1694 struct worktree **worktrees, **p;
1696 repo_read_index(revs->repo);
1697 do_add_index_objects_to_pending(revs, revs->repo->index, flags);
1699 if (revs->single_worktree)
1702 worktrees = get_worktrees();
1703 for (p = worktrees; *p; p++) {
1704 struct worktree *wt = *p;
1705 struct index_state istate = { NULL };
1708 continue; /* current index already taken care of */
1710 if (read_index_from(&istate,
1711 worktree_git_path(wt, "index"),
1712 get_worktree_git_dir(wt)) > 0)
1713 do_add_index_objects_to_pending(revs, &istate, flags);
1714 discard_index(&istate);
1716 free_worktrees(worktrees);
1719 struct add_alternate_refs_data {
1720 struct rev_info *revs;
1724 static void add_one_alternate_ref(const struct object_id *oid,
1727 const char *name = ".alternate";
1728 struct add_alternate_refs_data *data = vdata;
1731 obj = get_reference(data->revs, name, oid, data->flags);
1732 add_rev_cmdline(data->revs, obj, name, REV_CMD_REV, data->flags);
1733 add_pending_object(data->revs, obj, name);
1736 static void add_alternate_refs_to_pending(struct rev_info *revs,
1739 struct add_alternate_refs_data data;
1742 for_each_alternate_ref(add_one_alternate_ref, &data);
1745 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1748 struct object_id oid;
1750 struct commit *commit;
1751 struct commit_list *parents;
1753 const char *arg = arg_;
1756 flags ^= UNINTERESTING | BOTTOM;
1759 if (get_oid_committish(arg, &oid))
1762 it = get_reference(revs, arg, &oid, 0);
1763 if (!it && revs->ignore_missing)
1765 if (it->type != OBJ_TAG)
1767 if (!((struct tag*)it)->tagged)
1769 oidcpy(&oid, &((struct tag*)it)->tagged->oid);
1771 if (it->type != OBJ_COMMIT)
1773 commit = (struct commit *)it;
1774 if (exclude_parent &&
1775 exclude_parent > commit_list_count(commit->parents))
1777 for (parents = commit->parents, parent_number = 1;
1779 parents = parents->next, parent_number++) {
1780 if (exclude_parent && parent_number != exclude_parent)
1783 it = &parents->item->object;
1785 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1786 add_pending_object(revs, it, arg);
1791 void repo_init_revisions(struct repository *r,
1792 struct rev_info *revs,
1795 memset(revs, 0, sizeof(*revs));
1798 revs->abbrev = DEFAULT_ABBREV;
1799 revs->ignore_merges = 1;
1800 revs->simplify_history = 1;
1801 revs->pruning.repo = r;
1802 revs->pruning.flags.recursive = 1;
1803 revs->pruning.flags.quick = 1;
1804 revs->pruning.add_remove = file_add_remove;
1805 revs->pruning.change = file_change;
1806 revs->pruning.change_fn_data = revs;
1807 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1809 revs->prefix = prefix;
1812 revs->skip_count = -1;
1813 revs->max_count = -1;
1814 revs->max_parents = -1;
1815 revs->expand_tabs_in_log = -1;
1817 revs->commit_format = CMIT_FMT_DEFAULT;
1818 revs->expand_tabs_in_log_default = 8;
1820 init_grep_defaults(revs->repo);
1821 grep_init(&revs->grep_filter, revs->repo, prefix);
1822 revs->grep_filter.status_only = 1;
1824 repo_diff_setup(revs->repo, &revs->diffopt);
1825 if (prefix && !revs->diffopt.prefix) {
1826 revs->diffopt.prefix = prefix;
1827 revs->diffopt.prefix_length = strlen(prefix);
1830 init_display_notes(&revs->notes_opt);
1833 static void add_pending_commit_list(struct rev_info *revs,
1834 struct commit_list *commit_list,
1837 while (commit_list) {
1838 struct object *object = &commit_list->item->object;
1839 object->flags |= flags;
1840 add_pending_object(revs, object, oid_to_hex(&object->oid));
1841 commit_list = commit_list->next;
1845 static void prepare_show_merge(struct rev_info *revs)
1847 struct commit_list *bases;
1848 struct commit *head, *other;
1849 struct object_id oid;
1850 const char **prune = NULL;
1851 int i, prune_num = 1; /* counting terminating NULL */
1852 struct index_state *istate = revs->repo->index;
1854 if (get_oid("HEAD", &oid))
1855 die("--merge without HEAD?");
1856 head = lookup_commit_or_die(&oid, "HEAD");
1857 if (get_oid("MERGE_HEAD", &oid))
1858 die("--merge without MERGE_HEAD?");
1859 other = lookup_commit_or_die(&oid, "MERGE_HEAD");
1860 add_pending_object(revs, &head->object, "HEAD");
1861 add_pending_object(revs, &other->object, "MERGE_HEAD");
1862 bases = get_merge_bases(head, other);
1863 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1864 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1865 free_commit_list(bases);
1866 head->object.flags |= SYMMETRIC_LEFT;
1868 if (!istate->cache_nr)
1869 repo_read_index(revs->repo);
1870 for (i = 0; i < istate->cache_nr; i++) {
1871 const struct cache_entry *ce = istate->cache[i];
1874 if (ce_path_match(istate, ce, &revs->prune_data, NULL)) {
1876 REALLOC_ARRAY(prune, prune_num);
1877 prune[prune_num-2] = ce->name;
1878 prune[prune_num-1] = NULL;
1880 while ((i+1 < istate->cache_nr) &&
1881 ce_same_name(ce, istate->cache[i+1]))
1884 clear_pathspec(&revs->prune_data);
1885 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1886 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1890 static int dotdot_missing(const char *arg, char *dotdot,
1891 struct rev_info *revs, int symmetric)
1893 if (revs->ignore_missing)
1895 /* de-munge so we report the full argument */
1898 ? "Invalid symmetric difference expression %s"
1899 : "Invalid revision range %s", arg);
1902 static int handle_dotdot_1(const char *arg, char *dotdot,
1903 struct rev_info *revs, int flags,
1904 int cant_be_filename,
1905 struct object_context *a_oc,
1906 struct object_context *b_oc)
1908 const char *a_name, *b_name;
1909 struct object_id a_oid, b_oid;
1910 struct object *a_obj, *b_obj;
1911 unsigned int a_flags, b_flags;
1913 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1914 unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH;
1920 b_name = dotdot + 2;
1921 if (*b_name == '.') {
1928 if (get_oid_with_context(revs->repo, a_name, oc_flags, &a_oid, a_oc) ||
1929 get_oid_with_context(revs->repo, b_name, oc_flags, &b_oid, b_oc))
1932 if (!cant_be_filename) {
1934 verify_non_filename(revs->prefix, arg);
1938 a_obj = parse_object(revs->repo, &a_oid);
1939 b_obj = parse_object(revs->repo, &b_oid);
1940 if (!a_obj || !b_obj)
1941 return dotdot_missing(arg, dotdot, revs, symmetric);
1946 a_flags = flags_exclude;
1948 /* A...B -- find merge bases between the two */
1949 struct commit *a, *b;
1950 struct commit_list *exclude;
1952 a = lookup_commit_reference(revs->repo, &a_obj->oid);
1953 b = lookup_commit_reference(revs->repo, &b_obj->oid);
1955 return dotdot_missing(arg, dotdot, revs, symmetric);
1957 exclude = get_merge_bases(a, b);
1958 add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE,
1960 add_pending_commit_list(revs, exclude, flags_exclude);
1961 free_commit_list(exclude);
1964 a_flags = flags | SYMMETRIC_LEFT;
1967 a_obj->flags |= a_flags;
1968 b_obj->flags |= b_flags;
1969 add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
1970 add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
1971 add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path);
1972 add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path);
1976 static int handle_dotdot(const char *arg,
1977 struct rev_info *revs, int flags,
1978 int cant_be_filename)
1980 struct object_context a_oc, b_oc;
1981 char *dotdot = strstr(arg, "..");
1987 memset(&a_oc, 0, sizeof(a_oc));
1988 memset(&b_oc, 0, sizeof(b_oc));
1991 ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename,
2001 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
2003 struct object_context oc;
2005 struct object *object;
2006 struct object_id oid;
2008 const char *arg = arg_;
2009 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
2010 unsigned get_sha1_flags = GET_OID_RECORD_PATH;
2012 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
2014 if (!cant_be_filename && !strcmp(arg, "..")) {
2016 * Just ".."? That is not a range but the
2017 * pathspec for the parent directory.
2022 if (!handle_dotdot(arg, revs, flags, revarg_opt))
2025 mark = strstr(arg, "^@");
2026 if (mark && !mark[2]) {
2028 if (add_parents_only(revs, arg, flags, 0))
2032 mark = strstr(arg, "^!");
2033 if (mark && !mark[2]) {
2035 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0))
2038 mark = strstr(arg, "^-");
2040 int exclude_parent = 1;
2044 exclude_parent = strtoul(mark + 2, &end, 10);
2045 if (*end != '\0' || !exclude_parent)
2050 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent))
2056 local_flags = UNINTERESTING | BOTTOM;
2060 if (revarg_opt & REVARG_COMMITTISH)
2061 get_sha1_flags |= GET_OID_COMMITTISH;
2063 if (get_oid_with_context(revs->repo, arg, get_sha1_flags, &oid, &oc))
2064 return revs->ignore_missing ? 0 : -1;
2065 if (!cant_be_filename)
2066 verify_non_filename(revs->prefix, arg);
2067 object = get_reference(revs, arg, &oid, flags ^ local_flags);
2069 return revs->ignore_missing ? 0 : -1;
2070 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
2071 add_pending_object_with_path(revs, object, arg, oc.mode, oc.path);
2076 static void read_pathspec_from_stdin(struct strbuf *sb,
2077 struct argv_array *prune)
2079 while (strbuf_getline(sb, stdin) != EOF)
2080 argv_array_push(prune, sb->buf);
2083 static void read_revisions_from_stdin(struct rev_info *revs,
2084 struct argv_array *prune)
2087 int seen_dashdash = 0;
2090 save_warning = warn_on_object_refname_ambiguity;
2091 warn_on_object_refname_ambiguity = 0;
2093 strbuf_init(&sb, 1000);
2094 while (strbuf_getline(&sb, stdin) != EOF) {
2098 if (sb.buf[0] == '-') {
2099 if (len == 2 && sb.buf[1] == '-') {
2103 die("options not supported in --stdin mode");
2105 if (handle_revision_arg(sb.buf, revs, 0,
2106 REVARG_CANNOT_BE_FILENAME))
2107 die("bad revision '%s'", sb.buf);
2110 read_pathspec_from_stdin(&sb, prune);
2112 strbuf_release(&sb);
2113 warn_on_object_refname_ambiguity = save_warning;
2116 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
2118 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
2121 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
2123 append_header_grep_pattern(&revs->grep_filter, field, pattern);
2126 static void add_message_grep(struct rev_info *revs, const char *pattern)
2128 add_grep(revs, pattern, GREP_PATTERN_BODY);
2131 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
2132 int *unkc, const char **unkv,
2133 const struct setup_revision_opt* opt)
2135 const char *arg = argv[0];
2138 const unsigned hexsz = the_hash_algo->hexsz;
2140 /* pseudo revision arguments */
2141 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
2142 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
2143 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
2144 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
2145 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
2146 !strcmp(arg, "--indexed-objects") ||
2147 !strcmp(arg, "--alternate-refs") ||
2148 starts_with(arg, "--exclude=") ||
2149 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
2150 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
2152 unkv[(*unkc)++] = arg;
2156 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
2157 revs->max_count = atoi(optarg);
2160 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
2161 revs->skip_count = atoi(optarg);
2163 } else if ((*arg == '-') && isdigit(arg[1])) {
2164 /* accept -<digit>, like traditional "head" */
2165 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
2166 revs->max_count < 0)
2167 die("'%s': not a non-negative integer", arg + 1);
2169 } else if (!strcmp(arg, "-n")) {
2171 return error("-n requires an argument");
2172 revs->max_count = atoi(argv[1]);
2175 } else if (skip_prefix(arg, "-n", &optarg)) {
2176 revs->max_count = atoi(optarg);
2178 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
2179 revs->max_age = atoi(optarg);
2181 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
2182 revs->max_age = approxidate(optarg);
2184 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
2185 revs->max_age = approxidate(optarg);
2187 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
2188 revs->min_age = atoi(optarg);
2190 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
2191 revs->min_age = approxidate(optarg);
2193 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
2194 revs->min_age = approxidate(optarg);
2196 } else if (!strcmp(arg, "--first-parent")) {
2197 revs->first_parent_only = 1;
2198 } else if (!strcmp(arg, "--ancestry-path")) {
2199 revs->ancestry_path = 1;
2200 revs->simplify_history = 0;
2202 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
2203 init_reflog_walk(&revs->reflog_info);
2204 } else if (!strcmp(arg, "--default")) {
2206 return error("bad --default argument");
2207 revs->def = argv[1];
2209 } else if (!strcmp(arg, "--merge")) {
2210 revs->show_merge = 1;
2211 } else if (!strcmp(arg, "--topo-order")) {
2212 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
2213 revs->topo_order = 1;
2214 } else if (!strcmp(arg, "--simplify-merges")) {
2215 revs->simplify_merges = 1;
2216 revs->topo_order = 1;
2217 revs->rewrite_parents = 1;
2218 revs->simplify_history = 0;
2220 } else if (!strcmp(arg, "--simplify-by-decoration")) {
2221 revs->simplify_merges = 1;
2222 revs->topo_order = 1;
2223 revs->rewrite_parents = 1;
2224 revs->simplify_history = 0;
2225 revs->simplify_by_decoration = 1;
2228 } else if (!strcmp(arg, "--date-order")) {
2229 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
2230 revs->topo_order = 1;
2231 } else if (!strcmp(arg, "--author-date-order")) {
2232 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
2233 revs->topo_order = 1;
2234 } else if (!strcmp(arg, "--early-output")) {
2235 revs->early_output = 100;
2236 revs->topo_order = 1;
2237 } else if (skip_prefix(arg, "--early-output=", &optarg)) {
2238 if (strtoul_ui(optarg, 10, &revs->early_output) < 0)
2239 die("'%s': not a non-negative integer", optarg);
2240 revs->topo_order = 1;
2241 } else if (!strcmp(arg, "--parents")) {
2242 revs->rewrite_parents = 1;
2243 revs->print_parents = 1;
2244 } else if (!strcmp(arg, "--dense")) {
2246 } else if (!strcmp(arg, "--sparse")) {
2248 } else if (!strcmp(arg, "--in-commit-order")) {
2249 revs->tree_blobs_in_commit_order = 1;
2250 } else if (!strcmp(arg, "--remove-empty")) {
2251 revs->remove_empty_trees = 1;
2252 } else if (!strcmp(arg, "--merges")) {
2253 revs->min_parents = 2;
2254 } else if (!strcmp(arg, "--no-merges")) {
2255 revs->max_parents = 1;
2256 } else if (skip_prefix(arg, "--min-parents=", &optarg)) {
2257 revs->min_parents = atoi(optarg);
2258 } else if (!strcmp(arg, "--no-min-parents")) {
2259 revs->min_parents = 0;
2260 } else if (skip_prefix(arg, "--max-parents=", &optarg)) {
2261 revs->max_parents = atoi(optarg);
2262 } else if (!strcmp(arg, "--no-max-parents")) {
2263 revs->max_parents = -1;
2264 } else if (!strcmp(arg, "--boundary")) {
2266 } else if (!strcmp(arg, "--left-right")) {
2267 revs->left_right = 1;
2268 } else if (!strcmp(arg, "--left-only")) {
2269 if (revs->right_only)
2270 die("--left-only is incompatible with --right-only"
2272 revs->left_only = 1;
2273 } else if (!strcmp(arg, "--right-only")) {
2274 if (revs->left_only)
2275 die("--right-only is incompatible with --left-only");
2276 revs->right_only = 1;
2277 } else if (!strcmp(arg, "--cherry")) {
2278 if (revs->left_only)
2279 die("--cherry is incompatible with --left-only");
2280 revs->cherry_mark = 1;
2281 revs->right_only = 1;
2282 revs->max_parents = 1;
2284 } else if (!strcmp(arg, "--count")) {
2286 } else if (!strcmp(arg, "--cherry-mark")) {
2287 if (revs->cherry_pick)
2288 die("--cherry-mark is incompatible with --cherry-pick");
2289 revs->cherry_mark = 1;
2290 revs->limited = 1; /* needs limit_list() */
2291 } else if (!strcmp(arg, "--cherry-pick")) {
2292 if (revs->cherry_mark)
2293 die("--cherry-pick is incompatible with --cherry-mark");
2294 revs->cherry_pick = 1;
2296 } else if (!strcmp(arg, "--objects")) {
2297 revs->tag_objects = 1;
2298 revs->tree_objects = 1;
2299 revs->blob_objects = 1;
2300 } else if (!strcmp(arg, "--objects-edge")) {
2301 revs->tag_objects = 1;
2302 revs->tree_objects = 1;
2303 revs->blob_objects = 1;
2304 revs->edge_hint = 1;
2305 } else if (!strcmp(arg, "--objects-edge-aggressive")) {
2306 revs->tag_objects = 1;
2307 revs->tree_objects = 1;
2308 revs->blob_objects = 1;
2309 revs->edge_hint = 1;
2310 revs->edge_hint_aggressive = 1;
2311 } else if (!strcmp(arg, "--verify-objects")) {
2312 revs->tag_objects = 1;
2313 revs->tree_objects = 1;
2314 revs->blob_objects = 1;
2315 revs->verify_objects = 1;
2316 } else if (!strcmp(arg, "--unpacked")) {
2318 } else if (starts_with(arg, "--unpacked=")) {
2319 die("--unpacked=<packfile> no longer supported.");
2320 } else if (!strcmp(arg, "-r")) {
2322 revs->diffopt.flags.recursive = 1;
2323 } else if (!strcmp(arg, "-t")) {
2325 revs->diffopt.flags.recursive = 1;
2326 revs->diffopt.flags.tree_in_recursive = 1;
2327 } else if (!strcmp(arg, "-m")) {
2328 revs->ignore_merges = 0;
2329 } else if (!strcmp(arg, "-c")) {
2331 revs->dense_combined_merges = 0;
2332 revs->combine_merges = 1;
2333 } else if (!strcmp(arg, "--combined-all-paths")) {
2335 revs->combined_all_paths = 1;
2336 } else if (!strcmp(arg, "--cc")) {
2338 revs->dense_combined_merges = 1;
2339 revs->combine_merges = 1;
2340 } else if (!strcmp(arg, "-v")) {
2341 revs->verbose_header = 1;
2342 } else if (!strcmp(arg, "--pretty")) {
2343 revs->verbose_header = 1;
2344 revs->pretty_given = 1;
2345 get_commit_format(NULL, revs);
2346 } else if (skip_prefix(arg, "--pretty=", &optarg) ||
2347 skip_prefix(arg, "--format=", &optarg)) {
2349 * Detached form ("--pretty X" as opposed to "--pretty=X")
2350 * not allowed, since the argument is optional.
2352 revs->verbose_header = 1;
2353 revs->pretty_given = 1;
2354 get_commit_format(optarg, revs);
2355 } else if (!strcmp(arg, "--expand-tabs")) {
2356 revs->expand_tabs_in_log = 8;
2357 } else if (!strcmp(arg, "--no-expand-tabs")) {
2358 revs->expand_tabs_in_log = 0;
2359 } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
2361 if (strtol_i(arg, 10, &val) < 0 || val < 0)
2362 die("'%s': not a non-negative integer", arg);
2363 revs->expand_tabs_in_log = val;
2364 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
2365 enable_default_display_notes(&revs->notes_opt, &revs->show_notes);
2366 revs->show_notes_given = 1;
2367 } else if (!strcmp(arg, "--show-signature")) {
2368 revs->show_signature = 1;
2369 } else if (!strcmp(arg, "--no-show-signature")) {
2370 revs->show_signature = 0;
2371 } else if (!strcmp(arg, "--show-linear-break")) {
2372 revs->break_bar = " ..........";
2373 revs->track_linear = 1;
2374 revs->track_first_time = 1;
2375 } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) {
2376 revs->break_bar = xstrdup(optarg);
2377 revs->track_linear = 1;
2378 revs->track_first_time = 1;
2379 } else if (skip_prefix(arg, "--show-notes=", &optarg) ||
2380 skip_prefix(arg, "--notes=", &optarg)) {
2381 if (starts_with(arg, "--show-notes=") &&
2382 revs->notes_opt.use_default_notes < 0)
2383 revs->notes_opt.use_default_notes = 1;
2384 enable_ref_display_notes(&revs->notes_opt, &revs->show_notes, optarg);
2385 revs->show_notes_given = 1;
2386 } else if (!strcmp(arg, "--no-notes")) {
2387 disable_display_notes(&revs->notes_opt, &revs->show_notes);
2388 revs->show_notes_given = 1;
2389 } else if (!strcmp(arg, "--standard-notes")) {
2390 revs->show_notes_given = 1;
2391 revs->notes_opt.use_default_notes = 1;
2392 } else if (!strcmp(arg, "--no-standard-notes")) {
2393 revs->notes_opt.use_default_notes = 0;
2394 } else if (!strcmp(arg, "--oneline")) {
2395 revs->verbose_header = 1;
2396 get_commit_format("oneline", revs);
2397 revs->pretty_given = 1;
2398 revs->abbrev_commit = 1;
2399 } else if (!strcmp(arg, "--graph")) {
2400 revs->topo_order = 1;
2401 revs->rewrite_parents = 1;
2402 revs->graph = graph_init(revs);
2403 } else if (!strcmp(arg, "--encode-email-headers")) {
2404 revs->encode_email_headers = 1;
2405 } else if (!strcmp(arg, "--no-encode-email-headers")) {
2406 revs->encode_email_headers = 0;
2407 } else if (!strcmp(arg, "--root")) {
2408 revs->show_root_diff = 1;
2409 } else if (!strcmp(arg, "--no-commit-id")) {
2410 revs->no_commit_id = 1;
2411 } else if (!strcmp(arg, "--always")) {
2412 revs->always_show_header = 1;
2413 } else if (!strcmp(arg, "--no-abbrev")) {
2415 } else if (!strcmp(arg, "--abbrev")) {
2416 revs->abbrev = DEFAULT_ABBREV;
2417 } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
2418 revs->abbrev = strtoul(optarg, NULL, 10);
2419 if (revs->abbrev < MINIMUM_ABBREV)
2420 revs->abbrev = MINIMUM_ABBREV;
2421 else if (revs->abbrev > hexsz)
2422 revs->abbrev = hexsz;
2423 } else if (!strcmp(arg, "--abbrev-commit")) {
2424 revs->abbrev_commit = 1;
2425 revs->abbrev_commit_given = 1;
2426 } else if (!strcmp(arg, "--no-abbrev-commit")) {
2427 revs->abbrev_commit = 0;
2428 } else if (!strcmp(arg, "--full-diff")) {
2430 revs->full_diff = 1;
2431 } else if (!strcmp(arg, "--show-pulls")) {
2432 revs->show_pulls = 1;
2433 } else if (!strcmp(arg, "--full-history")) {
2434 revs->simplify_history = 0;
2435 } else if (!strcmp(arg, "--relative-date")) {
2436 revs->date_mode.type = DATE_RELATIVE;
2437 revs->date_mode_explicit = 1;
2438 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
2439 parse_date_format(optarg, &revs->date_mode);
2440 revs->date_mode_explicit = 1;
2442 } else if (!strcmp(arg, "--log-size")) {
2443 revs->show_log_size = 1;
2446 * Grepping the commit log
2448 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2449 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2451 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2452 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2454 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2455 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2457 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2458 add_message_grep(revs, optarg);
2460 } else if (!strcmp(arg, "--grep-debug")) {
2461 revs->grep_filter.debug = 1;
2462 } else if (!strcmp(arg, "--basic-regexp")) {
2463 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
2464 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2465 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
2466 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2467 revs->grep_filter.ignore_case = 1;
2468 revs->diffopt.pickaxe_opts |= DIFF_PICKAXE_IGNORE_CASE;
2469 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2470 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
2471 } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) {
2472 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
2473 } else if (!strcmp(arg, "--all-match")) {
2474 revs->grep_filter.all_match = 1;
2475 } else if (!strcmp(arg, "--invert-grep")) {
2476 revs->invert_grep = 1;
2477 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2478 if (strcmp(optarg, "none"))
2479 git_log_output_encoding = xstrdup(optarg);
2481 git_log_output_encoding = "";
2483 } else if (!strcmp(arg, "--reverse")) {
2485 } else if (!strcmp(arg, "--children")) {
2486 revs->children.name = "children";
2488 } else if (!strcmp(arg, "--ignore-missing")) {
2489 revs->ignore_missing = 1;
2490 } else if (opt && opt->allow_exclude_promisor_objects &&
2491 !strcmp(arg, "--exclude-promisor-objects")) {
2492 if (fetch_if_missing)
2493 BUG("exclude_promisor_objects can only be used when fetch_if_missing is 0");
2494 revs->exclude_promisor_objects = 1;
2496 int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
2498 unkv[(*unkc)++] = arg;
2501 if (revs->graph && revs->track_linear)
2502 die("--show-linear-break and --graph are incompatible");
2507 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2508 const struct option *options,
2509 const char * const usagestr[])
2511 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2512 &ctx->cpidx, ctx->out, NULL);
2514 error("unknown option `%s'", ctx->argv[0]);
2515 usage_with_options(usagestr, options);
2521 static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn,
2522 void *cb_data, const char *term)
2524 struct strbuf bisect_refs = STRBUF_INIT;
2526 strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2527 status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data, 0);
2528 strbuf_release(&bisect_refs);
2532 static int for_each_bad_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
2534 return for_each_bisect_ref(refs, fn, cb_data, term_bad);
2537 static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
2539 return for_each_bisect_ref(refs, fn, cb_data, term_good);
2542 static int handle_revision_pseudo_opt(const char *submodule,
2543 struct rev_info *revs,
2544 int argc, const char **argv, int *flags)
2546 const char *arg = argv[0];
2548 struct ref_store *refs;
2553 * We need some something like get_submodule_worktrees()
2554 * before we can go through all worktrees of a submodule,
2555 * .e.g with adding all HEADs from --all, which is not
2556 * supported right now, so stick to single worktree.
2558 if (!revs->single_worktree)
2559 BUG("--single-worktree cannot be used together with submodule");
2560 refs = get_submodule_ref_store(submodule);
2562 refs = get_main_ref_store(revs->repo);
2567 * Commands like "git shortlog" will not accept the options below
2568 * unless parse_revision_opt queues them (as opposed to erroring
2571 * When implementing your new pseudo-option, remember to
2572 * register it in the list at the top of handle_revision_opt.
2574 if (!strcmp(arg, "--all")) {
2575 handle_refs(refs, revs, *flags, refs_for_each_ref);
2576 handle_refs(refs, revs, *flags, refs_head_ref);
2577 if (!revs->single_worktree) {
2578 struct all_refs_cb cb;
2580 init_all_refs_cb(&cb, revs, *flags);
2581 other_head_refs(handle_one_ref, &cb);
2583 clear_ref_exclusion(&revs->ref_excludes);
2584 } else if (!strcmp(arg, "--branches")) {
2585 handle_refs(refs, revs, *flags, refs_for_each_branch_ref);
2586 clear_ref_exclusion(&revs->ref_excludes);
2587 } else if (!strcmp(arg, "--bisect")) {
2588 read_bisect_terms(&term_bad, &term_good);
2589 handle_refs(refs, revs, *flags, for_each_bad_bisect_ref);
2590 handle_refs(refs, revs, *flags ^ (UNINTERESTING | BOTTOM),
2591 for_each_good_bisect_ref);
2593 } else if (!strcmp(arg, "--tags")) {
2594 handle_refs(refs, revs, *flags, refs_for_each_tag_ref);
2595 clear_ref_exclusion(&revs->ref_excludes);
2596 } else if (!strcmp(arg, "--remotes")) {
2597 handle_refs(refs, revs, *flags, refs_for_each_remote_ref);
2598 clear_ref_exclusion(&revs->ref_excludes);
2599 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2600 struct all_refs_cb cb;
2601 init_all_refs_cb(&cb, revs, *flags);
2602 for_each_glob_ref(handle_one_ref, optarg, &cb);
2603 clear_ref_exclusion(&revs->ref_excludes);
2605 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2606 add_ref_exclusion(&revs->ref_excludes, optarg);
2608 } else if (skip_prefix(arg, "--branches=", &optarg)) {
2609 struct all_refs_cb cb;
2610 init_all_refs_cb(&cb, revs, *flags);
2611 for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb);
2612 clear_ref_exclusion(&revs->ref_excludes);
2613 } else if (skip_prefix(arg, "--tags=", &optarg)) {
2614 struct all_refs_cb cb;
2615 init_all_refs_cb(&cb, revs, *flags);
2616 for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb);
2617 clear_ref_exclusion(&revs->ref_excludes);
2618 } else if (skip_prefix(arg, "--remotes=", &optarg)) {
2619 struct all_refs_cb cb;
2620 init_all_refs_cb(&cb, revs, *flags);
2621 for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb);
2622 clear_ref_exclusion(&revs->ref_excludes);
2623 } else if (!strcmp(arg, "--reflog")) {
2624 add_reflogs_to_pending(revs, *flags);
2625 } else if (!strcmp(arg, "--indexed-objects")) {
2626 add_index_objects_to_pending(revs, *flags);
2627 } else if (!strcmp(arg, "--alternate-refs")) {
2628 add_alternate_refs_to_pending(revs, *flags);
2629 } else if (!strcmp(arg, "--not")) {
2630 *flags ^= UNINTERESTING | BOTTOM;
2631 } else if (!strcmp(arg, "--no-walk")) {
2632 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2633 } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
2635 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2636 * not allowed, since the argument is optional.
2638 if (!strcmp(optarg, "sorted"))
2639 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2640 else if (!strcmp(optarg, "unsorted"))
2641 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2643 return error("invalid argument to --no-walk");
2644 } else if (!strcmp(arg, "--do-walk")) {
2646 } else if (!strcmp(arg, "--single-worktree")) {
2647 revs->single_worktree = 1;
2655 static void NORETURN diagnose_missing_default(const char *def)
2658 const char *refname;
2660 refname = resolve_ref_unsafe(def, 0, NULL, &flags);
2661 if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2662 die(_("your current branch appears to be broken"));
2664 skip_prefix(refname, "refs/heads/", &refname);
2665 die(_("your current branch '%s' does not have any commits yet"),
2670 * Parse revision information, filling in the "rev_info" structure,
2671 * and removing the used arguments from the argument list.
2673 * Returns the number of arguments left that weren't recognized
2674 * (which are also moved to the head of the argument list)
2676 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2678 int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt;
2679 struct argv_array prune_data = ARGV_ARRAY_INIT;
2680 const char *submodule = NULL;
2681 int seen_end_of_options = 0;
2684 submodule = opt->submodule;
2686 /* First, search for "--" */
2687 if (opt && opt->assume_dashdash) {
2691 for (i = 1; i < argc; i++) {
2692 const char *arg = argv[i];
2693 if (strcmp(arg, "--"))
2698 argv_array_pushv(&prune_data, argv + i + 1);
2704 /* Second, deal with arguments and options */
2706 revarg_opt = opt ? opt->revarg_opt : 0;
2708 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2709 for (left = i = 1; i < argc; i++) {
2710 const char *arg = argv[i];
2711 if (!seen_end_of_options && *arg == '-') {
2714 opts = handle_revision_pseudo_opt(submodule,
2715 revs, argc - i, argv + i,
2722 if (!strcmp(arg, "--stdin")) {
2723 if (revs->disable_stdin) {
2727 if (revs->read_from_stdin++)
2728 die("--stdin given twice?");
2729 read_revisions_from_stdin(revs, &prune_data);
2733 if (!strcmp(arg, "--end-of-options")) {
2734 seen_end_of_options = 1;
2738 opts = handle_revision_opt(revs, argc - i, argv + i,
2750 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2752 if (seen_dashdash || *arg == '^')
2753 die("bad revision '%s'", arg);
2755 /* If we didn't have a "--":
2756 * (1) all filenames must exist;
2757 * (2) all rev-args must not be interpretable
2758 * as a valid filename.
2759 * but the latter we have checked in the main loop.
2761 for (j = i; j < argc; j++)
2762 verify_filename(revs->prefix, argv[j], j == i);
2764 argv_array_pushv(&prune_data, argv + i);
2771 if (prune_data.argc) {
2773 * If we need to introduce the magic "a lone ':' means no
2774 * pathspec whatsoever", here is the place to do so.
2776 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2777 * prune_data.nr = 0;
2778 * prune_data.alloc = 0;
2779 * free(prune_data.path);
2780 * prune_data.path = NULL;
2782 * terminate prune_data.alloc with NULL and
2783 * call init_pathspec() to set revs->prune_data here.
2786 parse_pathspec(&revs->prune_data, 0, 0,
2787 revs->prefix, prune_data.argv);
2789 argv_array_clear(&prune_data);
2791 if (revs->def == NULL)
2792 revs->def = opt ? opt->def : NULL;
2793 if (opt && opt->tweak)
2794 opt->tweak(revs, opt);
2795 if (revs->show_merge)
2796 prepare_show_merge(revs);
2797 if (revs->def && !revs->pending.nr && !revs->rev_input_given && !got_rev_arg) {
2798 struct object_id oid;
2799 struct object *object;
2800 struct object_context oc;
2801 if (get_oid_with_context(revs->repo, revs->def, 0, &oid, &oc))
2802 diagnose_missing_default(revs->def);
2803 object = get_reference(revs, revs->def, &oid, 0);
2804 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2807 /* Did the user ask for any diff output? Run the diff! */
2808 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2811 /* Pickaxe, diff-filter and rename following need diffs */
2812 if ((revs->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
2813 revs->diffopt.filter ||
2814 revs->diffopt.flags.follow_renames)
2817 if (revs->diffopt.objfind)
2818 revs->simplify_history = 0;
2820 if (revs->line_level_traverse) {
2821 if (want_ancestry(revs))
2823 revs->topo_order = 1;
2826 if (revs->topo_order && !generation_numbers_enabled(the_repository))
2829 if (revs->prune_data.nr) {
2830 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2831 /* Can't prune commits with rename following: the paths change.. */
2832 if (!revs->diffopt.flags.follow_renames)
2834 if (!revs->full_diff)
2835 copy_pathspec(&revs->diffopt.pathspec,
2838 if (revs->combine_merges)
2839 revs->ignore_merges = 0;
2840 if (revs->combined_all_paths && !revs->combine_merges)
2841 die("--combined-all-paths makes no sense without -c or --cc");
2843 revs->diffopt.abbrev = revs->abbrev;
2845 diff_setup_done(&revs->diffopt);
2847 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2848 &revs->grep_filter);
2849 if (!is_encoding_utf8(get_log_output_encoding()))
2850 revs->grep_filter.ignore_locale = 1;
2851 compile_grep_patterns(&revs->grep_filter);
2853 if (revs->reverse && revs->reflog_info)
2854 die("cannot combine --reverse with --walk-reflogs");
2855 if (revs->reflog_info && revs->limited)
2856 die("cannot combine --walk-reflogs with history-limiting options");
2857 if (revs->rewrite_parents && revs->children.name)
2858 die("cannot combine --parents and --children");
2861 * Limitations on the graph functionality
2863 if (revs->reverse && revs->graph)
2864 die("cannot combine --reverse with --graph");
2866 if (revs->reflog_info && revs->graph)
2867 die("cannot combine --walk-reflogs with --graph");
2868 if (revs->no_walk && revs->graph)
2869 die("cannot combine --no-walk with --graph");
2870 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2871 die("cannot use --grep-reflog without --walk-reflogs");
2873 if (revs->first_parent_only && revs->bisect)
2874 die(_("--first-parent is incompatible with --bisect"));
2876 if (revs->line_level_traverse &&
2877 (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT)))
2878 die(_("-L does not yet support diff formats besides -p and -s"));
2880 if (revs->expand_tabs_in_log < 0)
2881 revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2886 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2888 struct commit_list *l = xcalloc(1, sizeof(*l));
2891 l->next = add_decoration(&revs->children, &parent->object, l);
2894 static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2896 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2897 struct commit_list **pp, *p;
2898 int surviving_parents;
2900 /* Examine existing parents while marking ones we have seen... */
2901 pp = &commit->parents;
2902 surviving_parents = 0;
2903 while ((p = *pp) != NULL) {
2904 struct commit *parent = p->item;
2905 if (parent->object.flags & TMP_MARK) {
2908 compact_treesame(revs, commit, surviving_parents);
2911 parent->object.flags |= TMP_MARK;
2912 surviving_parents++;
2915 /* clear the temporary mark */
2916 for (p = commit->parents; p; p = p->next) {
2917 p->item->object.flags &= ~TMP_MARK;
2919 /* no update_treesame() - removing duplicates can't affect TREESAME */
2920 return surviving_parents;
2923 struct merge_simplify_state {
2924 struct commit *simplified;
2927 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2929 struct merge_simplify_state *st;
2931 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2933 st = xcalloc(1, sizeof(*st));
2934 add_decoration(&revs->merge_simplification, &commit->object, st);
2939 static int mark_redundant_parents(struct commit *commit)
2941 struct commit_list *h = reduce_heads(commit->parents);
2942 int i = 0, marked = 0;
2943 struct commit_list *po, *pn;
2945 /* Want these for sanity-checking only */
2946 int orig_cnt = commit_list_count(commit->parents);
2947 int cnt = commit_list_count(h);
2950 * Not ready to remove items yet, just mark them for now, based
2951 * on the output of reduce_heads(). reduce_heads outputs the reduced
2952 * set in its original order, so this isn't too hard.
2954 po = commit->parents;
2957 if (pn && po->item == pn->item) {
2961 po->item->object.flags |= TMP_MARK;
2967 if (i != cnt || cnt+marked != orig_cnt)
2968 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2970 free_commit_list(h);
2975 static int mark_treesame_root_parents(struct commit *commit)
2977 struct commit_list *p;
2980 for (p = commit->parents; p; p = p->next) {
2981 struct commit *parent = p->item;
2982 if (!parent->parents && (parent->object.flags & TREESAME)) {
2983 parent->object.flags |= TMP_MARK;
2992 * Awkward naming - this means one parent we are TREESAME to.
2993 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2994 * empty tree). Better name suggestions?
2996 static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2998 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2999 struct commit *unmarked = NULL, *marked = NULL;
3000 struct commit_list *p;
3003 for (p = commit->parents, n = 0; p; p = p->next, n++) {
3004 if (ts->treesame[n]) {
3005 if (p->item->object.flags & TMP_MARK) {
3018 * If we are TREESAME to a marked-for-deletion parent, but not to any
3019 * unmarked parents, unmark the first TREESAME parent. This is the
3020 * parent that the default simplify_history==1 scan would have followed,
3021 * and it doesn't make sense to omit that path when asking for a
3022 * simplified full history. Retaining it improves the chances of
3023 * understanding odd missed merges that took an old version of a file.
3027 * I--------*X A modified the file, but mainline merge X used
3028 * \ / "-s ours", so took the version from I. X is
3029 * `-*A--' TREESAME to I and !TREESAME to A.
3031 * Default log from X would produce "I". Without this check,
3032 * --full-history --simplify-merges would produce "I-A-X", showing
3033 * the merge commit X and that it changed A, but not making clear that
3034 * it had just taken the I version. With this check, the topology above
3037 * Note that it is possible that the simplification chooses a different
3038 * TREESAME parent from the default, in which case this test doesn't
3039 * activate, and we _do_ drop the default parent. Example:
3041 * I------X A modified the file, but it was reverted in B,
3042 * \ / meaning mainline merge X is TREESAME to both
3045 * Default log would produce "I" by following the first parent;
3046 * --full-history --simplify-merges will produce "I-A-B". But this is a
3047 * reasonable result - it presents a logical full history leading from
3048 * I to X, and X is not an important merge.
3050 if (!unmarked && marked) {
3051 marked->object.flags &= ~TMP_MARK;
3058 static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
3060 struct commit_list **pp, *p;
3061 int nth_parent, removed = 0;
3063 pp = &commit->parents;
3065 while ((p = *pp) != NULL) {
3066 struct commit *parent = p->item;
3067 if (parent->object.flags & TMP_MARK) {
3068 parent->object.flags &= ~TMP_MARK;
3072 compact_treesame(revs, commit, nth_parent);
3079 /* Removing parents can only increase TREESAMEness */
3080 if (removed && !(commit->object.flags & TREESAME))
3081 update_treesame(revs, commit);
3086 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
3088 struct commit_list *p;
3089 struct commit *parent;
3090 struct merge_simplify_state *st, *pst;
3093 st = locate_simplify_state(revs, commit);
3096 * Have we handled this one?
3102 * An UNINTERESTING commit simplifies to itself, so does a
3103 * root commit. We do not rewrite parents of such commit
3106 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
3107 st->simplified = commit;
3112 * Do we know what commit all of our parents that matter
3113 * should be rewritten to? Otherwise we are not ready to
3114 * rewrite this one yet.
3116 for (cnt = 0, p = commit->parents; p; p = p->next) {
3117 pst = locate_simplify_state(revs, p->item);
3118 if (!pst->simplified) {
3119 tail = &commit_list_insert(p->item, tail)->next;
3122 if (revs->first_parent_only)
3126 tail = &commit_list_insert(commit, tail)->next;
3131 * Rewrite our list of parents. Note that this cannot
3132 * affect our TREESAME flags in any way - a commit is
3133 * always TREESAME to its simplification.
3135 for (p = commit->parents; p; p = p->next) {
3136 pst = locate_simplify_state(revs, p->item);
3137 p->item = pst->simplified;
3138 if (revs->first_parent_only)
3142 if (revs->first_parent_only)
3145 cnt = remove_duplicate_parents(revs, commit);
3148 * It is possible that we are a merge and one side branch
3149 * does not have any commit that touches the given paths;
3150 * in such a case, the immediate parent from that branch
3151 * will be rewritten to be the merge base.
3153 * o----X X: the commit we are looking at;
3154 * / / o: a commit that touches the paths;
3157 * Further, a merge of an independent branch that doesn't
3158 * touch the path will reduce to a treesame root parent:
3160 * ----o----X X: the commit we are looking at;
3161 * / o: a commit that touches the paths;
3162 * r r: a root commit not touching the paths
3164 * Detect and simplify both cases.
3167 int marked = mark_redundant_parents(commit);
3168 marked += mark_treesame_root_parents(commit);
3170 marked -= leave_one_treesame_to_parent(revs, commit);
3172 cnt = remove_marked_parents(revs, commit);
3176 * A commit simplifies to itself if it is a root, if it is
3177 * UNINTERESTING, if it touches the given paths, or if it is a
3178 * merge and its parents don't simplify to one relevant commit
3179 * (the first two cases are already handled at the beginning of
3182 * Otherwise, it simplifies to what its sole relevant parent
3186 (commit->object.flags & UNINTERESTING) ||
3187 !(commit->object.flags & TREESAME) ||
3188 (parent = one_relevant_parent(revs, commit->parents)) == NULL ||
3189 (revs->show_pulls && (commit->object.flags & PULL_MERGE)))
3190 st->simplified = commit;
3192 pst = locate_simplify_state(revs, parent);
3193 st->simplified = pst->simplified;
3198 static void simplify_merges(struct rev_info *revs)
3200 struct commit_list *list, *next;
3201 struct commit_list *yet_to_do, **tail;
3202 struct commit *commit;
3207 /* feed the list reversed */
3209 for (list = revs->commits; list; list = next) {
3210 commit = list->item;
3213 * Do not free(list) here yet; the original list
3214 * is used later in this function.
3216 commit_list_insert(commit, &yet_to_do);
3223 commit = pop_commit(&list);
3224 tail = simplify_one(revs, commit, tail);
3228 /* clean up the result, removing the simplified ones */
3229 list = revs->commits;
3230 revs->commits = NULL;
3231 tail = &revs->commits;
3233 struct merge_simplify_state *st;
3235 commit = pop_commit(&list);
3236 st = locate_simplify_state(revs, commit);
3237 if (st->simplified == commit)
3238 tail = &commit_list_insert(commit, tail)->next;
3242 static void set_children(struct rev_info *revs)
3244 struct commit_list *l;
3245 for (l = revs->commits; l; l = l->next) {
3246 struct commit *commit = l->item;
3247 struct commit_list *p;
3249 for (p = commit->parents; p; p = p->next)
3250 add_child(revs, p->item, commit);
3254 void reset_revision_walk(void)
3256 clear_object_flags(SEEN | ADDED | SHOWN | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE);
3259 static int mark_uninteresting(const struct object_id *oid,
3260 struct packed_git *pack,
3264 struct rev_info *revs = cb;
3265 struct object *o = parse_object(revs->repo, oid);
3266 o->flags |= UNINTERESTING | SEEN;
3270 define_commit_slab(indegree_slab, int);
3271 define_commit_slab(author_date_slab, timestamp_t);
3273 struct topo_walk_info {
3274 uint32_t min_generation;
3275 struct prio_queue explore_queue;
3276 struct prio_queue indegree_queue;
3277 struct prio_queue topo_queue;
3278 struct indegree_slab indegree;
3279 struct author_date_slab author_date;
3282 static inline void test_flag_and_insert(struct prio_queue *q, struct commit *c, int flag)
3284 if (c->object.flags & flag)
3287 c->object.flags |= flag;
3288 prio_queue_put(q, c);
3291 static void explore_walk_step(struct rev_info *revs)
3293 struct topo_walk_info *info = revs->topo_walk_info;
3294 struct commit_list *p;
3295 struct commit *c = prio_queue_get(&info->explore_queue);
3300 if (parse_commit_gently(c, 1) < 0)
3303 if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
3304 record_author_date(&info->author_date, c);
3306 if (revs->max_age != -1 && (c->date < revs->max_age))
3307 c->object.flags |= UNINTERESTING;
3309 if (process_parents(revs, c, NULL, NULL) < 0)
3312 if (c->object.flags & UNINTERESTING)
3313 mark_parents_uninteresting(c);
3315 for (p = c->parents; p; p = p->next)
3316 test_flag_and_insert(&info->explore_queue, p->item, TOPO_WALK_EXPLORED);
3319 static void explore_to_depth(struct rev_info *revs,
3320 uint32_t gen_cutoff)
3322 struct topo_walk_info *info = revs->topo_walk_info;
3324 while ((c = prio_queue_peek(&info->explore_queue)) &&
3325 commit_graph_generation(c) >= gen_cutoff)
3326 explore_walk_step(revs);
3329 static void indegree_walk_step(struct rev_info *revs)
3331 struct commit_list *p;
3332 struct topo_walk_info *info = revs->topo_walk_info;
3333 struct commit *c = prio_queue_get(&info->indegree_queue);
3338 if (parse_commit_gently(c, 1) < 0)
3341 explore_to_depth(revs, commit_graph_generation(c));
3343 for (p = c->parents; p; p = p->next) {
3344 struct commit *parent = p->item;
3345 int *pi = indegree_slab_at(&info->indegree, parent);
3352 test_flag_and_insert(&info->indegree_queue, parent, TOPO_WALK_INDEGREE);
3354 if (revs->first_parent_only)
3359 static void compute_indegrees_to_depth(struct rev_info *revs,
3360 uint32_t gen_cutoff)
3362 struct topo_walk_info *info = revs->topo_walk_info;
3364 while ((c = prio_queue_peek(&info->indegree_queue)) &&
3365 commit_graph_generation(c) >= gen_cutoff)
3366 indegree_walk_step(revs);
3369 static void reset_topo_walk(struct rev_info *revs)
3371 struct topo_walk_info *info = revs->topo_walk_info;
3373 clear_prio_queue(&info->explore_queue);
3374 clear_prio_queue(&info->indegree_queue);
3375 clear_prio_queue(&info->topo_queue);
3376 clear_indegree_slab(&info->indegree);
3377 clear_author_date_slab(&info->author_date);
3379 FREE_AND_NULL(revs->topo_walk_info);
3382 static void init_topo_walk(struct rev_info *revs)
3384 struct topo_walk_info *info;
3385 struct commit_list *list;
3386 if (revs->topo_walk_info)
3387 reset_topo_walk(revs);
3389 revs->topo_walk_info = xmalloc(sizeof(struct topo_walk_info));
3390 info = revs->topo_walk_info;
3391 memset(info, 0, sizeof(struct topo_walk_info));
3393 init_indegree_slab(&info->indegree);
3394 memset(&info->explore_queue, 0, sizeof(info->explore_queue));
3395 memset(&info->indegree_queue, 0, sizeof(info->indegree_queue));
3396 memset(&info->topo_queue, 0, sizeof(info->topo_queue));
3398 switch (revs->sort_order) {
3399 default: /* REV_SORT_IN_GRAPH_ORDER */
3400 info->topo_queue.compare = NULL;
3402 case REV_SORT_BY_COMMIT_DATE:
3403 info->topo_queue.compare = compare_commits_by_commit_date;
3405 case REV_SORT_BY_AUTHOR_DATE:
3406 init_author_date_slab(&info->author_date);
3407 info->topo_queue.compare = compare_commits_by_author_date;
3408 info->topo_queue.cb_data = &info->author_date;
3412 info->explore_queue.compare = compare_commits_by_gen_then_commit_date;
3413 info->indegree_queue.compare = compare_commits_by_gen_then_commit_date;
3415 info->min_generation = GENERATION_NUMBER_INFINITY;
3416 for (list = revs->commits; list; list = list->next) {
3417 struct commit *c = list->item;
3418 uint32_t generation;
3420 if (parse_commit_gently(c, 1))
3423 test_flag_and_insert(&info->explore_queue, c, TOPO_WALK_EXPLORED);
3424 test_flag_and_insert(&info->indegree_queue, c, TOPO_WALK_INDEGREE);
3426 generation = commit_graph_generation(c);
3427 if (generation < info->min_generation)
3428 info->min_generation = generation;
3430 *(indegree_slab_at(&info->indegree, c)) = 1;
3432 if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
3433 record_author_date(&info->author_date, c);
3435 compute_indegrees_to_depth(revs, info->min_generation);
3437 for (list = revs->commits; list; list = list->next) {
3438 struct commit *c = list->item;
3440 if (*(indegree_slab_at(&info->indegree, c)) == 1)
3441 prio_queue_put(&info->topo_queue, c);
3445 * This is unfortunate; the initial tips need to be shown
3446 * in the order given from the revision traversal machinery.
3448 if (revs->sort_order == REV_SORT_IN_GRAPH_ORDER)
3449 prio_queue_reverse(&info->topo_queue);
3452 static struct commit *next_topo_commit(struct rev_info *revs)
3455 struct topo_walk_info *info = revs->topo_walk_info;
3457 /* pop next off of topo_queue */
3458 c = prio_queue_get(&info->topo_queue);
3461 *(indegree_slab_at(&info->indegree, c)) = 0;
3466 static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
3468 struct commit_list *p;
3469 struct topo_walk_info *info = revs->topo_walk_info;
3470 if (process_parents(revs, commit, NULL, NULL) < 0) {
3471 if (!revs->ignore_missing_links)
3472 die("Failed to traverse parents of commit %s",
3473 oid_to_hex(&commit->object.oid));
3476 for (p = commit->parents; p; p = p->next) {
3477 struct commit *parent = p->item;
3479 uint32_t generation;
3481 if (parent->object.flags & UNINTERESTING)
3484 if (parse_commit_gently(parent, 1) < 0)
3487 generation = commit_graph_generation(parent);
3488 if (generation < info->min_generation) {
3489 info->min_generation = generation;
3490 compute_indegrees_to_depth(revs, info->min_generation);
3493 pi = indegree_slab_at(&info->indegree, parent);
3497 prio_queue_put(&info->topo_queue, parent);
3499 if (revs->first_parent_only)
3504 int prepare_revision_walk(struct rev_info *revs)
3507 struct object_array old_pending;
3508 struct commit_list **next = &revs->commits;
3510 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
3511 revs->pending.nr = 0;
3512 revs->pending.alloc = 0;
3513 revs->pending.objects = NULL;
3514 for (i = 0; i < old_pending.nr; i++) {
3515 struct object_array_entry *e = old_pending.objects + i;
3516 struct commit *commit = handle_commit(revs, e);
3518 if (!(commit->object.flags & SEEN)) {
3519 commit->object.flags |= SEEN;
3520 next = commit_list_append(commit, next);
3524 object_array_clear(&old_pending);
3526 /* Signal whether we need per-parent treesame decoration */
3527 if (revs->simplify_merges ||
3528 (revs->limited && limiting_can_increase_treesame(revs)))
3529 revs->treesame.name = "treesame";
3531 if (revs->exclude_promisor_objects) {
3532 for_each_packed_object(mark_uninteresting, revs,
3533 FOR_EACH_OBJECT_PROMISOR_ONLY);
3536 if (!revs->reflog_info)
3537 prepare_to_use_bloom_filter(revs);
3538 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
3539 commit_list_sort_by_date(&revs->commits);
3542 if (revs->limited) {
3543 if (limit_list(revs) < 0)
3545 if (revs->topo_order)
3546 sort_in_topological_order(&revs->commits, revs->sort_order);
3547 } else if (revs->topo_order)
3548 init_topo_walk(revs);
3549 if (revs->line_level_traverse && want_ancestry(revs))
3551 * At the moment we can only do line-level log with parent
3552 * rewriting by performing this expensive pre-filtering step.
3553 * If parent rewriting is not requested, then we rather
3554 * perform the line-level log filtering during the regular
3555 * history traversal.
3557 line_log_filter(revs);
3558 if (revs->simplify_merges)
3559 simplify_merges(revs);
3560 if (revs->children.name)
3566 static enum rewrite_result rewrite_one_1(struct rev_info *revs,
3568 struct prio_queue *queue)
3571 struct commit *p = *pp;
3573 if (process_parents(revs, p, NULL, queue) < 0)
3574 return rewrite_one_error;
3575 if (p->object.flags & UNINTERESTING)
3576 return rewrite_one_ok;
3577 if (!(p->object.flags & TREESAME))
3578 return rewrite_one_ok;
3580 return rewrite_one_noparents;
3581 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
3582 return rewrite_one_ok;
3587 static void merge_queue_into_list(struct prio_queue *q, struct commit_list **list)
3590 struct commit *item = prio_queue_peek(q);
3591 struct commit_list *p = *list;
3593 if (p && p->item->date >= item->date)
3596 p = commit_list_insert(item, list);
3597 list = &p->next; /* skip newly added item */
3598 prio_queue_get(q); /* pop item */
3603 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
3605 struct prio_queue queue = { compare_commits_by_commit_date };
3606 enum rewrite_result ret = rewrite_one_1(revs, pp, &queue);
3607 merge_queue_into_list(&queue, &revs->commits);
3608 clear_prio_queue(&queue);
3612 int rewrite_parents(struct rev_info *revs, struct commit *commit,
3613 rewrite_parent_fn_t rewrite_parent)
3615 struct commit_list **pp = &commit->parents;
3617 struct commit_list *parent = *pp;
3618 switch (rewrite_parent(revs, &parent->item)) {
3619 case rewrite_one_ok:
3621 case rewrite_one_noparents:
3624 case rewrite_one_error:
3629 remove_duplicate_parents(revs, commit);
3633 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
3635 char *person, *endp;
3636 size_t len, namelen, maillen;
3639 struct ident_split ident;
3641 person = strstr(buf->buf, what);
3645 person += strlen(what);
3646 endp = strchr(person, '\n');
3650 len = endp - person;
3652 if (split_ident_line(&ident, person, len))
3655 mail = ident.mail_begin;
3656 maillen = ident.mail_end - ident.mail_begin;
3657 name = ident.name_begin;
3658 namelen = ident.name_end - ident.name_begin;
3660 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
3661 struct strbuf namemail = STRBUF_INIT;
3663 strbuf_addf(&namemail, "%.*s <%.*s>",
3664 (int)namelen, name, (int)maillen, mail);
3666 strbuf_splice(buf, ident.name_begin - buf->buf,
3667 ident.mail_end - ident.name_begin + 1,
3668 namemail.buf, namemail.len);
3670 strbuf_release(&namemail);
3678 static int commit_match(struct commit *commit, struct rev_info *opt)
3681 const char *encoding;
3682 const char *message;
3683 struct strbuf buf = STRBUF_INIT;
3685 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
3688 /* Prepend "fake" headers as needed */
3689 if (opt->grep_filter.use_reflog_filter) {
3690 strbuf_addstr(&buf, "reflog ");
3691 get_reflog_message(&buf, opt->reflog_info);
3692 strbuf_addch(&buf, '\n');
3696 * We grep in the user's output encoding, under the assumption that it
3697 * is the encoding they are most likely to write their grep pattern
3698 * for. In addition, it means we will match the "notes" encoding below,
3699 * so we will not end up with a buffer that has two different encodings
3702 encoding = get_log_output_encoding();
3703 message = logmsg_reencode(commit, NULL, encoding);
3705 /* Copy the commit to temporary if we are using "fake" headers */
3707 strbuf_addstr(&buf, message);
3709 if (opt->grep_filter.header_list && opt->mailmap) {
3711 strbuf_addstr(&buf, message);
3713 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
3714 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
3717 /* Append "fake" message parts as needed */
3718 if (opt->show_notes) {
3720 strbuf_addstr(&buf, message);
3721 format_display_notes(&commit->object.oid, &buf, encoding, 1);
3725 * Find either in the original commit message, or in the temporary.
3726 * Note that we cast away the constness of "message" here. It is
3727 * const because it may come from the cached commit buffer. That's OK,
3728 * because we know that it is modifiable heap memory, and that while
3729 * grep_buffer may modify it for speed, it will restore any
3730 * changes before returning.
3733 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
3735 retval = grep_buffer(&opt->grep_filter,
3736 (char *)message, strlen(message));
3737 strbuf_release(&buf);
3738 unuse_commit_buffer(commit, message);
3739 return opt->invert_grep ? !retval : retval;
3742 static inline int want_ancestry(const struct rev_info *revs)
3744 return (revs->rewrite_parents || revs->children.name);
3748 * Return a timestamp to be used for --since/--until comparisons for this
3749 * commit, based on the revision options.
3751 static timestamp_t comparison_date(const struct rev_info *revs,
3752 struct commit *commit)
3754 return revs->reflog_info ?
3755 get_reflog_timestamp(revs->reflog_info) :
3759 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
3761 if (commit->object.flags & SHOWN)
3762 return commit_ignore;
3763 if (revs->unpacked && has_object_pack(&commit->object.oid))
3764 return commit_ignore;
3765 if (commit->object.flags & UNINTERESTING)
3766 return commit_ignore;
3767 if (revs->line_level_traverse && !want_ancestry(revs)) {
3769 * In case of line-level log with parent rewriting
3770 * prepare_revision_walk() already took care of all line-level
3771 * log filtering, and there is nothing left to do here.
3773 * If parent rewriting was not requested, then this is the
3774 * place to perform the line-level log filtering. Notably,
3775 * this check, though expensive, must come before the other,
3776 * cheaper filtering conditions, because the tracked line
3777 * ranges must be adjusted even when the commit will end up
3778 * being ignored based on other conditions.
3780 if (!line_log_process_ranges_arbitrary_commit(revs, commit))
3781 return commit_ignore;
3783 if (revs->min_age != -1 &&
3784 comparison_date(revs, commit) > revs->min_age)
3785 return commit_ignore;
3786 if (revs->min_parents || (revs->max_parents >= 0)) {
3787 int n = commit_list_count(commit->parents);
3788 if ((n < revs->min_parents) ||
3789 ((revs->max_parents >= 0) && (n > revs->max_parents)))
3790 return commit_ignore;
3792 if (!commit_match(commit, revs))
3793 return commit_ignore;
3794 if (revs->prune && revs->dense) {
3795 /* Commit without changes? */
3796 if (commit->object.flags & TREESAME) {
3798 struct commit_list *p;
3799 /* drop merges unless we want parenthood */
3800 if (!want_ancestry(revs))
3801 return commit_ignore;
3803 if (revs->show_pulls && (commit->object.flags & PULL_MERGE))
3807 * If we want ancestry, then need to keep any merges
3808 * between relevant commits to tie together topology.
3809 * For consistency with TREESAME and simplification
3810 * use "relevant" here rather than just INTERESTING,
3811 * to treat bottom commit(s) as part of the topology.
3813 for (n = 0, p = commit->parents; p; p = p->next)
3814 if (relevant_commit(p->item))
3817 return commit_ignore;
3823 define_commit_slab(saved_parents, struct commit_list *);
3825 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3828 * You may only call save_parents() once per commit (this is checked
3829 * for non-root commits).
3831 static void save_parents(struct rev_info *revs, struct commit *commit)
3833 struct commit_list **pp;
3835 if (!revs->saved_parents_slab) {
3836 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3837 init_saved_parents(revs->saved_parents_slab);
3840 pp = saved_parents_at(revs->saved_parents_slab, commit);
3843 * When walking with reflogs, we may visit the same commit
3844 * several times: once for each appearance in the reflog.
3846 * In this case, save_parents() will be called multiple times.
3847 * We want to keep only the first set of parents. We need to
3848 * store a sentinel value for an empty (i.e., NULL) parent
3849 * list to distinguish it from a not-yet-saved list, however.
3853 if (commit->parents)
3854 *pp = copy_commit_list(commit->parents);
3856 *pp = EMPTY_PARENT_LIST;
3859 static void free_saved_parents(struct rev_info *revs)
3861 if (revs->saved_parents_slab)
3862 clear_saved_parents(revs->saved_parents_slab);
3865 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3867 struct commit_list *parents;
3869 if (!revs->saved_parents_slab)
3870 return commit->parents;
3872 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3873 if (parents == EMPTY_PARENT_LIST)
3878 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3880 enum commit_action action = get_commit_action(revs, commit);
3882 if (action == commit_show &&
3883 revs->prune && revs->dense && want_ancestry(revs)) {
3885 * --full-diff on simplified parents is no good: it
3886 * will show spurious changes from the commits that
3887 * were elided. So we save the parents on the side
3888 * when --full-diff is in effect.
3890 if (revs->full_diff)
3891 save_parents(revs, commit);
3892 if (rewrite_parents(revs, commit, rewrite_one) < 0)
3893 return commit_error;
3898 static void track_linear(struct rev_info *revs, struct commit *commit)
3900 if (revs->track_first_time) {
3902 revs->track_first_time = 0;
3904 struct commit_list *p;
3905 for (p = revs->previous_parents; p; p = p->next)
3906 if (p->item == NULL || /* first commit */
3907 oideq(&p->item->object.oid, &commit->object.oid))
3909 revs->linear = p != NULL;
3911 if (revs->reverse) {
3913 commit->object.flags |= TRACK_LINEAR;
3915 free_commit_list(revs->previous_parents);
3916 revs->previous_parents = copy_commit_list(commit->parents);
3919 static struct commit *get_revision_1(struct rev_info *revs)
3922 struct commit *commit;
3924 if (revs->reflog_info)
3925 commit = next_reflog_entry(revs->reflog_info);
3926 else if (revs->topo_walk_info)
3927 commit = next_topo_commit(revs);
3929 commit = pop_commit(&revs->commits);
3934 if (revs->reflog_info)
3935 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3938 * If we haven't done the list limiting, we need to look at
3939 * the parents here. We also need to do the date-based limiting
3940 * that we'd otherwise have done in limit_list().
3942 if (!revs->limited) {
3943 if (revs->max_age != -1 &&
3944 comparison_date(revs, commit) < revs->max_age)
3947 if (revs->reflog_info)
3948 try_to_simplify_commit(revs, commit);
3949 else if (revs->topo_walk_info)
3950 expand_topo_walk(revs, commit);
3951 else if (process_parents(revs, commit, &revs->commits, NULL) < 0) {
3952 if (!revs->ignore_missing_links)
3953 die("Failed to traverse parents of commit %s",
3954 oid_to_hex(&commit->object.oid));
3958 switch (simplify_commit(revs, commit)) {
3962 die("Failed to simplify parents of commit %s",
3963 oid_to_hex(&commit->object.oid));
3965 if (revs->track_linear)
3966 track_linear(revs, commit);
3973 * Return true for entries that have not yet been shown. (This is an
3974 * object_array_each_func_t.)
3976 static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3978 return !(entry->item->flags & SHOWN);
3982 * If array is on the verge of a realloc, garbage-collect any entries
3983 * that have already been shown to try to free up some space.
3985 static void gc_boundary(struct object_array *array)
3987 if (array->nr == array->alloc)
3988 object_array_filter(array, entry_unshown, NULL);
3991 static void create_boundary_commit_list(struct rev_info *revs)
3995 struct object_array *array = &revs->boundary_commits;
3996 struct object_array_entry *objects = array->objects;
3999 * If revs->commits is non-NULL at this point, an error occurred in
4000 * get_revision_1(). Ignore the error and continue printing the
4001 * boundary commits anyway. (This is what the code has always
4004 if (revs->commits) {
4005 free_commit_list(revs->commits);
4006 revs->commits = NULL;
4010 * Put all of the actual boundary commits from revs->boundary_commits
4011 * into revs->commits
4013 for (i = 0; i < array->nr; i++) {
4014 c = (struct commit *)(objects[i].item);
4017 if (!(c->object.flags & CHILD_SHOWN))
4019 if (c->object.flags & (SHOWN | BOUNDARY))
4021 c->object.flags |= BOUNDARY;
4022 commit_list_insert(c, &revs->commits);
4026 * If revs->topo_order is set, sort the boundary commits
4027 * in topological order
4029 sort_in_topological_order(&revs->commits, revs->sort_order);
4032 static struct commit *get_revision_internal(struct rev_info *revs)
4034 struct commit *c = NULL;
4035 struct commit_list *l;
4037 if (revs->boundary == 2) {
4039 * All of the normal commits have already been returned,
4040 * and we are now returning boundary commits.
4041 * create_boundary_commit_list() has populated
4042 * revs->commits with the remaining commits to return.
4044 c = pop_commit(&revs->commits);
4046 c->object.flags |= SHOWN;
4051 * If our max_count counter has reached zero, then we are done. We
4052 * don't simply return NULL because we still might need to show
4053 * boundary commits. But we want to avoid calling get_revision_1, which
4054 * might do a considerable amount of work finding the next commit only
4055 * for us to throw it away.
4057 * If it is non-zero, then either we don't have a max_count at all
4058 * (-1), or it is still counting, in which case we decrement.
4060 if (revs->max_count) {
4061 c = get_revision_1(revs);
4063 while (revs->skip_count > 0) {
4065 c = get_revision_1(revs);
4071 if (revs->max_count > 0)
4076 c->object.flags |= SHOWN;
4078 if (!revs->boundary)
4083 * get_revision_1() runs out the commits, and
4084 * we are done computing the boundaries.
4085 * switch to boundary commits output mode.
4090 * Update revs->commits to contain the list of
4093 create_boundary_commit_list(revs);
4095 return get_revision_internal(revs);
4099 * boundary commits are the commits that are parents of the
4100 * ones we got from get_revision_1() but they themselves are
4101 * not returned from get_revision_1(). Before returning
4102 * 'c', we need to mark its parents that they could be boundaries.
4105 for (l = c->parents; l; l = l->next) {
4107 p = &(l->item->object);
4108 if (p->flags & (CHILD_SHOWN | SHOWN))
4110 p->flags |= CHILD_SHOWN;
4111 gc_boundary(&revs->boundary_commits);
4112 add_object_array(p, NULL, &revs->boundary_commits);
4118 struct commit *get_revision(struct rev_info *revs)
4121 struct commit_list *reversed;
4123 if (revs->reverse) {
4125 while ((c = get_revision_internal(revs)))
4126 commit_list_insert(c, &reversed);
4127 revs->commits = reversed;
4129 revs->reverse_output_stage = 1;
4132 if (revs->reverse_output_stage) {
4133 c = pop_commit(&revs->commits);
4134 if (revs->track_linear)
4135 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
4139 c = get_revision_internal(revs);
4140 if (c && revs->graph)
4141 graph_update(revs->graph, c);
4143 free_saved_parents(revs);
4144 if (revs->previous_parents) {
4145 free_commit_list(revs->previous_parents);
4146 revs->previous_parents = NULL;
4152 const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
4154 if (commit->object.flags & BOUNDARY)
4156 else if (commit->object.flags & UNINTERESTING)
4158 else if (commit->object.flags & PATCHSAME)
4160 else if (!revs || revs->left_right) {
4161 if (commit->object.flags & SYMMETRIC_LEFT)
4165 } else if (revs->graph)
4167 else if (revs->cherry_mark)
4172 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
4174 const char *mark = get_revision_mark(revs, commit);
4177 fputs(mark, stdout);