Merge tag 'l10n-2.35.0-rnd2' of git://github.com/git-l10n/git-po
[git/debian.git] / revision.c
blobad4286fbdde521c3eebc048577bc61a341c9e6ee
1 #include "cache.h"
2 #include "object-store.h"
3 #include "tag.h"
4 #include "blob.h"
5 #include "tree.h"
6 #include "commit.h"
7 #include "diff.h"
8 #include "diff-merges.h"
9 #include "refs.h"
10 #include "revision.h"
11 #include "repository.h"
12 #include "graph.h"
13 #include "grep.h"
14 #include "reflog-walk.h"
15 #include "patch-ids.h"
16 #include "decorate.h"
17 #include "log-tree.h"
18 #include "string-list.h"
19 #include "line-log.h"
20 #include "mailmap.h"
21 #include "commit-slab.h"
22 #include "dir.h"
23 #include "cache-tree.h"
24 #include "bisect.h"
25 #include "packfile.h"
26 #include "worktree.h"
27 #include "strvec.h"
28 #include "commit-reach.h"
29 #include "commit-graph.h"
30 #include "prio-queue.h"
31 #include "hashmap.h"
32 #include "utf8.h"
33 #include "bloom.h"
34 #include "json-writer.h"
36 volatile show_early_output_fn_t show_early_output;
38 static const char *term_bad;
39 static const char *term_good;
41 implement_shared_commit_slab(revision_sources, char *);
43 static inline int want_ancestry(const struct rev_info *revs);
45 void show_object_with_name(FILE *out, struct object *obj, const char *name)
47 fprintf(out, "%s ", oid_to_hex(&obj->oid));
49 * This "for (const char *p = ..." is made as a first step towards
50 * making use of such declarations elsewhere in our codebase. If
51 * it causes compilation problems on your platform, please report
52 * it to the Git mailing list at git@vger.kernel.org. In the meantime,
53 * adding -std=gnu99 to CFLAGS may help if you are with older GCC.
55 for (const char *p = name; *p && *p != '\n'; p++)
56 fputc(*p, out);
57 fputc('\n', out);
60 static void mark_blob_uninteresting(struct blob *blob)
62 if (!blob)
63 return;
64 if (blob->object.flags & UNINTERESTING)
65 return;
66 blob->object.flags |= UNINTERESTING;
69 static void mark_tree_contents_uninteresting(struct repository *r,
70 struct tree *tree)
72 struct tree_desc desc;
73 struct name_entry entry;
75 if (parse_tree_gently(tree, 1) < 0)
76 return;
78 init_tree_desc(&desc, tree->buffer, tree->size);
79 while (tree_entry(&desc, &entry)) {
80 switch (object_type(entry.mode)) {
81 case OBJ_TREE:
82 mark_tree_uninteresting(r, lookup_tree(r, &entry.oid));
83 break;
84 case OBJ_BLOB:
85 mark_blob_uninteresting(lookup_blob(r, &entry.oid));
86 break;
87 default:
88 /* Subproject commit - not in this repository */
89 break;
94 * We don't care about the tree any more
95 * after it has been marked uninteresting.
97 free_tree_buffer(tree);
100 void mark_tree_uninteresting(struct repository *r, struct tree *tree)
102 struct object *obj;
104 if (!tree)
105 return;
107 obj = &tree->object;
108 if (obj->flags & UNINTERESTING)
109 return;
110 obj->flags |= UNINTERESTING;
111 mark_tree_contents_uninteresting(r, tree);
114 struct path_and_oids_entry {
115 struct hashmap_entry ent;
116 char *path;
117 struct oidset trees;
120 static int path_and_oids_cmp(const void *hashmap_cmp_fn_data,
121 const struct hashmap_entry *eptr,
122 const struct hashmap_entry *entry_or_key,
123 const void *keydata)
125 const struct path_and_oids_entry *e1, *e2;
127 e1 = container_of(eptr, const struct path_and_oids_entry, ent);
128 e2 = container_of(entry_or_key, const struct path_and_oids_entry, ent);
130 return strcmp(e1->path, e2->path);
133 static void paths_and_oids_clear(struct hashmap *map)
135 struct hashmap_iter iter;
136 struct path_and_oids_entry *entry;
138 hashmap_for_each_entry(map, &iter, entry, ent /* member name */) {
139 oidset_clear(&entry->trees);
140 free(entry->path);
143 hashmap_clear_and_free(map, struct path_and_oids_entry, ent);
146 static void paths_and_oids_insert(struct hashmap *map,
147 const char *path,
148 const struct object_id *oid)
150 int hash = strhash(path);
151 struct path_and_oids_entry key;
152 struct path_and_oids_entry *entry;
154 hashmap_entry_init(&key.ent, hash);
156 /* use a shallow copy for the lookup */
157 key.path = (char *)path;
158 oidset_init(&key.trees, 0);
160 entry = hashmap_get_entry(map, &key, ent, NULL);
161 if (!entry) {
162 CALLOC_ARRAY(entry, 1);
163 hashmap_entry_init(&entry->ent, hash);
164 entry->path = xstrdup(key.path);
165 oidset_init(&entry->trees, 16);
166 hashmap_put(map, &entry->ent);
169 oidset_insert(&entry->trees, oid);
172 static void add_children_by_path(struct repository *r,
173 struct tree *tree,
174 struct hashmap *map)
176 struct tree_desc desc;
177 struct name_entry entry;
179 if (!tree)
180 return;
182 if (parse_tree_gently(tree, 1) < 0)
183 return;
185 init_tree_desc(&desc, tree->buffer, tree->size);
186 while (tree_entry(&desc, &entry)) {
187 switch (object_type(entry.mode)) {
188 case OBJ_TREE:
189 paths_and_oids_insert(map, entry.path, &entry.oid);
191 if (tree->object.flags & UNINTERESTING) {
192 struct tree *child = lookup_tree(r, &entry.oid);
193 if (child)
194 child->object.flags |= UNINTERESTING;
196 break;
197 case OBJ_BLOB:
198 if (tree->object.flags & UNINTERESTING) {
199 struct blob *child = lookup_blob(r, &entry.oid);
200 if (child)
201 child->object.flags |= UNINTERESTING;
203 break;
204 default:
205 /* Subproject commit - not in this repository */
206 break;
210 free_tree_buffer(tree);
213 void mark_trees_uninteresting_sparse(struct repository *r,
214 struct oidset *trees)
216 unsigned has_interesting = 0, has_uninteresting = 0;
217 struct hashmap map = HASHMAP_INIT(path_and_oids_cmp, NULL);
218 struct hashmap_iter map_iter;
219 struct path_and_oids_entry *entry;
220 struct object_id *oid;
221 struct oidset_iter iter;
223 oidset_iter_init(trees, &iter);
224 while ((!has_interesting || !has_uninteresting) &&
225 (oid = oidset_iter_next(&iter))) {
226 struct tree *tree = lookup_tree(r, oid);
228 if (!tree)
229 continue;
231 if (tree->object.flags & UNINTERESTING)
232 has_uninteresting = 1;
233 else
234 has_interesting = 1;
237 /* Do not walk unless we have both types of trees. */
238 if (!has_uninteresting || !has_interesting)
239 return;
241 oidset_iter_init(trees, &iter);
242 while ((oid = oidset_iter_next(&iter))) {
243 struct tree *tree = lookup_tree(r, oid);
244 add_children_by_path(r, tree, &map);
247 hashmap_for_each_entry(&map, &map_iter, entry, ent /* member name */)
248 mark_trees_uninteresting_sparse(r, &entry->trees);
250 paths_and_oids_clear(&map);
253 struct commit_stack {
254 struct commit **items;
255 size_t nr, alloc;
257 #define COMMIT_STACK_INIT { 0 }
259 static void commit_stack_push(struct commit_stack *stack, struct commit *commit)
261 ALLOC_GROW(stack->items, stack->nr + 1, stack->alloc);
262 stack->items[stack->nr++] = commit;
265 static struct commit *commit_stack_pop(struct commit_stack *stack)
267 return stack->nr ? stack->items[--stack->nr] : NULL;
270 static void commit_stack_clear(struct commit_stack *stack)
272 FREE_AND_NULL(stack->items);
273 stack->nr = stack->alloc = 0;
276 static void mark_one_parent_uninteresting(struct commit *commit,
277 struct commit_stack *pending)
279 struct commit_list *l;
281 if (commit->object.flags & UNINTERESTING)
282 return;
283 commit->object.flags |= UNINTERESTING;
286 * Normally we haven't parsed the parent
287 * yet, so we won't have a parent of a parent
288 * here. However, it may turn out that we've
289 * reached this commit some other way (where it
290 * wasn't uninteresting), in which case we need
291 * to mark its parents recursively too..
293 for (l = commit->parents; l; l = l->next)
294 commit_stack_push(pending, l->item);
297 void mark_parents_uninteresting(struct commit *commit)
299 struct commit_stack pending = COMMIT_STACK_INIT;
300 struct commit_list *l;
302 for (l = commit->parents; l; l = l->next)
303 mark_one_parent_uninteresting(l->item, &pending);
305 while (pending.nr > 0)
306 mark_one_parent_uninteresting(commit_stack_pop(&pending),
307 &pending);
309 commit_stack_clear(&pending);
312 static void add_pending_object_with_path(struct rev_info *revs,
313 struct object *obj,
314 const char *name, unsigned mode,
315 const char *path)
317 struct interpret_branch_name_options options = { 0 };
318 if (!obj)
319 return;
320 if (revs->no_walk && (obj->flags & UNINTERESTING))
321 revs->no_walk = 0;
322 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
323 struct strbuf buf = STRBUF_INIT;
324 size_t namelen = strlen(name);
325 int len = interpret_branch_name(name, namelen, &buf, &options);
327 if (0 < len && len < namelen && 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,
339 struct object *obj,
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;
354 struct object *obj;
355 if (get_oid("HEAD", &oid))
356 return;
357 obj = parse_object(revs->repo, &oid);
358 if (!obj)
359 return;
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,
365 unsigned int flags)
367 struct object *object;
368 struct commit *commit;
371 * If the repository has commit graphs, we try to opportunistically
372 * look up the object ID in those graphs. Like this, we can avoid
373 * parsing commit data from disk.
375 commit = lookup_commit_in_graph(revs->repo, oid);
376 if (commit)
377 object = &commit->object;
378 else
379 object = parse_object(revs->repo, oid);
381 if (!object) {
382 if (revs->ignore_missing)
383 return object;
384 if (revs->exclude_promisor_objects && is_promisor_object(oid))
385 return NULL;
386 die("bad object %s", name);
388 object->flags |= flags;
389 return object;
392 void add_pending_oid(struct rev_info *revs, const char *name,
393 const struct object_id *oid, unsigned int flags)
395 struct object *object = get_reference(revs, name, oid, flags);
396 add_pending_object(revs, object, name);
399 static struct commit *handle_commit(struct rev_info *revs,
400 struct object_array_entry *entry)
402 struct object *object = entry->item;
403 const char *name = entry->name;
404 const char *path = entry->path;
405 unsigned int mode = entry->mode;
406 unsigned long flags = object->flags;
409 * Tag object? Look what it points to..
411 while (object->type == OBJ_TAG) {
412 struct tag *tag = (struct tag *) object;
413 if (revs->tag_objects && !(flags & UNINTERESTING))
414 add_pending_object(revs, object, tag->tag);
415 object = parse_object(revs->repo, get_tagged_oid(tag));
416 if (!object) {
417 if (revs->ignore_missing_links || (flags & UNINTERESTING))
418 return NULL;
419 if (revs->exclude_promisor_objects &&
420 is_promisor_object(&tag->tagged->oid))
421 return NULL;
422 die("bad object %s", oid_to_hex(&tag->tagged->oid));
424 object->flags |= flags;
426 * We'll handle the tagged object by looping or dropping
427 * through to the non-tag handlers below. Do not
428 * propagate path data from the tag's pending entry.
430 path = NULL;
431 mode = 0;
435 * Commit object? Just return it, we'll do all the complex
436 * reachability crud.
438 if (object->type == OBJ_COMMIT) {
439 struct commit *commit = (struct commit *)object;
441 if (repo_parse_commit(revs->repo, commit) < 0)
442 die("unable to parse commit %s", name);
443 if (flags & UNINTERESTING) {
444 mark_parents_uninteresting(commit);
446 if (!revs->topo_order || !generation_numbers_enabled(the_repository))
447 revs->limited = 1;
449 if (revs->sources) {
450 char **slot = revision_sources_at(revs->sources, commit);
452 if (!*slot)
453 *slot = xstrdup(name);
455 return commit;
459 * Tree object? Either mark it uninteresting, or add it
460 * to the list of objects to look at later..
462 if (object->type == OBJ_TREE) {
463 struct tree *tree = (struct tree *)object;
464 if (!revs->tree_objects)
465 return NULL;
466 if (flags & UNINTERESTING) {
467 mark_tree_contents_uninteresting(revs->repo, tree);
468 return NULL;
470 add_pending_object_with_path(revs, object, name, mode, path);
471 return NULL;
475 * Blob object? You know the drill by now..
477 if (object->type == OBJ_BLOB) {
478 if (!revs->blob_objects)
479 return NULL;
480 if (flags & UNINTERESTING)
481 return NULL;
482 add_pending_object_with_path(revs, object, name, mode, path);
483 return NULL;
485 die("%s is unknown object", name);
488 static int everybody_uninteresting(struct commit_list *orig,
489 struct commit **interesting_cache)
491 struct commit_list *list = orig;
493 if (*interesting_cache) {
494 struct commit *commit = *interesting_cache;
495 if (!(commit->object.flags & UNINTERESTING))
496 return 0;
499 while (list) {
500 struct commit *commit = list->item;
501 list = list->next;
502 if (commit->object.flags & UNINTERESTING)
503 continue;
505 *interesting_cache = commit;
506 return 0;
508 return 1;
512 * A definition of "relevant" commit that we can use to simplify limited graphs
513 * by eliminating side branches.
515 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
516 * in our list), or that is a specified BOTTOM commit. Then after computing
517 * a limited list, during processing we can generally ignore boundary merges
518 * coming from outside the graph, (ie from irrelevant parents), and treat
519 * those merges as if they were single-parent. TREESAME is defined to consider
520 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
521 * we don't care if we were !TREESAME to non-graph parents.
523 * Treating bottom commits as relevant ensures that a limited graph's
524 * connection to the actual bottom commit is not viewed as a side branch, but
525 * treated as part of the graph. For example:
527 * ....Z...A---X---o---o---B
528 * . /
529 * W---Y
531 * When computing "A..B", the A-X connection is at least as important as
532 * Y-X, despite A being flagged UNINTERESTING.
534 * And when computing --ancestry-path "A..B", the A-X connection is more
535 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
537 static inline int relevant_commit(struct commit *commit)
539 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
543 * Return a single relevant commit from a parent list. If we are a TREESAME
544 * commit, and this selects one of our parents, then we can safely simplify to
545 * that parent.
547 static struct commit *one_relevant_parent(const struct rev_info *revs,
548 struct commit_list *orig)
550 struct commit_list *list = orig;
551 struct commit *relevant = NULL;
553 if (!orig)
554 return NULL;
557 * For 1-parent commits, or if first-parent-only, then return that
558 * first parent (even if not "relevant" by the above definition).
559 * TREESAME will have been set purely on that parent.
561 if (revs->first_parent_only || !orig->next)
562 return orig->item;
565 * For multi-parent commits, identify a sole relevant parent, if any.
566 * If we have only one relevant parent, then TREESAME will be set purely
567 * with regard to that parent, and we can simplify accordingly.
569 * If we have more than one relevant parent, or no relevant parents
570 * (and multiple irrelevant ones), then we can't select a parent here
571 * and return NULL.
573 while (list) {
574 struct commit *commit = list->item;
575 list = list->next;
576 if (relevant_commit(commit)) {
577 if (relevant)
578 return NULL;
579 relevant = commit;
582 return relevant;
586 * The goal is to get REV_TREE_NEW as the result only if the
587 * diff consists of all '+' (and no other changes), REV_TREE_OLD
588 * if the whole diff is removal of old data, and otherwise
589 * REV_TREE_DIFFERENT (of course if the trees are the same we
590 * want REV_TREE_SAME).
592 * The only time we care about the distinction is when
593 * remove_empty_trees is in effect, in which case we care only about
594 * whether the whole change is REV_TREE_NEW, or if there's another type
595 * of change. Which means we can stop the diff early in either of these
596 * cases:
598 * 1. We're not using remove_empty_trees at all.
600 * 2. We saw anything except REV_TREE_NEW.
602 static int tree_difference = REV_TREE_SAME;
604 static void file_add_remove(struct diff_options *options,
605 int addremove, unsigned mode,
606 const struct object_id *oid,
607 int oid_valid,
608 const char *fullpath, unsigned dirty_submodule)
610 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
611 struct rev_info *revs = options->change_fn_data;
613 tree_difference |= diff;
614 if (!revs->remove_empty_trees || tree_difference != REV_TREE_NEW)
615 options->flags.has_changes = 1;
618 static void file_change(struct diff_options *options,
619 unsigned old_mode, unsigned new_mode,
620 const struct object_id *old_oid,
621 const struct object_id *new_oid,
622 int old_oid_valid, int new_oid_valid,
623 const char *fullpath,
624 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
626 tree_difference = REV_TREE_DIFFERENT;
627 options->flags.has_changes = 1;
630 static int bloom_filter_atexit_registered;
631 static unsigned int count_bloom_filter_maybe;
632 static unsigned int count_bloom_filter_definitely_not;
633 static unsigned int count_bloom_filter_false_positive;
634 static unsigned int count_bloom_filter_not_present;
636 static void trace2_bloom_filter_statistics_atexit(void)
638 struct json_writer jw = JSON_WRITER_INIT;
640 jw_object_begin(&jw, 0);
641 jw_object_intmax(&jw, "filter_not_present", count_bloom_filter_not_present);
642 jw_object_intmax(&jw, "maybe", count_bloom_filter_maybe);
643 jw_object_intmax(&jw, "definitely_not", count_bloom_filter_definitely_not);
644 jw_object_intmax(&jw, "false_positive", count_bloom_filter_false_positive);
645 jw_end(&jw);
647 trace2_data_json("bloom", the_repository, "statistics", &jw);
649 jw_release(&jw);
652 static int forbid_bloom_filters(struct pathspec *spec)
654 if (spec->has_wildcard)
655 return 1;
656 if (spec->nr > 1)
657 return 1;
658 if (spec->magic & ~PATHSPEC_LITERAL)
659 return 1;
660 if (spec->nr && (spec->items[0].magic & ~PATHSPEC_LITERAL))
661 return 1;
663 return 0;
666 static void prepare_to_use_bloom_filter(struct rev_info *revs)
668 struct pathspec_item *pi;
669 char *path_alloc = NULL;
670 const char *path, *p;
671 size_t len;
672 int path_component_nr = 1;
674 if (!revs->commits)
675 return;
677 if (forbid_bloom_filters(&revs->prune_data))
678 return;
680 repo_parse_commit(revs->repo, revs->commits->item);
682 revs->bloom_filter_settings = get_bloom_filter_settings(revs->repo);
683 if (!revs->bloom_filter_settings)
684 return;
686 if (!revs->pruning.pathspec.nr)
687 return;
689 pi = &revs->pruning.pathspec.items[0];
691 /* remove single trailing slash from path, if needed */
692 if (pi->len > 0 && pi->match[pi->len - 1] == '/') {
693 path_alloc = xmemdupz(pi->match, pi->len - 1);
694 path = path_alloc;
695 } else
696 path = pi->match;
698 len = strlen(path);
699 if (!len) {
700 revs->bloom_filter_settings = NULL;
701 free(path_alloc);
702 return;
705 p = path;
706 while (*p) {
708 * At this point, the path is normalized to use Unix-style
709 * path separators. This is required due to how the
710 * changed-path Bloom filters store the paths.
712 if (*p == '/')
713 path_component_nr++;
714 p++;
717 revs->bloom_keys_nr = path_component_nr;
718 ALLOC_ARRAY(revs->bloom_keys, revs->bloom_keys_nr);
720 fill_bloom_key(path, len, &revs->bloom_keys[0],
721 revs->bloom_filter_settings);
722 path_component_nr = 1;
724 p = path + len - 1;
725 while (p > path) {
726 if (*p == '/')
727 fill_bloom_key(path, p - path,
728 &revs->bloom_keys[path_component_nr++],
729 revs->bloom_filter_settings);
730 p--;
733 if (trace2_is_enabled() && !bloom_filter_atexit_registered) {
734 atexit(trace2_bloom_filter_statistics_atexit);
735 bloom_filter_atexit_registered = 1;
738 free(path_alloc);
741 static int check_maybe_different_in_bloom_filter(struct rev_info *revs,
742 struct commit *commit)
744 struct bloom_filter *filter;
745 int result = 1, j;
747 if (!revs->repo->objects->commit_graph)
748 return -1;
750 if (commit_graph_generation(commit) == GENERATION_NUMBER_INFINITY)
751 return -1;
753 filter = get_bloom_filter(revs->repo, commit);
755 if (!filter) {
756 count_bloom_filter_not_present++;
757 return -1;
760 for (j = 0; result && j < revs->bloom_keys_nr; j++) {
761 result = bloom_filter_contains(filter,
762 &revs->bloom_keys[j],
763 revs->bloom_filter_settings);
766 if (result)
767 count_bloom_filter_maybe++;
768 else
769 count_bloom_filter_definitely_not++;
771 return result;
774 static int rev_compare_tree(struct rev_info *revs,
775 struct commit *parent, struct commit *commit, int nth_parent)
777 struct tree *t1 = get_commit_tree(parent);
778 struct tree *t2 = get_commit_tree(commit);
779 int bloom_ret = 1;
781 if (!t1)
782 return REV_TREE_NEW;
783 if (!t2)
784 return REV_TREE_OLD;
786 if (revs->simplify_by_decoration) {
788 * If we are simplifying by decoration, then the commit
789 * is worth showing if it has a tag pointing at it.
791 if (get_name_decoration(&commit->object))
792 return REV_TREE_DIFFERENT;
794 * A commit that is not pointed by a tag is uninteresting
795 * if we are not limited by path. This means that you will
796 * see the usual "commits that touch the paths" plus any
797 * tagged commit by specifying both --simplify-by-decoration
798 * and pathspec.
800 if (!revs->prune_data.nr)
801 return REV_TREE_SAME;
804 if (revs->bloom_keys_nr && !nth_parent) {
805 bloom_ret = check_maybe_different_in_bloom_filter(revs, commit);
807 if (bloom_ret == 0)
808 return REV_TREE_SAME;
811 tree_difference = REV_TREE_SAME;
812 revs->pruning.flags.has_changes = 0;
813 diff_tree_oid(&t1->object.oid, &t2->object.oid, "", &revs->pruning);
815 if (!nth_parent)
816 if (bloom_ret == 1 && tree_difference == REV_TREE_SAME)
817 count_bloom_filter_false_positive++;
819 return tree_difference;
822 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
824 struct tree *t1 = get_commit_tree(commit);
826 if (!t1)
827 return 0;
829 tree_difference = REV_TREE_SAME;
830 revs->pruning.flags.has_changes = 0;
831 diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
833 return tree_difference == REV_TREE_SAME;
836 struct treesame_state {
837 unsigned int nparents;
838 unsigned char treesame[FLEX_ARRAY];
841 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
843 unsigned n = commit_list_count(commit->parents);
844 struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
845 st->nparents = n;
846 add_decoration(&revs->treesame, &commit->object, st);
847 return st;
851 * Must be called immediately after removing the nth_parent from a commit's
852 * parent list, if we are maintaining the per-parent treesame[] decoration.
853 * This does not recalculate the master TREESAME flag - update_treesame()
854 * should be called to update it after a sequence of treesame[] modifications
855 * that may have affected it.
857 static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
859 struct treesame_state *st;
860 int old_same;
862 if (!commit->parents) {
864 * Have just removed the only parent from a non-merge.
865 * Different handling, as we lack decoration.
867 if (nth_parent != 0)
868 die("compact_treesame %u", nth_parent);
869 old_same = !!(commit->object.flags & TREESAME);
870 if (rev_same_tree_as_empty(revs, commit))
871 commit->object.flags |= TREESAME;
872 else
873 commit->object.flags &= ~TREESAME;
874 return old_same;
877 st = lookup_decoration(&revs->treesame, &commit->object);
878 if (!st || nth_parent >= st->nparents)
879 die("compact_treesame %u", nth_parent);
881 old_same = st->treesame[nth_parent];
882 memmove(st->treesame + nth_parent,
883 st->treesame + nth_parent + 1,
884 st->nparents - nth_parent - 1);
887 * If we've just become a non-merge commit, update TREESAME
888 * immediately, and remove the no-longer-needed decoration.
889 * If still a merge, defer update until update_treesame().
891 if (--st->nparents == 1) {
892 if (commit->parents->next)
893 die("compact_treesame parents mismatch");
894 if (st->treesame[0] && revs->dense)
895 commit->object.flags |= TREESAME;
896 else
897 commit->object.flags &= ~TREESAME;
898 free(add_decoration(&revs->treesame, &commit->object, NULL));
901 return old_same;
904 static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
906 if (commit->parents && commit->parents->next) {
907 unsigned n;
908 struct treesame_state *st;
909 struct commit_list *p;
910 unsigned relevant_parents;
911 unsigned relevant_change, irrelevant_change;
913 st = lookup_decoration(&revs->treesame, &commit->object);
914 if (!st)
915 die("update_treesame %s", oid_to_hex(&commit->object.oid));
916 relevant_parents = 0;
917 relevant_change = irrelevant_change = 0;
918 for (p = commit->parents, n = 0; p; n++, p = p->next) {
919 if (relevant_commit(p->item)) {
920 relevant_change |= !st->treesame[n];
921 relevant_parents++;
922 } else
923 irrelevant_change |= !st->treesame[n];
925 if (relevant_parents ? relevant_change : irrelevant_change)
926 commit->object.flags &= ~TREESAME;
927 else
928 commit->object.flags |= TREESAME;
931 return commit->object.flags & TREESAME;
934 static inline int limiting_can_increase_treesame(const struct rev_info *revs)
937 * TREESAME is irrelevant unless prune && dense;
938 * if simplify_history is set, we can't have a mixture of TREESAME and
939 * !TREESAME INTERESTING parents (and we don't have treesame[]
940 * decoration anyway);
941 * if first_parent_only is set, then the TREESAME flag is locked
942 * against the first parent (and again we lack treesame[] decoration).
944 return revs->prune && revs->dense &&
945 !revs->simplify_history &&
946 !revs->first_parent_only;
949 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
951 struct commit_list **pp, *parent;
952 struct treesame_state *ts = NULL;
953 int relevant_change = 0, irrelevant_change = 0;
954 int relevant_parents, nth_parent;
957 * If we don't do pruning, everything is interesting
959 if (!revs->prune)
960 return;
962 if (!get_commit_tree(commit))
963 return;
965 if (!commit->parents) {
966 if (rev_same_tree_as_empty(revs, commit))
967 commit->object.flags |= TREESAME;
968 return;
972 * Normal non-merge commit? If we don't want to make the
973 * history dense, we consider it always to be a change..
975 if (!revs->dense && !commit->parents->next)
976 return;
978 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
979 (parent = *pp) != NULL;
980 pp = &parent->next, nth_parent++) {
981 struct commit *p = parent->item;
982 if (relevant_commit(p))
983 relevant_parents++;
985 if (nth_parent == 1) {
987 * This our second loop iteration - so we now know
988 * we're dealing with a merge.
990 * Do not compare with later parents when we care only about
991 * the first parent chain, in order to avoid derailing the
992 * traversal to follow a side branch that brought everything
993 * in the path we are limited to by the pathspec.
995 if (revs->first_parent_only)
996 break;
998 * If this will remain a potentially-simplifiable
999 * merge, remember per-parent treesame if needed.
1000 * Initialise the array with the comparison from our
1001 * first iteration.
1003 if (revs->treesame.name &&
1004 !revs->simplify_history &&
1005 !(commit->object.flags & UNINTERESTING)) {
1006 ts = initialise_treesame(revs, commit);
1007 if (!(irrelevant_change || relevant_change))
1008 ts->treesame[0] = 1;
1011 if (repo_parse_commit(revs->repo, p) < 0)
1012 die("cannot simplify commit %s (because of %s)",
1013 oid_to_hex(&commit->object.oid),
1014 oid_to_hex(&p->object.oid));
1015 switch (rev_compare_tree(revs, p, commit, nth_parent)) {
1016 case REV_TREE_SAME:
1017 if (!revs->simplify_history || !relevant_commit(p)) {
1018 /* Even if a merge with an uninteresting
1019 * side branch brought the entire change
1020 * we are interested in, we do not want
1021 * to lose the other branches of this
1022 * merge, so we just keep going.
1024 if (ts)
1025 ts->treesame[nth_parent] = 1;
1026 continue;
1028 parent->next = NULL;
1029 commit->parents = parent;
1032 * A merge commit is a "diversion" if it is not
1033 * TREESAME to its first parent but is TREESAME
1034 * to a later parent. In the simplified history,
1035 * we "divert" the history walk to the later
1036 * parent. These commits are shown when "show_pulls"
1037 * is enabled, so do not mark the object as
1038 * TREESAME here.
1040 if (!revs->show_pulls || !nth_parent)
1041 commit->object.flags |= TREESAME;
1043 return;
1045 case REV_TREE_NEW:
1046 if (revs->remove_empty_trees &&
1047 rev_same_tree_as_empty(revs, p)) {
1048 /* We are adding all the specified
1049 * paths from this parent, so the
1050 * history beyond this parent is not
1051 * interesting. Remove its parents
1052 * (they are grandparents for us).
1053 * IOW, we pretend this parent is a
1054 * "root" commit.
1056 if (repo_parse_commit(revs->repo, p) < 0)
1057 die("cannot simplify commit %s (invalid %s)",
1058 oid_to_hex(&commit->object.oid),
1059 oid_to_hex(&p->object.oid));
1060 p->parents = NULL;
1062 /* fallthrough */
1063 case REV_TREE_OLD:
1064 case REV_TREE_DIFFERENT:
1065 if (relevant_commit(p))
1066 relevant_change = 1;
1067 else
1068 irrelevant_change = 1;
1070 if (!nth_parent)
1071 commit->object.flags |= PULL_MERGE;
1073 continue;
1075 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
1079 * TREESAME is straightforward for single-parent commits. For merge
1080 * commits, it is most useful to define it so that "irrelevant"
1081 * parents cannot make us !TREESAME - if we have any relevant
1082 * parents, then we only consider TREESAMEness with respect to them,
1083 * allowing irrelevant merges from uninteresting branches to be
1084 * simplified away. Only if we have only irrelevant parents do we
1085 * base TREESAME on them. Note that this logic is replicated in
1086 * update_treesame, which should be kept in sync.
1088 if (relevant_parents ? !relevant_change : !irrelevant_change)
1089 commit->object.flags |= TREESAME;
1092 static int process_parents(struct rev_info *revs, struct commit *commit,
1093 struct commit_list **list, struct prio_queue *queue)
1095 struct commit_list *parent = commit->parents;
1096 unsigned left_flag;
1098 if (commit->object.flags & ADDED)
1099 return 0;
1100 commit->object.flags |= ADDED;
1102 if (revs->include_check &&
1103 !revs->include_check(commit, revs->include_check_data))
1104 return 0;
1107 * If the commit is uninteresting, don't try to
1108 * prune parents - we want the maximal uninteresting
1109 * set.
1111 * Normally we haven't parsed the parent
1112 * yet, so we won't have a parent of a parent
1113 * here. However, it may turn out that we've
1114 * reached this commit some other way (where it
1115 * wasn't uninteresting), in which case we need
1116 * to mark its parents recursively too..
1118 if (commit->object.flags & UNINTERESTING) {
1119 while (parent) {
1120 struct commit *p = parent->item;
1121 parent = parent->next;
1122 if (p)
1123 p->object.flags |= UNINTERESTING;
1124 if (repo_parse_commit_gently(revs->repo, p, 1) < 0)
1125 continue;
1126 if (p->parents)
1127 mark_parents_uninteresting(p);
1128 if (p->object.flags & SEEN)
1129 continue;
1130 p->object.flags |= (SEEN | NOT_USER_GIVEN);
1131 if (list)
1132 commit_list_insert_by_date(p, list);
1133 if (queue)
1134 prio_queue_put(queue, p);
1136 return 0;
1140 * Ok, the commit wasn't uninteresting. Try to
1141 * simplify the commit history and find the parent
1142 * that has no differences in the path set if one exists.
1144 try_to_simplify_commit(revs, commit);
1146 if (revs->no_walk)
1147 return 0;
1149 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
1151 for (parent = commit->parents; parent; parent = parent->next) {
1152 struct commit *p = parent->item;
1153 int gently = revs->ignore_missing_links ||
1154 revs->exclude_promisor_objects;
1155 if (repo_parse_commit_gently(revs->repo, p, gently) < 0) {
1156 if (revs->exclude_promisor_objects &&
1157 is_promisor_object(&p->object.oid)) {
1158 if (revs->first_parent_only)
1159 break;
1160 continue;
1162 return -1;
1164 if (revs->sources) {
1165 char **slot = revision_sources_at(revs->sources, p);
1167 if (!*slot)
1168 *slot = *revision_sources_at(revs->sources, commit);
1170 p->object.flags |= left_flag;
1171 if (!(p->object.flags & SEEN)) {
1172 p->object.flags |= (SEEN | NOT_USER_GIVEN);
1173 if (list)
1174 commit_list_insert_by_date(p, list);
1175 if (queue)
1176 prio_queue_put(queue, p);
1178 if (revs->first_parent_only)
1179 break;
1181 return 0;
1184 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
1186 struct commit_list *p;
1187 int left_count = 0, right_count = 0;
1188 int left_first;
1189 struct patch_ids ids;
1190 unsigned cherry_flag;
1192 /* First count the commits on the left and on the right */
1193 for (p = list; p; p = p->next) {
1194 struct commit *commit = p->item;
1195 unsigned flags = commit->object.flags;
1196 if (flags & BOUNDARY)
1198 else if (flags & SYMMETRIC_LEFT)
1199 left_count++;
1200 else
1201 right_count++;
1204 if (!left_count || !right_count)
1205 return;
1207 left_first = left_count < right_count;
1208 init_patch_ids(revs->repo, &ids);
1209 ids.diffopts.pathspec = revs->diffopt.pathspec;
1211 /* Compute patch-ids for one side */
1212 for (p = list; p; p = p->next) {
1213 struct commit *commit = p->item;
1214 unsigned flags = commit->object.flags;
1216 if (flags & BOUNDARY)
1217 continue;
1219 * If we have fewer left, left_first is set and we omit
1220 * commits on the right branch in this loop. If we have
1221 * fewer right, we skip the left ones.
1223 if (left_first != !!(flags & SYMMETRIC_LEFT))
1224 continue;
1225 add_commit_patch_id(commit, &ids);
1228 /* either cherry_mark or cherry_pick are true */
1229 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
1231 /* Check the other side */
1232 for (p = list; p; p = p->next) {
1233 struct commit *commit = p->item;
1234 struct patch_id *id;
1235 unsigned flags = commit->object.flags;
1237 if (flags & BOUNDARY)
1238 continue;
1240 * If we have fewer left, left_first is set and we omit
1241 * commits on the left branch in this loop.
1243 if (left_first == !!(flags & SYMMETRIC_LEFT))
1244 continue;
1247 * Have we seen the same patch id?
1249 id = patch_id_iter_first(commit, &ids);
1250 if (!id)
1251 continue;
1253 commit->object.flags |= cherry_flag;
1254 do {
1255 id->commit->object.flags |= cherry_flag;
1256 } while ((id = patch_id_iter_next(id, &ids)));
1259 free_patch_ids(&ids);
1262 /* How many extra uninteresting commits we want to see.. */
1263 #define SLOP 5
1265 static int still_interesting(struct commit_list *src, timestamp_t date, int slop,
1266 struct commit **interesting_cache)
1269 * No source list at all? We're definitely done..
1271 if (!src)
1272 return 0;
1275 * Does the destination list contain entries with a date
1276 * before the source list? Definitely _not_ done.
1278 if (date <= src->item->date)
1279 return SLOP;
1282 * Does the source list still have interesting commits in
1283 * it? Definitely not done..
1285 if (!everybody_uninteresting(src, interesting_cache))
1286 return SLOP;
1288 /* Ok, we're closing in.. */
1289 return slop-1;
1293 * "rev-list --ancestry-path A..B" computes commits that are ancestors
1294 * of B but not ancestors of A but further limits the result to those
1295 * that are descendants of A. This takes the list of bottom commits and
1296 * the result of "A..B" without --ancestry-path, and limits the latter
1297 * further to the ones that can reach one of the commits in "bottom".
1299 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
1301 struct commit_list *p;
1302 struct commit_list *rlist = NULL;
1303 int made_progress;
1306 * Reverse the list so that it will be likely that we would
1307 * process parents before children.
1309 for (p = list; p; p = p->next)
1310 commit_list_insert(p->item, &rlist);
1312 for (p = bottom; p; p = p->next)
1313 p->item->object.flags |= TMP_MARK;
1316 * Mark the ones that can reach bottom commits in "list",
1317 * in a bottom-up fashion.
1319 do {
1320 made_progress = 0;
1321 for (p = rlist; p; p = p->next) {
1322 struct commit *c = p->item;
1323 struct commit_list *parents;
1324 if (c->object.flags & (TMP_MARK | UNINTERESTING))
1325 continue;
1326 for (parents = c->parents;
1327 parents;
1328 parents = parents->next) {
1329 if (!(parents->item->object.flags & TMP_MARK))
1330 continue;
1331 c->object.flags |= TMP_MARK;
1332 made_progress = 1;
1333 break;
1336 } while (made_progress);
1339 * NEEDSWORK: decide if we want to remove parents that are
1340 * not marked with TMP_MARK from commit->parents for commits
1341 * in the resulting list. We may not want to do that, though.
1345 * The ones that are not marked with TMP_MARK are uninteresting
1347 for (p = list; p; p = p->next) {
1348 struct commit *c = p->item;
1349 if (c->object.flags & TMP_MARK)
1350 continue;
1351 c->object.flags |= UNINTERESTING;
1354 /* We are done with the TMP_MARK */
1355 for (p = list; p; p = p->next)
1356 p->item->object.flags &= ~TMP_MARK;
1357 for (p = bottom; p; p = p->next)
1358 p->item->object.flags &= ~TMP_MARK;
1359 free_commit_list(rlist);
1363 * Before walking the history, keep the set of "negative" refs the
1364 * caller has asked to exclude.
1366 * This is used to compute "rev-list --ancestry-path A..B", as we need
1367 * to filter the result of "A..B" further to the ones that can actually
1368 * reach A.
1370 static struct commit_list *collect_bottom_commits(struct commit_list *list)
1372 struct commit_list *elem, *bottom = NULL;
1373 for (elem = list; elem; elem = elem->next)
1374 if (elem->item->object.flags & BOTTOM)
1375 commit_list_insert(elem->item, &bottom);
1376 return bottom;
1379 /* Assumes either left_only or right_only is set */
1380 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1382 struct commit_list *p;
1384 for (p = list; p; p = p->next) {
1385 struct commit *commit = p->item;
1387 if (revs->right_only) {
1388 if (commit->object.flags & SYMMETRIC_LEFT)
1389 commit->object.flags |= SHOWN;
1390 } else /* revs->left_only is set */
1391 if (!(commit->object.flags & SYMMETRIC_LEFT))
1392 commit->object.flags |= SHOWN;
1396 static int limit_list(struct rev_info *revs)
1398 int slop = SLOP;
1399 timestamp_t date = TIME_MAX;
1400 struct commit_list *original_list = revs->commits;
1401 struct commit_list *newlist = NULL;
1402 struct commit_list **p = &newlist;
1403 struct commit_list *bottom = NULL;
1404 struct commit *interesting_cache = NULL;
1406 if (revs->ancestry_path) {
1407 bottom = collect_bottom_commits(original_list);
1408 if (!bottom)
1409 die("--ancestry-path given but there are no bottom commits");
1412 while (original_list) {
1413 struct commit *commit = pop_commit(&original_list);
1414 struct object *obj = &commit->object;
1415 show_early_output_fn_t show;
1417 if (commit == interesting_cache)
1418 interesting_cache = NULL;
1420 if (revs->max_age != -1 && (commit->date < revs->max_age))
1421 obj->flags |= UNINTERESTING;
1422 if (process_parents(revs, commit, &original_list, NULL) < 0)
1423 return -1;
1424 if (obj->flags & UNINTERESTING) {
1425 mark_parents_uninteresting(commit);
1426 slop = still_interesting(original_list, date, slop, &interesting_cache);
1427 if (slop)
1428 continue;
1429 break;
1431 if (revs->min_age != -1 && (commit->date > revs->min_age) &&
1432 !revs->line_level_traverse)
1433 continue;
1434 date = commit->date;
1435 p = &commit_list_insert(commit, p)->next;
1437 show = show_early_output;
1438 if (!show)
1439 continue;
1441 show(revs, newlist);
1442 show_early_output = NULL;
1444 if (revs->cherry_pick || revs->cherry_mark)
1445 cherry_pick_list(newlist, revs);
1447 if (revs->left_only || revs->right_only)
1448 limit_left_right(newlist, revs);
1450 if (bottom) {
1451 limit_to_ancestry(bottom, newlist);
1452 free_commit_list(bottom);
1456 * Check if any commits have become TREESAME by some of their parents
1457 * becoming UNINTERESTING.
1459 if (limiting_can_increase_treesame(revs)) {
1460 struct commit_list *list = NULL;
1461 for (list = newlist; list; list = list->next) {
1462 struct commit *c = list->item;
1463 if (c->object.flags & (UNINTERESTING | TREESAME))
1464 continue;
1465 update_treesame(revs, c);
1469 free_commit_list(original_list);
1470 revs->commits = newlist;
1471 return 0;
1475 * Add an entry to refs->cmdline with the specified information.
1476 * *name is copied.
1478 static void add_rev_cmdline(struct rev_info *revs,
1479 struct object *item,
1480 const char *name,
1481 int whence,
1482 unsigned flags)
1484 struct rev_cmdline_info *info = &revs->cmdline;
1485 unsigned int nr = info->nr;
1487 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1488 info->rev[nr].item = item;
1489 info->rev[nr].name = xstrdup(name);
1490 info->rev[nr].whence = whence;
1491 info->rev[nr].flags = flags;
1492 info->nr++;
1495 static void add_rev_cmdline_list(struct rev_info *revs,
1496 struct commit_list *commit_list,
1497 int whence,
1498 unsigned flags)
1500 while (commit_list) {
1501 struct object *object = &commit_list->item->object;
1502 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1503 whence, flags);
1504 commit_list = commit_list->next;
1508 struct all_refs_cb {
1509 int all_flags;
1510 int warned_bad_reflog;
1511 struct rev_info *all_revs;
1512 const char *name_for_errormsg;
1513 struct worktree *wt;
1516 int ref_excluded(struct string_list *ref_excludes, const char *path)
1518 struct string_list_item *item;
1520 if (!ref_excludes)
1521 return 0;
1522 for_each_string_list_item(item, ref_excludes) {
1523 if (!wildmatch(item->string, path, 0))
1524 return 1;
1526 return 0;
1529 static int handle_one_ref(const char *path, const struct object_id *oid,
1530 int flag, void *cb_data)
1532 struct all_refs_cb *cb = cb_data;
1533 struct object *object;
1535 if (ref_excluded(cb->all_revs->ref_excludes, path))
1536 return 0;
1538 object = get_reference(cb->all_revs, path, oid, cb->all_flags);
1539 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1540 add_pending_object(cb->all_revs, object, path);
1541 return 0;
1544 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1545 unsigned flags)
1547 cb->all_revs = revs;
1548 cb->all_flags = flags;
1549 revs->rev_input_given = 1;
1550 cb->wt = NULL;
1553 void clear_ref_exclusion(struct string_list **ref_excludes_p)
1555 if (*ref_excludes_p) {
1556 string_list_clear(*ref_excludes_p, 0);
1557 free(*ref_excludes_p);
1559 *ref_excludes_p = NULL;
1562 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1564 if (!*ref_excludes_p) {
1565 CALLOC_ARRAY(*ref_excludes_p, 1);
1566 (*ref_excludes_p)->strdup_strings = 1;
1568 string_list_append(*ref_excludes_p, exclude);
1571 static void handle_refs(struct ref_store *refs,
1572 struct rev_info *revs, unsigned flags,
1573 int (*for_each)(struct ref_store *, each_ref_fn, void *))
1575 struct all_refs_cb cb;
1577 if (!refs) {
1578 /* this could happen with uninitialized submodules */
1579 return;
1582 init_all_refs_cb(&cb, revs, flags);
1583 for_each(refs, handle_one_ref, &cb);
1586 static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
1588 struct all_refs_cb *cb = cb_data;
1589 if (!is_null_oid(oid)) {
1590 struct object *o = parse_object(cb->all_revs->repo, oid);
1591 if (o) {
1592 o->flags |= cb->all_flags;
1593 /* ??? CMDLINEFLAGS ??? */
1594 add_pending_object(cb->all_revs, o, "");
1596 else if (!cb->warned_bad_reflog) {
1597 warning("reflog of '%s' references pruned commits",
1598 cb->name_for_errormsg);
1599 cb->warned_bad_reflog = 1;
1604 static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
1605 const char *email, timestamp_t timestamp, int tz,
1606 const char *message, void *cb_data)
1608 handle_one_reflog_commit(ooid, cb_data);
1609 handle_one_reflog_commit(noid, cb_data);
1610 return 0;
1613 static int handle_one_reflog(const char *refname_in_wt,
1614 const struct object_id *oid,
1615 int flag, void *cb_data)
1617 struct all_refs_cb *cb = cb_data;
1618 struct strbuf refname = STRBUF_INIT;
1620 cb->warned_bad_reflog = 0;
1621 strbuf_worktree_ref(cb->wt, &refname, refname_in_wt);
1622 cb->name_for_errormsg = refname.buf;
1623 refs_for_each_reflog_ent(get_main_ref_store(the_repository),
1624 refname.buf,
1625 handle_one_reflog_ent, cb_data);
1626 strbuf_release(&refname);
1627 return 0;
1630 static void add_other_reflogs_to_pending(struct all_refs_cb *cb)
1632 struct worktree **worktrees, **p;
1634 worktrees = get_worktrees();
1635 for (p = worktrees; *p; p++) {
1636 struct worktree *wt = *p;
1638 if (wt->is_current)
1639 continue;
1641 cb->wt = wt;
1642 refs_for_each_reflog(get_worktree_ref_store(wt),
1643 handle_one_reflog,
1644 cb);
1646 free_worktrees(worktrees);
1649 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1651 struct all_refs_cb cb;
1653 cb.all_revs = revs;
1654 cb.all_flags = flags;
1655 cb.wt = NULL;
1656 for_each_reflog(handle_one_reflog, &cb);
1658 if (!revs->single_worktree)
1659 add_other_reflogs_to_pending(&cb);
1662 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1663 struct strbuf *path, unsigned int flags)
1665 size_t baselen = path->len;
1666 int i;
1668 if (it->entry_count >= 0) {
1669 struct tree *tree = lookup_tree(revs->repo, &it->oid);
1670 tree->object.flags |= flags;
1671 add_pending_object_with_path(revs, &tree->object, "",
1672 040000, path->buf);
1675 for (i = 0; i < it->subtree_nr; i++) {
1676 struct cache_tree_sub *sub = it->down[i];
1677 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1678 add_cache_tree(sub->cache_tree, revs, path, flags);
1679 strbuf_setlen(path, baselen);
1684 static void do_add_index_objects_to_pending(struct rev_info *revs,
1685 struct index_state *istate,
1686 unsigned int flags)
1688 int i;
1690 /* TODO: audit for interaction with sparse-index. */
1691 ensure_full_index(istate);
1692 for (i = 0; i < istate->cache_nr; i++) {
1693 struct cache_entry *ce = istate->cache[i];
1694 struct blob *blob;
1696 if (S_ISGITLINK(ce->ce_mode))
1697 continue;
1699 blob = lookup_blob(revs->repo, &ce->oid);
1700 if (!blob)
1701 die("unable to add index blob to traversal");
1702 blob->object.flags |= flags;
1703 add_pending_object_with_path(revs, &blob->object, "",
1704 ce->ce_mode, ce->name);
1707 if (istate->cache_tree) {
1708 struct strbuf path = STRBUF_INIT;
1709 add_cache_tree(istate->cache_tree, revs, &path, flags);
1710 strbuf_release(&path);
1714 void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
1716 struct worktree **worktrees, **p;
1718 repo_read_index(revs->repo);
1719 do_add_index_objects_to_pending(revs, revs->repo->index, flags);
1721 if (revs->single_worktree)
1722 return;
1724 worktrees = get_worktrees();
1725 for (p = worktrees; *p; p++) {
1726 struct worktree *wt = *p;
1727 struct index_state istate = { NULL };
1729 if (wt->is_current)
1730 continue; /* current index already taken care of */
1732 if (read_index_from(&istate,
1733 worktree_git_path(wt, "index"),
1734 get_worktree_git_dir(wt)) > 0)
1735 do_add_index_objects_to_pending(revs, &istate, flags);
1736 discard_index(&istate);
1738 free_worktrees(worktrees);
1741 struct add_alternate_refs_data {
1742 struct rev_info *revs;
1743 unsigned int flags;
1746 static void add_one_alternate_ref(const struct object_id *oid,
1747 void *vdata)
1749 const char *name = ".alternate";
1750 struct add_alternate_refs_data *data = vdata;
1751 struct object *obj;
1753 obj = get_reference(data->revs, name, oid, data->flags);
1754 add_rev_cmdline(data->revs, obj, name, REV_CMD_REV, data->flags);
1755 add_pending_object(data->revs, obj, name);
1758 static void add_alternate_refs_to_pending(struct rev_info *revs,
1759 unsigned int flags)
1761 struct add_alternate_refs_data data;
1762 data.revs = revs;
1763 data.flags = flags;
1764 for_each_alternate_ref(add_one_alternate_ref, &data);
1767 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1768 int exclude_parent)
1770 struct object_id oid;
1771 struct object *it;
1772 struct commit *commit;
1773 struct commit_list *parents;
1774 int parent_number;
1775 const char *arg = arg_;
1777 if (*arg == '^') {
1778 flags ^= UNINTERESTING | BOTTOM;
1779 arg++;
1781 if (get_oid_committish(arg, &oid))
1782 return 0;
1783 while (1) {
1784 it = get_reference(revs, arg, &oid, 0);
1785 if (!it && revs->ignore_missing)
1786 return 0;
1787 if (it->type != OBJ_TAG)
1788 break;
1789 if (!((struct tag*)it)->tagged)
1790 return 0;
1791 oidcpy(&oid, &((struct tag*)it)->tagged->oid);
1793 if (it->type != OBJ_COMMIT)
1794 return 0;
1795 commit = (struct commit *)it;
1796 if (exclude_parent &&
1797 exclude_parent > commit_list_count(commit->parents))
1798 return 0;
1799 for (parents = commit->parents, parent_number = 1;
1800 parents;
1801 parents = parents->next, parent_number++) {
1802 if (exclude_parent && parent_number != exclude_parent)
1803 continue;
1805 it = &parents->item->object;
1806 it->flags |= flags;
1807 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1808 add_pending_object(revs, it, arg);
1810 return 1;
1813 void repo_init_revisions(struct repository *r,
1814 struct rev_info *revs,
1815 const char *prefix)
1817 memset(revs, 0, sizeof(*revs));
1819 revs->repo = r;
1820 revs->abbrev = DEFAULT_ABBREV;
1821 revs->simplify_history = 1;
1822 revs->pruning.repo = r;
1823 revs->pruning.flags.recursive = 1;
1824 revs->pruning.flags.quick = 1;
1825 revs->pruning.add_remove = file_add_remove;
1826 revs->pruning.change = file_change;
1827 revs->pruning.change_fn_data = revs;
1828 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1829 revs->dense = 1;
1830 revs->prefix = prefix;
1831 revs->max_age = -1;
1832 revs->min_age = -1;
1833 revs->skip_count = -1;
1834 revs->max_count = -1;
1835 revs->max_parents = -1;
1836 revs->expand_tabs_in_log = -1;
1838 revs->commit_format = CMIT_FMT_DEFAULT;
1839 revs->expand_tabs_in_log_default = 8;
1841 grep_init(&revs->grep_filter, revs->repo, prefix);
1842 revs->grep_filter.status_only = 1;
1844 repo_diff_setup(revs->repo, &revs->diffopt);
1845 if (prefix && !revs->diffopt.prefix) {
1846 revs->diffopt.prefix = prefix;
1847 revs->diffopt.prefix_length = strlen(prefix);
1850 init_display_notes(&revs->notes_opt);
1853 static void add_pending_commit_list(struct rev_info *revs,
1854 struct commit_list *commit_list,
1855 unsigned int flags)
1857 while (commit_list) {
1858 struct object *object = &commit_list->item->object;
1859 object->flags |= flags;
1860 add_pending_object(revs, object, oid_to_hex(&object->oid));
1861 commit_list = commit_list->next;
1865 static void prepare_show_merge(struct rev_info *revs)
1867 struct commit_list *bases;
1868 struct commit *head, *other;
1869 struct object_id oid;
1870 const char **prune = NULL;
1871 int i, prune_num = 1; /* counting terminating NULL */
1872 struct index_state *istate = revs->repo->index;
1874 if (get_oid("HEAD", &oid))
1875 die("--merge without HEAD?");
1876 head = lookup_commit_or_die(&oid, "HEAD");
1877 if (get_oid("MERGE_HEAD", &oid))
1878 die("--merge without MERGE_HEAD?");
1879 other = lookup_commit_or_die(&oid, "MERGE_HEAD");
1880 add_pending_object(revs, &head->object, "HEAD");
1881 add_pending_object(revs, &other->object, "MERGE_HEAD");
1882 bases = get_merge_bases(head, other);
1883 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1884 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1885 free_commit_list(bases);
1886 head->object.flags |= SYMMETRIC_LEFT;
1888 if (!istate->cache_nr)
1889 repo_read_index(revs->repo);
1890 for (i = 0; i < istate->cache_nr; i++) {
1891 const struct cache_entry *ce = istate->cache[i];
1892 if (!ce_stage(ce))
1893 continue;
1894 if (ce_path_match(istate, ce, &revs->prune_data, NULL)) {
1895 prune_num++;
1896 REALLOC_ARRAY(prune, prune_num);
1897 prune[prune_num-2] = ce->name;
1898 prune[prune_num-1] = NULL;
1900 while ((i+1 < istate->cache_nr) &&
1901 ce_same_name(ce, istate->cache[i+1]))
1902 i++;
1904 clear_pathspec(&revs->prune_data);
1905 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1906 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1907 revs->limited = 1;
1910 static int dotdot_missing(const char *arg, char *dotdot,
1911 struct rev_info *revs, int symmetric)
1913 if (revs->ignore_missing)
1914 return 0;
1915 /* de-munge so we report the full argument */
1916 *dotdot = '.';
1917 die(symmetric
1918 ? "Invalid symmetric difference expression %s"
1919 : "Invalid revision range %s", arg);
1922 static int handle_dotdot_1(const char *arg, char *dotdot,
1923 struct rev_info *revs, int flags,
1924 int cant_be_filename,
1925 struct object_context *a_oc,
1926 struct object_context *b_oc)
1928 const char *a_name, *b_name;
1929 struct object_id a_oid, b_oid;
1930 struct object *a_obj, *b_obj;
1931 unsigned int a_flags, b_flags;
1932 int symmetric = 0;
1933 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1934 unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH;
1936 a_name = arg;
1937 if (!*a_name)
1938 a_name = "HEAD";
1940 b_name = dotdot + 2;
1941 if (*b_name == '.') {
1942 symmetric = 1;
1943 b_name++;
1945 if (!*b_name)
1946 b_name = "HEAD";
1948 if (get_oid_with_context(revs->repo, a_name, oc_flags, &a_oid, a_oc) ||
1949 get_oid_with_context(revs->repo, b_name, oc_flags, &b_oid, b_oc))
1950 return -1;
1952 if (!cant_be_filename) {
1953 *dotdot = '.';
1954 verify_non_filename(revs->prefix, arg);
1955 *dotdot = '\0';
1958 a_obj = parse_object(revs->repo, &a_oid);
1959 b_obj = parse_object(revs->repo, &b_oid);
1960 if (!a_obj || !b_obj)
1961 return dotdot_missing(arg, dotdot, revs, symmetric);
1963 if (!symmetric) {
1964 /* just A..B */
1965 b_flags = flags;
1966 a_flags = flags_exclude;
1967 } else {
1968 /* A...B -- find merge bases between the two */
1969 struct commit *a, *b;
1970 struct commit_list *exclude;
1972 a = lookup_commit_reference(revs->repo, &a_obj->oid);
1973 b = lookup_commit_reference(revs->repo, &b_obj->oid);
1974 if (!a || !b)
1975 return dotdot_missing(arg, dotdot, revs, symmetric);
1977 exclude = get_merge_bases(a, b);
1978 add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE,
1979 flags_exclude);
1980 add_pending_commit_list(revs, exclude, flags_exclude);
1981 free_commit_list(exclude);
1983 b_flags = flags;
1984 a_flags = flags | SYMMETRIC_LEFT;
1987 a_obj->flags |= a_flags;
1988 b_obj->flags |= b_flags;
1989 add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
1990 add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
1991 add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path);
1992 add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path);
1993 return 0;
1996 static int handle_dotdot(const char *arg,
1997 struct rev_info *revs, int flags,
1998 int cant_be_filename)
2000 struct object_context a_oc, b_oc;
2001 char *dotdot = strstr(arg, "..");
2002 int ret;
2004 if (!dotdot)
2005 return -1;
2007 memset(&a_oc, 0, sizeof(a_oc));
2008 memset(&b_oc, 0, sizeof(b_oc));
2010 *dotdot = '\0';
2011 ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename,
2012 &a_oc, &b_oc);
2013 *dotdot = '.';
2015 free(a_oc.path);
2016 free(b_oc.path);
2018 return ret;
2021 static int handle_revision_arg_1(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
2023 struct object_context oc;
2024 char *mark;
2025 struct object *object;
2026 struct object_id oid;
2027 int local_flags;
2028 const char *arg = arg_;
2029 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
2030 unsigned get_sha1_flags = GET_OID_RECORD_PATH;
2032 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
2034 if (!cant_be_filename && !strcmp(arg, "..")) {
2036 * Just ".."? That is not a range but the
2037 * pathspec for the parent directory.
2039 return -1;
2042 if (!handle_dotdot(arg, revs, flags, revarg_opt))
2043 return 0;
2045 mark = strstr(arg, "^@");
2046 if (mark && !mark[2]) {
2047 *mark = 0;
2048 if (add_parents_only(revs, arg, flags, 0))
2049 return 0;
2050 *mark = '^';
2052 mark = strstr(arg, "^!");
2053 if (mark && !mark[2]) {
2054 *mark = 0;
2055 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0))
2056 *mark = '^';
2058 mark = strstr(arg, "^-");
2059 if (mark) {
2060 int exclude_parent = 1;
2062 if (mark[2]) {
2063 char *end;
2064 exclude_parent = strtoul(mark + 2, &end, 10);
2065 if (*end != '\0' || !exclude_parent)
2066 return -1;
2069 *mark = 0;
2070 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent))
2071 *mark = '^';
2074 local_flags = 0;
2075 if (*arg == '^') {
2076 local_flags = UNINTERESTING | BOTTOM;
2077 arg++;
2080 if (revarg_opt & REVARG_COMMITTISH)
2081 get_sha1_flags |= GET_OID_COMMITTISH;
2083 if (get_oid_with_context(revs->repo, arg, get_sha1_flags, &oid, &oc))
2084 return revs->ignore_missing ? 0 : -1;
2085 if (!cant_be_filename)
2086 verify_non_filename(revs->prefix, arg);
2087 object = get_reference(revs, arg, &oid, flags ^ local_flags);
2088 if (!object)
2089 return revs->ignore_missing ? 0 : -1;
2090 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
2091 add_pending_object_with_path(revs, object, arg, oc.mode, oc.path);
2092 free(oc.path);
2093 return 0;
2096 int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt)
2098 int ret = handle_revision_arg_1(arg, revs, flags, revarg_opt);
2099 if (!ret)
2100 revs->rev_input_given = 1;
2101 return ret;
2104 static void read_pathspec_from_stdin(struct strbuf *sb,
2105 struct strvec *prune)
2107 while (strbuf_getline(sb, stdin) != EOF)
2108 strvec_push(prune, sb->buf);
2111 static void read_revisions_from_stdin(struct rev_info *revs,
2112 struct strvec *prune)
2114 struct strbuf sb;
2115 int seen_dashdash = 0;
2116 int save_warning;
2118 save_warning = warn_on_object_refname_ambiguity;
2119 warn_on_object_refname_ambiguity = 0;
2121 strbuf_init(&sb, 1000);
2122 while (strbuf_getline(&sb, stdin) != EOF) {
2123 int len = sb.len;
2124 if (!len)
2125 break;
2126 if (sb.buf[0] == '-') {
2127 if (len == 2 && sb.buf[1] == '-') {
2128 seen_dashdash = 1;
2129 break;
2131 die("options not supported in --stdin mode");
2133 if (handle_revision_arg(sb.buf, revs, 0,
2134 REVARG_CANNOT_BE_FILENAME))
2135 die("bad revision '%s'", sb.buf);
2137 if (seen_dashdash)
2138 read_pathspec_from_stdin(&sb, prune);
2140 strbuf_release(&sb);
2141 warn_on_object_refname_ambiguity = save_warning;
2144 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
2146 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
2149 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
2151 append_header_grep_pattern(&revs->grep_filter, field, pattern);
2154 static void add_message_grep(struct rev_info *revs, const char *pattern)
2156 add_grep(revs, pattern, GREP_PATTERN_BODY);
2159 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
2160 int *unkc, const char **unkv,
2161 const struct setup_revision_opt* opt)
2163 const char *arg = argv[0];
2164 const char *optarg;
2165 int argcount;
2166 const unsigned hexsz = the_hash_algo->hexsz;
2168 /* pseudo revision arguments */
2169 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
2170 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
2171 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
2172 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
2173 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
2174 !strcmp(arg, "--indexed-objects") ||
2175 !strcmp(arg, "--alternate-refs") ||
2176 starts_with(arg, "--exclude=") ||
2177 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
2178 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
2180 unkv[(*unkc)++] = arg;
2181 return 1;
2184 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
2185 revs->max_count = atoi(optarg);
2186 revs->no_walk = 0;
2187 return argcount;
2188 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
2189 revs->skip_count = atoi(optarg);
2190 return argcount;
2191 } else if ((*arg == '-') && isdigit(arg[1])) {
2192 /* accept -<digit>, like traditional "head" */
2193 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
2194 revs->max_count < 0)
2195 die("'%s': not a non-negative integer", arg + 1);
2196 revs->no_walk = 0;
2197 } else if (!strcmp(arg, "-n")) {
2198 if (argc <= 1)
2199 return error("-n requires an argument");
2200 revs->max_count = atoi(argv[1]);
2201 revs->no_walk = 0;
2202 return 2;
2203 } else if (skip_prefix(arg, "-n", &optarg)) {
2204 revs->max_count = atoi(optarg);
2205 revs->no_walk = 0;
2206 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
2207 revs->max_age = atoi(optarg);
2208 return argcount;
2209 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
2210 revs->max_age = approxidate(optarg);
2211 return argcount;
2212 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
2213 revs->max_age = approxidate(optarg);
2214 return argcount;
2215 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
2216 revs->min_age = atoi(optarg);
2217 return argcount;
2218 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
2219 revs->min_age = approxidate(optarg);
2220 return argcount;
2221 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
2222 revs->min_age = approxidate(optarg);
2223 return argcount;
2224 } else if (!strcmp(arg, "--first-parent")) {
2225 revs->first_parent_only = 1;
2226 } else if (!strcmp(arg, "--ancestry-path")) {
2227 revs->ancestry_path = 1;
2228 revs->simplify_history = 0;
2229 revs->limited = 1;
2230 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
2231 init_reflog_walk(&revs->reflog_info);
2232 } else if (!strcmp(arg, "--default")) {
2233 if (argc <= 1)
2234 return error("bad --default argument");
2235 revs->def = argv[1];
2236 return 2;
2237 } else if (!strcmp(arg, "--merge")) {
2238 revs->show_merge = 1;
2239 } else if (!strcmp(arg, "--topo-order")) {
2240 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
2241 revs->topo_order = 1;
2242 } else if (!strcmp(arg, "--simplify-merges")) {
2243 revs->simplify_merges = 1;
2244 revs->topo_order = 1;
2245 revs->rewrite_parents = 1;
2246 revs->simplify_history = 0;
2247 revs->limited = 1;
2248 } else if (!strcmp(arg, "--simplify-by-decoration")) {
2249 revs->simplify_merges = 1;
2250 revs->topo_order = 1;
2251 revs->rewrite_parents = 1;
2252 revs->simplify_history = 0;
2253 revs->simplify_by_decoration = 1;
2254 revs->limited = 1;
2255 revs->prune = 1;
2256 } else if (!strcmp(arg, "--date-order")) {
2257 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
2258 revs->topo_order = 1;
2259 } else if (!strcmp(arg, "--author-date-order")) {
2260 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
2261 revs->topo_order = 1;
2262 } else if (!strcmp(arg, "--early-output")) {
2263 revs->early_output = 100;
2264 revs->topo_order = 1;
2265 } else if (skip_prefix(arg, "--early-output=", &optarg)) {
2266 if (strtoul_ui(optarg, 10, &revs->early_output) < 0)
2267 die("'%s': not a non-negative integer", optarg);
2268 revs->topo_order = 1;
2269 } else if (!strcmp(arg, "--parents")) {
2270 revs->rewrite_parents = 1;
2271 revs->print_parents = 1;
2272 } else if (!strcmp(arg, "--dense")) {
2273 revs->dense = 1;
2274 } else if (!strcmp(arg, "--sparse")) {
2275 revs->dense = 0;
2276 } else if (!strcmp(arg, "--in-commit-order")) {
2277 revs->tree_blobs_in_commit_order = 1;
2278 } else if (!strcmp(arg, "--remove-empty")) {
2279 revs->remove_empty_trees = 1;
2280 } else if (!strcmp(arg, "--merges")) {
2281 revs->min_parents = 2;
2282 } else if (!strcmp(arg, "--no-merges")) {
2283 revs->max_parents = 1;
2284 } else if (skip_prefix(arg, "--min-parents=", &optarg)) {
2285 revs->min_parents = atoi(optarg);
2286 } else if (!strcmp(arg, "--no-min-parents")) {
2287 revs->min_parents = 0;
2288 } else if (skip_prefix(arg, "--max-parents=", &optarg)) {
2289 revs->max_parents = atoi(optarg);
2290 } else if (!strcmp(arg, "--no-max-parents")) {
2291 revs->max_parents = -1;
2292 } else if (!strcmp(arg, "--boundary")) {
2293 revs->boundary = 1;
2294 } else if (!strcmp(arg, "--left-right")) {
2295 revs->left_right = 1;
2296 } else if (!strcmp(arg, "--left-only")) {
2297 if (revs->right_only)
2298 die("--left-only is incompatible with --right-only"
2299 " or --cherry");
2300 revs->left_only = 1;
2301 } else if (!strcmp(arg, "--right-only")) {
2302 if (revs->left_only)
2303 die(_("options '%s' and '%s' cannot be used together"), "--right-only", "--left-only");
2304 revs->right_only = 1;
2305 } else if (!strcmp(arg, "--cherry")) {
2306 if (revs->left_only)
2307 die(_("options '%s' and '%s' cannot be used together"), "--cherry", "--left-only");
2308 revs->cherry_mark = 1;
2309 revs->right_only = 1;
2310 revs->max_parents = 1;
2311 revs->limited = 1;
2312 } else if (!strcmp(arg, "--count")) {
2313 revs->count = 1;
2314 } else if (!strcmp(arg, "--cherry-mark")) {
2315 if (revs->cherry_pick)
2316 die(_("options '%s' and '%s' cannot be used together"), "--cherry-mark", "--cherry-pick");
2317 revs->cherry_mark = 1;
2318 revs->limited = 1; /* needs limit_list() */
2319 } else if (!strcmp(arg, "--cherry-pick")) {
2320 if (revs->cherry_mark)
2321 die(_("options '%s' and '%s' cannot be used together"), "--cherry-pick", "--cherry-mark");
2322 revs->cherry_pick = 1;
2323 revs->limited = 1;
2324 } else if (!strcmp(arg, "--objects")) {
2325 revs->tag_objects = 1;
2326 revs->tree_objects = 1;
2327 revs->blob_objects = 1;
2328 } else if (!strcmp(arg, "--objects-edge")) {
2329 revs->tag_objects = 1;
2330 revs->tree_objects = 1;
2331 revs->blob_objects = 1;
2332 revs->edge_hint = 1;
2333 } else if (!strcmp(arg, "--objects-edge-aggressive")) {
2334 revs->tag_objects = 1;
2335 revs->tree_objects = 1;
2336 revs->blob_objects = 1;
2337 revs->edge_hint = 1;
2338 revs->edge_hint_aggressive = 1;
2339 } else if (!strcmp(arg, "--verify-objects")) {
2340 revs->tag_objects = 1;
2341 revs->tree_objects = 1;
2342 revs->blob_objects = 1;
2343 revs->verify_objects = 1;
2344 } else if (!strcmp(arg, "--unpacked")) {
2345 revs->unpacked = 1;
2346 } else if (starts_with(arg, "--unpacked=")) {
2347 die(_("--unpacked=<packfile> no longer supported"));
2348 } else if (!strcmp(arg, "--no-kept-objects")) {
2349 revs->no_kept_objects = 1;
2350 revs->keep_pack_cache_flags |= IN_CORE_KEEP_PACKS;
2351 revs->keep_pack_cache_flags |= ON_DISK_KEEP_PACKS;
2352 } else if (skip_prefix(arg, "--no-kept-objects=", &optarg)) {
2353 revs->no_kept_objects = 1;
2354 if (!strcmp(optarg, "in-core"))
2355 revs->keep_pack_cache_flags |= IN_CORE_KEEP_PACKS;
2356 if (!strcmp(optarg, "on-disk"))
2357 revs->keep_pack_cache_flags |= ON_DISK_KEEP_PACKS;
2358 } else if (!strcmp(arg, "-r")) {
2359 revs->diff = 1;
2360 revs->diffopt.flags.recursive = 1;
2361 } else if (!strcmp(arg, "-t")) {
2362 revs->diff = 1;
2363 revs->diffopt.flags.recursive = 1;
2364 revs->diffopt.flags.tree_in_recursive = 1;
2365 } else if ((argcount = diff_merges_parse_opts(revs, argv))) {
2366 return argcount;
2367 } else if (!strcmp(arg, "-v")) {
2368 revs->verbose_header = 1;
2369 } else if (!strcmp(arg, "--pretty")) {
2370 revs->verbose_header = 1;
2371 revs->pretty_given = 1;
2372 get_commit_format(NULL, revs);
2373 } else if (skip_prefix(arg, "--pretty=", &optarg) ||
2374 skip_prefix(arg, "--format=", &optarg)) {
2376 * Detached form ("--pretty X" as opposed to "--pretty=X")
2377 * not allowed, since the argument is optional.
2379 revs->verbose_header = 1;
2380 revs->pretty_given = 1;
2381 get_commit_format(optarg, revs);
2382 } else if (!strcmp(arg, "--expand-tabs")) {
2383 revs->expand_tabs_in_log = 8;
2384 } else if (!strcmp(arg, "--no-expand-tabs")) {
2385 revs->expand_tabs_in_log = 0;
2386 } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
2387 int val;
2388 if (strtol_i(arg, 10, &val) < 0 || val < 0)
2389 die("'%s': not a non-negative integer", arg);
2390 revs->expand_tabs_in_log = val;
2391 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
2392 enable_default_display_notes(&revs->notes_opt, &revs->show_notes);
2393 revs->show_notes_given = 1;
2394 } else if (!strcmp(arg, "--show-signature")) {
2395 revs->show_signature = 1;
2396 } else if (!strcmp(arg, "--no-show-signature")) {
2397 revs->show_signature = 0;
2398 } else if (!strcmp(arg, "--show-linear-break")) {
2399 revs->break_bar = " ..........";
2400 revs->track_linear = 1;
2401 revs->track_first_time = 1;
2402 } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) {
2403 revs->break_bar = xstrdup(optarg);
2404 revs->track_linear = 1;
2405 revs->track_first_time = 1;
2406 } else if (skip_prefix(arg, "--show-notes=", &optarg) ||
2407 skip_prefix(arg, "--notes=", &optarg)) {
2408 if (starts_with(arg, "--show-notes=") &&
2409 revs->notes_opt.use_default_notes < 0)
2410 revs->notes_opt.use_default_notes = 1;
2411 enable_ref_display_notes(&revs->notes_opt, &revs->show_notes, optarg);
2412 revs->show_notes_given = 1;
2413 } else if (!strcmp(arg, "--no-notes")) {
2414 disable_display_notes(&revs->notes_opt, &revs->show_notes);
2415 revs->show_notes_given = 1;
2416 } else if (!strcmp(arg, "--standard-notes")) {
2417 revs->show_notes_given = 1;
2418 revs->notes_opt.use_default_notes = 1;
2419 } else if (!strcmp(arg, "--no-standard-notes")) {
2420 revs->notes_opt.use_default_notes = 0;
2421 } else if (!strcmp(arg, "--oneline")) {
2422 revs->verbose_header = 1;
2423 get_commit_format("oneline", revs);
2424 revs->pretty_given = 1;
2425 revs->abbrev_commit = 1;
2426 } else if (!strcmp(arg, "--graph")) {
2427 revs->topo_order = 1;
2428 revs->rewrite_parents = 1;
2429 revs->graph = graph_init(revs);
2430 } else if (!strcmp(arg, "--encode-email-headers")) {
2431 revs->encode_email_headers = 1;
2432 } else if (!strcmp(arg, "--no-encode-email-headers")) {
2433 revs->encode_email_headers = 0;
2434 } else if (!strcmp(arg, "--root")) {
2435 revs->show_root_diff = 1;
2436 } else if (!strcmp(arg, "--no-commit-id")) {
2437 revs->no_commit_id = 1;
2438 } else if (!strcmp(arg, "--always")) {
2439 revs->always_show_header = 1;
2440 } else if (!strcmp(arg, "--no-abbrev")) {
2441 revs->abbrev = 0;
2442 } else if (!strcmp(arg, "--abbrev")) {
2443 revs->abbrev = DEFAULT_ABBREV;
2444 } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
2445 revs->abbrev = strtoul(optarg, NULL, 10);
2446 if (revs->abbrev < MINIMUM_ABBREV)
2447 revs->abbrev = MINIMUM_ABBREV;
2448 else if (revs->abbrev > hexsz)
2449 revs->abbrev = hexsz;
2450 } else if (!strcmp(arg, "--abbrev-commit")) {
2451 revs->abbrev_commit = 1;
2452 revs->abbrev_commit_given = 1;
2453 } else if (!strcmp(arg, "--no-abbrev-commit")) {
2454 revs->abbrev_commit = 0;
2455 } else if (!strcmp(arg, "--full-diff")) {
2456 revs->diff = 1;
2457 revs->full_diff = 1;
2458 } else if (!strcmp(arg, "--show-pulls")) {
2459 revs->show_pulls = 1;
2460 } else if (!strcmp(arg, "--full-history")) {
2461 revs->simplify_history = 0;
2462 } else if (!strcmp(arg, "--relative-date")) {
2463 revs->date_mode.type = DATE_RELATIVE;
2464 revs->date_mode_explicit = 1;
2465 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
2466 parse_date_format(optarg, &revs->date_mode);
2467 revs->date_mode_explicit = 1;
2468 return argcount;
2469 } else if (!strcmp(arg, "--log-size")) {
2470 revs->show_log_size = 1;
2473 * Grepping the commit log
2475 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2476 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2477 return argcount;
2478 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2479 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2480 return argcount;
2481 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2482 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2483 return argcount;
2484 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2485 add_message_grep(revs, optarg);
2486 return argcount;
2487 } else if (!strcmp(arg, "--basic-regexp")) {
2488 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
2489 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2490 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
2491 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2492 revs->grep_filter.ignore_case = 1;
2493 revs->diffopt.pickaxe_opts |= DIFF_PICKAXE_IGNORE_CASE;
2494 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2495 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
2496 } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) {
2497 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
2498 } else if (!strcmp(arg, "--all-match")) {
2499 revs->grep_filter.all_match = 1;
2500 } else if (!strcmp(arg, "--invert-grep")) {
2501 revs->grep_filter.no_body_match = 1;
2502 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2503 if (strcmp(optarg, "none"))
2504 git_log_output_encoding = xstrdup(optarg);
2505 else
2506 git_log_output_encoding = "";
2507 return argcount;
2508 } else if (!strcmp(arg, "--reverse")) {
2509 revs->reverse ^= 1;
2510 } else if (!strcmp(arg, "--children")) {
2511 revs->children.name = "children";
2512 revs->limited = 1;
2513 } else if (!strcmp(arg, "--ignore-missing")) {
2514 revs->ignore_missing = 1;
2515 } else if (opt && opt->allow_exclude_promisor_objects &&
2516 !strcmp(arg, "--exclude-promisor-objects")) {
2517 if (fetch_if_missing)
2518 BUG("exclude_promisor_objects can only be used when fetch_if_missing is 0");
2519 revs->exclude_promisor_objects = 1;
2520 } else {
2521 int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
2522 if (!opts)
2523 unkv[(*unkc)++] = arg;
2524 return opts;
2526 if (revs->graph && revs->track_linear)
2527 die(_("options '%s' and '%s' cannot be used together"), "--show-linear-break", "--graph");
2529 return 1;
2532 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2533 const struct option *options,
2534 const char * const usagestr[])
2536 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2537 &ctx->cpidx, ctx->out, NULL);
2538 if (n <= 0) {
2539 error("unknown option `%s'", ctx->argv[0]);
2540 usage_with_options(usagestr, options);
2542 ctx->argv += n;
2543 ctx->argc -= n;
2546 static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn,
2547 void *cb_data, const char *term)
2549 struct strbuf bisect_refs = STRBUF_INIT;
2550 int status;
2551 strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2552 status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data);
2553 strbuf_release(&bisect_refs);
2554 return status;
2557 static int for_each_bad_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
2559 return for_each_bisect_ref(refs, fn, cb_data, term_bad);
2562 static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
2564 return for_each_bisect_ref(refs, fn, cb_data, term_good);
2567 static int handle_revision_pseudo_opt(struct rev_info *revs,
2568 const char **argv, int *flags)
2570 const char *arg = argv[0];
2571 const char *optarg;
2572 struct ref_store *refs;
2573 int argcount;
2575 if (revs->repo != the_repository) {
2577 * We need some something like get_submodule_worktrees()
2578 * before we can go through all worktrees of a submodule,
2579 * .e.g with adding all HEADs from --all, which is not
2580 * supported right now, so stick to single worktree.
2582 if (!revs->single_worktree)
2583 BUG("--single-worktree cannot be used together with submodule");
2585 refs = get_main_ref_store(revs->repo);
2588 * NOTE!
2590 * Commands like "git shortlog" will not accept the options below
2591 * unless parse_revision_opt queues them (as opposed to erroring
2592 * out).
2594 * When implementing your new pseudo-option, remember to
2595 * register it in the list at the top of handle_revision_opt.
2597 if (!strcmp(arg, "--all")) {
2598 handle_refs(refs, revs, *flags, refs_for_each_ref);
2599 handle_refs(refs, revs, *flags, refs_head_ref);
2600 if (!revs->single_worktree) {
2601 struct all_refs_cb cb;
2603 init_all_refs_cb(&cb, revs, *flags);
2604 other_head_refs(handle_one_ref, &cb);
2606 clear_ref_exclusion(&revs->ref_excludes);
2607 } else if (!strcmp(arg, "--branches")) {
2608 handle_refs(refs, revs, *flags, refs_for_each_branch_ref);
2609 clear_ref_exclusion(&revs->ref_excludes);
2610 } else if (!strcmp(arg, "--bisect")) {
2611 read_bisect_terms(&term_bad, &term_good);
2612 handle_refs(refs, revs, *flags, for_each_bad_bisect_ref);
2613 handle_refs(refs, revs, *flags ^ (UNINTERESTING | BOTTOM),
2614 for_each_good_bisect_ref);
2615 revs->bisect = 1;
2616 } else if (!strcmp(arg, "--tags")) {
2617 handle_refs(refs, revs, *flags, refs_for_each_tag_ref);
2618 clear_ref_exclusion(&revs->ref_excludes);
2619 } else if (!strcmp(arg, "--remotes")) {
2620 handle_refs(refs, revs, *flags, refs_for_each_remote_ref);
2621 clear_ref_exclusion(&revs->ref_excludes);
2622 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2623 struct all_refs_cb cb;
2624 init_all_refs_cb(&cb, revs, *flags);
2625 for_each_glob_ref(handle_one_ref, optarg, &cb);
2626 clear_ref_exclusion(&revs->ref_excludes);
2627 return argcount;
2628 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2629 add_ref_exclusion(&revs->ref_excludes, optarg);
2630 return argcount;
2631 } else if (skip_prefix(arg, "--branches=", &optarg)) {
2632 struct all_refs_cb cb;
2633 init_all_refs_cb(&cb, revs, *flags);
2634 for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb);
2635 clear_ref_exclusion(&revs->ref_excludes);
2636 } else if (skip_prefix(arg, "--tags=", &optarg)) {
2637 struct all_refs_cb cb;
2638 init_all_refs_cb(&cb, revs, *flags);
2639 for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb);
2640 clear_ref_exclusion(&revs->ref_excludes);
2641 } else if (skip_prefix(arg, "--remotes=", &optarg)) {
2642 struct all_refs_cb cb;
2643 init_all_refs_cb(&cb, revs, *flags);
2644 for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb);
2645 clear_ref_exclusion(&revs->ref_excludes);
2646 } else if (!strcmp(arg, "--reflog")) {
2647 add_reflogs_to_pending(revs, *flags);
2648 } else if (!strcmp(arg, "--indexed-objects")) {
2649 add_index_objects_to_pending(revs, *flags);
2650 } else if (!strcmp(arg, "--alternate-refs")) {
2651 add_alternate_refs_to_pending(revs, *flags);
2652 } else if (!strcmp(arg, "--not")) {
2653 *flags ^= UNINTERESTING | BOTTOM;
2654 } else if (!strcmp(arg, "--no-walk")) {
2655 revs->no_walk = 1;
2656 } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
2658 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2659 * not allowed, since the argument is optional.
2661 revs->no_walk = 1;
2662 if (!strcmp(optarg, "sorted"))
2663 revs->unsorted_input = 0;
2664 else if (!strcmp(optarg, "unsorted"))
2665 revs->unsorted_input = 1;
2666 else
2667 return error("invalid argument to --no-walk");
2668 } else if (!strcmp(arg, "--do-walk")) {
2669 revs->no_walk = 0;
2670 } else if (!strcmp(arg, "--single-worktree")) {
2671 revs->single_worktree = 1;
2672 } else {
2673 return 0;
2676 return 1;
2679 static void NORETURN diagnose_missing_default(const char *def)
2681 int flags;
2682 const char *refname;
2684 refname = resolve_ref_unsafe(def, 0, NULL, &flags);
2685 if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2686 die(_("your current branch appears to be broken"));
2688 skip_prefix(refname, "refs/heads/", &refname);
2689 die(_("your current branch '%s' does not have any commits yet"),
2690 refname);
2694 * Parse revision information, filling in the "rev_info" structure,
2695 * and removing the used arguments from the argument list.
2697 * Returns the number of arguments left that weren't recognized
2698 * (which are also moved to the head of the argument list)
2700 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2702 int i, flags, left, seen_dashdash, revarg_opt;
2703 struct strvec prune_data = STRVEC_INIT;
2704 int seen_end_of_options = 0;
2706 /* First, search for "--" */
2707 if (opt && opt->assume_dashdash) {
2708 seen_dashdash = 1;
2709 } else {
2710 seen_dashdash = 0;
2711 for (i = 1; i < argc; i++) {
2712 const char *arg = argv[i];
2713 if (strcmp(arg, "--"))
2714 continue;
2715 argv[i] = NULL;
2716 argc = i;
2717 if (argv[i + 1])
2718 strvec_pushv(&prune_data, argv + i + 1);
2719 seen_dashdash = 1;
2720 break;
2724 /* Second, deal with arguments and options */
2725 flags = 0;
2726 revarg_opt = opt ? opt->revarg_opt : 0;
2727 if (seen_dashdash)
2728 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2729 for (left = i = 1; i < argc; i++) {
2730 const char *arg = argv[i];
2731 if (!seen_end_of_options && *arg == '-') {
2732 int opts;
2734 opts = handle_revision_pseudo_opt(
2735 revs, argv + i,
2736 &flags);
2737 if (opts > 0) {
2738 i += opts - 1;
2739 continue;
2742 if (!strcmp(arg, "--stdin")) {
2743 if (revs->disable_stdin) {
2744 argv[left++] = arg;
2745 continue;
2747 if (revs->read_from_stdin++)
2748 die("--stdin given twice?");
2749 read_revisions_from_stdin(revs, &prune_data);
2750 continue;
2753 if (!strcmp(arg, "--end-of-options")) {
2754 seen_end_of_options = 1;
2755 continue;
2758 opts = handle_revision_opt(revs, argc - i, argv + i,
2759 &left, argv, opt);
2760 if (opts > 0) {
2761 i += opts - 1;
2762 continue;
2764 if (opts < 0)
2765 exit(128);
2766 continue;
2770 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2771 int j;
2772 if (seen_dashdash || *arg == '^')
2773 die("bad revision '%s'", arg);
2775 /* If we didn't have a "--":
2776 * (1) all filenames must exist;
2777 * (2) all rev-args must not be interpretable
2778 * as a valid filename.
2779 * but the latter we have checked in the main loop.
2781 for (j = i; j < argc; j++)
2782 verify_filename(revs->prefix, argv[j], j == i);
2784 strvec_pushv(&prune_data, argv + i);
2785 break;
2789 if (prune_data.nr) {
2791 * If we need to introduce the magic "a lone ':' means no
2792 * pathspec whatsoever", here is the place to do so.
2794 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2795 * prune_data.nr = 0;
2796 * prune_data.alloc = 0;
2797 * free(prune_data.path);
2798 * prune_data.path = NULL;
2799 * } else {
2800 * terminate prune_data.alloc with NULL and
2801 * call init_pathspec() to set revs->prune_data here.
2804 parse_pathspec(&revs->prune_data, 0, 0,
2805 revs->prefix, prune_data.v);
2807 strvec_clear(&prune_data);
2809 if (revs->def == NULL)
2810 revs->def = opt ? opt->def : NULL;
2811 if (opt && opt->tweak)
2812 opt->tweak(revs, opt);
2813 if (revs->show_merge)
2814 prepare_show_merge(revs);
2815 if (revs->def && !revs->pending.nr && !revs->rev_input_given) {
2816 struct object_id oid;
2817 struct object *object;
2818 struct object_context oc;
2819 if (get_oid_with_context(revs->repo, revs->def, 0, &oid, &oc))
2820 diagnose_missing_default(revs->def);
2821 object = get_reference(revs, revs->def, &oid, 0);
2822 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2825 /* Did the user ask for any diff output? Run the diff! */
2826 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2827 revs->diff = 1;
2829 /* Pickaxe, diff-filter and rename following need diffs */
2830 if ((revs->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
2831 revs->diffopt.filter ||
2832 revs->diffopt.flags.follow_renames)
2833 revs->diff = 1;
2835 if (revs->diffopt.objfind)
2836 revs->simplify_history = 0;
2838 if (revs->line_level_traverse) {
2839 if (want_ancestry(revs))
2840 revs->limited = 1;
2841 revs->topo_order = 1;
2844 if (revs->topo_order && !generation_numbers_enabled(the_repository))
2845 revs->limited = 1;
2847 if (revs->prune_data.nr) {
2848 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2849 /* Can't prune commits with rename following: the paths change.. */
2850 if (!revs->diffopt.flags.follow_renames)
2851 revs->prune = 1;
2852 if (!revs->full_diff)
2853 copy_pathspec(&revs->diffopt.pathspec,
2854 &revs->prune_data);
2857 diff_merges_setup_revs(revs);
2859 revs->diffopt.abbrev = revs->abbrev;
2861 diff_setup_done(&revs->diffopt);
2863 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2864 &revs->grep_filter);
2865 if (!is_encoding_utf8(get_log_output_encoding()))
2866 revs->grep_filter.ignore_locale = 1;
2867 compile_grep_patterns(&revs->grep_filter);
2869 if (revs->reverse && revs->reflog_info)
2870 die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--walk-reflogs");
2871 if (revs->reflog_info && revs->limited)
2872 die("cannot combine --walk-reflogs with history-limiting options");
2873 if (revs->rewrite_parents && revs->children.name)
2874 die(_("options '%s' and '%s' cannot be used together"), "--parents", "--children");
2877 * Limitations on the graph functionality
2879 if (revs->reverse && revs->graph)
2880 die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--graph");
2882 if (revs->reflog_info && revs->graph)
2883 die(_("options '%s' and '%s' cannot be used together"), "--walk-reflogs", "--graph");
2884 if (revs->no_walk && revs->graph)
2885 die(_("options '%s' and '%s' cannot be used together"), "--no-walk", "--graph");
2886 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2887 die(_("the option '%s' requires '%s'"), "--grep-reflog", "--walk-reflogs");
2889 if (revs->line_level_traverse &&
2890 (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT)))
2891 die(_("-L does not yet support diff formats besides -p and -s"));
2893 if (revs->expand_tabs_in_log < 0)
2894 revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2896 return left;
2899 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2901 struct commit_list *l = xcalloc(1, sizeof(*l));
2903 l->item = child;
2904 l->next = add_decoration(&revs->children, &parent->object, l);
2907 static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2909 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2910 struct commit_list **pp, *p;
2911 int surviving_parents;
2913 /* Examine existing parents while marking ones we have seen... */
2914 pp = &commit->parents;
2915 surviving_parents = 0;
2916 while ((p = *pp) != NULL) {
2917 struct commit *parent = p->item;
2918 if (parent->object.flags & TMP_MARK) {
2919 *pp = p->next;
2920 if (ts)
2921 compact_treesame(revs, commit, surviving_parents);
2922 continue;
2924 parent->object.flags |= TMP_MARK;
2925 surviving_parents++;
2926 pp = &p->next;
2928 /* clear the temporary mark */
2929 for (p = commit->parents; p; p = p->next) {
2930 p->item->object.flags &= ~TMP_MARK;
2932 /* no update_treesame() - removing duplicates can't affect TREESAME */
2933 return surviving_parents;
2936 struct merge_simplify_state {
2937 struct commit *simplified;
2940 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2942 struct merge_simplify_state *st;
2944 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2945 if (!st) {
2946 CALLOC_ARRAY(st, 1);
2947 add_decoration(&revs->merge_simplification, &commit->object, st);
2949 return st;
2952 static int mark_redundant_parents(struct commit *commit)
2954 struct commit_list *h = reduce_heads(commit->parents);
2955 int i = 0, marked = 0;
2956 struct commit_list *po, *pn;
2958 /* Want these for sanity-checking only */
2959 int orig_cnt = commit_list_count(commit->parents);
2960 int cnt = commit_list_count(h);
2963 * Not ready to remove items yet, just mark them for now, based
2964 * on the output of reduce_heads(). reduce_heads outputs the reduced
2965 * set in its original order, so this isn't too hard.
2967 po = commit->parents;
2968 pn = h;
2969 while (po) {
2970 if (pn && po->item == pn->item) {
2971 pn = pn->next;
2972 i++;
2973 } else {
2974 po->item->object.flags |= TMP_MARK;
2975 marked++;
2977 po=po->next;
2980 if (i != cnt || cnt+marked != orig_cnt)
2981 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2983 free_commit_list(h);
2985 return marked;
2988 static int mark_treesame_root_parents(struct commit *commit)
2990 struct commit_list *p;
2991 int marked = 0;
2993 for (p = commit->parents; p; p = p->next) {
2994 struct commit *parent = p->item;
2995 if (!parent->parents && (parent->object.flags & TREESAME)) {
2996 parent->object.flags |= TMP_MARK;
2997 marked++;
3001 return marked;
3005 * Awkward naming - this means one parent we are TREESAME to.
3006 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
3007 * empty tree). Better name suggestions?
3009 static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
3011 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
3012 struct commit *unmarked = NULL, *marked = NULL;
3013 struct commit_list *p;
3014 unsigned n;
3016 for (p = commit->parents, n = 0; p; p = p->next, n++) {
3017 if (ts->treesame[n]) {
3018 if (p->item->object.flags & TMP_MARK) {
3019 if (!marked)
3020 marked = p->item;
3021 } else {
3022 if (!unmarked) {
3023 unmarked = p->item;
3024 break;
3031 * If we are TREESAME to a marked-for-deletion parent, but not to any
3032 * unmarked parents, unmark the first TREESAME parent. This is the
3033 * parent that the default simplify_history==1 scan would have followed,
3034 * and it doesn't make sense to omit that path when asking for a
3035 * simplified full history. Retaining it improves the chances of
3036 * understanding odd missed merges that took an old version of a file.
3038 * Example:
3040 * I--------*X A modified the file, but mainline merge X used
3041 * \ / "-s ours", so took the version from I. X is
3042 * `-*A--' TREESAME to I and !TREESAME to A.
3044 * Default log from X would produce "I". Without this check,
3045 * --full-history --simplify-merges would produce "I-A-X", showing
3046 * the merge commit X and that it changed A, but not making clear that
3047 * it had just taken the I version. With this check, the topology above
3048 * is retained.
3050 * Note that it is possible that the simplification chooses a different
3051 * TREESAME parent from the default, in which case this test doesn't
3052 * activate, and we _do_ drop the default parent. Example:
3054 * I------X A modified the file, but it was reverted in B,
3055 * \ / meaning mainline merge X is TREESAME to both
3056 * *A-*B parents.
3058 * Default log would produce "I" by following the first parent;
3059 * --full-history --simplify-merges will produce "I-A-B". But this is a
3060 * reasonable result - it presents a logical full history leading from
3061 * I to X, and X is not an important merge.
3063 if (!unmarked && marked) {
3064 marked->object.flags &= ~TMP_MARK;
3065 return 1;
3068 return 0;
3071 static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
3073 struct commit_list **pp, *p;
3074 int nth_parent, removed = 0;
3076 pp = &commit->parents;
3077 nth_parent = 0;
3078 while ((p = *pp) != NULL) {
3079 struct commit *parent = p->item;
3080 if (parent->object.flags & TMP_MARK) {
3081 parent->object.flags &= ~TMP_MARK;
3082 *pp = p->next;
3083 free(p);
3084 removed++;
3085 compact_treesame(revs, commit, nth_parent);
3086 continue;
3088 pp = &p->next;
3089 nth_parent++;
3092 /* Removing parents can only increase TREESAMEness */
3093 if (removed && !(commit->object.flags & TREESAME))
3094 update_treesame(revs, commit);
3096 return nth_parent;
3099 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
3101 struct commit_list *p;
3102 struct commit *parent;
3103 struct merge_simplify_state *st, *pst;
3104 int cnt;
3106 st = locate_simplify_state(revs, commit);
3109 * Have we handled this one?
3111 if (st->simplified)
3112 return tail;
3115 * An UNINTERESTING commit simplifies to itself, so does a
3116 * root commit. We do not rewrite parents of such commit
3117 * anyway.
3119 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
3120 st->simplified = commit;
3121 return tail;
3125 * Do we know what commit all of our parents that matter
3126 * should be rewritten to? Otherwise we are not ready to
3127 * rewrite this one yet.
3129 for (cnt = 0, p = commit->parents; p; p = p->next) {
3130 pst = locate_simplify_state(revs, p->item);
3131 if (!pst->simplified) {
3132 tail = &commit_list_insert(p->item, tail)->next;
3133 cnt++;
3135 if (revs->first_parent_only)
3136 break;
3138 if (cnt) {
3139 tail = &commit_list_insert(commit, tail)->next;
3140 return tail;
3144 * Rewrite our list of parents. Note that this cannot
3145 * affect our TREESAME flags in any way - a commit is
3146 * always TREESAME to its simplification.
3148 for (p = commit->parents; p; p = p->next) {
3149 pst = locate_simplify_state(revs, p->item);
3150 p->item = pst->simplified;
3151 if (revs->first_parent_only)
3152 break;
3155 if (revs->first_parent_only)
3156 cnt = 1;
3157 else
3158 cnt = remove_duplicate_parents(revs, commit);
3161 * It is possible that we are a merge and one side branch
3162 * does not have any commit that touches the given paths;
3163 * in such a case, the immediate parent from that branch
3164 * will be rewritten to be the merge base.
3166 * o----X X: the commit we are looking at;
3167 * / / o: a commit that touches the paths;
3168 * ---o----'
3170 * Further, a merge of an independent branch that doesn't
3171 * touch the path will reduce to a treesame root parent:
3173 * ----o----X X: the commit we are looking at;
3174 * / o: a commit that touches the paths;
3175 * r r: a root commit not touching the paths
3177 * Detect and simplify both cases.
3179 if (1 < cnt) {
3180 int marked = mark_redundant_parents(commit);
3181 marked += mark_treesame_root_parents(commit);
3182 if (marked)
3183 marked -= leave_one_treesame_to_parent(revs, commit);
3184 if (marked)
3185 cnt = remove_marked_parents(revs, commit);
3189 * A commit simplifies to itself if it is a root, if it is
3190 * UNINTERESTING, if it touches the given paths, or if it is a
3191 * merge and its parents don't simplify to one relevant commit
3192 * (the first two cases are already handled at the beginning of
3193 * this function).
3195 * Otherwise, it simplifies to what its sole relevant parent
3196 * simplifies to.
3198 if (!cnt ||
3199 (commit->object.flags & UNINTERESTING) ||
3200 !(commit->object.flags & TREESAME) ||
3201 (parent = one_relevant_parent(revs, commit->parents)) == NULL ||
3202 (revs->show_pulls && (commit->object.flags & PULL_MERGE)))
3203 st->simplified = commit;
3204 else {
3205 pst = locate_simplify_state(revs, parent);
3206 st->simplified = pst->simplified;
3208 return tail;
3211 static void simplify_merges(struct rev_info *revs)
3213 struct commit_list *list, *next;
3214 struct commit_list *yet_to_do, **tail;
3215 struct commit *commit;
3217 if (!revs->prune)
3218 return;
3220 /* feed the list reversed */
3221 yet_to_do = NULL;
3222 for (list = revs->commits; list; list = next) {
3223 commit = list->item;
3224 next = list->next;
3226 * Do not free(list) here yet; the original list
3227 * is used later in this function.
3229 commit_list_insert(commit, &yet_to_do);
3231 while (yet_to_do) {
3232 list = yet_to_do;
3233 yet_to_do = NULL;
3234 tail = &yet_to_do;
3235 while (list) {
3236 commit = pop_commit(&list);
3237 tail = simplify_one(revs, commit, tail);
3241 /* clean up the result, removing the simplified ones */
3242 list = revs->commits;
3243 revs->commits = NULL;
3244 tail = &revs->commits;
3245 while (list) {
3246 struct merge_simplify_state *st;
3248 commit = pop_commit(&list);
3249 st = locate_simplify_state(revs, commit);
3250 if (st->simplified == commit)
3251 tail = &commit_list_insert(commit, tail)->next;
3255 static void set_children(struct rev_info *revs)
3257 struct commit_list *l;
3258 for (l = revs->commits; l; l = l->next) {
3259 struct commit *commit = l->item;
3260 struct commit_list *p;
3262 for (p = commit->parents; p; p = p->next)
3263 add_child(revs, p->item, commit);
3267 void reset_revision_walk(void)
3269 clear_object_flags(SEEN | ADDED | SHOWN | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE);
3272 static int mark_uninteresting(const struct object_id *oid,
3273 struct packed_git *pack,
3274 uint32_t pos,
3275 void *cb)
3277 struct rev_info *revs = cb;
3278 struct object *o = lookup_unknown_object(revs->repo, oid);
3279 o->flags |= UNINTERESTING | SEEN;
3280 return 0;
3283 define_commit_slab(indegree_slab, int);
3284 define_commit_slab(author_date_slab, timestamp_t);
3286 struct topo_walk_info {
3287 timestamp_t min_generation;
3288 struct prio_queue explore_queue;
3289 struct prio_queue indegree_queue;
3290 struct prio_queue topo_queue;
3291 struct indegree_slab indegree;
3292 struct author_date_slab author_date;
3295 static int topo_walk_atexit_registered;
3296 static unsigned int count_explore_walked;
3297 static unsigned int count_indegree_walked;
3298 static unsigned int count_topo_walked;
3300 static void trace2_topo_walk_statistics_atexit(void)
3302 struct json_writer jw = JSON_WRITER_INIT;
3304 jw_object_begin(&jw, 0);
3305 jw_object_intmax(&jw, "count_explore_walked", count_explore_walked);
3306 jw_object_intmax(&jw, "count_indegree_walked", count_indegree_walked);
3307 jw_object_intmax(&jw, "count_topo_walked", count_topo_walked);
3308 jw_end(&jw);
3310 trace2_data_json("topo_walk", the_repository, "statistics", &jw);
3312 jw_release(&jw);
3315 static inline void test_flag_and_insert(struct prio_queue *q, struct commit *c, int flag)
3317 if (c->object.flags & flag)
3318 return;
3320 c->object.flags |= flag;
3321 prio_queue_put(q, c);
3324 static void explore_walk_step(struct rev_info *revs)
3326 struct topo_walk_info *info = revs->topo_walk_info;
3327 struct commit_list *p;
3328 struct commit *c = prio_queue_get(&info->explore_queue);
3330 if (!c)
3331 return;
3333 if (repo_parse_commit_gently(revs->repo, c, 1) < 0)
3334 return;
3336 count_explore_walked++;
3338 if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
3339 record_author_date(&info->author_date, c);
3341 if (revs->max_age != -1 && (c->date < revs->max_age))
3342 c->object.flags |= UNINTERESTING;
3344 if (process_parents(revs, c, NULL, NULL) < 0)
3345 return;
3347 if (c->object.flags & UNINTERESTING)
3348 mark_parents_uninteresting(c);
3350 for (p = c->parents; p; p = p->next)
3351 test_flag_and_insert(&info->explore_queue, p->item, TOPO_WALK_EXPLORED);
3354 static void explore_to_depth(struct rev_info *revs,
3355 timestamp_t gen_cutoff)
3357 struct topo_walk_info *info = revs->topo_walk_info;
3358 struct commit *c;
3359 while ((c = prio_queue_peek(&info->explore_queue)) &&
3360 commit_graph_generation(c) >= gen_cutoff)
3361 explore_walk_step(revs);
3364 static void indegree_walk_step(struct rev_info *revs)
3366 struct commit_list *p;
3367 struct topo_walk_info *info = revs->topo_walk_info;
3368 struct commit *c = prio_queue_get(&info->indegree_queue);
3370 if (!c)
3371 return;
3373 if (repo_parse_commit_gently(revs->repo, c, 1) < 0)
3374 return;
3376 count_indegree_walked++;
3378 explore_to_depth(revs, commit_graph_generation(c));
3380 for (p = c->parents; p; p = p->next) {
3381 struct commit *parent = p->item;
3382 int *pi = indegree_slab_at(&info->indegree, parent);
3384 if (repo_parse_commit_gently(revs->repo, parent, 1) < 0)
3385 return;
3387 if (*pi)
3388 (*pi)++;
3389 else
3390 *pi = 2;
3392 test_flag_and_insert(&info->indegree_queue, parent, TOPO_WALK_INDEGREE);
3394 if (revs->first_parent_only)
3395 return;
3399 static void compute_indegrees_to_depth(struct rev_info *revs,
3400 timestamp_t gen_cutoff)
3402 struct topo_walk_info *info = revs->topo_walk_info;
3403 struct commit *c;
3404 while ((c = prio_queue_peek(&info->indegree_queue)) &&
3405 commit_graph_generation(c) >= gen_cutoff)
3406 indegree_walk_step(revs);
3409 static void reset_topo_walk(struct rev_info *revs)
3411 struct topo_walk_info *info = revs->topo_walk_info;
3413 clear_prio_queue(&info->explore_queue);
3414 clear_prio_queue(&info->indegree_queue);
3415 clear_prio_queue(&info->topo_queue);
3416 clear_indegree_slab(&info->indegree);
3417 clear_author_date_slab(&info->author_date);
3419 FREE_AND_NULL(revs->topo_walk_info);
3422 static void init_topo_walk(struct rev_info *revs)
3424 struct topo_walk_info *info;
3425 struct commit_list *list;
3426 if (revs->topo_walk_info)
3427 reset_topo_walk(revs);
3429 revs->topo_walk_info = xmalloc(sizeof(struct topo_walk_info));
3430 info = revs->topo_walk_info;
3431 memset(info, 0, sizeof(struct topo_walk_info));
3433 init_indegree_slab(&info->indegree);
3434 memset(&info->explore_queue, 0, sizeof(info->explore_queue));
3435 memset(&info->indegree_queue, 0, sizeof(info->indegree_queue));
3436 memset(&info->topo_queue, 0, sizeof(info->topo_queue));
3438 switch (revs->sort_order) {
3439 default: /* REV_SORT_IN_GRAPH_ORDER */
3440 info->topo_queue.compare = NULL;
3441 break;
3442 case REV_SORT_BY_COMMIT_DATE:
3443 info->topo_queue.compare = compare_commits_by_commit_date;
3444 break;
3445 case REV_SORT_BY_AUTHOR_DATE:
3446 init_author_date_slab(&info->author_date);
3447 info->topo_queue.compare = compare_commits_by_author_date;
3448 info->topo_queue.cb_data = &info->author_date;
3449 break;
3452 info->explore_queue.compare = compare_commits_by_gen_then_commit_date;
3453 info->indegree_queue.compare = compare_commits_by_gen_then_commit_date;
3455 info->min_generation = GENERATION_NUMBER_INFINITY;
3456 for (list = revs->commits; list; list = list->next) {
3457 struct commit *c = list->item;
3458 timestamp_t generation;
3460 if (repo_parse_commit_gently(revs->repo, c, 1))
3461 continue;
3463 test_flag_and_insert(&info->explore_queue, c, TOPO_WALK_EXPLORED);
3464 test_flag_and_insert(&info->indegree_queue, c, TOPO_WALK_INDEGREE);
3466 generation = commit_graph_generation(c);
3467 if (generation < info->min_generation)
3468 info->min_generation = generation;
3470 *(indegree_slab_at(&info->indegree, c)) = 1;
3472 if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
3473 record_author_date(&info->author_date, c);
3475 compute_indegrees_to_depth(revs, info->min_generation);
3477 for (list = revs->commits; list; list = list->next) {
3478 struct commit *c = list->item;
3480 if (*(indegree_slab_at(&info->indegree, c)) == 1)
3481 prio_queue_put(&info->topo_queue, c);
3485 * This is unfortunate; the initial tips need to be shown
3486 * in the order given from the revision traversal machinery.
3488 if (revs->sort_order == REV_SORT_IN_GRAPH_ORDER)
3489 prio_queue_reverse(&info->topo_queue);
3491 if (trace2_is_enabled() && !topo_walk_atexit_registered) {
3492 atexit(trace2_topo_walk_statistics_atexit);
3493 topo_walk_atexit_registered = 1;
3497 static struct commit *next_topo_commit(struct rev_info *revs)
3499 struct commit *c;
3500 struct topo_walk_info *info = revs->topo_walk_info;
3502 /* pop next off of topo_queue */
3503 c = prio_queue_get(&info->topo_queue);
3505 if (c)
3506 *(indegree_slab_at(&info->indegree, c)) = 0;
3508 return c;
3511 static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
3513 struct commit_list *p;
3514 struct topo_walk_info *info = revs->topo_walk_info;
3515 if (process_parents(revs, commit, NULL, NULL) < 0) {
3516 if (!revs->ignore_missing_links)
3517 die("Failed to traverse parents of commit %s",
3518 oid_to_hex(&commit->object.oid));
3521 count_topo_walked++;
3523 for (p = commit->parents; p; p = p->next) {
3524 struct commit *parent = p->item;
3525 int *pi;
3526 timestamp_t generation;
3528 if (parent->object.flags & UNINTERESTING)
3529 continue;
3531 if (repo_parse_commit_gently(revs->repo, parent, 1) < 0)
3532 continue;
3534 generation = commit_graph_generation(parent);
3535 if (generation < info->min_generation) {
3536 info->min_generation = generation;
3537 compute_indegrees_to_depth(revs, info->min_generation);
3540 pi = indegree_slab_at(&info->indegree, parent);
3542 (*pi)--;
3543 if (*pi == 1)
3544 prio_queue_put(&info->topo_queue, parent);
3546 if (revs->first_parent_only)
3547 return;
3551 int prepare_revision_walk(struct rev_info *revs)
3553 int i;
3554 struct object_array old_pending;
3555 struct commit_list **next = &revs->commits;
3557 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
3558 revs->pending.nr = 0;
3559 revs->pending.alloc = 0;
3560 revs->pending.objects = NULL;
3561 for (i = 0; i < old_pending.nr; i++) {
3562 struct object_array_entry *e = old_pending.objects + i;
3563 struct commit *commit = handle_commit(revs, e);
3564 if (commit) {
3565 if (!(commit->object.flags & SEEN)) {
3566 commit->object.flags |= SEEN;
3567 next = commit_list_append(commit, next);
3571 object_array_clear(&old_pending);
3573 /* Signal whether we need per-parent treesame decoration */
3574 if (revs->simplify_merges ||
3575 (revs->limited && limiting_can_increase_treesame(revs)))
3576 revs->treesame.name = "treesame";
3578 if (revs->exclude_promisor_objects) {
3579 for_each_packed_object(mark_uninteresting, revs,
3580 FOR_EACH_OBJECT_PROMISOR_ONLY);
3583 if (!revs->reflog_info)
3584 prepare_to_use_bloom_filter(revs);
3585 if (!revs->unsorted_input)
3586 commit_list_sort_by_date(&revs->commits);
3587 if (revs->no_walk)
3588 return 0;
3589 if (revs->limited) {
3590 if (limit_list(revs) < 0)
3591 return -1;
3592 if (revs->topo_order)
3593 sort_in_topological_order(&revs->commits, revs->sort_order);
3594 } else if (revs->topo_order)
3595 init_topo_walk(revs);
3596 if (revs->line_level_traverse && want_ancestry(revs))
3598 * At the moment we can only do line-level log with parent
3599 * rewriting by performing this expensive pre-filtering step.
3600 * If parent rewriting is not requested, then we rather
3601 * perform the line-level log filtering during the regular
3602 * history traversal.
3604 line_log_filter(revs);
3605 if (revs->simplify_merges)
3606 simplify_merges(revs);
3607 if (revs->children.name)
3608 set_children(revs);
3610 return 0;
3613 static enum rewrite_result rewrite_one_1(struct rev_info *revs,
3614 struct commit **pp,
3615 struct prio_queue *queue)
3617 for (;;) {
3618 struct commit *p = *pp;
3619 if (!revs->limited)
3620 if (process_parents(revs, p, NULL, queue) < 0)
3621 return rewrite_one_error;
3622 if (p->object.flags & UNINTERESTING)
3623 return rewrite_one_ok;
3624 if (!(p->object.flags & TREESAME))
3625 return rewrite_one_ok;
3626 if (!p->parents)
3627 return rewrite_one_noparents;
3628 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
3629 return rewrite_one_ok;
3630 *pp = p;
3634 static void merge_queue_into_list(struct prio_queue *q, struct commit_list **list)
3636 while (q->nr) {
3637 struct commit *item = prio_queue_peek(q);
3638 struct commit_list *p = *list;
3640 if (p && p->item->date >= item->date)
3641 list = &p->next;
3642 else {
3643 p = commit_list_insert(item, list);
3644 list = &p->next; /* skip newly added item */
3645 prio_queue_get(q); /* pop item */
3650 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
3652 struct prio_queue queue = { compare_commits_by_commit_date };
3653 enum rewrite_result ret = rewrite_one_1(revs, pp, &queue);
3654 merge_queue_into_list(&queue, &revs->commits);
3655 clear_prio_queue(&queue);
3656 return ret;
3659 int rewrite_parents(struct rev_info *revs, struct commit *commit,
3660 rewrite_parent_fn_t rewrite_parent)
3662 struct commit_list **pp = &commit->parents;
3663 while (*pp) {
3664 struct commit_list *parent = *pp;
3665 switch (rewrite_parent(revs, &parent->item)) {
3666 case rewrite_one_ok:
3667 break;
3668 case rewrite_one_noparents:
3669 *pp = parent->next;
3670 continue;
3671 case rewrite_one_error:
3672 return -1;
3674 pp = &parent->next;
3676 remove_duplicate_parents(revs, commit);
3677 return 0;
3680 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
3682 char *person, *endp;
3683 size_t len, namelen, maillen;
3684 const char *name;
3685 const char *mail;
3686 struct ident_split ident;
3688 person = strstr(buf->buf, what);
3689 if (!person)
3690 return 0;
3692 person += strlen(what);
3693 endp = strchr(person, '\n');
3694 if (!endp)
3695 return 0;
3697 len = endp - person;
3699 if (split_ident_line(&ident, person, len))
3700 return 0;
3702 mail = ident.mail_begin;
3703 maillen = ident.mail_end - ident.mail_begin;
3704 name = ident.name_begin;
3705 namelen = ident.name_end - ident.name_begin;
3707 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
3708 struct strbuf namemail = STRBUF_INIT;
3710 strbuf_addf(&namemail, "%.*s <%.*s>",
3711 (int)namelen, name, (int)maillen, mail);
3713 strbuf_splice(buf, ident.name_begin - buf->buf,
3714 ident.mail_end - ident.name_begin + 1,
3715 namemail.buf, namemail.len);
3717 strbuf_release(&namemail);
3719 return 1;
3722 return 0;
3725 static int commit_match(struct commit *commit, struct rev_info *opt)
3727 int retval;
3728 const char *encoding;
3729 const char *message;
3730 struct strbuf buf = STRBUF_INIT;
3732 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
3733 return 1;
3735 /* Prepend "fake" headers as needed */
3736 if (opt->grep_filter.use_reflog_filter) {
3737 strbuf_addstr(&buf, "reflog ");
3738 get_reflog_message(&buf, opt->reflog_info);
3739 strbuf_addch(&buf, '\n');
3743 * We grep in the user's output encoding, under the assumption that it
3744 * is the encoding they are most likely to write their grep pattern
3745 * for. In addition, it means we will match the "notes" encoding below,
3746 * so we will not end up with a buffer that has two different encodings
3747 * in it.
3749 encoding = get_log_output_encoding();
3750 message = logmsg_reencode(commit, NULL, encoding);
3752 /* Copy the commit to temporary if we are using "fake" headers */
3753 if (buf.len)
3754 strbuf_addstr(&buf, message);
3756 if (opt->grep_filter.header_list && opt->mailmap) {
3757 if (!buf.len)
3758 strbuf_addstr(&buf, message);
3760 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
3761 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
3764 /* Append "fake" message parts as needed */
3765 if (opt->show_notes) {
3766 if (!buf.len)
3767 strbuf_addstr(&buf, message);
3768 format_display_notes(&commit->object.oid, &buf, encoding, 1);
3772 * Find either in the original commit message, or in the temporary.
3773 * Note that we cast away the constness of "message" here. It is
3774 * const because it may come from the cached commit buffer. That's OK,
3775 * because we know that it is modifiable heap memory, and that while
3776 * grep_buffer may modify it for speed, it will restore any
3777 * changes before returning.
3779 if (buf.len)
3780 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
3781 else
3782 retval = grep_buffer(&opt->grep_filter,
3783 (char *)message, strlen(message));
3784 strbuf_release(&buf);
3785 unuse_commit_buffer(commit, message);
3786 return retval;
3789 static inline int want_ancestry(const struct rev_info *revs)
3791 return (revs->rewrite_parents || revs->children.name);
3795 * Return a timestamp to be used for --since/--until comparisons for this
3796 * commit, based on the revision options.
3798 static timestamp_t comparison_date(const struct rev_info *revs,
3799 struct commit *commit)
3801 return revs->reflog_info ?
3802 get_reflog_timestamp(revs->reflog_info) :
3803 commit->date;
3806 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
3808 if (commit->object.flags & SHOWN)
3809 return commit_ignore;
3810 if (revs->unpacked && has_object_pack(&commit->object.oid))
3811 return commit_ignore;
3812 if (revs->no_kept_objects) {
3813 if (has_object_kept_pack(&commit->object.oid,
3814 revs->keep_pack_cache_flags))
3815 return commit_ignore;
3817 if (commit->object.flags & UNINTERESTING)
3818 return commit_ignore;
3819 if (revs->line_level_traverse && !want_ancestry(revs)) {
3821 * In case of line-level log with parent rewriting
3822 * prepare_revision_walk() already took care of all line-level
3823 * log filtering, and there is nothing left to do here.
3825 * If parent rewriting was not requested, then this is the
3826 * place to perform the line-level log filtering. Notably,
3827 * this check, though expensive, must come before the other,
3828 * cheaper filtering conditions, because the tracked line
3829 * ranges must be adjusted even when the commit will end up
3830 * being ignored based on other conditions.
3832 if (!line_log_process_ranges_arbitrary_commit(revs, commit))
3833 return commit_ignore;
3835 if (revs->min_age != -1 &&
3836 comparison_date(revs, commit) > revs->min_age)
3837 return commit_ignore;
3838 if (revs->min_parents || (revs->max_parents >= 0)) {
3839 int n = commit_list_count(commit->parents);
3840 if ((n < revs->min_parents) ||
3841 ((revs->max_parents >= 0) && (n > revs->max_parents)))
3842 return commit_ignore;
3844 if (!commit_match(commit, revs))
3845 return commit_ignore;
3846 if (revs->prune && revs->dense) {
3847 /* Commit without changes? */
3848 if (commit->object.flags & TREESAME) {
3849 int n;
3850 struct commit_list *p;
3851 /* drop merges unless we want parenthood */
3852 if (!want_ancestry(revs))
3853 return commit_ignore;
3855 if (revs->show_pulls && (commit->object.flags & PULL_MERGE))
3856 return commit_show;
3859 * If we want ancestry, then need to keep any merges
3860 * between relevant commits to tie together topology.
3861 * For consistency with TREESAME and simplification
3862 * use "relevant" here rather than just INTERESTING,
3863 * to treat bottom commit(s) as part of the topology.
3865 for (n = 0, p = commit->parents; p; p = p->next)
3866 if (relevant_commit(p->item))
3867 if (++n >= 2)
3868 return commit_show;
3869 return commit_ignore;
3872 return commit_show;
3875 define_commit_slab(saved_parents, struct commit_list *);
3877 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3880 * You may only call save_parents() once per commit (this is checked
3881 * for non-root commits).
3883 static void save_parents(struct rev_info *revs, struct commit *commit)
3885 struct commit_list **pp;
3887 if (!revs->saved_parents_slab) {
3888 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3889 init_saved_parents(revs->saved_parents_slab);
3892 pp = saved_parents_at(revs->saved_parents_slab, commit);
3895 * When walking with reflogs, we may visit the same commit
3896 * several times: once for each appearance in the reflog.
3898 * In this case, save_parents() will be called multiple times.
3899 * We want to keep only the first set of parents. We need to
3900 * store a sentinel value for an empty (i.e., NULL) parent
3901 * list to distinguish it from a not-yet-saved list, however.
3903 if (*pp)
3904 return;
3905 if (commit->parents)
3906 *pp = copy_commit_list(commit->parents);
3907 else
3908 *pp = EMPTY_PARENT_LIST;
3911 static void free_saved_parents(struct rev_info *revs)
3913 if (revs->saved_parents_slab)
3914 clear_saved_parents(revs->saved_parents_slab);
3917 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3919 struct commit_list *parents;
3921 if (!revs->saved_parents_slab)
3922 return commit->parents;
3924 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3925 if (parents == EMPTY_PARENT_LIST)
3926 return NULL;
3927 return parents;
3930 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3932 enum commit_action action = get_commit_action(revs, commit);
3934 if (action == commit_show &&
3935 revs->prune && revs->dense && want_ancestry(revs)) {
3937 * --full-diff on simplified parents is no good: it
3938 * will show spurious changes from the commits that
3939 * were elided. So we save the parents on the side
3940 * when --full-diff is in effect.
3942 if (revs->full_diff)
3943 save_parents(revs, commit);
3944 if (rewrite_parents(revs, commit, rewrite_one) < 0)
3945 return commit_error;
3947 return action;
3950 static void track_linear(struct rev_info *revs, struct commit *commit)
3952 if (revs->track_first_time) {
3953 revs->linear = 1;
3954 revs->track_first_time = 0;
3955 } else {
3956 struct commit_list *p;
3957 for (p = revs->previous_parents; p; p = p->next)
3958 if (p->item == NULL || /* first commit */
3959 oideq(&p->item->object.oid, &commit->object.oid))
3960 break;
3961 revs->linear = p != NULL;
3963 if (revs->reverse) {
3964 if (revs->linear)
3965 commit->object.flags |= TRACK_LINEAR;
3967 free_commit_list(revs->previous_parents);
3968 revs->previous_parents = copy_commit_list(commit->parents);
3971 static struct commit *get_revision_1(struct rev_info *revs)
3973 while (1) {
3974 struct commit *commit;
3976 if (revs->reflog_info)
3977 commit = next_reflog_entry(revs->reflog_info);
3978 else if (revs->topo_walk_info)
3979 commit = next_topo_commit(revs);
3980 else
3981 commit = pop_commit(&revs->commits);
3983 if (!commit)
3984 return NULL;
3986 if (revs->reflog_info)
3987 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3990 * If we haven't done the list limiting, we need to look at
3991 * the parents here. We also need to do the date-based limiting
3992 * that we'd otherwise have done in limit_list().
3994 if (!revs->limited) {
3995 if (revs->max_age != -1 &&
3996 comparison_date(revs, commit) < revs->max_age)
3997 continue;
3999 if (revs->reflog_info)
4000 try_to_simplify_commit(revs, commit);
4001 else if (revs->topo_walk_info)
4002 expand_topo_walk(revs, commit);
4003 else if (process_parents(revs, commit, &revs->commits, NULL) < 0) {
4004 if (!revs->ignore_missing_links)
4005 die("Failed to traverse parents of commit %s",
4006 oid_to_hex(&commit->object.oid));
4010 switch (simplify_commit(revs, commit)) {
4011 case commit_ignore:
4012 continue;
4013 case commit_error:
4014 die("Failed to simplify parents of commit %s",
4015 oid_to_hex(&commit->object.oid));
4016 default:
4017 if (revs->track_linear)
4018 track_linear(revs, commit);
4019 return commit;
4025 * Return true for entries that have not yet been shown. (This is an
4026 * object_array_each_func_t.)
4028 static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
4030 return !(entry->item->flags & SHOWN);
4034 * If array is on the verge of a realloc, garbage-collect any entries
4035 * that have already been shown to try to free up some space.
4037 static void gc_boundary(struct object_array *array)
4039 if (array->nr == array->alloc)
4040 object_array_filter(array, entry_unshown, NULL);
4043 static void create_boundary_commit_list(struct rev_info *revs)
4045 unsigned i;
4046 struct commit *c;
4047 struct object_array *array = &revs->boundary_commits;
4048 struct object_array_entry *objects = array->objects;
4051 * If revs->commits is non-NULL at this point, an error occurred in
4052 * get_revision_1(). Ignore the error and continue printing the
4053 * boundary commits anyway. (This is what the code has always
4054 * done.)
4056 if (revs->commits) {
4057 free_commit_list(revs->commits);
4058 revs->commits = NULL;
4062 * Put all of the actual boundary commits from revs->boundary_commits
4063 * into revs->commits
4065 for (i = 0; i < array->nr; i++) {
4066 c = (struct commit *)(objects[i].item);
4067 if (!c)
4068 continue;
4069 if (!(c->object.flags & CHILD_SHOWN))
4070 continue;
4071 if (c->object.flags & (SHOWN | BOUNDARY))
4072 continue;
4073 c->object.flags |= BOUNDARY;
4074 commit_list_insert(c, &revs->commits);
4078 * If revs->topo_order is set, sort the boundary commits
4079 * in topological order
4081 sort_in_topological_order(&revs->commits, revs->sort_order);
4084 static struct commit *get_revision_internal(struct rev_info *revs)
4086 struct commit *c = NULL;
4087 struct commit_list *l;
4089 if (revs->boundary == 2) {
4091 * All of the normal commits have already been returned,
4092 * and we are now returning boundary commits.
4093 * create_boundary_commit_list() has populated
4094 * revs->commits with the remaining commits to return.
4096 c = pop_commit(&revs->commits);
4097 if (c)
4098 c->object.flags |= SHOWN;
4099 return c;
4103 * If our max_count counter has reached zero, then we are done. We
4104 * don't simply return NULL because we still might need to show
4105 * boundary commits. But we want to avoid calling get_revision_1, which
4106 * might do a considerable amount of work finding the next commit only
4107 * for us to throw it away.
4109 * If it is non-zero, then either we don't have a max_count at all
4110 * (-1), or it is still counting, in which case we decrement.
4112 if (revs->max_count) {
4113 c = get_revision_1(revs);
4114 if (c) {
4115 while (revs->skip_count > 0) {
4116 revs->skip_count--;
4117 c = get_revision_1(revs);
4118 if (!c)
4119 break;
4123 if (revs->max_count > 0)
4124 revs->max_count--;
4127 if (c)
4128 c->object.flags |= SHOWN;
4130 if (!revs->boundary)
4131 return c;
4133 if (!c) {
4135 * get_revision_1() runs out the commits, and
4136 * we are done computing the boundaries.
4137 * switch to boundary commits output mode.
4139 revs->boundary = 2;
4142 * Update revs->commits to contain the list of
4143 * boundary commits.
4145 create_boundary_commit_list(revs);
4147 return get_revision_internal(revs);
4151 * boundary commits are the commits that are parents of the
4152 * ones we got from get_revision_1() but they themselves are
4153 * not returned from get_revision_1(). Before returning
4154 * 'c', we need to mark its parents that they could be boundaries.
4157 for (l = c->parents; l; l = l->next) {
4158 struct object *p;
4159 p = &(l->item->object);
4160 if (p->flags & (CHILD_SHOWN | SHOWN))
4161 continue;
4162 p->flags |= CHILD_SHOWN;
4163 gc_boundary(&revs->boundary_commits);
4164 add_object_array(p, NULL, &revs->boundary_commits);
4167 return c;
4170 struct commit *get_revision(struct rev_info *revs)
4172 struct commit *c;
4173 struct commit_list *reversed;
4175 if (revs->reverse) {
4176 reversed = NULL;
4177 while ((c = get_revision_internal(revs)))
4178 commit_list_insert(c, &reversed);
4179 revs->commits = reversed;
4180 revs->reverse = 0;
4181 revs->reverse_output_stage = 1;
4184 if (revs->reverse_output_stage) {
4185 c = pop_commit(&revs->commits);
4186 if (revs->track_linear)
4187 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
4188 return c;
4191 c = get_revision_internal(revs);
4192 if (c && revs->graph)
4193 graph_update(revs->graph, c);
4194 if (!c) {
4195 free_saved_parents(revs);
4196 if (revs->previous_parents) {
4197 free_commit_list(revs->previous_parents);
4198 revs->previous_parents = NULL;
4201 return c;
4204 const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
4206 if (commit->object.flags & BOUNDARY)
4207 return "-";
4208 else if (commit->object.flags & UNINTERESTING)
4209 return "^";
4210 else if (commit->object.flags & PATCHSAME)
4211 return "=";
4212 else if (!revs || revs->left_right) {
4213 if (commit->object.flags & SYMMETRIC_LEFT)
4214 return "<";
4215 else
4216 return ">";
4217 } else if (revs->graph)
4218 return "*";
4219 else if (revs->cherry_mark)
4220 return "+";
4221 return "";
4224 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
4226 const char *mark = get_revision_mark(revs, commit);
4227 if (!strlen(mark))
4228 return;
4229 fputs(mark, stdout);
4230 putchar(' ');