debian: new upstream release
[git/debian.git] / revision.c
blob6aa7f4f56755bdc2b79455c61a9882085980f90a
1 #include "cache.h"
2 #include "object-store.h"
3 #include "tag.h"
4 #include "blob.h"
5 #include "tree.h"
6 #include "commit.h"
7 #include "diff.h"
8 #include "refs.h"
9 #include "revision.h"
10 #include "repository.h"
11 #include "graph.h"
12 #include "grep.h"
13 #include "reflog-walk.h"
14 #include "patch-ids.h"
15 #include "decorate.h"
16 #include "log-tree.h"
17 #include "string-list.h"
18 #include "line-log.h"
19 #include "mailmap.h"
20 #include "commit-slab.h"
21 #include "dir.h"
22 #include "cache-tree.h"
23 #include "bisect.h"
24 #include "packfile.h"
25 #include "worktree.h"
26 #include "argv-array.h"
27 #include "commit-reach.h"
28 #include "commit-graph.h"
29 #include "prio-queue.h"
30 #include "hashmap.h"
31 #include "utf8.h"
32 #include "bloom.h"
33 #include "json-writer.h"
35 volatile show_early_output_fn_t show_early_output;
37 static const char *term_bad;
38 static const char *term_good;
40 implement_shared_commit_slab(revision_sources, char *);
42 static inline int want_ancestry(const struct rev_info *revs);
44 void show_object_with_name(FILE *out, struct object *obj, const char *name)
46 const char *p;
48 fprintf(out, "%s ", oid_to_hex(&obj->oid));
49 for (p = name; *p && *p != '\n'; p++)
50 fputc(*p, out);
51 fputc('\n', out);
54 static void mark_blob_uninteresting(struct blob *blob)
56 if (!blob)
57 return;
58 if (blob->object.flags & UNINTERESTING)
59 return;
60 blob->object.flags |= UNINTERESTING;
63 static void mark_tree_contents_uninteresting(struct repository *r,
64 struct tree *tree)
66 struct tree_desc desc;
67 struct name_entry entry;
69 if (parse_tree_gently(tree, 1) < 0)
70 return;
72 init_tree_desc(&desc, tree->buffer, tree->size);
73 while (tree_entry(&desc, &entry)) {
74 switch (object_type(entry.mode)) {
75 case OBJ_TREE:
76 mark_tree_uninteresting(r, lookup_tree(r, &entry.oid));
77 break;
78 case OBJ_BLOB:
79 mark_blob_uninteresting(lookup_blob(r, &entry.oid));
80 break;
81 default:
82 /* Subproject commit - not in this repository */
83 break;
88 * We don't care about the tree any more
89 * after it has been marked uninteresting.
91 free_tree_buffer(tree);
94 void mark_tree_uninteresting(struct repository *r, struct tree *tree)
96 struct object *obj;
98 if (!tree)
99 return;
101 obj = &tree->object;
102 if (obj->flags & UNINTERESTING)
103 return;
104 obj->flags |= UNINTERESTING;
105 mark_tree_contents_uninteresting(r, tree);
108 struct path_and_oids_entry {
109 struct hashmap_entry ent;
110 char *path;
111 struct oidset trees;
114 static int path_and_oids_cmp(const void *hashmap_cmp_fn_data,
115 const struct hashmap_entry *eptr,
116 const struct hashmap_entry *entry_or_key,
117 const void *keydata)
119 const struct path_and_oids_entry *e1, *e2;
121 e1 = container_of(eptr, const struct path_and_oids_entry, ent);
122 e2 = container_of(entry_or_key, const struct path_and_oids_entry, ent);
124 return strcmp(e1->path, e2->path);
127 static void paths_and_oids_init(struct hashmap *map)
129 hashmap_init(map, path_and_oids_cmp, NULL, 0);
132 static void paths_and_oids_clear(struct hashmap *map)
134 struct hashmap_iter iter;
135 struct path_and_oids_entry *entry;
137 hashmap_for_each_entry(map, &iter, entry, ent /* member name */) {
138 oidset_clear(&entry->trees);
139 free(entry->path);
142 hashmap_free_entries(map, struct path_and_oids_entry, ent);
145 static void paths_and_oids_insert(struct hashmap *map,
146 const char *path,
147 const struct object_id *oid)
149 int hash = strhash(path);
150 struct path_and_oids_entry key;
151 struct path_and_oids_entry *entry;
153 hashmap_entry_init(&key.ent, hash);
155 /* use a shallow copy for the lookup */
156 key.path = (char *)path;
157 oidset_init(&key.trees, 0);
159 entry = hashmap_get_entry(map, &key, ent, NULL);
160 if (!entry) {
161 entry = xcalloc(1, sizeof(struct path_and_oids_entry));
162 hashmap_entry_init(&entry->ent, hash);
163 entry->path = xstrdup(key.path);
164 oidset_init(&entry->trees, 16);
165 hashmap_put(map, &entry->ent);
168 oidset_insert(&entry->trees, oid);
171 static void add_children_by_path(struct repository *r,
172 struct tree *tree,
173 struct hashmap *map)
175 struct tree_desc desc;
176 struct name_entry entry;
178 if (!tree)
179 return;
181 if (parse_tree_gently(tree, 1) < 0)
182 return;
184 init_tree_desc(&desc, tree->buffer, tree->size);
185 while (tree_entry(&desc, &entry)) {
186 switch (object_type(entry.mode)) {
187 case OBJ_TREE:
188 paths_and_oids_insert(map, entry.path, &entry.oid);
190 if (tree->object.flags & UNINTERESTING) {
191 struct tree *child = lookup_tree(r, &entry.oid);
192 if (child)
193 child->object.flags |= UNINTERESTING;
195 break;
196 case OBJ_BLOB:
197 if (tree->object.flags & UNINTERESTING) {
198 struct blob *child = lookup_blob(r, &entry.oid);
199 if (child)
200 child->object.flags |= UNINTERESTING;
202 break;
203 default:
204 /* Subproject commit - not in this repository */
205 break;
209 free_tree_buffer(tree);
212 void mark_trees_uninteresting_sparse(struct repository *r,
213 struct oidset *trees)
215 unsigned has_interesting = 0, has_uninteresting = 0;
216 struct hashmap map;
217 struct hashmap_iter map_iter;
218 struct path_and_oids_entry *entry;
219 struct object_id *oid;
220 struct oidset_iter iter;
222 oidset_iter_init(trees, &iter);
223 while ((!has_interesting || !has_uninteresting) &&
224 (oid = oidset_iter_next(&iter))) {
225 struct tree *tree = lookup_tree(r, oid);
227 if (!tree)
228 continue;
230 if (tree->object.flags & UNINTERESTING)
231 has_uninteresting = 1;
232 else
233 has_interesting = 1;
236 /* Do not walk unless we have both types of trees. */
237 if (!has_uninteresting || !has_interesting)
238 return;
240 paths_and_oids_init(&map);
242 oidset_iter_init(trees, &iter);
243 while ((oid = oidset_iter_next(&iter))) {
244 struct tree *tree = lookup_tree(r, oid);
245 add_children_by_path(r, tree, &map);
248 hashmap_for_each_entry(&map, &map_iter, entry, ent /* member name */)
249 mark_trees_uninteresting_sparse(r, &entry->trees);
251 paths_and_oids_clear(&map);
254 struct commit_stack {
255 struct commit **items;
256 size_t nr, alloc;
258 #define COMMIT_STACK_INIT { NULL, 0, 0 }
260 static void commit_stack_push(struct commit_stack *stack, struct commit *commit)
262 ALLOC_GROW(stack->items, stack->nr + 1, stack->alloc);
263 stack->items[stack->nr++] = commit;
266 static struct commit *commit_stack_pop(struct commit_stack *stack)
268 return stack->nr ? stack->items[--stack->nr] : NULL;
271 static void commit_stack_clear(struct commit_stack *stack)
273 FREE_AND_NULL(stack->items);
274 stack->nr = stack->alloc = 0;
277 static void mark_one_parent_uninteresting(struct commit *commit,
278 struct commit_stack *pending)
280 struct commit_list *l;
282 if (commit->object.flags & UNINTERESTING)
283 return;
284 commit->object.flags |= UNINTERESTING;
287 * Normally we haven't parsed the parent
288 * yet, so we won't have a parent of a parent
289 * here. However, it may turn out that we've
290 * reached this commit some other way (where it
291 * wasn't uninteresting), in which case we need
292 * to mark its parents recursively too..
294 for (l = commit->parents; l; l = l->next)
295 commit_stack_push(pending, l->item);
298 void mark_parents_uninteresting(struct commit *commit)
300 struct commit_stack pending = COMMIT_STACK_INIT;
301 struct commit_list *l;
303 for (l = commit->parents; l; l = l->next)
304 mark_one_parent_uninteresting(l->item, &pending);
306 while (pending.nr > 0)
307 mark_one_parent_uninteresting(commit_stack_pop(&pending),
308 &pending);
310 commit_stack_clear(&pending);
313 static void add_pending_object_with_path(struct rev_info *revs,
314 struct object *obj,
315 const char *name, unsigned mode,
316 const char *path)
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 int len = interpret_branch_name(name, 0, &buf, 0);
326 if (0 < len && name[len] && buf.len)
327 strbuf_addstr(&buf, name + len);
328 add_reflog_for_walk(revs->reflog_info,
329 (struct commit *)obj,
330 buf.buf[0] ? buf.buf: name);
331 strbuf_release(&buf);
332 return; /* do not add the commit itself */
334 add_object_array_with_path(obj, name, &revs->pending, mode, path);
337 static void add_pending_object_with_mode(struct rev_info *revs,
338 struct object *obj,
339 const char *name, unsigned mode)
341 add_pending_object_with_path(revs, obj, name, mode, NULL);
344 void add_pending_object(struct rev_info *revs,
345 struct object *obj, const char *name)
347 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
350 void add_head_to_pending(struct rev_info *revs)
352 struct object_id oid;
353 struct object *obj;
354 if (get_oid("HEAD", &oid))
355 return;
356 obj = parse_object(revs->repo, &oid);
357 if (!obj)
358 return;
359 add_pending_object(revs, obj, "HEAD");
362 static struct object *get_reference(struct rev_info *revs, const char *name,
363 const struct object_id *oid,
364 unsigned int flags)
366 struct object *object;
369 * If the repository has commit graphs, repo_parse_commit() avoids
370 * reading the object buffer, so use it whenever possible.
372 if (oid_object_info(revs->repo, oid, NULL) == OBJ_COMMIT) {
373 struct commit *c = lookup_commit(revs->repo, oid);
374 if (!repo_parse_commit(revs->repo, c))
375 object = (struct object *) c;
376 else
377 object = NULL;
378 } else {
379 object = parse_object(revs->repo, oid);
382 if (!object) {
383 if (revs->ignore_missing)
384 return object;
385 if (revs->exclude_promisor_objects && is_promisor_object(oid))
386 return NULL;
387 die("bad object %s", name);
389 object->flags |= flags;
390 return object;
393 void add_pending_oid(struct rev_info *revs, const char *name,
394 const struct object_id *oid, unsigned int flags)
396 struct object *object = get_reference(revs, name, oid, flags);
397 add_pending_object(revs, object, name);
400 static struct commit *handle_commit(struct rev_info *revs,
401 struct object_array_entry *entry)
403 struct object *object = entry->item;
404 const char *name = entry->name;
405 const char *path = entry->path;
406 unsigned int mode = entry->mode;
407 unsigned long flags = object->flags;
410 * Tag object? Look what it points to..
412 while (object->type == OBJ_TAG) {
413 struct tag *tag = (struct tag *) object;
414 if (revs->tag_objects && !(flags & UNINTERESTING))
415 add_pending_object(revs, object, tag->tag);
416 object = parse_object(revs->repo, get_tagged_oid(tag));
417 if (!object) {
418 if (revs->ignore_missing_links || (flags & UNINTERESTING))
419 return NULL;
420 if (revs->exclude_promisor_objects &&
421 is_promisor_object(&tag->tagged->oid))
422 return NULL;
423 die("bad object %s", oid_to_hex(&tag->tagged->oid));
425 object->flags |= flags;
427 * We'll handle the tagged object by looping or dropping
428 * through to the non-tag handlers below. Do not
429 * propagate path data from the tag's pending entry.
431 path = NULL;
432 mode = 0;
436 * Commit object? Just return it, we'll do all the complex
437 * reachability crud.
439 if (object->type == OBJ_COMMIT) {
440 struct commit *commit = (struct commit *)object;
442 if (parse_commit(commit) < 0)
443 die("unable to parse commit %s", name);
444 if (flags & UNINTERESTING) {
445 mark_parents_uninteresting(commit);
447 if (!revs->topo_order || !generation_numbers_enabled(the_repository))
448 revs->limited = 1;
450 if (revs->sources) {
451 char **slot = revision_sources_at(revs->sources, commit);
453 if (!*slot)
454 *slot = xstrdup(name);
456 return commit;
460 * Tree object? Either mark it uninteresting, or add it
461 * to the list of objects to look at later..
463 if (object->type == OBJ_TREE) {
464 struct tree *tree = (struct tree *)object;
465 if (!revs->tree_objects)
466 return NULL;
467 if (flags & UNINTERESTING) {
468 mark_tree_contents_uninteresting(revs->repo, tree);
469 return NULL;
471 add_pending_object_with_path(revs, object, name, mode, path);
472 return NULL;
476 * Blob object? You know the drill by now..
478 if (object->type == OBJ_BLOB) {
479 if (!revs->blob_objects)
480 return NULL;
481 if (flags & UNINTERESTING)
482 return NULL;
483 add_pending_object_with_path(revs, object, name, mode, path);
484 return NULL;
486 die("%s is unknown object", name);
489 static int everybody_uninteresting(struct commit_list *orig,
490 struct commit **interesting_cache)
492 struct commit_list *list = orig;
494 if (*interesting_cache) {
495 struct commit *commit = *interesting_cache;
496 if (!(commit->object.flags & UNINTERESTING))
497 return 0;
500 while (list) {
501 struct commit *commit = list->item;
502 list = list->next;
503 if (commit->object.flags & UNINTERESTING)
504 continue;
506 *interesting_cache = commit;
507 return 0;
509 return 1;
513 * A definition of "relevant" commit that we can use to simplify limited graphs
514 * by eliminating side branches.
516 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
517 * in our list), or that is a specified BOTTOM commit. Then after computing
518 * a limited list, during processing we can generally ignore boundary merges
519 * coming from outside the graph, (ie from irrelevant parents), and treat
520 * those merges as if they were single-parent. TREESAME is defined to consider
521 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
522 * we don't care if we were !TREESAME to non-graph parents.
524 * Treating bottom commits as relevant ensures that a limited graph's
525 * connection to the actual bottom commit is not viewed as a side branch, but
526 * treated as part of the graph. For example:
528 * ....Z...A---X---o---o---B
529 * . /
530 * W---Y
532 * When computing "A..B", the A-X connection is at least as important as
533 * Y-X, despite A being flagged UNINTERESTING.
535 * And when computing --ancestry-path "A..B", the A-X connection is more
536 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
538 static inline int relevant_commit(struct commit *commit)
540 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
544 * Return a single relevant commit from a parent list. If we are a TREESAME
545 * commit, and this selects one of our parents, then we can safely simplify to
546 * that parent.
548 static struct commit *one_relevant_parent(const struct rev_info *revs,
549 struct commit_list *orig)
551 struct commit_list *list = orig;
552 struct commit *relevant = NULL;
554 if (!orig)
555 return NULL;
558 * For 1-parent commits, or if first-parent-only, then return that
559 * first parent (even if not "relevant" by the above definition).
560 * TREESAME will have been set purely on that parent.
562 if (revs->first_parent_only || !orig->next)
563 return orig->item;
566 * For multi-parent commits, identify a sole relevant parent, if any.
567 * If we have only one relevant parent, then TREESAME will be set purely
568 * with regard to that parent, and we can simplify accordingly.
570 * If we have more than one relevant parent, or no relevant parents
571 * (and multiple irrelevant ones), then we can't select a parent here
572 * and return NULL.
574 while (list) {
575 struct commit *commit = list->item;
576 list = list->next;
577 if (relevant_commit(commit)) {
578 if (relevant)
579 return NULL;
580 relevant = commit;
583 return relevant;
587 * The goal is to get REV_TREE_NEW as the result only if the
588 * diff consists of all '+' (and no other changes), REV_TREE_OLD
589 * if the whole diff is removal of old data, and otherwise
590 * REV_TREE_DIFFERENT (of course if the trees are the same we
591 * want REV_TREE_SAME).
593 * The only time we care about the distinction is when
594 * remove_empty_trees is in effect, in which case we care only about
595 * whether the whole change is REV_TREE_NEW, or if there's another type
596 * of change. Which means we can stop the diff early in either of these
597 * cases:
599 * 1. We're not using remove_empty_trees at all.
601 * 2. We saw anything except REV_TREE_NEW.
603 static int tree_difference = REV_TREE_SAME;
605 static void file_add_remove(struct diff_options *options,
606 int addremove, unsigned mode,
607 const struct object_id *oid,
608 int oid_valid,
609 const char *fullpath, unsigned dirty_submodule)
611 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
612 struct rev_info *revs = options->change_fn_data;
614 tree_difference |= diff;
615 if (!revs->remove_empty_trees || tree_difference != REV_TREE_NEW)
616 options->flags.has_changes = 1;
619 static void file_change(struct diff_options *options,
620 unsigned old_mode, unsigned new_mode,
621 const struct object_id *old_oid,
622 const struct object_id *new_oid,
623 int old_oid_valid, int new_oid_valid,
624 const char *fullpath,
625 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
627 tree_difference = REV_TREE_DIFFERENT;
628 options->flags.has_changes = 1;
631 static int bloom_filter_atexit_registered;
632 static unsigned int count_bloom_filter_maybe;
633 static unsigned int count_bloom_filter_definitely_not;
634 static unsigned int count_bloom_filter_false_positive;
635 static unsigned int count_bloom_filter_not_present;
636 static unsigned int count_bloom_filter_length_zero;
638 static void trace2_bloom_filter_statistics_atexit(void)
640 struct json_writer jw = JSON_WRITER_INIT;
642 jw_object_begin(&jw, 0);
643 jw_object_intmax(&jw, "filter_not_present", count_bloom_filter_not_present);
644 jw_object_intmax(&jw, "zero_length_filter", count_bloom_filter_length_zero);
645 jw_object_intmax(&jw, "maybe", count_bloom_filter_maybe);
646 jw_object_intmax(&jw, "definitely_not", count_bloom_filter_definitely_not);
647 jw_object_intmax(&jw, "false_positive", count_bloom_filter_false_positive);
648 jw_end(&jw);
650 trace2_data_json("bloom", the_repository, "statistics", &jw);
652 jw_release(&jw);
655 static int forbid_bloom_filters(struct pathspec *spec)
657 if (spec->has_wildcard)
658 return 1;
659 if (spec->nr > 1)
660 return 1;
661 if (spec->magic & ~PATHSPEC_LITERAL)
662 return 1;
663 if (spec->nr && (spec->items[0].magic & ~PATHSPEC_LITERAL))
664 return 1;
666 return 0;
669 static void prepare_to_use_bloom_filter(struct rev_info *revs)
671 struct pathspec_item *pi;
672 char *path_alloc = NULL;
673 const char *path;
674 int last_index;
675 int len;
677 if (!revs->commits)
678 return;
680 if (forbid_bloom_filters(&revs->prune_data))
681 return;
683 repo_parse_commit(revs->repo, revs->commits->item);
685 if (!revs->repo->objects->commit_graph)
686 return;
688 revs->bloom_filter_settings = revs->repo->objects->commit_graph->bloom_filter_settings;
689 if (!revs->bloom_filter_settings)
690 return;
692 if (!revs->pruning.pathspec.nr)
693 return;
695 pi = &revs->pruning.pathspec.items[0];
696 last_index = pi->len - 1;
698 /* remove single trailing slash from path, if needed */
699 if (pi->match[last_index] == '/') {
700 path_alloc = xstrdup(pi->match);
701 path_alloc[last_index] = '\0';
702 path = path_alloc;
703 } else
704 path = pi->match;
706 len = strlen(path);
708 revs->bloom_key = xmalloc(sizeof(struct bloom_key));
709 fill_bloom_key(path, len, revs->bloom_key, revs->bloom_filter_settings);
711 if (trace2_is_enabled() && !bloom_filter_atexit_registered) {
712 atexit(trace2_bloom_filter_statistics_atexit);
713 bloom_filter_atexit_registered = 1;
716 free(path_alloc);
719 static int check_maybe_different_in_bloom_filter(struct rev_info *revs,
720 struct commit *commit)
722 struct bloom_filter *filter;
723 int result;
725 if (!revs->repo->objects->commit_graph)
726 return -1;
728 if (commit_graph_generation(commit) == GENERATION_NUMBER_INFINITY)
729 return -1;
731 filter = get_bloom_filter(revs->repo, commit, 0);
733 if (!filter) {
734 count_bloom_filter_not_present++;
735 return -1;
738 if (!filter->len) {
739 count_bloom_filter_length_zero++;
740 return -1;
743 result = bloom_filter_contains(filter,
744 revs->bloom_key,
745 revs->bloom_filter_settings);
747 if (result)
748 count_bloom_filter_maybe++;
749 else
750 count_bloom_filter_definitely_not++;
752 return result;
755 static int rev_compare_tree(struct rev_info *revs,
756 struct commit *parent, struct commit *commit, int nth_parent)
758 struct tree *t1 = get_commit_tree(parent);
759 struct tree *t2 = get_commit_tree(commit);
760 int bloom_ret = 1;
762 if (!t1)
763 return REV_TREE_NEW;
764 if (!t2)
765 return REV_TREE_OLD;
767 if (revs->simplify_by_decoration) {
769 * If we are simplifying by decoration, then the commit
770 * is worth showing if it has a tag pointing at it.
772 if (get_name_decoration(&commit->object))
773 return REV_TREE_DIFFERENT;
775 * A commit that is not pointed by a tag is uninteresting
776 * if we are not limited by path. This means that you will
777 * see the usual "commits that touch the paths" plus any
778 * tagged commit by specifying both --simplify-by-decoration
779 * and pathspec.
781 if (!revs->prune_data.nr)
782 return REV_TREE_SAME;
785 if (revs->bloom_key && !nth_parent) {
786 bloom_ret = check_maybe_different_in_bloom_filter(revs, commit);
788 if (bloom_ret == 0)
789 return REV_TREE_SAME;
792 tree_difference = REV_TREE_SAME;
793 revs->pruning.flags.has_changes = 0;
794 if (diff_tree_oid(&t1->object.oid, &t2->object.oid, "",
795 &revs->pruning) < 0)
796 return REV_TREE_DIFFERENT;
798 if (!nth_parent)
799 if (bloom_ret == 1 && tree_difference == REV_TREE_SAME)
800 count_bloom_filter_false_positive++;
802 return tree_difference;
805 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
807 int retval;
808 struct tree *t1 = get_commit_tree(commit);
810 if (!t1)
811 return 0;
813 tree_difference = REV_TREE_SAME;
814 revs->pruning.flags.has_changes = 0;
815 retval = diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
817 return retval >= 0 && (tree_difference == REV_TREE_SAME);
820 struct treesame_state {
821 unsigned int nparents;
822 unsigned char treesame[FLEX_ARRAY];
825 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
827 unsigned n = commit_list_count(commit->parents);
828 struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
829 st->nparents = n;
830 add_decoration(&revs->treesame, &commit->object, st);
831 return st;
835 * Must be called immediately after removing the nth_parent from a commit's
836 * parent list, if we are maintaining the per-parent treesame[] decoration.
837 * This does not recalculate the master TREESAME flag - update_treesame()
838 * should be called to update it after a sequence of treesame[] modifications
839 * that may have affected it.
841 static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
843 struct treesame_state *st;
844 int old_same;
846 if (!commit->parents) {
848 * Have just removed the only parent from a non-merge.
849 * Different handling, as we lack decoration.
851 if (nth_parent != 0)
852 die("compact_treesame %u", nth_parent);
853 old_same = !!(commit->object.flags & TREESAME);
854 if (rev_same_tree_as_empty(revs, commit))
855 commit->object.flags |= TREESAME;
856 else
857 commit->object.flags &= ~TREESAME;
858 return old_same;
861 st = lookup_decoration(&revs->treesame, &commit->object);
862 if (!st || nth_parent >= st->nparents)
863 die("compact_treesame %u", nth_parent);
865 old_same = st->treesame[nth_parent];
866 memmove(st->treesame + nth_parent,
867 st->treesame + nth_parent + 1,
868 st->nparents - nth_parent - 1);
871 * If we've just become a non-merge commit, update TREESAME
872 * immediately, and remove the no-longer-needed decoration.
873 * If still a merge, defer update until update_treesame().
875 if (--st->nparents == 1) {
876 if (commit->parents->next)
877 die("compact_treesame parents mismatch");
878 if (st->treesame[0] && revs->dense)
879 commit->object.flags |= TREESAME;
880 else
881 commit->object.flags &= ~TREESAME;
882 free(add_decoration(&revs->treesame, &commit->object, NULL));
885 return old_same;
888 static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
890 if (commit->parents && commit->parents->next) {
891 unsigned n;
892 struct treesame_state *st;
893 struct commit_list *p;
894 unsigned relevant_parents;
895 unsigned relevant_change, irrelevant_change;
897 st = lookup_decoration(&revs->treesame, &commit->object);
898 if (!st)
899 die("update_treesame %s", oid_to_hex(&commit->object.oid));
900 relevant_parents = 0;
901 relevant_change = irrelevant_change = 0;
902 for (p = commit->parents, n = 0; p; n++, p = p->next) {
903 if (relevant_commit(p->item)) {
904 relevant_change |= !st->treesame[n];
905 relevant_parents++;
906 } else
907 irrelevant_change |= !st->treesame[n];
909 if (relevant_parents ? relevant_change : irrelevant_change)
910 commit->object.flags &= ~TREESAME;
911 else
912 commit->object.flags |= TREESAME;
915 return commit->object.flags & TREESAME;
918 static inline int limiting_can_increase_treesame(const struct rev_info *revs)
921 * TREESAME is irrelevant unless prune && dense;
922 * if simplify_history is set, we can't have a mixture of TREESAME and
923 * !TREESAME INTERESTING parents (and we don't have treesame[]
924 * decoration anyway);
925 * if first_parent_only is set, then the TREESAME flag is locked
926 * against the first parent (and again we lack treesame[] decoration).
928 return revs->prune && revs->dense &&
929 !revs->simplify_history &&
930 !revs->first_parent_only;
933 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
935 struct commit_list **pp, *parent;
936 struct treesame_state *ts = NULL;
937 int relevant_change = 0, irrelevant_change = 0;
938 int relevant_parents, nth_parent;
941 * If we don't do pruning, everything is interesting
943 if (!revs->prune)
944 return;
946 if (!get_commit_tree(commit))
947 return;
949 if (!commit->parents) {
950 if (rev_same_tree_as_empty(revs, commit))
951 commit->object.flags |= TREESAME;
952 return;
956 * Normal non-merge commit? If we don't want to make the
957 * history dense, we consider it always to be a change..
959 if (!revs->dense && !commit->parents->next)
960 return;
962 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
963 (parent = *pp) != NULL;
964 pp = &parent->next, nth_parent++) {
965 struct commit *p = parent->item;
966 if (relevant_commit(p))
967 relevant_parents++;
969 if (nth_parent == 1) {
971 * This our second loop iteration - so we now know
972 * we're dealing with a merge.
974 * Do not compare with later parents when we care only about
975 * the first parent chain, in order to avoid derailing the
976 * traversal to follow a side branch that brought everything
977 * in the path we are limited to by the pathspec.
979 if (revs->first_parent_only)
980 break;
982 * If this will remain a potentially-simplifiable
983 * merge, remember per-parent treesame if needed.
984 * Initialise the array with the comparison from our
985 * first iteration.
987 if (revs->treesame.name &&
988 !revs->simplify_history &&
989 !(commit->object.flags & UNINTERESTING)) {
990 ts = initialise_treesame(revs, commit);
991 if (!(irrelevant_change || relevant_change))
992 ts->treesame[0] = 1;
995 if (parse_commit(p) < 0)
996 die("cannot simplify commit %s (because of %s)",
997 oid_to_hex(&commit->object.oid),
998 oid_to_hex(&p->object.oid));
999 switch (rev_compare_tree(revs, p, commit, nth_parent)) {
1000 case REV_TREE_SAME:
1001 if (!revs->simplify_history || !relevant_commit(p)) {
1002 /* Even if a merge with an uninteresting
1003 * side branch brought the entire change
1004 * we are interested in, we do not want
1005 * to lose the other branches of this
1006 * merge, so we just keep going.
1008 if (ts)
1009 ts->treesame[nth_parent] = 1;
1010 continue;
1012 parent->next = NULL;
1013 commit->parents = parent;
1016 * A merge commit is a "diversion" if it is not
1017 * TREESAME to its first parent but is TREESAME
1018 * to a later parent. In the simplified history,
1019 * we "divert" the history walk to the later
1020 * parent. These commits are shown when "show_pulls"
1021 * is enabled, so do not mark the object as
1022 * TREESAME here.
1024 if (!revs->show_pulls || !nth_parent)
1025 commit->object.flags |= TREESAME;
1027 return;
1029 case REV_TREE_NEW:
1030 if (revs->remove_empty_trees &&
1031 rev_same_tree_as_empty(revs, p)) {
1032 /* We are adding all the specified
1033 * paths from this parent, so the
1034 * history beyond this parent is not
1035 * interesting. Remove its parents
1036 * (they are grandparents for us).
1037 * IOW, we pretend this parent is a
1038 * "root" commit.
1040 if (parse_commit(p) < 0)
1041 die("cannot simplify commit %s (invalid %s)",
1042 oid_to_hex(&commit->object.oid),
1043 oid_to_hex(&p->object.oid));
1044 p->parents = NULL;
1046 /* fallthrough */
1047 case REV_TREE_OLD:
1048 case REV_TREE_DIFFERENT:
1049 if (relevant_commit(p))
1050 relevant_change = 1;
1051 else
1052 irrelevant_change = 1;
1054 if (!nth_parent)
1055 commit->object.flags |= PULL_MERGE;
1057 continue;
1059 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
1063 * TREESAME is straightforward for single-parent commits. For merge
1064 * commits, it is most useful to define it so that "irrelevant"
1065 * parents cannot make us !TREESAME - if we have any relevant
1066 * parents, then we only consider TREESAMEness with respect to them,
1067 * allowing irrelevant merges from uninteresting branches to be
1068 * simplified away. Only if we have only irrelevant parents do we
1069 * base TREESAME on them. Note that this logic is replicated in
1070 * update_treesame, which should be kept in sync.
1072 if (relevant_parents ? !relevant_change : !irrelevant_change)
1073 commit->object.flags |= TREESAME;
1076 static int process_parents(struct rev_info *revs, struct commit *commit,
1077 struct commit_list **list, struct prio_queue *queue)
1079 struct commit_list *parent = commit->parents;
1080 unsigned left_flag;
1082 if (commit->object.flags & ADDED)
1083 return 0;
1084 commit->object.flags |= ADDED;
1086 if (revs->include_check &&
1087 !revs->include_check(commit, revs->include_check_data))
1088 return 0;
1091 * If the commit is uninteresting, don't try to
1092 * prune parents - we want the maximal uninteresting
1093 * set.
1095 * Normally we haven't parsed the parent
1096 * yet, so we won't have a parent of a parent
1097 * here. However, it may turn out that we've
1098 * reached this commit some other way (where it
1099 * wasn't uninteresting), in which case we need
1100 * to mark its parents recursively too..
1102 if (commit->object.flags & UNINTERESTING) {
1103 while (parent) {
1104 struct commit *p = parent->item;
1105 parent = parent->next;
1106 if (p)
1107 p->object.flags |= UNINTERESTING;
1108 if (parse_commit_gently(p, 1) < 0)
1109 continue;
1110 if (p->parents)
1111 mark_parents_uninteresting(p);
1112 if (p->object.flags & SEEN)
1113 continue;
1114 p->object.flags |= SEEN;
1115 if (list)
1116 commit_list_insert_by_date(p, list);
1117 if (queue)
1118 prio_queue_put(queue, p);
1120 return 0;
1124 * Ok, the commit wasn't uninteresting. Try to
1125 * simplify the commit history and find the parent
1126 * that has no differences in the path set if one exists.
1128 try_to_simplify_commit(revs, commit);
1130 if (revs->no_walk)
1131 return 0;
1133 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
1135 for (parent = commit->parents; parent; parent = parent->next) {
1136 struct commit *p = parent->item;
1137 int gently = revs->ignore_missing_links ||
1138 revs->exclude_promisor_objects;
1139 if (parse_commit_gently(p, gently) < 0) {
1140 if (revs->exclude_promisor_objects &&
1141 is_promisor_object(&p->object.oid)) {
1142 if (revs->first_parent_only)
1143 break;
1144 continue;
1146 return -1;
1148 if (revs->sources) {
1149 char **slot = revision_sources_at(revs->sources, p);
1151 if (!*slot)
1152 *slot = *revision_sources_at(revs->sources, commit);
1154 p->object.flags |= left_flag;
1155 if (!(p->object.flags & SEEN)) {
1156 p->object.flags |= SEEN;
1157 if (list)
1158 commit_list_insert_by_date(p, list);
1159 if (queue)
1160 prio_queue_put(queue, p);
1162 if (revs->first_parent_only)
1163 break;
1165 return 0;
1168 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
1170 struct commit_list *p;
1171 int left_count = 0, right_count = 0;
1172 int left_first;
1173 struct patch_ids ids;
1174 unsigned cherry_flag;
1176 /* First count the commits on the left and on the right */
1177 for (p = list; p; p = p->next) {
1178 struct commit *commit = p->item;
1179 unsigned flags = commit->object.flags;
1180 if (flags & BOUNDARY)
1182 else if (flags & SYMMETRIC_LEFT)
1183 left_count++;
1184 else
1185 right_count++;
1188 if (!left_count || !right_count)
1189 return;
1191 left_first = left_count < right_count;
1192 init_patch_ids(revs->repo, &ids);
1193 ids.diffopts.pathspec = revs->diffopt.pathspec;
1195 /* Compute patch-ids for one side */
1196 for (p = list; p; p = p->next) {
1197 struct commit *commit = p->item;
1198 unsigned flags = commit->object.flags;
1200 if (flags & BOUNDARY)
1201 continue;
1203 * If we have fewer left, left_first is set and we omit
1204 * commits on the right branch in this loop. If we have
1205 * fewer right, we skip the left ones.
1207 if (left_first != !!(flags & SYMMETRIC_LEFT))
1208 continue;
1209 add_commit_patch_id(commit, &ids);
1212 /* either cherry_mark or cherry_pick are true */
1213 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
1215 /* Check the other side */
1216 for (p = list; p; p = p->next) {
1217 struct commit *commit = p->item;
1218 struct patch_id *id;
1219 unsigned flags = commit->object.flags;
1221 if (flags & BOUNDARY)
1222 continue;
1224 * If we have fewer left, left_first is set and we omit
1225 * commits on the left branch in this loop.
1227 if (left_first == !!(flags & SYMMETRIC_LEFT))
1228 continue;
1231 * Have we seen the same patch id?
1233 id = has_commit_patch_id(commit, &ids);
1234 if (!id)
1235 continue;
1237 commit->object.flags |= cherry_flag;
1238 id->commit->object.flags |= cherry_flag;
1241 free_patch_ids(&ids);
1244 /* How many extra uninteresting commits we want to see.. */
1245 #define SLOP 5
1247 static int still_interesting(struct commit_list *src, timestamp_t date, int slop,
1248 struct commit **interesting_cache)
1251 * No source list at all? We're definitely done..
1253 if (!src)
1254 return 0;
1257 * Does the destination list contain entries with a date
1258 * before the source list? Definitely _not_ done.
1260 if (date <= src->item->date)
1261 return SLOP;
1264 * Does the source list still have interesting commits in
1265 * it? Definitely not done..
1267 if (!everybody_uninteresting(src, interesting_cache))
1268 return SLOP;
1270 /* Ok, we're closing in.. */
1271 return slop-1;
1275 * "rev-list --ancestry-path A..B" computes commits that are ancestors
1276 * of B but not ancestors of A but further limits the result to those
1277 * that are descendants of A. This takes the list of bottom commits and
1278 * the result of "A..B" without --ancestry-path, and limits the latter
1279 * further to the ones that can reach one of the commits in "bottom".
1281 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
1283 struct commit_list *p;
1284 struct commit_list *rlist = NULL;
1285 int made_progress;
1288 * Reverse the list so that it will be likely that we would
1289 * process parents before children.
1291 for (p = list; p; p = p->next)
1292 commit_list_insert(p->item, &rlist);
1294 for (p = bottom; p; p = p->next)
1295 p->item->object.flags |= TMP_MARK;
1298 * Mark the ones that can reach bottom commits in "list",
1299 * in a bottom-up fashion.
1301 do {
1302 made_progress = 0;
1303 for (p = rlist; p; p = p->next) {
1304 struct commit *c = p->item;
1305 struct commit_list *parents;
1306 if (c->object.flags & (TMP_MARK | UNINTERESTING))
1307 continue;
1308 for (parents = c->parents;
1309 parents;
1310 parents = parents->next) {
1311 if (!(parents->item->object.flags & TMP_MARK))
1312 continue;
1313 c->object.flags |= TMP_MARK;
1314 made_progress = 1;
1315 break;
1318 } while (made_progress);
1321 * NEEDSWORK: decide if we want to remove parents that are
1322 * not marked with TMP_MARK from commit->parents for commits
1323 * in the resulting list. We may not want to do that, though.
1327 * The ones that are not marked with TMP_MARK are uninteresting
1329 for (p = list; p; p = p->next) {
1330 struct commit *c = p->item;
1331 if (c->object.flags & TMP_MARK)
1332 continue;
1333 c->object.flags |= UNINTERESTING;
1336 /* We are done with the TMP_MARK */
1337 for (p = list; p; p = p->next)
1338 p->item->object.flags &= ~TMP_MARK;
1339 for (p = bottom; p; p = p->next)
1340 p->item->object.flags &= ~TMP_MARK;
1341 free_commit_list(rlist);
1345 * Before walking the history, keep the set of "negative" refs the
1346 * caller has asked to exclude.
1348 * This is used to compute "rev-list --ancestry-path A..B", as we need
1349 * to filter the result of "A..B" further to the ones that can actually
1350 * reach A.
1352 static struct commit_list *collect_bottom_commits(struct commit_list *list)
1354 struct commit_list *elem, *bottom = NULL;
1355 for (elem = list; elem; elem = elem->next)
1356 if (elem->item->object.flags & BOTTOM)
1357 commit_list_insert(elem->item, &bottom);
1358 return bottom;
1361 /* Assumes either left_only or right_only is set */
1362 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1364 struct commit_list *p;
1366 for (p = list; p; p = p->next) {
1367 struct commit *commit = p->item;
1369 if (revs->right_only) {
1370 if (commit->object.flags & SYMMETRIC_LEFT)
1371 commit->object.flags |= SHOWN;
1372 } else /* revs->left_only is set */
1373 if (!(commit->object.flags & SYMMETRIC_LEFT))
1374 commit->object.flags |= SHOWN;
1378 static int limit_list(struct rev_info *revs)
1380 int slop = SLOP;
1381 timestamp_t date = TIME_MAX;
1382 struct commit_list *list = revs->commits;
1383 struct commit_list *newlist = NULL;
1384 struct commit_list **p = &newlist;
1385 struct commit_list *bottom = NULL;
1386 struct commit *interesting_cache = NULL;
1388 if (revs->ancestry_path) {
1389 bottom = collect_bottom_commits(list);
1390 if (!bottom)
1391 die("--ancestry-path given but there are no bottom commits");
1394 while (list) {
1395 struct commit *commit = pop_commit(&list);
1396 struct object *obj = &commit->object;
1397 show_early_output_fn_t show;
1399 if (commit == interesting_cache)
1400 interesting_cache = NULL;
1402 if (revs->max_age != -1 && (commit->date < revs->max_age))
1403 obj->flags |= UNINTERESTING;
1404 if (process_parents(revs, commit, &list, NULL) < 0)
1405 return -1;
1406 if (obj->flags & UNINTERESTING) {
1407 mark_parents_uninteresting(commit);
1408 slop = still_interesting(list, date, slop, &interesting_cache);
1409 if (slop)
1410 continue;
1411 break;
1413 if (revs->min_age != -1 && (commit->date > revs->min_age) &&
1414 !revs->line_level_traverse)
1415 continue;
1416 date = commit->date;
1417 p = &commit_list_insert(commit, p)->next;
1419 show = show_early_output;
1420 if (!show)
1421 continue;
1423 show(revs, newlist);
1424 show_early_output = NULL;
1426 if (revs->cherry_pick || revs->cherry_mark)
1427 cherry_pick_list(newlist, revs);
1429 if (revs->left_only || revs->right_only)
1430 limit_left_right(newlist, revs);
1432 if (bottom) {
1433 limit_to_ancestry(bottom, newlist);
1434 free_commit_list(bottom);
1438 * Check if any commits have become TREESAME by some of their parents
1439 * becoming UNINTERESTING.
1441 if (limiting_can_increase_treesame(revs))
1442 for (list = newlist; list; list = list->next) {
1443 struct commit *c = list->item;
1444 if (c->object.flags & (UNINTERESTING | TREESAME))
1445 continue;
1446 update_treesame(revs, c);
1449 revs->commits = newlist;
1450 return 0;
1454 * Add an entry to refs->cmdline with the specified information.
1455 * *name is copied.
1457 static void add_rev_cmdline(struct rev_info *revs,
1458 struct object *item,
1459 const char *name,
1460 int whence,
1461 unsigned flags)
1463 struct rev_cmdline_info *info = &revs->cmdline;
1464 unsigned int nr = info->nr;
1466 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1467 info->rev[nr].item = item;
1468 info->rev[nr].name = xstrdup(name);
1469 info->rev[nr].whence = whence;
1470 info->rev[nr].flags = flags;
1471 info->nr++;
1474 static void add_rev_cmdline_list(struct rev_info *revs,
1475 struct commit_list *commit_list,
1476 int whence,
1477 unsigned flags)
1479 while (commit_list) {
1480 struct object *object = &commit_list->item->object;
1481 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1482 whence, flags);
1483 commit_list = commit_list->next;
1487 struct all_refs_cb {
1488 int all_flags;
1489 int warned_bad_reflog;
1490 struct rev_info *all_revs;
1491 const char *name_for_errormsg;
1492 struct worktree *wt;
1495 int ref_excluded(struct string_list *ref_excludes, const char *path)
1497 struct string_list_item *item;
1499 if (!ref_excludes)
1500 return 0;
1501 for_each_string_list_item(item, ref_excludes) {
1502 if (!wildmatch(item->string, path, 0))
1503 return 1;
1505 return 0;
1508 static int handle_one_ref(const char *path, const struct object_id *oid,
1509 int flag, void *cb_data)
1511 struct all_refs_cb *cb = cb_data;
1512 struct object *object;
1514 if (ref_excluded(cb->all_revs->ref_excludes, path))
1515 return 0;
1517 object = get_reference(cb->all_revs, path, oid, cb->all_flags);
1518 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1519 add_pending_oid(cb->all_revs, path, oid, cb->all_flags);
1520 return 0;
1523 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1524 unsigned flags)
1526 cb->all_revs = revs;
1527 cb->all_flags = flags;
1528 revs->rev_input_given = 1;
1529 cb->wt = NULL;
1532 void clear_ref_exclusion(struct string_list **ref_excludes_p)
1534 if (*ref_excludes_p) {
1535 string_list_clear(*ref_excludes_p, 0);
1536 free(*ref_excludes_p);
1538 *ref_excludes_p = NULL;
1541 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1543 if (!*ref_excludes_p) {
1544 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1545 (*ref_excludes_p)->strdup_strings = 1;
1547 string_list_append(*ref_excludes_p, exclude);
1550 static void handle_refs(struct ref_store *refs,
1551 struct rev_info *revs, unsigned flags,
1552 int (*for_each)(struct ref_store *, each_ref_fn, void *))
1554 struct all_refs_cb cb;
1556 if (!refs) {
1557 /* this could happen with uninitialized submodules */
1558 return;
1561 init_all_refs_cb(&cb, revs, flags);
1562 for_each(refs, handle_one_ref, &cb);
1565 static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
1567 struct all_refs_cb *cb = cb_data;
1568 if (!is_null_oid(oid)) {
1569 struct object *o = parse_object(cb->all_revs->repo, oid);
1570 if (o) {
1571 o->flags |= cb->all_flags;
1572 /* ??? CMDLINEFLAGS ??? */
1573 add_pending_object(cb->all_revs, o, "");
1575 else if (!cb->warned_bad_reflog) {
1576 warning("reflog of '%s' references pruned commits",
1577 cb->name_for_errormsg);
1578 cb->warned_bad_reflog = 1;
1583 static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
1584 const char *email, timestamp_t timestamp, int tz,
1585 const char *message, void *cb_data)
1587 handle_one_reflog_commit(ooid, cb_data);
1588 handle_one_reflog_commit(noid, cb_data);
1589 return 0;
1592 static int handle_one_reflog(const char *refname_in_wt,
1593 const struct object_id *oid,
1594 int flag, void *cb_data)
1596 struct all_refs_cb *cb = cb_data;
1597 struct strbuf refname = STRBUF_INIT;
1599 cb->warned_bad_reflog = 0;
1600 strbuf_worktree_ref(cb->wt, &refname, refname_in_wt);
1601 cb->name_for_errormsg = refname.buf;
1602 refs_for_each_reflog_ent(get_main_ref_store(the_repository),
1603 refname.buf,
1604 handle_one_reflog_ent, cb_data);
1605 strbuf_release(&refname);
1606 return 0;
1609 static void add_other_reflogs_to_pending(struct all_refs_cb *cb)
1611 struct worktree **worktrees, **p;
1613 worktrees = get_worktrees();
1614 for (p = worktrees; *p; p++) {
1615 struct worktree *wt = *p;
1617 if (wt->is_current)
1618 continue;
1620 cb->wt = wt;
1621 refs_for_each_reflog(get_worktree_ref_store(wt),
1622 handle_one_reflog,
1623 cb);
1625 free_worktrees(worktrees);
1628 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1630 struct all_refs_cb cb;
1632 cb.all_revs = revs;
1633 cb.all_flags = flags;
1634 cb.wt = NULL;
1635 for_each_reflog(handle_one_reflog, &cb);
1637 if (!revs->single_worktree)
1638 add_other_reflogs_to_pending(&cb);
1641 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1642 struct strbuf *path, unsigned int flags)
1644 size_t baselen = path->len;
1645 int i;
1647 if (it->entry_count >= 0) {
1648 struct tree *tree = lookup_tree(revs->repo, &it->oid);
1649 tree->object.flags |= flags;
1650 add_pending_object_with_path(revs, &tree->object, "",
1651 040000, path->buf);
1654 for (i = 0; i < it->subtree_nr; i++) {
1655 struct cache_tree_sub *sub = it->down[i];
1656 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1657 add_cache_tree(sub->cache_tree, revs, path, flags);
1658 strbuf_setlen(path, baselen);
1663 static void do_add_index_objects_to_pending(struct rev_info *revs,
1664 struct index_state *istate,
1665 unsigned int flags)
1667 int i;
1669 for (i = 0; i < istate->cache_nr; i++) {
1670 struct cache_entry *ce = istate->cache[i];
1671 struct blob *blob;
1673 if (S_ISGITLINK(ce->ce_mode))
1674 continue;
1676 blob = lookup_blob(revs->repo, &ce->oid);
1677 if (!blob)
1678 die("unable to add index blob to traversal");
1679 blob->object.flags |= flags;
1680 add_pending_object_with_path(revs, &blob->object, "",
1681 ce->ce_mode, ce->name);
1684 if (istate->cache_tree) {
1685 struct strbuf path = STRBUF_INIT;
1686 add_cache_tree(istate->cache_tree, revs, &path, flags);
1687 strbuf_release(&path);
1691 void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
1693 struct worktree **worktrees, **p;
1695 repo_read_index(revs->repo);
1696 do_add_index_objects_to_pending(revs, revs->repo->index, flags);
1698 if (revs->single_worktree)
1699 return;
1701 worktrees = get_worktrees();
1702 for (p = worktrees; *p; p++) {
1703 struct worktree *wt = *p;
1704 struct index_state istate = { NULL };
1706 if (wt->is_current)
1707 continue; /* current index already taken care of */
1709 if (read_index_from(&istate,
1710 worktree_git_path(wt, "index"),
1711 get_worktree_git_dir(wt)) > 0)
1712 do_add_index_objects_to_pending(revs, &istate, flags);
1713 discard_index(&istate);
1715 free_worktrees(worktrees);
1718 struct add_alternate_refs_data {
1719 struct rev_info *revs;
1720 unsigned int flags;
1723 static void add_one_alternate_ref(const struct object_id *oid,
1724 void *vdata)
1726 const char *name = ".alternate";
1727 struct add_alternate_refs_data *data = vdata;
1728 struct object *obj;
1730 obj = get_reference(data->revs, name, oid, data->flags);
1731 add_rev_cmdline(data->revs, obj, name, REV_CMD_REV, data->flags);
1732 add_pending_object(data->revs, obj, name);
1735 static void add_alternate_refs_to_pending(struct rev_info *revs,
1736 unsigned int flags)
1738 struct add_alternate_refs_data data;
1739 data.revs = revs;
1740 data.flags = flags;
1741 for_each_alternate_ref(add_one_alternate_ref, &data);
1744 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1745 int exclude_parent)
1747 struct object_id oid;
1748 struct object *it;
1749 struct commit *commit;
1750 struct commit_list *parents;
1751 int parent_number;
1752 const char *arg = arg_;
1754 if (*arg == '^') {
1755 flags ^= UNINTERESTING | BOTTOM;
1756 arg++;
1758 if (get_oid_committish(arg, &oid))
1759 return 0;
1760 while (1) {
1761 it = get_reference(revs, arg, &oid, 0);
1762 if (!it && revs->ignore_missing)
1763 return 0;
1764 if (it->type != OBJ_TAG)
1765 break;
1766 if (!((struct tag*)it)->tagged)
1767 return 0;
1768 oidcpy(&oid, &((struct tag*)it)->tagged->oid);
1770 if (it->type != OBJ_COMMIT)
1771 return 0;
1772 commit = (struct commit *)it;
1773 if (exclude_parent &&
1774 exclude_parent > commit_list_count(commit->parents))
1775 return 0;
1776 for (parents = commit->parents, parent_number = 1;
1777 parents;
1778 parents = parents->next, parent_number++) {
1779 if (exclude_parent && parent_number != exclude_parent)
1780 continue;
1782 it = &parents->item->object;
1783 it->flags |= flags;
1784 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1785 add_pending_object(revs, it, arg);
1787 return 1;
1790 void repo_init_revisions(struct repository *r,
1791 struct rev_info *revs,
1792 const char *prefix)
1794 memset(revs, 0, sizeof(*revs));
1796 revs->repo = r;
1797 revs->abbrev = DEFAULT_ABBREV;
1798 revs->ignore_merges = 1;
1799 revs->simplify_history = 1;
1800 revs->pruning.repo = r;
1801 revs->pruning.flags.recursive = 1;
1802 revs->pruning.flags.quick = 1;
1803 revs->pruning.add_remove = file_add_remove;
1804 revs->pruning.change = file_change;
1805 revs->pruning.change_fn_data = revs;
1806 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1807 revs->dense = 1;
1808 revs->prefix = prefix;
1809 revs->max_age = -1;
1810 revs->min_age = -1;
1811 revs->skip_count = -1;
1812 revs->max_count = -1;
1813 revs->max_parents = -1;
1814 revs->expand_tabs_in_log = -1;
1816 revs->commit_format = CMIT_FMT_DEFAULT;
1817 revs->expand_tabs_in_log_default = 8;
1819 init_grep_defaults(revs->repo);
1820 grep_init(&revs->grep_filter, revs->repo, prefix);
1821 revs->grep_filter.status_only = 1;
1823 repo_diff_setup(revs->repo, &revs->diffopt);
1824 if (prefix && !revs->diffopt.prefix) {
1825 revs->diffopt.prefix = prefix;
1826 revs->diffopt.prefix_length = strlen(prefix);
1829 init_display_notes(&revs->notes_opt);
1832 static void add_pending_commit_list(struct rev_info *revs,
1833 struct commit_list *commit_list,
1834 unsigned int flags)
1836 while (commit_list) {
1837 struct object *object = &commit_list->item->object;
1838 object->flags |= flags;
1839 add_pending_object(revs, object, oid_to_hex(&object->oid));
1840 commit_list = commit_list->next;
1844 static void prepare_show_merge(struct rev_info *revs)
1846 struct commit_list *bases;
1847 struct commit *head, *other;
1848 struct object_id oid;
1849 const char **prune = NULL;
1850 int i, prune_num = 1; /* counting terminating NULL */
1851 struct index_state *istate = revs->repo->index;
1853 if (get_oid("HEAD", &oid))
1854 die("--merge without HEAD?");
1855 head = lookup_commit_or_die(&oid, "HEAD");
1856 if (get_oid("MERGE_HEAD", &oid))
1857 die("--merge without MERGE_HEAD?");
1858 other = lookup_commit_or_die(&oid, "MERGE_HEAD");
1859 add_pending_object(revs, &head->object, "HEAD");
1860 add_pending_object(revs, &other->object, "MERGE_HEAD");
1861 bases = get_merge_bases(head, other);
1862 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1863 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1864 free_commit_list(bases);
1865 head->object.flags |= SYMMETRIC_LEFT;
1867 if (!istate->cache_nr)
1868 repo_read_index(revs->repo);
1869 for (i = 0; i < istate->cache_nr; i++) {
1870 const struct cache_entry *ce = istate->cache[i];
1871 if (!ce_stage(ce))
1872 continue;
1873 if (ce_path_match(istate, ce, &revs->prune_data, NULL)) {
1874 prune_num++;
1875 REALLOC_ARRAY(prune, prune_num);
1876 prune[prune_num-2] = ce->name;
1877 prune[prune_num-1] = NULL;
1879 while ((i+1 < istate->cache_nr) &&
1880 ce_same_name(ce, istate->cache[i+1]))
1881 i++;
1883 clear_pathspec(&revs->prune_data);
1884 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1885 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1886 revs->limited = 1;
1889 static int dotdot_missing(const char *arg, char *dotdot,
1890 struct rev_info *revs, int symmetric)
1892 if (revs->ignore_missing)
1893 return 0;
1894 /* de-munge so we report the full argument */
1895 *dotdot = '.';
1896 die(symmetric
1897 ? "Invalid symmetric difference expression %s"
1898 : "Invalid revision range %s", arg);
1901 static int handle_dotdot_1(const char *arg, char *dotdot,
1902 struct rev_info *revs, int flags,
1903 int cant_be_filename,
1904 struct object_context *a_oc,
1905 struct object_context *b_oc)
1907 const char *a_name, *b_name;
1908 struct object_id a_oid, b_oid;
1909 struct object *a_obj, *b_obj;
1910 unsigned int a_flags, b_flags;
1911 int symmetric = 0;
1912 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1913 unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH;
1915 a_name = arg;
1916 if (!*a_name)
1917 a_name = "HEAD";
1919 b_name = dotdot + 2;
1920 if (*b_name == '.') {
1921 symmetric = 1;
1922 b_name++;
1924 if (!*b_name)
1925 b_name = "HEAD";
1927 if (get_oid_with_context(revs->repo, a_name, oc_flags, &a_oid, a_oc) ||
1928 get_oid_with_context(revs->repo, b_name, oc_flags, &b_oid, b_oc))
1929 return -1;
1931 if (!cant_be_filename) {
1932 *dotdot = '.';
1933 verify_non_filename(revs->prefix, arg);
1934 *dotdot = '\0';
1937 a_obj = parse_object(revs->repo, &a_oid);
1938 b_obj = parse_object(revs->repo, &b_oid);
1939 if (!a_obj || !b_obj)
1940 return dotdot_missing(arg, dotdot, revs, symmetric);
1942 if (!symmetric) {
1943 /* just A..B */
1944 b_flags = flags;
1945 a_flags = flags_exclude;
1946 } else {
1947 /* A...B -- find merge bases between the two */
1948 struct commit *a, *b;
1949 struct commit_list *exclude;
1951 a = lookup_commit_reference(revs->repo, &a_obj->oid);
1952 b = lookup_commit_reference(revs->repo, &b_obj->oid);
1953 if (!a || !b)
1954 return dotdot_missing(arg, dotdot, revs, symmetric);
1956 exclude = get_merge_bases(a, b);
1957 add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE,
1958 flags_exclude);
1959 add_pending_commit_list(revs, exclude, flags_exclude);
1960 free_commit_list(exclude);
1962 b_flags = flags;
1963 a_flags = flags | SYMMETRIC_LEFT;
1966 a_obj->flags |= a_flags;
1967 b_obj->flags |= b_flags;
1968 add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
1969 add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
1970 add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path);
1971 add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path);
1972 return 0;
1975 static int handle_dotdot(const char *arg,
1976 struct rev_info *revs, int flags,
1977 int cant_be_filename)
1979 struct object_context a_oc, b_oc;
1980 char *dotdot = strstr(arg, "..");
1981 int ret;
1983 if (!dotdot)
1984 return -1;
1986 memset(&a_oc, 0, sizeof(a_oc));
1987 memset(&b_oc, 0, sizeof(b_oc));
1989 *dotdot = '\0';
1990 ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename,
1991 &a_oc, &b_oc);
1992 *dotdot = '.';
1994 free(a_oc.path);
1995 free(b_oc.path);
1997 return ret;
2000 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
2002 struct object_context oc;
2003 char *mark;
2004 struct object *object;
2005 struct object_id oid;
2006 int local_flags;
2007 const char *arg = arg_;
2008 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
2009 unsigned get_sha1_flags = GET_OID_RECORD_PATH;
2011 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
2013 if (!cant_be_filename && !strcmp(arg, "..")) {
2015 * Just ".."? That is not a range but the
2016 * pathspec for the parent directory.
2018 return -1;
2021 if (!handle_dotdot(arg, revs, flags, revarg_opt))
2022 return 0;
2024 mark = strstr(arg, "^@");
2025 if (mark && !mark[2]) {
2026 *mark = 0;
2027 if (add_parents_only(revs, arg, flags, 0))
2028 return 0;
2029 *mark = '^';
2031 mark = strstr(arg, "^!");
2032 if (mark && !mark[2]) {
2033 *mark = 0;
2034 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0))
2035 *mark = '^';
2037 mark = strstr(arg, "^-");
2038 if (mark) {
2039 int exclude_parent = 1;
2041 if (mark[2]) {
2042 char *end;
2043 exclude_parent = strtoul(mark + 2, &end, 10);
2044 if (*end != '\0' || !exclude_parent)
2045 return -1;
2048 *mark = 0;
2049 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent))
2050 *mark = '^';
2053 local_flags = 0;
2054 if (*arg == '^') {
2055 local_flags = UNINTERESTING | BOTTOM;
2056 arg++;
2059 if (revarg_opt & REVARG_COMMITTISH)
2060 get_sha1_flags |= GET_OID_COMMITTISH;
2062 if (get_oid_with_context(revs->repo, arg, get_sha1_flags, &oid, &oc))
2063 return revs->ignore_missing ? 0 : -1;
2064 if (!cant_be_filename)
2065 verify_non_filename(revs->prefix, arg);
2066 object = get_reference(revs, arg, &oid, flags ^ local_flags);
2067 if (!object)
2068 return revs->ignore_missing ? 0 : -1;
2069 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
2070 add_pending_object_with_path(revs, object, arg, oc.mode, oc.path);
2071 free(oc.path);
2072 return 0;
2075 static void read_pathspec_from_stdin(struct strbuf *sb,
2076 struct argv_array *prune)
2078 while (strbuf_getline(sb, stdin) != EOF)
2079 argv_array_push(prune, sb->buf);
2082 static void read_revisions_from_stdin(struct rev_info *revs,
2083 struct argv_array *prune)
2085 struct strbuf sb;
2086 int seen_dashdash = 0;
2087 int save_warning;
2089 save_warning = warn_on_object_refname_ambiguity;
2090 warn_on_object_refname_ambiguity = 0;
2092 strbuf_init(&sb, 1000);
2093 while (strbuf_getline(&sb, stdin) != EOF) {
2094 int len = sb.len;
2095 if (!len)
2096 break;
2097 if (sb.buf[0] == '-') {
2098 if (len == 2 && sb.buf[1] == '-') {
2099 seen_dashdash = 1;
2100 break;
2102 die("options not supported in --stdin mode");
2104 if (handle_revision_arg(sb.buf, revs, 0,
2105 REVARG_CANNOT_BE_FILENAME))
2106 die("bad revision '%s'", sb.buf);
2108 if (seen_dashdash)
2109 read_pathspec_from_stdin(&sb, prune);
2111 strbuf_release(&sb);
2112 warn_on_object_refname_ambiguity = save_warning;
2115 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
2117 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
2120 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
2122 append_header_grep_pattern(&revs->grep_filter, field, pattern);
2125 static void add_message_grep(struct rev_info *revs, const char *pattern)
2127 add_grep(revs, pattern, GREP_PATTERN_BODY);
2130 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
2131 int *unkc, const char **unkv,
2132 const struct setup_revision_opt* opt)
2134 const char *arg = argv[0];
2135 const char *optarg;
2136 int argcount;
2137 const unsigned hexsz = the_hash_algo->hexsz;
2139 /* pseudo revision arguments */
2140 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
2141 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
2142 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
2143 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
2144 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
2145 !strcmp(arg, "--indexed-objects") ||
2146 !strcmp(arg, "--alternate-refs") ||
2147 starts_with(arg, "--exclude=") ||
2148 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
2149 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
2151 unkv[(*unkc)++] = arg;
2152 return 1;
2155 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
2156 revs->max_count = atoi(optarg);
2157 revs->no_walk = 0;
2158 return argcount;
2159 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
2160 revs->skip_count = atoi(optarg);
2161 return argcount;
2162 } else if ((*arg == '-') && isdigit(arg[1])) {
2163 /* accept -<digit>, like traditional "head" */
2164 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
2165 revs->max_count < 0)
2166 die("'%s': not a non-negative integer", arg + 1);
2167 revs->no_walk = 0;
2168 } else if (!strcmp(arg, "-n")) {
2169 if (argc <= 1)
2170 return error("-n requires an argument");
2171 revs->max_count = atoi(argv[1]);
2172 revs->no_walk = 0;
2173 return 2;
2174 } else if (skip_prefix(arg, "-n", &optarg)) {
2175 revs->max_count = atoi(optarg);
2176 revs->no_walk = 0;
2177 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
2178 revs->max_age = atoi(optarg);
2179 return argcount;
2180 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
2181 revs->max_age = approxidate(optarg);
2182 return argcount;
2183 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
2184 revs->max_age = approxidate(optarg);
2185 return argcount;
2186 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
2187 revs->min_age = atoi(optarg);
2188 return argcount;
2189 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
2190 revs->min_age = approxidate(optarg);
2191 return argcount;
2192 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
2193 revs->min_age = approxidate(optarg);
2194 return argcount;
2195 } else if (!strcmp(arg, "--first-parent")) {
2196 revs->first_parent_only = 1;
2197 } else if (!strcmp(arg, "--ancestry-path")) {
2198 revs->ancestry_path = 1;
2199 revs->simplify_history = 0;
2200 revs->limited = 1;
2201 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
2202 init_reflog_walk(&revs->reflog_info);
2203 } else if (!strcmp(arg, "--default")) {
2204 if (argc <= 1)
2205 return error("bad --default argument");
2206 revs->def = argv[1];
2207 return 2;
2208 } else if (!strcmp(arg, "--merge")) {
2209 revs->show_merge = 1;
2210 } else if (!strcmp(arg, "--topo-order")) {
2211 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
2212 revs->topo_order = 1;
2213 } else if (!strcmp(arg, "--simplify-merges")) {
2214 revs->simplify_merges = 1;
2215 revs->topo_order = 1;
2216 revs->rewrite_parents = 1;
2217 revs->simplify_history = 0;
2218 revs->limited = 1;
2219 } else if (!strcmp(arg, "--simplify-by-decoration")) {
2220 revs->simplify_merges = 1;
2221 revs->topo_order = 1;
2222 revs->rewrite_parents = 1;
2223 revs->simplify_history = 0;
2224 revs->simplify_by_decoration = 1;
2225 revs->limited = 1;
2226 revs->prune = 1;
2227 } else if (!strcmp(arg, "--date-order")) {
2228 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
2229 revs->topo_order = 1;
2230 } else if (!strcmp(arg, "--author-date-order")) {
2231 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
2232 revs->topo_order = 1;
2233 } else if (!strcmp(arg, "--early-output")) {
2234 revs->early_output = 100;
2235 revs->topo_order = 1;
2236 } else if (skip_prefix(arg, "--early-output=", &optarg)) {
2237 if (strtoul_ui(optarg, 10, &revs->early_output) < 0)
2238 die("'%s': not a non-negative integer", optarg);
2239 revs->topo_order = 1;
2240 } else if (!strcmp(arg, "--parents")) {
2241 revs->rewrite_parents = 1;
2242 revs->print_parents = 1;
2243 } else if (!strcmp(arg, "--dense")) {
2244 revs->dense = 1;
2245 } else if (!strcmp(arg, "--sparse")) {
2246 revs->dense = 0;
2247 } else if (!strcmp(arg, "--in-commit-order")) {
2248 revs->tree_blobs_in_commit_order = 1;
2249 } else if (!strcmp(arg, "--remove-empty")) {
2250 revs->remove_empty_trees = 1;
2251 } else if (!strcmp(arg, "--merges")) {
2252 revs->min_parents = 2;
2253 } else if (!strcmp(arg, "--no-merges")) {
2254 revs->max_parents = 1;
2255 } else if (skip_prefix(arg, "--min-parents=", &optarg)) {
2256 revs->min_parents = atoi(optarg);
2257 } else if (!strcmp(arg, "--no-min-parents")) {
2258 revs->min_parents = 0;
2259 } else if (skip_prefix(arg, "--max-parents=", &optarg)) {
2260 revs->max_parents = atoi(optarg);
2261 } else if (!strcmp(arg, "--no-max-parents")) {
2262 revs->max_parents = -1;
2263 } else if (!strcmp(arg, "--boundary")) {
2264 revs->boundary = 1;
2265 } else if (!strcmp(arg, "--left-right")) {
2266 revs->left_right = 1;
2267 } else if (!strcmp(arg, "--left-only")) {
2268 if (revs->right_only)
2269 die("--left-only is incompatible with --right-only"
2270 " or --cherry");
2271 revs->left_only = 1;
2272 } else if (!strcmp(arg, "--right-only")) {
2273 if (revs->left_only)
2274 die("--right-only is incompatible with --left-only");
2275 revs->right_only = 1;
2276 } else if (!strcmp(arg, "--cherry")) {
2277 if (revs->left_only)
2278 die("--cherry is incompatible with --left-only");
2279 revs->cherry_mark = 1;
2280 revs->right_only = 1;
2281 revs->max_parents = 1;
2282 revs->limited = 1;
2283 } else if (!strcmp(arg, "--count")) {
2284 revs->count = 1;
2285 } else if (!strcmp(arg, "--cherry-mark")) {
2286 if (revs->cherry_pick)
2287 die("--cherry-mark is incompatible with --cherry-pick");
2288 revs->cherry_mark = 1;
2289 revs->limited = 1; /* needs limit_list() */
2290 } else if (!strcmp(arg, "--cherry-pick")) {
2291 if (revs->cherry_mark)
2292 die("--cherry-pick is incompatible with --cherry-mark");
2293 revs->cherry_pick = 1;
2294 revs->limited = 1;
2295 } else if (!strcmp(arg, "--objects")) {
2296 revs->tag_objects = 1;
2297 revs->tree_objects = 1;
2298 revs->blob_objects = 1;
2299 } else if (!strcmp(arg, "--objects-edge")) {
2300 revs->tag_objects = 1;
2301 revs->tree_objects = 1;
2302 revs->blob_objects = 1;
2303 revs->edge_hint = 1;
2304 } else if (!strcmp(arg, "--objects-edge-aggressive")) {
2305 revs->tag_objects = 1;
2306 revs->tree_objects = 1;
2307 revs->blob_objects = 1;
2308 revs->edge_hint = 1;
2309 revs->edge_hint_aggressive = 1;
2310 } else if (!strcmp(arg, "--verify-objects")) {
2311 revs->tag_objects = 1;
2312 revs->tree_objects = 1;
2313 revs->blob_objects = 1;
2314 revs->verify_objects = 1;
2315 } else if (!strcmp(arg, "--unpacked")) {
2316 revs->unpacked = 1;
2317 } else if (starts_with(arg, "--unpacked=")) {
2318 die("--unpacked=<packfile> no longer supported.");
2319 } else if (!strcmp(arg, "-r")) {
2320 revs->diff = 1;
2321 revs->diffopt.flags.recursive = 1;
2322 } else if (!strcmp(arg, "-t")) {
2323 revs->diff = 1;
2324 revs->diffopt.flags.recursive = 1;
2325 revs->diffopt.flags.tree_in_recursive = 1;
2326 } else if (!strcmp(arg, "-m")) {
2327 revs->ignore_merges = 0;
2328 } else if (!strcmp(arg, "-c")) {
2329 revs->diff = 1;
2330 revs->dense_combined_merges = 0;
2331 revs->combine_merges = 1;
2332 } else if (!strcmp(arg, "--combined-all-paths")) {
2333 revs->diff = 1;
2334 revs->combined_all_paths = 1;
2335 } else if (!strcmp(arg, "--cc")) {
2336 revs->diff = 1;
2337 revs->dense_combined_merges = 1;
2338 revs->combine_merges = 1;
2339 } else if (!strcmp(arg, "-v")) {
2340 revs->verbose_header = 1;
2341 } else if (!strcmp(arg, "--pretty")) {
2342 revs->verbose_header = 1;
2343 revs->pretty_given = 1;
2344 get_commit_format(NULL, revs);
2345 } else if (skip_prefix(arg, "--pretty=", &optarg) ||
2346 skip_prefix(arg, "--format=", &optarg)) {
2348 * Detached form ("--pretty X" as opposed to "--pretty=X")
2349 * not allowed, since the argument is optional.
2351 revs->verbose_header = 1;
2352 revs->pretty_given = 1;
2353 get_commit_format(optarg, revs);
2354 } else if (!strcmp(arg, "--expand-tabs")) {
2355 revs->expand_tabs_in_log = 8;
2356 } else if (!strcmp(arg, "--no-expand-tabs")) {
2357 revs->expand_tabs_in_log = 0;
2358 } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
2359 int val;
2360 if (strtol_i(arg, 10, &val) < 0 || val < 0)
2361 die("'%s': not a non-negative integer", arg);
2362 revs->expand_tabs_in_log = val;
2363 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
2364 enable_default_display_notes(&revs->notes_opt, &revs->show_notes);
2365 revs->show_notes_given = 1;
2366 } else if (!strcmp(arg, "--show-signature")) {
2367 revs->show_signature = 1;
2368 } else if (!strcmp(arg, "--no-show-signature")) {
2369 revs->show_signature = 0;
2370 } else if (!strcmp(arg, "--show-linear-break")) {
2371 revs->break_bar = " ..........";
2372 revs->track_linear = 1;
2373 revs->track_first_time = 1;
2374 } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) {
2375 revs->break_bar = xstrdup(optarg);
2376 revs->track_linear = 1;
2377 revs->track_first_time = 1;
2378 } else if (skip_prefix(arg, "--show-notes=", &optarg) ||
2379 skip_prefix(arg, "--notes=", &optarg)) {
2380 if (starts_with(arg, "--show-notes=") &&
2381 revs->notes_opt.use_default_notes < 0)
2382 revs->notes_opt.use_default_notes = 1;
2383 enable_ref_display_notes(&revs->notes_opt, &revs->show_notes, optarg);
2384 revs->show_notes_given = 1;
2385 } else if (!strcmp(arg, "--no-notes")) {
2386 disable_display_notes(&revs->notes_opt, &revs->show_notes);
2387 revs->show_notes_given = 1;
2388 } else if (!strcmp(arg, "--standard-notes")) {
2389 revs->show_notes_given = 1;
2390 revs->notes_opt.use_default_notes = 1;
2391 } else if (!strcmp(arg, "--no-standard-notes")) {
2392 revs->notes_opt.use_default_notes = 0;
2393 } else if (!strcmp(arg, "--oneline")) {
2394 revs->verbose_header = 1;
2395 get_commit_format("oneline", revs);
2396 revs->pretty_given = 1;
2397 revs->abbrev_commit = 1;
2398 } else if (!strcmp(arg, "--graph")) {
2399 revs->topo_order = 1;
2400 revs->rewrite_parents = 1;
2401 revs->graph = graph_init(revs);
2402 } else if (!strcmp(arg, "--encode-email-headers")) {
2403 revs->encode_email_headers = 1;
2404 } else if (!strcmp(arg, "--no-encode-email-headers")) {
2405 revs->encode_email_headers = 0;
2406 } else if (!strcmp(arg, "--root")) {
2407 revs->show_root_diff = 1;
2408 } else if (!strcmp(arg, "--no-commit-id")) {
2409 revs->no_commit_id = 1;
2410 } else if (!strcmp(arg, "--always")) {
2411 revs->always_show_header = 1;
2412 } else if (!strcmp(arg, "--no-abbrev")) {
2413 revs->abbrev = 0;
2414 } else if (!strcmp(arg, "--abbrev")) {
2415 revs->abbrev = DEFAULT_ABBREV;
2416 } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
2417 revs->abbrev = strtoul(optarg, NULL, 10);
2418 if (revs->abbrev < MINIMUM_ABBREV)
2419 revs->abbrev = MINIMUM_ABBREV;
2420 else if (revs->abbrev > hexsz)
2421 revs->abbrev = hexsz;
2422 } else if (!strcmp(arg, "--abbrev-commit")) {
2423 revs->abbrev_commit = 1;
2424 revs->abbrev_commit_given = 1;
2425 } else if (!strcmp(arg, "--no-abbrev-commit")) {
2426 revs->abbrev_commit = 0;
2427 } else if (!strcmp(arg, "--full-diff")) {
2428 revs->diff = 1;
2429 revs->full_diff = 1;
2430 } else if (!strcmp(arg, "--show-pulls")) {
2431 revs->show_pulls = 1;
2432 } else if (!strcmp(arg, "--full-history")) {
2433 revs->simplify_history = 0;
2434 } else if (!strcmp(arg, "--relative-date")) {
2435 revs->date_mode.type = DATE_RELATIVE;
2436 revs->date_mode_explicit = 1;
2437 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
2438 parse_date_format(optarg, &revs->date_mode);
2439 revs->date_mode_explicit = 1;
2440 return argcount;
2441 } else if (!strcmp(arg, "--log-size")) {
2442 revs->show_log_size = 1;
2445 * Grepping the commit log
2447 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2448 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2449 return argcount;
2450 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2451 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2452 return argcount;
2453 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2454 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2455 return argcount;
2456 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2457 add_message_grep(revs, optarg);
2458 return argcount;
2459 } else if (!strcmp(arg, "--grep-debug")) {
2460 revs->grep_filter.debug = 1;
2461 } else if (!strcmp(arg, "--basic-regexp")) {
2462 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
2463 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2464 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
2465 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2466 revs->grep_filter.ignore_case = 1;
2467 revs->diffopt.pickaxe_opts |= DIFF_PICKAXE_IGNORE_CASE;
2468 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2469 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
2470 } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) {
2471 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
2472 } else if (!strcmp(arg, "--all-match")) {
2473 revs->grep_filter.all_match = 1;
2474 } else if (!strcmp(arg, "--invert-grep")) {
2475 revs->invert_grep = 1;
2476 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2477 if (strcmp(optarg, "none"))
2478 git_log_output_encoding = xstrdup(optarg);
2479 else
2480 git_log_output_encoding = "";
2481 return argcount;
2482 } else if (!strcmp(arg, "--reverse")) {
2483 revs->reverse ^= 1;
2484 } else if (!strcmp(arg, "--children")) {
2485 revs->children.name = "children";
2486 revs->limited = 1;
2487 } else if (!strcmp(arg, "--ignore-missing")) {
2488 revs->ignore_missing = 1;
2489 } else if (opt && opt->allow_exclude_promisor_objects &&
2490 !strcmp(arg, "--exclude-promisor-objects")) {
2491 if (fetch_if_missing)
2492 BUG("exclude_promisor_objects can only be used when fetch_if_missing is 0");
2493 revs->exclude_promisor_objects = 1;
2494 } else {
2495 int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
2496 if (!opts)
2497 unkv[(*unkc)++] = arg;
2498 return opts;
2500 if (revs->graph && revs->track_linear)
2501 die("--show-linear-break and --graph are incompatible");
2503 return 1;
2506 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2507 const struct option *options,
2508 const char * const usagestr[])
2510 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2511 &ctx->cpidx, ctx->out, NULL);
2512 if (n <= 0) {
2513 error("unknown option `%s'", ctx->argv[0]);
2514 usage_with_options(usagestr, options);
2516 ctx->argv += n;
2517 ctx->argc -= n;
2520 static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn,
2521 void *cb_data, const char *term)
2523 struct strbuf bisect_refs = STRBUF_INIT;
2524 int status;
2525 strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2526 status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data, 0);
2527 strbuf_release(&bisect_refs);
2528 return status;
2531 static int for_each_bad_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
2533 return for_each_bisect_ref(refs, fn, cb_data, term_bad);
2536 static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
2538 return for_each_bisect_ref(refs, fn, cb_data, term_good);
2541 static int handle_revision_pseudo_opt(const char *submodule,
2542 struct rev_info *revs,
2543 int argc, const char **argv, int *flags)
2545 const char *arg = argv[0];
2546 const char *optarg;
2547 struct ref_store *refs;
2548 int argcount;
2550 if (submodule) {
2552 * We need some something like get_submodule_worktrees()
2553 * before we can go through all worktrees of a submodule,
2554 * .e.g with adding all HEADs from --all, which is not
2555 * supported right now, so stick to single worktree.
2557 if (!revs->single_worktree)
2558 BUG("--single-worktree cannot be used together with submodule");
2559 refs = get_submodule_ref_store(submodule);
2560 } else
2561 refs = get_main_ref_store(revs->repo);
2564 * NOTE!
2566 * Commands like "git shortlog" will not accept the options below
2567 * unless parse_revision_opt queues them (as opposed to erroring
2568 * out).
2570 * When implementing your new pseudo-option, remember to
2571 * register it in the list at the top of handle_revision_opt.
2573 if (!strcmp(arg, "--all")) {
2574 handle_refs(refs, revs, *flags, refs_for_each_ref);
2575 handle_refs(refs, revs, *flags, refs_head_ref);
2576 if (!revs->single_worktree) {
2577 struct all_refs_cb cb;
2579 init_all_refs_cb(&cb, revs, *flags);
2580 other_head_refs(handle_one_ref, &cb);
2582 clear_ref_exclusion(&revs->ref_excludes);
2583 } else if (!strcmp(arg, "--branches")) {
2584 handle_refs(refs, revs, *flags, refs_for_each_branch_ref);
2585 clear_ref_exclusion(&revs->ref_excludes);
2586 } else if (!strcmp(arg, "--bisect")) {
2587 read_bisect_terms(&term_bad, &term_good);
2588 handle_refs(refs, revs, *flags, for_each_bad_bisect_ref);
2589 handle_refs(refs, revs, *flags ^ (UNINTERESTING | BOTTOM),
2590 for_each_good_bisect_ref);
2591 revs->bisect = 1;
2592 } else if (!strcmp(arg, "--tags")) {
2593 handle_refs(refs, revs, *flags, refs_for_each_tag_ref);
2594 clear_ref_exclusion(&revs->ref_excludes);
2595 } else if (!strcmp(arg, "--remotes")) {
2596 handle_refs(refs, revs, *flags, refs_for_each_remote_ref);
2597 clear_ref_exclusion(&revs->ref_excludes);
2598 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2599 struct all_refs_cb cb;
2600 init_all_refs_cb(&cb, revs, *flags);
2601 for_each_glob_ref(handle_one_ref, optarg, &cb);
2602 clear_ref_exclusion(&revs->ref_excludes);
2603 return argcount;
2604 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2605 add_ref_exclusion(&revs->ref_excludes, optarg);
2606 return argcount;
2607 } else if (skip_prefix(arg, "--branches=", &optarg)) {
2608 struct all_refs_cb cb;
2609 init_all_refs_cb(&cb, revs, *flags);
2610 for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb);
2611 clear_ref_exclusion(&revs->ref_excludes);
2612 } else if (skip_prefix(arg, "--tags=", &optarg)) {
2613 struct all_refs_cb cb;
2614 init_all_refs_cb(&cb, revs, *flags);
2615 for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb);
2616 clear_ref_exclusion(&revs->ref_excludes);
2617 } else if (skip_prefix(arg, "--remotes=", &optarg)) {
2618 struct all_refs_cb cb;
2619 init_all_refs_cb(&cb, revs, *flags);
2620 for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb);
2621 clear_ref_exclusion(&revs->ref_excludes);
2622 } else if (!strcmp(arg, "--reflog")) {
2623 add_reflogs_to_pending(revs, *flags);
2624 } else if (!strcmp(arg, "--indexed-objects")) {
2625 add_index_objects_to_pending(revs, *flags);
2626 } else if (!strcmp(arg, "--alternate-refs")) {
2627 add_alternate_refs_to_pending(revs, *flags);
2628 } else if (!strcmp(arg, "--not")) {
2629 *flags ^= UNINTERESTING | BOTTOM;
2630 } else if (!strcmp(arg, "--no-walk")) {
2631 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2632 } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
2634 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2635 * not allowed, since the argument is optional.
2637 if (!strcmp(optarg, "sorted"))
2638 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2639 else if (!strcmp(optarg, "unsorted"))
2640 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2641 else
2642 return error("invalid argument to --no-walk");
2643 } else if (!strcmp(arg, "--do-walk")) {
2644 revs->no_walk = 0;
2645 } else if (!strcmp(arg, "--single-worktree")) {
2646 revs->single_worktree = 1;
2647 } else {
2648 return 0;
2651 return 1;
2654 static void NORETURN diagnose_missing_default(const char *def)
2656 int flags;
2657 const char *refname;
2659 refname = resolve_ref_unsafe(def, 0, NULL, &flags);
2660 if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2661 die(_("your current branch appears to be broken"));
2663 skip_prefix(refname, "refs/heads/", &refname);
2664 die(_("your current branch '%s' does not have any commits yet"),
2665 refname);
2669 * Parse revision information, filling in the "rev_info" structure,
2670 * and removing the used arguments from the argument list.
2672 * Returns the number of arguments left that weren't recognized
2673 * (which are also moved to the head of the argument list)
2675 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2677 int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt;
2678 struct argv_array prune_data = ARGV_ARRAY_INIT;
2679 const char *submodule = NULL;
2680 int seen_end_of_options = 0;
2682 if (opt)
2683 submodule = opt->submodule;
2685 /* First, search for "--" */
2686 if (opt && opt->assume_dashdash) {
2687 seen_dashdash = 1;
2688 } else {
2689 seen_dashdash = 0;
2690 for (i = 1; i < argc; i++) {
2691 const char *arg = argv[i];
2692 if (strcmp(arg, "--"))
2693 continue;
2694 argv[i] = NULL;
2695 argc = i;
2696 if (argv[i + 1])
2697 argv_array_pushv(&prune_data, argv + i + 1);
2698 seen_dashdash = 1;
2699 break;
2703 /* Second, deal with arguments and options */
2704 flags = 0;
2705 revarg_opt = opt ? opt->revarg_opt : 0;
2706 if (seen_dashdash)
2707 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2708 for (left = i = 1; i < argc; i++) {
2709 const char *arg = argv[i];
2710 if (!seen_end_of_options && *arg == '-') {
2711 int opts;
2713 opts = handle_revision_pseudo_opt(submodule,
2714 revs, argc - i, argv + i,
2715 &flags);
2716 if (opts > 0) {
2717 i += opts - 1;
2718 continue;
2721 if (!strcmp(arg, "--stdin")) {
2722 if (revs->disable_stdin) {
2723 argv[left++] = arg;
2724 continue;
2726 if (revs->read_from_stdin++)
2727 die("--stdin given twice?");
2728 read_revisions_from_stdin(revs, &prune_data);
2729 continue;
2732 if (!strcmp(arg, "--end-of-options")) {
2733 seen_end_of_options = 1;
2734 continue;
2737 opts = handle_revision_opt(revs, argc - i, argv + i,
2738 &left, argv, opt);
2739 if (opts > 0) {
2740 i += opts - 1;
2741 continue;
2743 if (opts < 0)
2744 exit(128);
2745 continue;
2749 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2750 int j;
2751 if (seen_dashdash || *arg == '^')
2752 die("bad revision '%s'", arg);
2754 /* If we didn't have a "--":
2755 * (1) all filenames must exist;
2756 * (2) all rev-args must not be interpretable
2757 * as a valid filename.
2758 * but the latter we have checked in the main loop.
2760 for (j = i; j < argc; j++)
2761 verify_filename(revs->prefix, argv[j], j == i);
2763 argv_array_pushv(&prune_data, argv + i);
2764 break;
2766 else
2767 got_rev_arg = 1;
2770 if (prune_data.argc) {
2772 * If we need to introduce the magic "a lone ':' means no
2773 * pathspec whatsoever", here is the place to do so.
2775 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2776 * prune_data.nr = 0;
2777 * prune_data.alloc = 0;
2778 * free(prune_data.path);
2779 * prune_data.path = NULL;
2780 * } else {
2781 * terminate prune_data.alloc with NULL and
2782 * call init_pathspec() to set revs->prune_data here.
2785 parse_pathspec(&revs->prune_data, 0, 0,
2786 revs->prefix, prune_data.argv);
2788 argv_array_clear(&prune_data);
2790 if (revs->def == NULL)
2791 revs->def = opt ? opt->def : NULL;
2792 if (opt && opt->tweak)
2793 opt->tweak(revs, opt);
2794 if (revs->show_merge)
2795 prepare_show_merge(revs);
2796 if (revs->def && !revs->pending.nr && !revs->rev_input_given && !got_rev_arg) {
2797 struct object_id oid;
2798 struct object *object;
2799 struct object_context oc;
2800 if (get_oid_with_context(revs->repo, revs->def, 0, &oid, &oc))
2801 diagnose_missing_default(revs->def);
2802 object = get_reference(revs, revs->def, &oid, 0);
2803 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2806 /* Did the user ask for any diff output? Run the diff! */
2807 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2808 revs->diff = 1;
2810 /* Pickaxe, diff-filter and rename following need diffs */
2811 if ((revs->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
2812 revs->diffopt.filter ||
2813 revs->diffopt.flags.follow_renames)
2814 revs->diff = 1;
2816 if (revs->diffopt.objfind)
2817 revs->simplify_history = 0;
2819 if (revs->line_level_traverse) {
2820 if (want_ancestry(revs))
2821 revs->limited = 1;
2822 revs->topo_order = 1;
2825 if (revs->topo_order && !generation_numbers_enabled(the_repository))
2826 revs->limited = 1;
2828 if (revs->prune_data.nr) {
2829 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2830 /* Can't prune commits with rename following: the paths change.. */
2831 if (!revs->diffopt.flags.follow_renames)
2832 revs->prune = 1;
2833 if (!revs->full_diff)
2834 copy_pathspec(&revs->diffopt.pathspec,
2835 &revs->prune_data);
2837 if (revs->combine_merges)
2838 revs->ignore_merges = 0;
2839 if (revs->combined_all_paths && !revs->combine_merges)
2840 die("--combined-all-paths makes no sense without -c or --cc");
2842 revs->diffopt.abbrev = revs->abbrev;
2844 diff_setup_done(&revs->diffopt);
2846 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2847 &revs->grep_filter);
2848 if (!is_encoding_utf8(get_log_output_encoding()))
2849 revs->grep_filter.ignore_locale = 1;
2850 compile_grep_patterns(&revs->grep_filter);
2852 if (revs->reverse && revs->reflog_info)
2853 die("cannot combine --reverse with --walk-reflogs");
2854 if (revs->reflog_info && revs->limited)
2855 die("cannot combine --walk-reflogs with history-limiting options");
2856 if (revs->rewrite_parents && revs->children.name)
2857 die("cannot combine --parents and --children");
2860 * Limitations on the graph functionality
2862 if (revs->reverse && revs->graph)
2863 die("cannot combine --reverse with --graph");
2865 if (revs->reflog_info && revs->graph)
2866 die("cannot combine --walk-reflogs with --graph");
2867 if (revs->no_walk && revs->graph)
2868 die("cannot combine --no-walk with --graph");
2869 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2870 die("cannot use --grep-reflog without --walk-reflogs");
2872 if (revs->first_parent_only && revs->bisect)
2873 die(_("--first-parent is incompatible with --bisect"));
2875 if (revs->line_level_traverse &&
2876 (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT)))
2877 die(_("-L does not yet support diff formats besides -p and -s"));
2879 if (revs->expand_tabs_in_log < 0)
2880 revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2882 return left;
2885 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2887 struct commit_list *l = xcalloc(1, sizeof(*l));
2889 l->item = child;
2890 l->next = add_decoration(&revs->children, &parent->object, l);
2893 static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2895 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2896 struct commit_list **pp, *p;
2897 int surviving_parents;
2899 /* Examine existing parents while marking ones we have seen... */
2900 pp = &commit->parents;
2901 surviving_parents = 0;
2902 while ((p = *pp) != NULL) {
2903 struct commit *parent = p->item;
2904 if (parent->object.flags & TMP_MARK) {
2905 *pp = p->next;
2906 if (ts)
2907 compact_treesame(revs, commit, surviving_parents);
2908 continue;
2910 parent->object.flags |= TMP_MARK;
2911 surviving_parents++;
2912 pp = &p->next;
2914 /* clear the temporary mark */
2915 for (p = commit->parents; p; p = p->next) {
2916 p->item->object.flags &= ~TMP_MARK;
2918 /* no update_treesame() - removing duplicates can't affect TREESAME */
2919 return surviving_parents;
2922 struct merge_simplify_state {
2923 struct commit *simplified;
2926 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2928 struct merge_simplify_state *st;
2930 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2931 if (!st) {
2932 st = xcalloc(1, sizeof(*st));
2933 add_decoration(&revs->merge_simplification, &commit->object, st);
2935 return st;
2938 static int mark_redundant_parents(struct commit *commit)
2940 struct commit_list *h = reduce_heads(commit->parents);
2941 int i = 0, marked = 0;
2942 struct commit_list *po, *pn;
2944 /* Want these for sanity-checking only */
2945 int orig_cnt = commit_list_count(commit->parents);
2946 int cnt = commit_list_count(h);
2949 * Not ready to remove items yet, just mark them for now, based
2950 * on the output of reduce_heads(). reduce_heads outputs the reduced
2951 * set in its original order, so this isn't too hard.
2953 po = commit->parents;
2954 pn = h;
2955 while (po) {
2956 if (pn && po->item == pn->item) {
2957 pn = pn->next;
2958 i++;
2959 } else {
2960 po->item->object.flags |= TMP_MARK;
2961 marked++;
2963 po=po->next;
2966 if (i != cnt || cnt+marked != orig_cnt)
2967 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2969 free_commit_list(h);
2971 return marked;
2974 static int mark_treesame_root_parents(struct commit *commit)
2976 struct commit_list *p;
2977 int marked = 0;
2979 for (p = commit->parents; p; p = p->next) {
2980 struct commit *parent = p->item;
2981 if (!parent->parents && (parent->object.flags & TREESAME)) {
2982 parent->object.flags |= TMP_MARK;
2983 marked++;
2987 return marked;
2991 * Awkward naming - this means one parent we are TREESAME to.
2992 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2993 * empty tree). Better name suggestions?
2995 static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2997 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2998 struct commit *unmarked = NULL, *marked = NULL;
2999 struct commit_list *p;
3000 unsigned n;
3002 for (p = commit->parents, n = 0; p; p = p->next, n++) {
3003 if (ts->treesame[n]) {
3004 if (p->item->object.flags & TMP_MARK) {
3005 if (!marked)
3006 marked = p->item;
3007 } else {
3008 if (!unmarked) {
3009 unmarked = p->item;
3010 break;
3017 * If we are TREESAME to a marked-for-deletion parent, but not to any
3018 * unmarked parents, unmark the first TREESAME parent. This is the
3019 * parent that the default simplify_history==1 scan would have followed,
3020 * and it doesn't make sense to omit that path when asking for a
3021 * simplified full history. Retaining it improves the chances of
3022 * understanding odd missed merges that took an old version of a file.
3024 * Example:
3026 * I--------*X A modified the file, but mainline merge X used
3027 * \ / "-s ours", so took the version from I. X is
3028 * `-*A--' TREESAME to I and !TREESAME to A.
3030 * Default log from X would produce "I". Without this check,
3031 * --full-history --simplify-merges would produce "I-A-X", showing
3032 * the merge commit X and that it changed A, but not making clear that
3033 * it had just taken the I version. With this check, the topology above
3034 * is retained.
3036 * Note that it is possible that the simplification chooses a different
3037 * TREESAME parent from the default, in which case this test doesn't
3038 * activate, and we _do_ drop the default parent. Example:
3040 * I------X A modified the file, but it was reverted in B,
3041 * \ / meaning mainline merge X is TREESAME to both
3042 * *A-*B parents.
3044 * Default log would produce "I" by following the first parent;
3045 * --full-history --simplify-merges will produce "I-A-B". But this is a
3046 * reasonable result - it presents a logical full history leading from
3047 * I to X, and X is not an important merge.
3049 if (!unmarked && marked) {
3050 marked->object.flags &= ~TMP_MARK;
3051 return 1;
3054 return 0;
3057 static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
3059 struct commit_list **pp, *p;
3060 int nth_parent, removed = 0;
3062 pp = &commit->parents;
3063 nth_parent = 0;
3064 while ((p = *pp) != NULL) {
3065 struct commit *parent = p->item;
3066 if (parent->object.flags & TMP_MARK) {
3067 parent->object.flags &= ~TMP_MARK;
3068 *pp = p->next;
3069 free(p);
3070 removed++;
3071 compact_treesame(revs, commit, nth_parent);
3072 continue;
3074 pp = &p->next;
3075 nth_parent++;
3078 /* Removing parents can only increase TREESAMEness */
3079 if (removed && !(commit->object.flags & TREESAME))
3080 update_treesame(revs, commit);
3082 return nth_parent;
3085 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
3087 struct commit_list *p;
3088 struct commit *parent;
3089 struct merge_simplify_state *st, *pst;
3090 int cnt;
3092 st = locate_simplify_state(revs, commit);
3095 * Have we handled this one?
3097 if (st->simplified)
3098 return tail;
3101 * An UNINTERESTING commit simplifies to itself, so does a
3102 * root commit. We do not rewrite parents of such commit
3103 * anyway.
3105 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
3106 st->simplified = commit;
3107 return tail;
3111 * Do we know what commit all of our parents that matter
3112 * should be rewritten to? Otherwise we are not ready to
3113 * rewrite this one yet.
3115 for (cnt = 0, p = commit->parents; p; p = p->next) {
3116 pst = locate_simplify_state(revs, p->item);
3117 if (!pst->simplified) {
3118 tail = &commit_list_insert(p->item, tail)->next;
3119 cnt++;
3121 if (revs->first_parent_only)
3122 break;
3124 if (cnt) {
3125 tail = &commit_list_insert(commit, tail)->next;
3126 return tail;
3130 * Rewrite our list of parents. Note that this cannot
3131 * affect our TREESAME flags in any way - a commit is
3132 * always TREESAME to its simplification.
3134 for (p = commit->parents; p; p = p->next) {
3135 pst = locate_simplify_state(revs, p->item);
3136 p->item = pst->simplified;
3137 if (revs->first_parent_only)
3138 break;
3141 if (revs->first_parent_only)
3142 cnt = 1;
3143 else
3144 cnt = remove_duplicate_parents(revs, commit);
3147 * It is possible that we are a merge and one side branch
3148 * does not have any commit that touches the given paths;
3149 * in such a case, the immediate parent from that branch
3150 * will be rewritten to be the merge base.
3152 * o----X X: the commit we are looking at;
3153 * / / o: a commit that touches the paths;
3154 * ---o----'
3156 * Further, a merge of an independent branch that doesn't
3157 * touch the path will reduce to a treesame root parent:
3159 * ----o----X X: the commit we are looking at;
3160 * / o: a commit that touches the paths;
3161 * r r: a root commit not touching the paths
3163 * Detect and simplify both cases.
3165 if (1 < cnt) {
3166 int marked = mark_redundant_parents(commit);
3167 marked += mark_treesame_root_parents(commit);
3168 if (marked)
3169 marked -= leave_one_treesame_to_parent(revs, commit);
3170 if (marked)
3171 cnt = remove_marked_parents(revs, commit);
3175 * A commit simplifies to itself if it is a root, if it is
3176 * UNINTERESTING, if it touches the given paths, or if it is a
3177 * merge and its parents don't simplify to one relevant commit
3178 * (the first two cases are already handled at the beginning of
3179 * this function).
3181 * Otherwise, it simplifies to what its sole relevant parent
3182 * simplifies to.
3184 if (!cnt ||
3185 (commit->object.flags & UNINTERESTING) ||
3186 !(commit->object.flags & TREESAME) ||
3187 (parent = one_relevant_parent(revs, commit->parents)) == NULL ||
3188 (revs->show_pulls && (commit->object.flags & PULL_MERGE)))
3189 st->simplified = commit;
3190 else {
3191 pst = locate_simplify_state(revs, parent);
3192 st->simplified = pst->simplified;
3194 return tail;
3197 static void simplify_merges(struct rev_info *revs)
3199 struct commit_list *list, *next;
3200 struct commit_list *yet_to_do, **tail;
3201 struct commit *commit;
3203 if (!revs->prune)
3204 return;
3206 /* feed the list reversed */
3207 yet_to_do = NULL;
3208 for (list = revs->commits; list; list = next) {
3209 commit = list->item;
3210 next = list->next;
3212 * Do not free(list) here yet; the original list
3213 * is used later in this function.
3215 commit_list_insert(commit, &yet_to_do);
3217 while (yet_to_do) {
3218 list = yet_to_do;
3219 yet_to_do = NULL;
3220 tail = &yet_to_do;
3221 while (list) {
3222 commit = pop_commit(&list);
3223 tail = simplify_one(revs, commit, tail);
3227 /* clean up the result, removing the simplified ones */
3228 list = revs->commits;
3229 revs->commits = NULL;
3230 tail = &revs->commits;
3231 while (list) {
3232 struct merge_simplify_state *st;
3234 commit = pop_commit(&list);
3235 st = locate_simplify_state(revs, commit);
3236 if (st->simplified == commit)
3237 tail = &commit_list_insert(commit, tail)->next;
3241 static void set_children(struct rev_info *revs)
3243 struct commit_list *l;
3244 for (l = revs->commits; l; l = l->next) {
3245 struct commit *commit = l->item;
3246 struct commit_list *p;
3248 for (p = commit->parents; p; p = p->next)
3249 add_child(revs, p->item, commit);
3253 void reset_revision_walk(void)
3255 clear_object_flags(SEEN | ADDED | SHOWN | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE);
3258 static int mark_uninteresting(const struct object_id *oid,
3259 struct packed_git *pack,
3260 uint32_t pos,
3261 void *cb)
3263 struct rev_info *revs = cb;
3264 struct object *o = parse_object(revs->repo, oid);
3265 o->flags |= UNINTERESTING | SEEN;
3266 return 0;
3269 define_commit_slab(indegree_slab, int);
3270 define_commit_slab(author_date_slab, timestamp_t);
3272 struct topo_walk_info {
3273 uint32_t min_generation;
3274 struct prio_queue explore_queue;
3275 struct prio_queue indegree_queue;
3276 struct prio_queue topo_queue;
3277 struct indegree_slab indegree;
3278 struct author_date_slab author_date;
3281 static inline void test_flag_and_insert(struct prio_queue *q, struct commit *c, int flag)
3283 if (c->object.flags & flag)
3284 return;
3286 c->object.flags |= flag;
3287 prio_queue_put(q, c);
3290 static void explore_walk_step(struct rev_info *revs)
3292 struct topo_walk_info *info = revs->topo_walk_info;
3293 struct commit_list *p;
3294 struct commit *c = prio_queue_get(&info->explore_queue);
3296 if (!c)
3297 return;
3299 if (parse_commit_gently(c, 1) < 0)
3300 return;
3302 if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
3303 record_author_date(&info->author_date, c);
3305 if (revs->max_age != -1 && (c->date < revs->max_age))
3306 c->object.flags |= UNINTERESTING;
3308 if (process_parents(revs, c, NULL, NULL) < 0)
3309 return;
3311 if (c->object.flags & UNINTERESTING)
3312 mark_parents_uninteresting(c);
3314 for (p = c->parents; p; p = p->next)
3315 test_flag_and_insert(&info->explore_queue, p->item, TOPO_WALK_EXPLORED);
3318 static void explore_to_depth(struct rev_info *revs,
3319 uint32_t gen_cutoff)
3321 struct topo_walk_info *info = revs->topo_walk_info;
3322 struct commit *c;
3323 while ((c = prio_queue_peek(&info->explore_queue)) &&
3324 commit_graph_generation(c) >= gen_cutoff)
3325 explore_walk_step(revs);
3328 static void indegree_walk_step(struct rev_info *revs)
3330 struct commit_list *p;
3331 struct topo_walk_info *info = revs->topo_walk_info;
3332 struct commit *c = prio_queue_get(&info->indegree_queue);
3334 if (!c)
3335 return;
3337 if (parse_commit_gently(c, 1) < 0)
3338 return;
3340 explore_to_depth(revs, commit_graph_generation(c));
3342 for (p = c->parents; p; p = p->next) {
3343 struct commit *parent = p->item;
3344 int *pi = indegree_slab_at(&info->indegree, parent);
3346 if (*pi)
3347 (*pi)++;
3348 else
3349 *pi = 2;
3351 test_flag_and_insert(&info->indegree_queue, parent, TOPO_WALK_INDEGREE);
3353 if (revs->first_parent_only)
3354 return;
3358 static void compute_indegrees_to_depth(struct rev_info *revs,
3359 uint32_t gen_cutoff)
3361 struct topo_walk_info *info = revs->topo_walk_info;
3362 struct commit *c;
3363 while ((c = prio_queue_peek(&info->indegree_queue)) &&
3364 commit_graph_generation(c) >= gen_cutoff)
3365 indegree_walk_step(revs);
3368 static void reset_topo_walk(struct rev_info *revs)
3370 struct topo_walk_info *info = revs->topo_walk_info;
3372 clear_prio_queue(&info->explore_queue);
3373 clear_prio_queue(&info->indegree_queue);
3374 clear_prio_queue(&info->topo_queue);
3375 clear_indegree_slab(&info->indegree);
3376 clear_author_date_slab(&info->author_date);
3378 FREE_AND_NULL(revs->topo_walk_info);
3381 static void init_topo_walk(struct rev_info *revs)
3383 struct topo_walk_info *info;
3384 struct commit_list *list;
3385 if (revs->topo_walk_info)
3386 reset_topo_walk(revs);
3388 revs->topo_walk_info = xmalloc(sizeof(struct topo_walk_info));
3389 info = revs->topo_walk_info;
3390 memset(info, 0, sizeof(struct topo_walk_info));
3392 init_indegree_slab(&info->indegree);
3393 memset(&info->explore_queue, 0, sizeof(info->explore_queue));
3394 memset(&info->indegree_queue, 0, sizeof(info->indegree_queue));
3395 memset(&info->topo_queue, 0, sizeof(info->topo_queue));
3397 switch (revs->sort_order) {
3398 default: /* REV_SORT_IN_GRAPH_ORDER */
3399 info->topo_queue.compare = NULL;
3400 break;
3401 case REV_SORT_BY_COMMIT_DATE:
3402 info->topo_queue.compare = compare_commits_by_commit_date;
3403 break;
3404 case REV_SORT_BY_AUTHOR_DATE:
3405 init_author_date_slab(&info->author_date);
3406 info->topo_queue.compare = compare_commits_by_author_date;
3407 info->topo_queue.cb_data = &info->author_date;
3408 break;
3411 info->explore_queue.compare = compare_commits_by_gen_then_commit_date;
3412 info->indegree_queue.compare = compare_commits_by_gen_then_commit_date;
3414 info->min_generation = GENERATION_NUMBER_INFINITY;
3415 for (list = revs->commits; list; list = list->next) {
3416 struct commit *c = list->item;
3417 uint32_t generation;
3419 if (parse_commit_gently(c, 1))
3420 continue;
3422 test_flag_and_insert(&info->explore_queue, c, TOPO_WALK_EXPLORED);
3423 test_flag_and_insert(&info->indegree_queue, c, TOPO_WALK_INDEGREE);
3425 generation = commit_graph_generation(c);
3426 if (generation < info->min_generation)
3427 info->min_generation = generation;
3429 *(indegree_slab_at(&info->indegree, c)) = 1;
3431 if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
3432 record_author_date(&info->author_date, c);
3434 compute_indegrees_to_depth(revs, info->min_generation);
3436 for (list = revs->commits; list; list = list->next) {
3437 struct commit *c = list->item;
3439 if (*(indegree_slab_at(&info->indegree, c)) == 1)
3440 prio_queue_put(&info->topo_queue, c);
3444 * This is unfortunate; the initial tips need to be shown
3445 * in the order given from the revision traversal machinery.
3447 if (revs->sort_order == REV_SORT_IN_GRAPH_ORDER)
3448 prio_queue_reverse(&info->topo_queue);
3451 static struct commit *next_topo_commit(struct rev_info *revs)
3453 struct commit *c;
3454 struct topo_walk_info *info = revs->topo_walk_info;
3456 /* pop next off of topo_queue */
3457 c = prio_queue_get(&info->topo_queue);
3459 if (c)
3460 *(indegree_slab_at(&info->indegree, c)) = 0;
3462 return c;
3465 static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
3467 struct commit_list *p;
3468 struct topo_walk_info *info = revs->topo_walk_info;
3469 if (process_parents(revs, commit, NULL, NULL) < 0) {
3470 if (!revs->ignore_missing_links)
3471 die("Failed to traverse parents of commit %s",
3472 oid_to_hex(&commit->object.oid));
3475 for (p = commit->parents; p; p = p->next) {
3476 struct commit *parent = p->item;
3477 int *pi;
3478 uint32_t generation;
3480 if (parent->object.flags & UNINTERESTING)
3481 continue;
3483 if (parse_commit_gently(parent, 1) < 0)
3484 continue;
3486 generation = commit_graph_generation(parent);
3487 if (generation < info->min_generation) {
3488 info->min_generation = generation;
3489 compute_indegrees_to_depth(revs, info->min_generation);
3492 pi = indegree_slab_at(&info->indegree, parent);
3494 (*pi)--;
3495 if (*pi == 1)
3496 prio_queue_put(&info->topo_queue, parent);
3498 if (revs->first_parent_only)
3499 return;
3503 int prepare_revision_walk(struct rev_info *revs)
3505 int i;
3506 struct object_array old_pending;
3507 struct commit_list **next = &revs->commits;
3509 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
3510 revs->pending.nr = 0;
3511 revs->pending.alloc = 0;
3512 revs->pending.objects = NULL;
3513 for (i = 0; i < old_pending.nr; i++) {
3514 struct object_array_entry *e = old_pending.objects + i;
3515 struct commit *commit = handle_commit(revs, e);
3516 if (commit) {
3517 if (!(commit->object.flags & SEEN)) {
3518 commit->object.flags |= SEEN;
3519 next = commit_list_append(commit, next);
3523 object_array_clear(&old_pending);
3525 /* Signal whether we need per-parent treesame decoration */
3526 if (revs->simplify_merges ||
3527 (revs->limited && limiting_can_increase_treesame(revs)))
3528 revs->treesame.name = "treesame";
3530 if (revs->exclude_promisor_objects) {
3531 for_each_packed_object(mark_uninteresting, revs,
3532 FOR_EACH_OBJECT_PROMISOR_ONLY);
3535 if (!revs->reflog_info)
3536 prepare_to_use_bloom_filter(revs);
3537 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
3538 commit_list_sort_by_date(&revs->commits);
3539 if (revs->no_walk)
3540 return 0;
3541 if (revs->limited) {
3542 if (limit_list(revs) < 0)
3543 return -1;
3544 if (revs->topo_order)
3545 sort_in_topological_order(&revs->commits, revs->sort_order);
3546 } else if (revs->topo_order)
3547 init_topo_walk(revs);
3548 if (revs->line_level_traverse && want_ancestry(revs))
3550 * At the moment we can only do line-level log with parent
3551 * rewriting by performing this expensive pre-filtering step.
3552 * If parent rewriting is not requested, then we rather
3553 * perform the line-level log filtering during the regular
3554 * history traversal.
3556 line_log_filter(revs);
3557 if (revs->simplify_merges)
3558 simplify_merges(revs);
3559 if (revs->children.name)
3560 set_children(revs);
3562 return 0;
3565 static enum rewrite_result rewrite_one_1(struct rev_info *revs,
3566 struct commit **pp,
3567 struct prio_queue *queue)
3569 for (;;) {
3570 struct commit *p = *pp;
3571 if (!revs->limited)
3572 if (process_parents(revs, p, NULL, queue) < 0)
3573 return rewrite_one_error;
3574 if (p->object.flags & UNINTERESTING)
3575 return rewrite_one_ok;
3576 if (!(p->object.flags & TREESAME))
3577 return rewrite_one_ok;
3578 if (!p->parents)
3579 return rewrite_one_noparents;
3580 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
3581 return rewrite_one_ok;
3582 *pp = p;
3586 static void merge_queue_into_list(struct prio_queue *q, struct commit_list **list)
3588 while (q->nr) {
3589 struct commit *item = prio_queue_peek(q);
3590 struct commit_list *p = *list;
3592 if (p && p->item->date >= item->date)
3593 list = &p->next;
3594 else {
3595 p = commit_list_insert(item, list);
3596 list = &p->next; /* skip newly added item */
3597 prio_queue_get(q); /* pop item */
3602 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
3604 struct prio_queue queue = { compare_commits_by_commit_date };
3605 enum rewrite_result ret = rewrite_one_1(revs, pp, &queue);
3606 merge_queue_into_list(&queue, &revs->commits);
3607 clear_prio_queue(&queue);
3608 return ret;
3611 int rewrite_parents(struct rev_info *revs, struct commit *commit,
3612 rewrite_parent_fn_t rewrite_parent)
3614 struct commit_list **pp = &commit->parents;
3615 while (*pp) {
3616 struct commit_list *parent = *pp;
3617 switch (rewrite_parent(revs, &parent->item)) {
3618 case rewrite_one_ok:
3619 break;
3620 case rewrite_one_noparents:
3621 *pp = parent->next;
3622 continue;
3623 case rewrite_one_error:
3624 return -1;
3626 pp = &parent->next;
3628 remove_duplicate_parents(revs, commit);
3629 return 0;
3632 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
3634 char *person, *endp;
3635 size_t len, namelen, maillen;
3636 const char *name;
3637 const char *mail;
3638 struct ident_split ident;
3640 person = strstr(buf->buf, what);
3641 if (!person)
3642 return 0;
3644 person += strlen(what);
3645 endp = strchr(person, '\n');
3646 if (!endp)
3647 return 0;
3649 len = endp - person;
3651 if (split_ident_line(&ident, person, len))
3652 return 0;
3654 mail = ident.mail_begin;
3655 maillen = ident.mail_end - ident.mail_begin;
3656 name = ident.name_begin;
3657 namelen = ident.name_end - ident.name_begin;
3659 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
3660 struct strbuf namemail = STRBUF_INIT;
3662 strbuf_addf(&namemail, "%.*s <%.*s>",
3663 (int)namelen, name, (int)maillen, mail);
3665 strbuf_splice(buf, ident.name_begin - buf->buf,
3666 ident.mail_end - ident.name_begin + 1,
3667 namemail.buf, namemail.len);
3669 strbuf_release(&namemail);
3671 return 1;
3674 return 0;
3677 static int commit_match(struct commit *commit, struct rev_info *opt)
3679 int retval;
3680 const char *encoding;
3681 const char *message;
3682 struct strbuf buf = STRBUF_INIT;
3684 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
3685 return 1;
3687 /* Prepend "fake" headers as needed */
3688 if (opt->grep_filter.use_reflog_filter) {
3689 strbuf_addstr(&buf, "reflog ");
3690 get_reflog_message(&buf, opt->reflog_info);
3691 strbuf_addch(&buf, '\n');
3695 * We grep in the user's output encoding, under the assumption that it
3696 * is the encoding they are most likely to write their grep pattern
3697 * for. In addition, it means we will match the "notes" encoding below,
3698 * so we will not end up with a buffer that has two different encodings
3699 * in it.
3701 encoding = get_log_output_encoding();
3702 message = logmsg_reencode(commit, NULL, encoding);
3704 /* Copy the commit to temporary if we are using "fake" headers */
3705 if (buf.len)
3706 strbuf_addstr(&buf, message);
3708 if (opt->grep_filter.header_list && opt->mailmap) {
3709 if (!buf.len)
3710 strbuf_addstr(&buf, message);
3712 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
3713 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
3716 /* Append "fake" message parts as needed */
3717 if (opt->show_notes) {
3718 if (!buf.len)
3719 strbuf_addstr(&buf, message);
3720 format_display_notes(&commit->object.oid, &buf, encoding, 1);
3724 * Find either in the original commit message, or in the temporary.
3725 * Note that we cast away the constness of "message" here. It is
3726 * const because it may come from the cached commit buffer. That's OK,
3727 * because we know that it is modifiable heap memory, and that while
3728 * grep_buffer may modify it for speed, it will restore any
3729 * changes before returning.
3731 if (buf.len)
3732 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
3733 else
3734 retval = grep_buffer(&opt->grep_filter,
3735 (char *)message, strlen(message));
3736 strbuf_release(&buf);
3737 unuse_commit_buffer(commit, message);
3738 return opt->invert_grep ? !retval : retval;
3741 static inline int want_ancestry(const struct rev_info *revs)
3743 return (revs->rewrite_parents || revs->children.name);
3747 * Return a timestamp to be used for --since/--until comparisons for this
3748 * commit, based on the revision options.
3750 static timestamp_t comparison_date(const struct rev_info *revs,
3751 struct commit *commit)
3753 return revs->reflog_info ?
3754 get_reflog_timestamp(revs->reflog_info) :
3755 commit->date;
3758 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
3760 if (commit->object.flags & SHOWN)
3761 return commit_ignore;
3762 if (revs->unpacked && has_object_pack(&commit->object.oid))
3763 return commit_ignore;
3764 if (commit->object.flags & UNINTERESTING)
3765 return commit_ignore;
3766 if (revs->line_level_traverse && !want_ancestry(revs)) {
3768 * In case of line-level log with parent rewriting
3769 * prepare_revision_walk() already took care of all line-level
3770 * log filtering, and there is nothing left to do here.
3772 * If parent rewriting was not requested, then this is the
3773 * place to perform the line-level log filtering. Notably,
3774 * this check, though expensive, must come before the other,
3775 * cheaper filtering conditions, because the tracked line
3776 * ranges must be adjusted even when the commit will end up
3777 * being ignored based on other conditions.
3779 if (!line_log_process_ranges_arbitrary_commit(revs, commit))
3780 return commit_ignore;
3782 if (revs->min_age != -1 &&
3783 comparison_date(revs, commit) > revs->min_age)
3784 return commit_ignore;
3785 if (revs->min_parents || (revs->max_parents >= 0)) {
3786 int n = commit_list_count(commit->parents);
3787 if ((n < revs->min_parents) ||
3788 ((revs->max_parents >= 0) && (n > revs->max_parents)))
3789 return commit_ignore;
3791 if (!commit_match(commit, revs))
3792 return commit_ignore;
3793 if (revs->prune && revs->dense) {
3794 /* Commit without changes? */
3795 if (commit->object.flags & TREESAME) {
3796 int n;
3797 struct commit_list *p;
3798 /* drop merges unless we want parenthood */
3799 if (!want_ancestry(revs))
3800 return commit_ignore;
3802 if (revs->show_pulls && (commit->object.flags & PULL_MERGE))
3803 return commit_show;
3806 * If we want ancestry, then need to keep any merges
3807 * between relevant commits to tie together topology.
3808 * For consistency with TREESAME and simplification
3809 * use "relevant" here rather than just INTERESTING,
3810 * to treat bottom commit(s) as part of the topology.
3812 for (n = 0, p = commit->parents; p; p = p->next)
3813 if (relevant_commit(p->item))
3814 if (++n >= 2)
3815 return commit_show;
3816 return commit_ignore;
3819 return commit_show;
3822 define_commit_slab(saved_parents, struct commit_list *);
3824 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3827 * You may only call save_parents() once per commit (this is checked
3828 * for non-root commits).
3830 static void save_parents(struct rev_info *revs, struct commit *commit)
3832 struct commit_list **pp;
3834 if (!revs->saved_parents_slab) {
3835 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3836 init_saved_parents(revs->saved_parents_slab);
3839 pp = saved_parents_at(revs->saved_parents_slab, commit);
3842 * When walking with reflogs, we may visit the same commit
3843 * several times: once for each appearance in the reflog.
3845 * In this case, save_parents() will be called multiple times.
3846 * We want to keep only the first set of parents. We need to
3847 * store a sentinel value for an empty (i.e., NULL) parent
3848 * list to distinguish it from a not-yet-saved list, however.
3850 if (*pp)
3851 return;
3852 if (commit->parents)
3853 *pp = copy_commit_list(commit->parents);
3854 else
3855 *pp = EMPTY_PARENT_LIST;
3858 static void free_saved_parents(struct rev_info *revs)
3860 if (revs->saved_parents_slab)
3861 clear_saved_parents(revs->saved_parents_slab);
3864 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3866 struct commit_list *parents;
3868 if (!revs->saved_parents_slab)
3869 return commit->parents;
3871 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3872 if (parents == EMPTY_PARENT_LIST)
3873 return NULL;
3874 return parents;
3877 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3879 enum commit_action action = get_commit_action(revs, commit);
3881 if (action == commit_show &&
3882 revs->prune && revs->dense && want_ancestry(revs)) {
3884 * --full-diff on simplified parents is no good: it
3885 * will show spurious changes from the commits that
3886 * were elided. So we save the parents on the side
3887 * when --full-diff is in effect.
3889 if (revs->full_diff)
3890 save_parents(revs, commit);
3891 if (rewrite_parents(revs, commit, rewrite_one) < 0)
3892 return commit_error;
3894 return action;
3897 static void track_linear(struct rev_info *revs, struct commit *commit)
3899 if (revs->track_first_time) {
3900 revs->linear = 1;
3901 revs->track_first_time = 0;
3902 } else {
3903 struct commit_list *p;
3904 for (p = revs->previous_parents; p; p = p->next)
3905 if (p->item == NULL || /* first commit */
3906 oideq(&p->item->object.oid, &commit->object.oid))
3907 break;
3908 revs->linear = p != NULL;
3910 if (revs->reverse) {
3911 if (revs->linear)
3912 commit->object.flags |= TRACK_LINEAR;
3914 free_commit_list(revs->previous_parents);
3915 revs->previous_parents = copy_commit_list(commit->parents);
3918 static struct commit *get_revision_1(struct rev_info *revs)
3920 while (1) {
3921 struct commit *commit;
3923 if (revs->reflog_info)
3924 commit = next_reflog_entry(revs->reflog_info);
3925 else if (revs->topo_walk_info)
3926 commit = next_topo_commit(revs);
3927 else
3928 commit = pop_commit(&revs->commits);
3930 if (!commit)
3931 return NULL;
3933 if (revs->reflog_info)
3934 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3937 * If we haven't done the list limiting, we need to look at
3938 * the parents here. We also need to do the date-based limiting
3939 * that we'd otherwise have done in limit_list().
3941 if (!revs->limited) {
3942 if (revs->max_age != -1 &&
3943 comparison_date(revs, commit) < revs->max_age)
3944 continue;
3946 if (revs->reflog_info)
3947 try_to_simplify_commit(revs, commit);
3948 else if (revs->topo_walk_info)
3949 expand_topo_walk(revs, commit);
3950 else if (process_parents(revs, commit, &revs->commits, NULL) < 0) {
3951 if (!revs->ignore_missing_links)
3952 die("Failed to traverse parents of commit %s",
3953 oid_to_hex(&commit->object.oid));
3957 switch (simplify_commit(revs, commit)) {
3958 case commit_ignore:
3959 continue;
3960 case commit_error:
3961 die("Failed to simplify parents of commit %s",
3962 oid_to_hex(&commit->object.oid));
3963 default:
3964 if (revs->track_linear)
3965 track_linear(revs, commit);
3966 return commit;
3972 * Return true for entries that have not yet been shown. (This is an
3973 * object_array_each_func_t.)
3975 static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3977 return !(entry->item->flags & SHOWN);
3981 * If array is on the verge of a realloc, garbage-collect any entries
3982 * that have already been shown to try to free up some space.
3984 static void gc_boundary(struct object_array *array)
3986 if (array->nr == array->alloc)
3987 object_array_filter(array, entry_unshown, NULL);
3990 static void create_boundary_commit_list(struct rev_info *revs)
3992 unsigned i;
3993 struct commit *c;
3994 struct object_array *array = &revs->boundary_commits;
3995 struct object_array_entry *objects = array->objects;
3998 * If revs->commits is non-NULL at this point, an error occurred in
3999 * get_revision_1(). Ignore the error and continue printing the
4000 * boundary commits anyway. (This is what the code has always
4001 * done.)
4003 if (revs->commits) {
4004 free_commit_list(revs->commits);
4005 revs->commits = NULL;
4009 * Put all of the actual boundary commits from revs->boundary_commits
4010 * into revs->commits
4012 for (i = 0; i < array->nr; i++) {
4013 c = (struct commit *)(objects[i].item);
4014 if (!c)
4015 continue;
4016 if (!(c->object.flags & CHILD_SHOWN))
4017 continue;
4018 if (c->object.flags & (SHOWN | BOUNDARY))
4019 continue;
4020 c->object.flags |= BOUNDARY;
4021 commit_list_insert(c, &revs->commits);
4025 * If revs->topo_order is set, sort the boundary commits
4026 * in topological order
4028 sort_in_topological_order(&revs->commits, revs->sort_order);
4031 static struct commit *get_revision_internal(struct rev_info *revs)
4033 struct commit *c = NULL;
4034 struct commit_list *l;
4036 if (revs->boundary == 2) {
4038 * All of the normal commits have already been returned,
4039 * and we are now returning boundary commits.
4040 * create_boundary_commit_list() has populated
4041 * revs->commits with the remaining commits to return.
4043 c = pop_commit(&revs->commits);
4044 if (c)
4045 c->object.flags |= SHOWN;
4046 return c;
4050 * If our max_count counter has reached zero, then we are done. We
4051 * don't simply return NULL because we still might need to show
4052 * boundary commits. But we want to avoid calling get_revision_1, which
4053 * might do a considerable amount of work finding the next commit only
4054 * for us to throw it away.
4056 * If it is non-zero, then either we don't have a max_count at all
4057 * (-1), or it is still counting, in which case we decrement.
4059 if (revs->max_count) {
4060 c = get_revision_1(revs);
4061 if (c) {
4062 while (revs->skip_count > 0) {
4063 revs->skip_count--;
4064 c = get_revision_1(revs);
4065 if (!c)
4066 break;
4070 if (revs->max_count > 0)
4071 revs->max_count--;
4074 if (c)
4075 c->object.flags |= SHOWN;
4077 if (!revs->boundary)
4078 return c;
4080 if (!c) {
4082 * get_revision_1() runs out the commits, and
4083 * we are done computing the boundaries.
4084 * switch to boundary commits output mode.
4086 revs->boundary = 2;
4089 * Update revs->commits to contain the list of
4090 * boundary commits.
4092 create_boundary_commit_list(revs);
4094 return get_revision_internal(revs);
4098 * boundary commits are the commits that are parents of the
4099 * ones we got from get_revision_1() but they themselves are
4100 * not returned from get_revision_1(). Before returning
4101 * 'c', we need to mark its parents that they could be boundaries.
4104 for (l = c->parents; l; l = l->next) {
4105 struct object *p;
4106 p = &(l->item->object);
4107 if (p->flags & (CHILD_SHOWN | SHOWN))
4108 continue;
4109 p->flags |= CHILD_SHOWN;
4110 gc_boundary(&revs->boundary_commits);
4111 add_object_array(p, NULL, &revs->boundary_commits);
4114 return c;
4117 struct commit *get_revision(struct rev_info *revs)
4119 struct commit *c;
4120 struct commit_list *reversed;
4122 if (revs->reverse) {
4123 reversed = NULL;
4124 while ((c = get_revision_internal(revs)))
4125 commit_list_insert(c, &reversed);
4126 revs->commits = reversed;
4127 revs->reverse = 0;
4128 revs->reverse_output_stage = 1;
4131 if (revs->reverse_output_stage) {
4132 c = pop_commit(&revs->commits);
4133 if (revs->track_linear)
4134 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
4135 return c;
4138 c = get_revision_internal(revs);
4139 if (c && revs->graph)
4140 graph_update(revs->graph, c);
4141 if (!c) {
4142 free_saved_parents(revs);
4143 if (revs->previous_parents) {
4144 free_commit_list(revs->previous_parents);
4145 revs->previous_parents = NULL;
4148 return c;
4151 const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
4153 if (commit->object.flags & BOUNDARY)
4154 return "-";
4155 else if (commit->object.flags & UNINTERESTING)
4156 return "^";
4157 else if (commit->object.flags & PATCHSAME)
4158 return "=";
4159 else if (!revs || revs->left_right) {
4160 if (commit->object.flags & SYMMETRIC_LEFT)
4161 return "<";
4162 else
4163 return ">";
4164 } else if (revs->graph)
4165 return "*";
4166 else if (revs->cherry_mark)
4167 return "+";
4168 return "";
4171 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
4173 const char *mark = get_revision_mark(revs, commit);
4174 if (!strlen(mark))
4175 return;
4176 fputs(mark, stdout);
4177 putchar(' ');