1 #include "git-compat-util.h"
6 #include "object-store.h"
12 #include "diff-merges.h"
15 #include "repository.h"
18 #include "reflog-walk.h"
19 #include "patch-ids.h"
22 #include "string-list.h"
25 #include "commit-slab.h"
27 #include "cache-tree.h"
32 #include "commit-reach.h"
33 #include "commit-graph.h"
34 #include "prio-queue.h"
38 #include "json-writer.h"
39 #include "list-objects-filter-options.h"
40 #include "resolve-undo.h"
42 volatile show_early_output_fn_t show_early_output
;
44 static const char *term_bad
;
45 static const char *term_good
;
47 implement_shared_commit_slab(revision_sources
, char *);
49 static inline int want_ancestry(const struct rev_info
*revs
);
51 void show_object_with_name(FILE *out
, struct object
*obj
, const char *name
)
53 fprintf(out
, "%s ", oid_to_hex(&obj
->oid
));
54 for (const char *p
= name
; *p
&& *p
!= '\n'; p
++)
59 static void mark_blob_uninteresting(struct blob
*blob
)
63 if (blob
->object
.flags
& UNINTERESTING
)
65 blob
->object
.flags
|= UNINTERESTING
;
68 static void mark_tree_contents_uninteresting(struct repository
*r
,
71 struct tree_desc desc
;
72 struct name_entry entry
;
74 if (parse_tree_gently(tree
, 1) < 0)
77 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
78 while (tree_entry(&desc
, &entry
)) {
79 switch (object_type(entry
.mode
)) {
81 mark_tree_uninteresting(r
, lookup_tree(r
, &entry
.oid
));
84 mark_blob_uninteresting(lookup_blob(r
, &entry
.oid
));
87 /* Subproject commit - not in this repository */
93 * We don't care about the tree any more
94 * after it has been marked uninteresting.
96 free_tree_buffer(tree
);
99 void mark_tree_uninteresting(struct repository
*r
, struct tree
*tree
)
107 if (obj
->flags
& UNINTERESTING
)
109 obj
->flags
|= UNINTERESTING
;
110 mark_tree_contents_uninteresting(r
, tree
);
113 struct path_and_oids_entry
{
114 struct hashmap_entry ent
;
119 static int path_and_oids_cmp(const void *hashmap_cmp_fn_data UNUSED
,
120 const struct hashmap_entry
*eptr
,
121 const struct hashmap_entry
*entry_or_key
,
122 const void *keydata UNUSED
)
124 const struct path_and_oids_entry
*e1
, *e2
;
126 e1
= container_of(eptr
, const struct path_and_oids_entry
, ent
);
127 e2
= container_of(entry_or_key
, const struct path_and_oids_entry
, ent
);
129 return strcmp(e1
->path
, e2
->path
);
132 static void paths_and_oids_clear(struct hashmap
*map
)
134 struct hashmap_iter iter
;
135 struct path_and_oids_entry
*entry
;
137 hashmap_for_each_entry(map
, &iter
, entry
, ent
/* member name */) {
138 oidset_clear(&entry
->trees
);
142 hashmap_clear_and_free(map
, struct path_and_oids_entry
, ent
);
145 static void paths_and_oids_insert(struct hashmap
*map
,
147 const struct object_id
*oid
)
149 int hash
= strhash(path
);
150 struct path_and_oids_entry key
;
151 struct path_and_oids_entry
*entry
;
153 hashmap_entry_init(&key
.ent
, hash
);
155 /* use a shallow copy for the lookup */
156 key
.path
= (char *)path
;
157 oidset_init(&key
.trees
, 0);
159 entry
= hashmap_get_entry(map
, &key
, ent
, NULL
);
161 CALLOC_ARRAY(entry
, 1);
162 hashmap_entry_init(&entry
->ent
, hash
);
163 entry
->path
= xstrdup(key
.path
);
164 oidset_init(&entry
->trees
, 16);
165 hashmap_put(map
, &entry
->ent
);
168 oidset_insert(&entry
->trees
, oid
);
171 static void add_children_by_path(struct repository
*r
,
175 struct tree_desc desc
;
176 struct name_entry entry
;
181 if (parse_tree_gently(tree
, 1) < 0)
184 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
185 while (tree_entry(&desc
, &entry
)) {
186 switch (object_type(entry
.mode
)) {
188 paths_and_oids_insert(map
, entry
.path
, &entry
.oid
);
190 if (tree
->object
.flags
& UNINTERESTING
) {
191 struct tree
*child
= lookup_tree(r
, &entry
.oid
);
193 child
->object
.flags
|= UNINTERESTING
;
197 if (tree
->object
.flags
& UNINTERESTING
) {
198 struct blob
*child
= lookup_blob(r
, &entry
.oid
);
200 child
->object
.flags
|= UNINTERESTING
;
204 /* Subproject commit - not in this repository */
209 free_tree_buffer(tree
);
212 void mark_trees_uninteresting_sparse(struct repository
*r
,
213 struct oidset
*trees
)
215 unsigned has_interesting
= 0, has_uninteresting
= 0;
216 struct hashmap map
= HASHMAP_INIT(path_and_oids_cmp
, NULL
);
217 struct hashmap_iter map_iter
;
218 struct path_and_oids_entry
*entry
;
219 struct object_id
*oid
;
220 struct oidset_iter iter
;
222 oidset_iter_init(trees
, &iter
);
223 while ((!has_interesting
|| !has_uninteresting
) &&
224 (oid
= oidset_iter_next(&iter
))) {
225 struct tree
*tree
= lookup_tree(r
, oid
);
230 if (tree
->object
.flags
& UNINTERESTING
)
231 has_uninteresting
= 1;
236 /* Do not walk unless we have both types of trees. */
237 if (!has_uninteresting
|| !has_interesting
)
240 oidset_iter_init(trees
, &iter
);
241 while ((oid
= oidset_iter_next(&iter
))) {
242 struct tree
*tree
= lookup_tree(r
, oid
);
243 add_children_by_path(r
, tree
, &map
);
246 hashmap_for_each_entry(&map
, &map_iter
, entry
, ent
/* member name */)
247 mark_trees_uninteresting_sparse(r
, &entry
->trees
);
249 paths_and_oids_clear(&map
);
252 struct commit_stack
{
253 struct commit
**items
;
256 #define COMMIT_STACK_INIT { 0 }
258 static void commit_stack_push(struct commit_stack
*stack
, struct commit
*commit
)
260 ALLOC_GROW(stack
->items
, stack
->nr
+ 1, stack
->alloc
);
261 stack
->items
[stack
->nr
++] = commit
;
264 static struct commit
*commit_stack_pop(struct commit_stack
*stack
)
266 return stack
->nr
? stack
->items
[--stack
->nr
] : NULL
;
269 static void commit_stack_clear(struct commit_stack
*stack
)
271 FREE_AND_NULL(stack
->items
);
272 stack
->nr
= stack
->alloc
= 0;
275 static void mark_one_parent_uninteresting(struct rev_info
*revs
, struct commit
*commit
,
276 struct commit_stack
*pending
)
278 struct commit_list
*l
;
280 if (commit
->object
.flags
& UNINTERESTING
)
282 commit
->object
.flags
|= UNINTERESTING
;
285 * Normally we haven't parsed the parent
286 * yet, so we won't have a parent of a parent
287 * here. However, it may turn out that we've
288 * reached this commit some other way (where it
289 * wasn't uninteresting), in which case we need
290 * to mark its parents recursively too..
292 for (l
= commit
->parents
; l
; l
= l
->next
) {
293 commit_stack_push(pending
, l
->item
);
294 if (revs
&& revs
->exclude_first_parent_only
)
299 void mark_parents_uninteresting(struct rev_info
*revs
, struct commit
*commit
)
301 struct commit_stack pending
= COMMIT_STACK_INIT
;
302 struct commit_list
*l
;
304 for (l
= commit
->parents
; l
; l
= l
->next
) {
305 mark_one_parent_uninteresting(revs
, l
->item
, &pending
);
306 if (revs
&& revs
->exclude_first_parent_only
)
310 while (pending
.nr
> 0)
311 mark_one_parent_uninteresting(revs
, commit_stack_pop(&pending
),
314 commit_stack_clear(&pending
);
317 static void add_pending_object_with_path(struct rev_info
*revs
,
319 const char *name
, unsigned mode
,
322 struct interpret_branch_name_options options
= { 0 };
325 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
327 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
328 struct strbuf buf
= STRBUF_INIT
;
329 size_t namelen
= strlen(name
);
330 int len
= interpret_branch_name(name
, namelen
, &buf
, &options
);
332 if (0 < len
&& len
< namelen
&& buf
.len
)
333 strbuf_addstr(&buf
, name
+ len
);
334 add_reflog_for_walk(revs
->reflog_info
,
335 (struct commit
*)obj
,
336 buf
.buf
[0] ? buf
.buf
: name
);
337 strbuf_release(&buf
);
338 return; /* do not add the commit itself */
340 add_object_array_with_path(obj
, name
, &revs
->pending
, mode
, path
);
343 static void add_pending_object_with_mode(struct rev_info
*revs
,
345 const char *name
, unsigned mode
)
347 add_pending_object_with_path(revs
, obj
, name
, mode
, NULL
);
350 void add_pending_object(struct rev_info
*revs
,
351 struct object
*obj
, const char *name
)
353 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
356 void add_head_to_pending(struct rev_info
*revs
)
358 struct object_id oid
;
360 if (get_oid("HEAD", &oid
))
362 obj
= parse_object(revs
->repo
, &oid
);
365 add_pending_object(revs
, obj
, "HEAD");
368 static struct object
*get_reference(struct rev_info
*revs
, const char *name
,
369 const struct object_id
*oid
,
372 struct object
*object
;
374 object
= parse_object_with_flags(revs
->repo
, oid
,
375 revs
->verify_objects
? 0 :
376 PARSE_OBJECT_SKIP_HASH_CHECK
);
379 if (revs
->ignore_missing
)
381 if (revs
->exclude_promisor_objects
&& is_promisor_object(oid
))
383 die("bad object %s", name
);
385 object
->flags
|= flags
;
389 void add_pending_oid(struct rev_info
*revs
, const char *name
,
390 const struct object_id
*oid
, unsigned int flags
)
392 struct object
*object
= get_reference(revs
, name
, oid
, flags
);
393 add_pending_object(revs
, object
, name
);
396 static struct commit
*handle_commit(struct rev_info
*revs
,
397 struct object_array_entry
*entry
)
399 struct object
*object
= entry
->item
;
400 const char *name
= entry
->name
;
401 const char *path
= entry
->path
;
402 unsigned int mode
= entry
->mode
;
403 unsigned long flags
= object
->flags
;
406 * Tag object? Look what it points to..
408 while (object
->type
== OBJ_TAG
) {
409 struct tag
*tag
= (struct tag
*) object
;
410 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
411 add_pending_object(revs
, object
, tag
->tag
);
412 object
= parse_object(revs
->repo
, get_tagged_oid(tag
));
414 if (revs
->ignore_missing_links
|| (flags
& UNINTERESTING
))
416 if (revs
->exclude_promisor_objects
&&
417 is_promisor_object(&tag
->tagged
->oid
))
419 die("bad object %s", oid_to_hex(&tag
->tagged
->oid
));
421 object
->flags
|= flags
;
423 * We'll handle the tagged object by looping or dropping
424 * through to the non-tag handlers below. Do not
425 * propagate path data from the tag's pending entry.
432 * Commit object? Just return it, we'll do all the complex
435 if (object
->type
== OBJ_COMMIT
) {
436 struct commit
*commit
= (struct commit
*)object
;
438 if (repo_parse_commit(revs
->repo
, commit
) < 0)
439 die("unable to parse commit %s", name
);
440 if (flags
& UNINTERESTING
) {
441 mark_parents_uninteresting(revs
, commit
);
443 if (!revs
->topo_order
|| !generation_numbers_enabled(the_repository
))
447 char **slot
= revision_sources_at(revs
->sources
, commit
);
450 *slot
= xstrdup(name
);
456 * Tree object? Either mark it uninteresting, or add it
457 * to the list of objects to look at later..
459 if (object
->type
== OBJ_TREE
) {
460 struct tree
*tree
= (struct tree
*)object
;
461 if (!revs
->tree_objects
)
463 if (flags
& UNINTERESTING
) {
464 mark_tree_contents_uninteresting(revs
->repo
, tree
);
467 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
472 * Blob object? You know the drill by now..
474 if (object
->type
== OBJ_BLOB
) {
475 if (!revs
->blob_objects
)
477 if (flags
& UNINTERESTING
)
479 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
482 die("%s is unknown object", name
);
485 static int everybody_uninteresting(struct commit_list
*orig
,
486 struct commit
**interesting_cache
)
488 struct commit_list
*list
= orig
;
490 if (*interesting_cache
) {
491 struct commit
*commit
= *interesting_cache
;
492 if (!(commit
->object
.flags
& UNINTERESTING
))
497 struct commit
*commit
= list
->item
;
499 if (commit
->object
.flags
& UNINTERESTING
)
502 *interesting_cache
= commit
;
509 * A definition of "relevant" commit that we can use to simplify limited graphs
510 * by eliminating side branches.
512 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
513 * in our list), or that is a specified BOTTOM commit. Then after computing
514 * a limited list, during processing we can generally ignore boundary merges
515 * coming from outside the graph, (ie from irrelevant parents), and treat
516 * those merges as if they were single-parent. TREESAME is defined to consider
517 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
518 * we don't care if we were !TREESAME to non-graph parents.
520 * Treating bottom commits as relevant ensures that a limited graph's
521 * connection to the actual bottom commit is not viewed as a side branch, but
522 * treated as part of the graph. For example:
524 * ....Z...A---X---o---o---B
528 * When computing "A..B", the A-X connection is at least as important as
529 * Y-X, despite A being flagged UNINTERESTING.
531 * And when computing --ancestry-path "A..B", the A-X connection is more
532 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
534 static inline int relevant_commit(struct commit
*commit
)
536 return (commit
->object
.flags
& (UNINTERESTING
| BOTTOM
)) != UNINTERESTING
;
540 * Return a single relevant commit from a parent list. If we are a TREESAME
541 * commit, and this selects one of our parents, then we can safely simplify to
544 static struct commit
*one_relevant_parent(const struct rev_info
*revs
,
545 struct commit_list
*orig
)
547 struct commit_list
*list
= orig
;
548 struct commit
*relevant
= NULL
;
554 * For 1-parent commits, or if first-parent-only, then return that
555 * first parent (even if not "relevant" by the above definition).
556 * TREESAME will have been set purely on that parent.
558 if (revs
->first_parent_only
|| !orig
->next
)
562 * For multi-parent commits, identify a sole relevant parent, if any.
563 * If we have only one relevant parent, then TREESAME will be set purely
564 * with regard to that parent, and we can simplify accordingly.
566 * If we have more than one relevant parent, or no relevant parents
567 * (and multiple irrelevant ones), then we can't select a parent here
571 struct commit
*commit
= list
->item
;
573 if (relevant_commit(commit
)) {
583 * The goal is to get REV_TREE_NEW as the result only if the
584 * diff consists of all '+' (and no other changes), REV_TREE_OLD
585 * if the whole diff is removal of old data, and otherwise
586 * REV_TREE_DIFFERENT (of course if the trees are the same we
587 * want REV_TREE_SAME).
589 * The only time we care about the distinction is when
590 * remove_empty_trees is in effect, in which case we care only about
591 * whether the whole change is REV_TREE_NEW, or if there's another type
592 * of change. Which means we can stop the diff early in either of these
595 * 1. We're not using remove_empty_trees at all.
597 * 2. We saw anything except REV_TREE_NEW.
599 #define REV_TREE_SAME 0
600 #define REV_TREE_NEW 1 /* Only new files */
601 #define REV_TREE_OLD 2 /* Only files removed */
602 #define REV_TREE_DIFFERENT 3 /* Mixed changes */
603 static int tree_difference
= REV_TREE_SAME
;
605 static void file_add_remove(struct diff_options
*options
,
607 unsigned mode UNUSED
,
608 const struct object_id
*oid UNUSED
,
609 int oid_valid UNUSED
,
610 const char *fullpath UNUSED
,
611 unsigned dirty_submodule UNUSED
)
613 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
614 struct rev_info
*revs
= options
->change_fn_data
;
616 tree_difference
|= diff
;
617 if (!revs
->remove_empty_trees
|| tree_difference
!= REV_TREE_NEW
)
618 options
->flags
.has_changes
= 1;
621 static void file_change(struct diff_options
*options
,
622 unsigned old_mode UNUSED
,
623 unsigned new_mode UNUSED
,
624 const struct object_id
*old_oid UNUSED
,
625 const struct object_id
*new_oid UNUSED
,
626 int old_oid_valid UNUSED
,
627 int new_oid_valid UNUSED
,
628 const char *fullpath UNUSED
,
629 unsigned old_dirty_submodule UNUSED
,
630 unsigned new_dirty_submodule UNUSED
)
632 tree_difference
= REV_TREE_DIFFERENT
;
633 options
->flags
.has_changes
= 1;
636 static int bloom_filter_atexit_registered
;
637 static unsigned int count_bloom_filter_maybe
;
638 static unsigned int count_bloom_filter_definitely_not
;
639 static unsigned int count_bloom_filter_false_positive
;
640 static unsigned int count_bloom_filter_not_present
;
642 static void trace2_bloom_filter_statistics_atexit(void)
644 struct json_writer jw
= JSON_WRITER_INIT
;
646 jw_object_begin(&jw
, 0);
647 jw_object_intmax(&jw
, "filter_not_present", count_bloom_filter_not_present
);
648 jw_object_intmax(&jw
, "maybe", count_bloom_filter_maybe
);
649 jw_object_intmax(&jw
, "definitely_not", count_bloom_filter_definitely_not
);
650 jw_object_intmax(&jw
, "false_positive", count_bloom_filter_false_positive
);
653 trace2_data_json("bloom", the_repository
, "statistics", &jw
);
658 static int forbid_bloom_filters(struct pathspec
*spec
)
660 if (spec
->has_wildcard
)
664 if (spec
->magic
& ~PATHSPEC_LITERAL
)
666 if (spec
->nr
&& (spec
->items
[0].magic
& ~PATHSPEC_LITERAL
))
672 static void prepare_to_use_bloom_filter(struct rev_info
*revs
)
674 struct pathspec_item
*pi
;
675 char *path_alloc
= NULL
;
676 const char *path
, *p
;
678 int path_component_nr
= 1;
683 if (forbid_bloom_filters(&revs
->prune_data
))
686 repo_parse_commit(revs
->repo
, revs
->commits
->item
);
688 revs
->bloom_filter_settings
= get_bloom_filter_settings(revs
->repo
);
689 if (!revs
->bloom_filter_settings
)
692 if (!revs
->pruning
.pathspec
.nr
)
695 pi
= &revs
->pruning
.pathspec
.items
[0];
697 /* remove single trailing slash from path, if needed */
698 if (pi
->len
> 0 && pi
->match
[pi
->len
- 1] == '/') {
699 path_alloc
= xmemdupz(pi
->match
, pi
->len
- 1);
706 revs
->bloom_filter_settings
= NULL
;
714 * At this point, the path is normalized to use Unix-style
715 * path separators. This is required due to how the
716 * changed-path Bloom filters store the paths.
723 revs
->bloom_keys_nr
= path_component_nr
;
724 ALLOC_ARRAY(revs
->bloom_keys
, revs
->bloom_keys_nr
);
726 fill_bloom_key(path
, len
, &revs
->bloom_keys
[0],
727 revs
->bloom_filter_settings
);
728 path_component_nr
= 1;
733 fill_bloom_key(path
, p
- path
,
734 &revs
->bloom_keys
[path_component_nr
++],
735 revs
->bloom_filter_settings
);
739 if (trace2_is_enabled() && !bloom_filter_atexit_registered
) {
740 atexit(trace2_bloom_filter_statistics_atexit
);
741 bloom_filter_atexit_registered
= 1;
747 static int check_maybe_different_in_bloom_filter(struct rev_info
*revs
,
748 struct commit
*commit
)
750 struct bloom_filter
*filter
;
753 if (!revs
->repo
->objects
->commit_graph
)
756 if (commit_graph_generation(commit
) == GENERATION_NUMBER_INFINITY
)
759 filter
= get_bloom_filter(revs
->repo
, commit
);
762 count_bloom_filter_not_present
++;
766 for (j
= 0; result
&& j
< revs
->bloom_keys_nr
; j
++) {
767 result
= bloom_filter_contains(filter
,
768 &revs
->bloom_keys
[j
],
769 revs
->bloom_filter_settings
);
773 count_bloom_filter_maybe
++;
775 count_bloom_filter_definitely_not
++;
780 static int rev_compare_tree(struct rev_info
*revs
,
781 struct commit
*parent
, struct commit
*commit
, int nth_parent
)
783 struct tree
*t1
= get_commit_tree(parent
);
784 struct tree
*t2
= get_commit_tree(commit
);
792 if (revs
->simplify_by_decoration
) {
794 * If we are simplifying by decoration, then the commit
795 * is worth showing if it has a tag pointing at it.
797 if (get_name_decoration(&commit
->object
))
798 return REV_TREE_DIFFERENT
;
800 * A commit that is not pointed by a tag is uninteresting
801 * if we are not limited by path. This means that you will
802 * see the usual "commits that touch the paths" plus any
803 * tagged commit by specifying both --simplify-by-decoration
806 if (!revs
->prune_data
.nr
)
807 return REV_TREE_SAME
;
810 if (revs
->bloom_keys_nr
&& !nth_parent
) {
811 bloom_ret
= check_maybe_different_in_bloom_filter(revs
, commit
);
814 return REV_TREE_SAME
;
817 tree_difference
= REV_TREE_SAME
;
818 revs
->pruning
.flags
.has_changes
= 0;
819 diff_tree_oid(&t1
->object
.oid
, &t2
->object
.oid
, "", &revs
->pruning
);
822 if (bloom_ret
== 1 && tree_difference
== REV_TREE_SAME
)
823 count_bloom_filter_false_positive
++;
825 return tree_difference
;
828 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
830 struct tree
*t1
= get_commit_tree(commit
);
835 tree_difference
= REV_TREE_SAME
;
836 revs
->pruning
.flags
.has_changes
= 0;
837 diff_tree_oid(NULL
, &t1
->object
.oid
, "", &revs
->pruning
);
839 return tree_difference
== REV_TREE_SAME
;
842 struct treesame_state
{
843 unsigned int nparents
;
844 unsigned char treesame
[FLEX_ARRAY
];
847 static struct treesame_state
*initialise_treesame(struct rev_info
*revs
, struct commit
*commit
)
849 unsigned n
= commit_list_count(commit
->parents
);
850 struct treesame_state
*st
= xcalloc(1, st_add(sizeof(*st
), n
));
852 add_decoration(&revs
->treesame
, &commit
->object
, st
);
857 * Must be called immediately after removing the nth_parent from a commit's
858 * parent list, if we are maintaining the per-parent treesame[] decoration.
859 * This does not recalculate the master TREESAME flag - update_treesame()
860 * should be called to update it after a sequence of treesame[] modifications
861 * that may have affected it.
863 static int compact_treesame(struct rev_info
*revs
, struct commit
*commit
, unsigned nth_parent
)
865 struct treesame_state
*st
;
868 if (!commit
->parents
) {
870 * Have just removed the only parent from a non-merge.
871 * Different handling, as we lack decoration.
874 die("compact_treesame %u", nth_parent
);
875 old_same
= !!(commit
->object
.flags
& TREESAME
);
876 if (rev_same_tree_as_empty(revs
, commit
))
877 commit
->object
.flags
|= TREESAME
;
879 commit
->object
.flags
&= ~TREESAME
;
883 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
884 if (!st
|| nth_parent
>= st
->nparents
)
885 die("compact_treesame %u", nth_parent
);
887 old_same
= st
->treesame
[nth_parent
];
888 memmove(st
->treesame
+ nth_parent
,
889 st
->treesame
+ nth_parent
+ 1,
890 st
->nparents
- nth_parent
- 1);
893 * If we've just become a non-merge commit, update TREESAME
894 * immediately, and remove the no-longer-needed decoration.
895 * If still a merge, defer update until update_treesame().
897 if (--st
->nparents
== 1) {
898 if (commit
->parents
->next
)
899 die("compact_treesame parents mismatch");
900 if (st
->treesame
[0] && revs
->dense
)
901 commit
->object
.flags
|= TREESAME
;
903 commit
->object
.flags
&= ~TREESAME
;
904 free(add_decoration(&revs
->treesame
, &commit
->object
, NULL
));
910 static unsigned update_treesame(struct rev_info
*revs
, struct commit
*commit
)
912 if (commit
->parents
&& commit
->parents
->next
) {
914 struct treesame_state
*st
;
915 struct commit_list
*p
;
916 unsigned relevant_parents
;
917 unsigned relevant_change
, irrelevant_change
;
919 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
921 die("update_treesame %s", oid_to_hex(&commit
->object
.oid
));
922 relevant_parents
= 0;
923 relevant_change
= irrelevant_change
= 0;
924 for (p
= commit
->parents
, n
= 0; p
; n
++, p
= p
->next
) {
925 if (relevant_commit(p
->item
)) {
926 relevant_change
|= !st
->treesame
[n
];
929 irrelevant_change
|= !st
->treesame
[n
];
931 if (relevant_parents
? relevant_change
: irrelevant_change
)
932 commit
->object
.flags
&= ~TREESAME
;
934 commit
->object
.flags
|= TREESAME
;
937 return commit
->object
.flags
& TREESAME
;
940 static inline int limiting_can_increase_treesame(const struct rev_info
*revs
)
943 * TREESAME is irrelevant unless prune && dense;
944 * if simplify_history is set, we can't have a mixture of TREESAME and
945 * !TREESAME INTERESTING parents (and we don't have treesame[]
946 * decoration anyway);
947 * if first_parent_only is set, then the TREESAME flag is locked
948 * against the first parent (and again we lack treesame[] decoration).
950 return revs
->prune
&& revs
->dense
&&
951 !revs
->simplify_history
&&
952 !revs
->first_parent_only
;
955 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
957 struct commit_list
**pp
, *parent
;
958 struct treesame_state
*ts
= NULL
;
959 int relevant_change
= 0, irrelevant_change
= 0;
960 int relevant_parents
, nth_parent
;
963 * If we don't do pruning, everything is interesting
968 if (!get_commit_tree(commit
))
971 if (!commit
->parents
) {
972 if (rev_same_tree_as_empty(revs
, commit
))
973 commit
->object
.flags
|= TREESAME
;
978 * Normal non-merge commit? If we don't want to make the
979 * history dense, we consider it always to be a change..
981 if (!revs
->dense
&& !commit
->parents
->next
)
984 for (pp
= &commit
->parents
, nth_parent
= 0, relevant_parents
= 0;
985 (parent
= *pp
) != NULL
;
986 pp
= &parent
->next
, nth_parent
++) {
987 struct commit
*p
= parent
->item
;
988 if (relevant_commit(p
))
991 if (nth_parent
== 1) {
993 * This our second loop iteration - so we now know
994 * we're dealing with a merge.
996 * Do not compare with later parents when we care only about
997 * the first parent chain, in order to avoid derailing the
998 * traversal to follow a side branch that brought everything
999 * in the path we are limited to by the pathspec.
1001 if (revs
->first_parent_only
)
1004 * If this will remain a potentially-simplifiable
1005 * merge, remember per-parent treesame if needed.
1006 * Initialise the array with the comparison from our
1009 if (revs
->treesame
.name
&&
1010 !revs
->simplify_history
&&
1011 !(commit
->object
.flags
& UNINTERESTING
)) {
1012 ts
= initialise_treesame(revs
, commit
);
1013 if (!(irrelevant_change
|| relevant_change
))
1014 ts
->treesame
[0] = 1;
1017 if (repo_parse_commit(revs
->repo
, p
) < 0)
1018 die("cannot simplify commit %s (because of %s)",
1019 oid_to_hex(&commit
->object
.oid
),
1020 oid_to_hex(&p
->object
.oid
));
1021 switch (rev_compare_tree(revs
, p
, commit
, nth_parent
)) {
1023 if (!revs
->simplify_history
|| !relevant_commit(p
)) {
1024 /* Even if a merge with an uninteresting
1025 * side branch brought the entire change
1026 * we are interested in, we do not want
1027 * to lose the other branches of this
1028 * merge, so we just keep going.
1031 ts
->treesame
[nth_parent
] = 1;
1034 parent
->next
= NULL
;
1035 commit
->parents
= parent
;
1038 * A merge commit is a "diversion" if it is not
1039 * TREESAME to its first parent but is TREESAME
1040 * to a later parent. In the simplified history,
1041 * we "divert" the history walk to the later
1042 * parent. These commits are shown when "show_pulls"
1043 * is enabled, so do not mark the object as
1046 if (!revs
->show_pulls
|| !nth_parent
)
1047 commit
->object
.flags
|= TREESAME
;
1052 if (revs
->remove_empty_trees
&&
1053 rev_same_tree_as_empty(revs
, p
)) {
1054 /* We are adding all the specified
1055 * paths from this parent, so the
1056 * history beyond this parent is not
1057 * interesting. Remove its parents
1058 * (they are grandparents for us).
1059 * IOW, we pretend this parent is a
1062 if (repo_parse_commit(revs
->repo
, p
) < 0)
1063 die("cannot simplify commit %s (invalid %s)",
1064 oid_to_hex(&commit
->object
.oid
),
1065 oid_to_hex(&p
->object
.oid
));
1070 case REV_TREE_DIFFERENT
:
1071 if (relevant_commit(p
))
1072 relevant_change
= 1;
1074 irrelevant_change
= 1;
1077 commit
->object
.flags
|= PULL_MERGE
;
1081 die("bad tree compare for commit %s", oid_to_hex(&commit
->object
.oid
));
1085 * TREESAME is straightforward for single-parent commits. For merge
1086 * commits, it is most useful to define it so that "irrelevant"
1087 * parents cannot make us !TREESAME - if we have any relevant
1088 * parents, then we only consider TREESAMEness with respect to them,
1089 * allowing irrelevant merges from uninteresting branches to be
1090 * simplified away. Only if we have only irrelevant parents do we
1091 * base TREESAME on them. Note that this logic is replicated in
1092 * update_treesame, which should be kept in sync.
1094 if (relevant_parents
? !relevant_change
: !irrelevant_change
)
1095 commit
->object
.flags
|= TREESAME
;
1098 static int process_parents(struct rev_info
*revs
, struct commit
*commit
,
1099 struct commit_list
**list
, struct prio_queue
*queue
)
1101 struct commit_list
*parent
= commit
->parents
;
1102 unsigned pass_flags
;
1104 if (commit
->object
.flags
& ADDED
)
1106 commit
->object
.flags
|= ADDED
;
1108 if (revs
->include_check
&&
1109 !revs
->include_check(commit
, revs
->include_check_data
))
1113 * If the commit is uninteresting, don't try to
1114 * prune parents - we want the maximal uninteresting
1117 * Normally we haven't parsed the parent
1118 * yet, so we won't have a parent of a parent
1119 * here. However, it may turn out that we've
1120 * reached this commit some other way (where it
1121 * wasn't uninteresting), in which case we need
1122 * to mark its parents recursively too..
1124 if (commit
->object
.flags
& UNINTERESTING
) {
1126 struct commit
*p
= parent
->item
;
1127 parent
= parent
->next
;
1129 p
->object
.flags
|= UNINTERESTING
;
1130 if (repo_parse_commit_gently(revs
->repo
, p
, 1) < 0)
1133 mark_parents_uninteresting(revs
, p
);
1134 if (p
->object
.flags
& SEEN
)
1136 p
->object
.flags
|= (SEEN
| NOT_USER_GIVEN
);
1138 commit_list_insert_by_date(p
, list
);
1140 prio_queue_put(queue
, p
);
1141 if (revs
->exclude_first_parent_only
)
1148 * Ok, the commit wasn't uninteresting. Try to
1149 * simplify the commit history and find the parent
1150 * that has no differences in the path set if one exists.
1152 try_to_simplify_commit(revs
, commit
);
1157 pass_flags
= (commit
->object
.flags
& (SYMMETRIC_LEFT
| ANCESTRY_PATH
));
1159 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
1160 struct commit
*p
= parent
->item
;
1161 int gently
= revs
->ignore_missing_links
||
1162 revs
->exclude_promisor_objects
;
1163 if (repo_parse_commit_gently(revs
->repo
, p
, gently
) < 0) {
1164 if (revs
->exclude_promisor_objects
&&
1165 is_promisor_object(&p
->object
.oid
)) {
1166 if (revs
->first_parent_only
)
1172 if (revs
->sources
) {
1173 char **slot
= revision_sources_at(revs
->sources
, p
);
1176 *slot
= *revision_sources_at(revs
->sources
, commit
);
1178 p
->object
.flags
|= pass_flags
;
1179 if (!(p
->object
.flags
& SEEN
)) {
1180 p
->object
.flags
|= (SEEN
| NOT_USER_GIVEN
);
1182 commit_list_insert_by_date(p
, list
);
1184 prio_queue_put(queue
, p
);
1186 if (revs
->first_parent_only
)
1192 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
1194 struct commit_list
*p
;
1195 int left_count
= 0, right_count
= 0;
1197 struct patch_ids ids
;
1198 unsigned cherry_flag
;
1200 /* First count the commits on the left and on the right */
1201 for (p
= list
; p
; p
= p
->next
) {
1202 struct commit
*commit
= p
->item
;
1203 unsigned flags
= commit
->object
.flags
;
1204 if (flags
& BOUNDARY
)
1206 else if (flags
& SYMMETRIC_LEFT
)
1212 if (!left_count
|| !right_count
)
1215 left_first
= left_count
< right_count
;
1216 init_patch_ids(revs
->repo
, &ids
);
1217 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
1219 /* Compute patch-ids for one side */
1220 for (p
= list
; p
; p
= p
->next
) {
1221 struct commit
*commit
= p
->item
;
1222 unsigned flags
= commit
->object
.flags
;
1224 if (flags
& BOUNDARY
)
1227 * If we have fewer left, left_first is set and we omit
1228 * commits on the right branch in this loop. If we have
1229 * fewer right, we skip the left ones.
1231 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
1233 add_commit_patch_id(commit
, &ids
);
1236 /* either cherry_mark or cherry_pick are true */
1237 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
1239 /* Check the other side */
1240 for (p
= list
; p
; p
= p
->next
) {
1241 struct commit
*commit
= p
->item
;
1242 struct patch_id
*id
;
1243 unsigned flags
= commit
->object
.flags
;
1245 if (flags
& BOUNDARY
)
1248 * If we have fewer left, left_first is set and we omit
1249 * commits on the left branch in this loop.
1251 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
1255 * Have we seen the same patch id?
1257 id
= patch_id_iter_first(commit
, &ids
);
1261 commit
->object
.flags
|= cherry_flag
;
1263 id
->commit
->object
.flags
|= cherry_flag
;
1264 } while ((id
= patch_id_iter_next(id
, &ids
)));
1267 free_patch_ids(&ids
);
1270 /* How many extra uninteresting commits we want to see.. */
1273 static int still_interesting(struct commit_list
*src
, timestamp_t date
, int slop
,
1274 struct commit
**interesting_cache
)
1277 * No source list at all? We're definitely done..
1283 * Does the destination list contain entries with a date
1284 * before the source list? Definitely _not_ done.
1286 if (date
<= src
->item
->date
)
1290 * Does the source list still have interesting commits in
1291 * it? Definitely not done..
1293 if (!everybody_uninteresting(src
, interesting_cache
))
1296 /* Ok, we're closing in.. */
1301 * "rev-list --ancestry-path=C_0 [--ancestry-path=C_1 ...] A..B"
1302 * computes commits that are ancestors of B but not ancestors of A but
1303 * further limits the result to those that have any of C in their
1304 * ancestry path (i.e. are either ancestors of any of C, descendants
1305 * of any of C, or are any of C). If --ancestry-path is specified with
1306 * no commit, we use all bottom commits for C.
1308 * Before this function is called, ancestors of C will have already
1309 * been marked with ANCESTRY_PATH previously.
1311 * This takes the list of bottom commits and the result of "A..B"
1312 * without --ancestry-path, and limits the latter further to the ones
1313 * that have any of C in their ancestry path. Since the ancestors of C
1314 * have already been marked (a prerequisite of this function), we just
1315 * need to mark the descendants, then exclude any commit that does not
1316 * have any of these marks.
1318 static void limit_to_ancestry(struct commit_list
*bottoms
, struct commit_list
*list
)
1320 struct commit_list
*p
;
1321 struct commit_list
*rlist
= NULL
;
1325 * Reverse the list so that it will be likely that we would
1326 * process parents before children.
1328 for (p
= list
; p
; p
= p
->next
)
1329 commit_list_insert(p
->item
, &rlist
);
1331 for (p
= bottoms
; p
; p
= p
->next
)
1332 p
->item
->object
.flags
|= TMP_MARK
;
1335 * Mark the ones that can reach bottom commits in "list",
1336 * in a bottom-up fashion.
1340 for (p
= rlist
; p
; p
= p
->next
) {
1341 struct commit
*c
= p
->item
;
1342 struct commit_list
*parents
;
1343 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
1345 for (parents
= c
->parents
;
1347 parents
= parents
->next
) {
1348 if (!(parents
->item
->object
.flags
& TMP_MARK
))
1350 c
->object
.flags
|= TMP_MARK
;
1355 } while (made_progress
);
1358 * NEEDSWORK: decide if we want to remove parents that are
1359 * not marked with TMP_MARK from commit->parents for commits
1360 * in the resulting list. We may not want to do that, though.
1364 * The ones that are not marked with either TMP_MARK or
1365 * ANCESTRY_PATH are uninteresting
1367 for (p
= list
; p
; p
= p
->next
) {
1368 struct commit
*c
= p
->item
;
1369 if (c
->object
.flags
& (TMP_MARK
| ANCESTRY_PATH
))
1371 c
->object
.flags
|= UNINTERESTING
;
1374 /* We are done with TMP_MARK and ANCESTRY_PATH */
1375 for (p
= list
; p
; p
= p
->next
)
1376 p
->item
->object
.flags
&= ~(TMP_MARK
| ANCESTRY_PATH
);
1377 for (p
= bottoms
; p
; p
= p
->next
)
1378 p
->item
->object
.flags
&= ~(TMP_MARK
| ANCESTRY_PATH
);
1379 free_commit_list(rlist
);
1383 * Before walking the history, add the set of "negative" refs the
1384 * caller has asked to exclude to the bottom list.
1386 * This is used to compute "rev-list --ancestry-path A..B", as we need
1387 * to filter the result of "A..B" further to the ones that can actually
1390 static void collect_bottom_commits(struct commit_list
*list
,
1391 struct commit_list
**bottom
)
1393 struct commit_list
*elem
;
1394 for (elem
= list
; elem
; elem
= elem
->next
)
1395 if (elem
->item
->object
.flags
& BOTTOM
)
1396 commit_list_insert(elem
->item
, bottom
);
1399 /* Assumes either left_only or right_only is set */
1400 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
1402 struct commit_list
*p
;
1404 for (p
= list
; p
; p
= p
->next
) {
1405 struct commit
*commit
= p
->item
;
1407 if (revs
->right_only
) {
1408 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
1409 commit
->object
.flags
|= SHOWN
;
1410 } else /* revs->left_only is set */
1411 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
1412 commit
->object
.flags
|= SHOWN
;
1416 static int limit_list(struct rev_info
*revs
)
1419 timestamp_t date
= TIME_MAX
;
1420 struct commit_list
*original_list
= revs
->commits
;
1421 struct commit_list
*newlist
= NULL
;
1422 struct commit_list
**p
= &newlist
;
1423 struct commit
*interesting_cache
= NULL
;
1425 if (revs
->ancestry_path_implicit_bottoms
) {
1426 collect_bottom_commits(original_list
,
1427 &revs
->ancestry_path_bottoms
);
1428 if (!revs
->ancestry_path_bottoms
)
1429 die("--ancestry-path given but there are no bottom commits");
1432 while (original_list
) {
1433 struct commit
*commit
= pop_commit(&original_list
);
1434 struct object
*obj
= &commit
->object
;
1435 show_early_output_fn_t show
;
1437 if (commit
== interesting_cache
)
1438 interesting_cache
= NULL
;
1440 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
1441 obj
->flags
|= UNINTERESTING
;
1442 if (process_parents(revs
, commit
, &original_list
, NULL
) < 0)
1444 if (obj
->flags
& UNINTERESTING
) {
1445 mark_parents_uninteresting(revs
, commit
);
1446 slop
= still_interesting(original_list
, date
, slop
, &interesting_cache
);
1451 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
) &&
1452 !revs
->line_level_traverse
)
1454 if (revs
->max_age_as_filter
!= -1 &&
1455 (commit
->date
< revs
->max_age_as_filter
) && !revs
->line_level_traverse
)
1457 date
= commit
->date
;
1458 p
= &commit_list_insert(commit
, p
)->next
;
1460 show
= show_early_output
;
1464 show(revs
, newlist
);
1465 show_early_output
= NULL
;
1467 if (revs
->cherry_pick
|| revs
->cherry_mark
)
1468 cherry_pick_list(newlist
, revs
);
1470 if (revs
->left_only
|| revs
->right_only
)
1471 limit_left_right(newlist
, revs
);
1473 if (revs
->ancestry_path
)
1474 limit_to_ancestry(revs
->ancestry_path_bottoms
, newlist
);
1477 * Check if any commits have become TREESAME by some of their parents
1478 * becoming UNINTERESTING.
1480 if (limiting_can_increase_treesame(revs
)) {
1481 struct commit_list
*list
= NULL
;
1482 for (list
= newlist
; list
; list
= list
->next
) {
1483 struct commit
*c
= list
->item
;
1484 if (c
->object
.flags
& (UNINTERESTING
| TREESAME
))
1486 update_treesame(revs
, c
);
1490 free_commit_list(original_list
);
1491 revs
->commits
= newlist
;
1496 * Add an entry to refs->cmdline with the specified information.
1499 static void add_rev_cmdline(struct rev_info
*revs
,
1500 struct object
*item
,
1505 struct rev_cmdline_info
*info
= &revs
->cmdline
;
1506 unsigned int nr
= info
->nr
;
1508 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
1509 info
->rev
[nr
].item
= item
;
1510 info
->rev
[nr
].name
= xstrdup(name
);
1511 info
->rev
[nr
].whence
= whence
;
1512 info
->rev
[nr
].flags
= flags
;
1516 static void add_rev_cmdline_list(struct rev_info
*revs
,
1517 struct commit_list
*commit_list
,
1521 while (commit_list
) {
1522 struct object
*object
= &commit_list
->item
->object
;
1523 add_rev_cmdline(revs
, object
, oid_to_hex(&object
->oid
),
1525 commit_list
= commit_list
->next
;
1529 int ref_excluded(const struct ref_exclusions
*exclusions
, const char *path
)
1531 const char *stripped_path
= strip_namespace(path
);
1532 struct string_list_item
*item
;
1534 for_each_string_list_item(item
, &exclusions
->excluded_refs
) {
1535 if (!wildmatch(item
->string
, path
, 0))
1539 if (ref_is_hidden(stripped_path
, path
, &exclusions
->hidden_refs
))
1545 void init_ref_exclusions(struct ref_exclusions
*exclusions
)
1547 struct ref_exclusions blank
= REF_EXCLUSIONS_INIT
;
1548 memcpy(exclusions
, &blank
, sizeof(*exclusions
));
1551 void clear_ref_exclusions(struct ref_exclusions
*exclusions
)
1553 string_list_clear(&exclusions
->excluded_refs
, 0);
1554 string_list_clear(&exclusions
->hidden_refs
, 0);
1555 exclusions
->hidden_refs_configured
= 0;
1558 void add_ref_exclusion(struct ref_exclusions
*exclusions
, const char *exclude
)
1560 string_list_append(&exclusions
->excluded_refs
, exclude
);
1563 struct exclude_hidden_refs_cb
{
1564 struct ref_exclusions
*exclusions
;
1565 const char *section
;
1568 static int hide_refs_config(const char *var
, const char *value
, void *cb_data
)
1570 struct exclude_hidden_refs_cb
*cb
= cb_data
;
1571 cb
->exclusions
->hidden_refs_configured
= 1;
1572 return parse_hide_refs_config(var
, value
, cb
->section
,
1573 &cb
->exclusions
->hidden_refs
);
1576 void exclude_hidden_refs(struct ref_exclusions
*exclusions
, const char *section
)
1578 struct exclude_hidden_refs_cb cb
;
1580 if (strcmp(section
, "fetch") && strcmp(section
, "receive") &&
1581 strcmp(section
, "uploadpack"))
1582 die(_("unsupported section for hidden refs: %s"), section
);
1584 if (exclusions
->hidden_refs_configured
)
1585 die(_("--exclude-hidden= passed more than once"));
1587 cb
.exclusions
= exclusions
;
1588 cb
.section
= section
;
1590 git_config(hide_refs_config
, &cb
);
1593 struct all_refs_cb
{
1595 int warned_bad_reflog
;
1596 struct rev_info
*all_revs
;
1597 const char *name_for_errormsg
;
1598 struct worktree
*wt
;
1601 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
1605 struct all_refs_cb
*cb
= cb_data
;
1606 struct object
*object
;
1608 if (ref_excluded(&cb
->all_revs
->ref_excludes
, path
))
1611 object
= get_reference(cb
->all_revs
, path
, oid
, cb
->all_flags
);
1612 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
1613 add_pending_object(cb
->all_revs
, object
, path
);
1617 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
1620 cb
->all_revs
= revs
;
1621 cb
->all_flags
= flags
;
1622 revs
->rev_input_given
= 1;
1626 static void handle_refs(struct ref_store
*refs
,
1627 struct rev_info
*revs
, unsigned flags
,
1628 int (*for_each
)(struct ref_store
*, each_ref_fn
, void *))
1630 struct all_refs_cb cb
;
1633 /* this could happen with uninitialized submodules */
1637 init_all_refs_cb(&cb
, revs
, flags
);
1638 for_each(refs
, handle_one_ref
, &cb
);
1641 static void handle_one_reflog_commit(struct object_id
*oid
, void *cb_data
)
1643 struct all_refs_cb
*cb
= cb_data
;
1644 if (!is_null_oid(oid
)) {
1645 struct object
*o
= parse_object(cb
->all_revs
->repo
, oid
);
1647 o
->flags
|= cb
->all_flags
;
1648 /* ??? CMDLINEFLAGS ??? */
1649 add_pending_object(cb
->all_revs
, o
, "");
1651 else if (!cb
->warned_bad_reflog
) {
1652 warning("reflog of '%s' references pruned commits",
1653 cb
->name_for_errormsg
);
1654 cb
->warned_bad_reflog
= 1;
1659 static int handle_one_reflog_ent(struct object_id
*ooid
, struct object_id
*noid
,
1660 const char *email UNUSED
,
1661 timestamp_t timestamp UNUSED
,
1663 const char *message UNUSED
,
1666 handle_one_reflog_commit(ooid
, cb_data
);
1667 handle_one_reflog_commit(noid
, cb_data
);
1671 static int handle_one_reflog(const char *refname_in_wt
,
1672 const struct object_id
*oid UNUSED
,
1673 int flag UNUSED
, void *cb_data
)
1675 struct all_refs_cb
*cb
= cb_data
;
1676 struct strbuf refname
= STRBUF_INIT
;
1678 cb
->warned_bad_reflog
= 0;
1679 strbuf_worktree_ref(cb
->wt
, &refname
, refname_in_wt
);
1680 cb
->name_for_errormsg
= refname
.buf
;
1681 refs_for_each_reflog_ent(get_main_ref_store(the_repository
),
1683 handle_one_reflog_ent
, cb_data
);
1684 strbuf_release(&refname
);
1688 static void add_other_reflogs_to_pending(struct all_refs_cb
*cb
)
1690 struct worktree
**worktrees
, **p
;
1692 worktrees
= get_worktrees();
1693 for (p
= worktrees
; *p
; p
++) {
1694 struct worktree
*wt
= *p
;
1700 refs_for_each_reflog(get_worktree_ref_store(wt
),
1704 free_worktrees(worktrees
);
1707 void add_reflogs_to_pending(struct rev_info
*revs
, unsigned flags
)
1709 struct all_refs_cb cb
;
1712 cb
.all_flags
= flags
;
1714 for_each_reflog(handle_one_reflog
, &cb
);
1716 if (!revs
->single_worktree
)
1717 add_other_reflogs_to_pending(&cb
);
1720 static void add_cache_tree(struct cache_tree
*it
, struct rev_info
*revs
,
1721 struct strbuf
*path
, unsigned int flags
)
1723 size_t baselen
= path
->len
;
1726 if (it
->entry_count
>= 0) {
1727 struct tree
*tree
= lookup_tree(revs
->repo
, &it
->oid
);
1728 tree
->object
.flags
|= flags
;
1729 add_pending_object_with_path(revs
, &tree
->object
, "",
1733 for (i
= 0; i
< it
->subtree_nr
; i
++) {
1734 struct cache_tree_sub
*sub
= it
->down
[i
];
1735 strbuf_addf(path
, "%s%s", baselen
? "/" : "", sub
->name
);
1736 add_cache_tree(sub
->cache_tree
, revs
, path
, flags
);
1737 strbuf_setlen(path
, baselen
);
1742 static void add_resolve_undo_to_pending(struct index_state
*istate
, struct rev_info
*revs
)
1744 struct string_list_item
*item
;
1745 struct string_list
*resolve_undo
= istate
->resolve_undo
;
1750 for_each_string_list_item(item
, resolve_undo
) {
1751 const char *path
= item
->string
;
1752 struct resolve_undo_info
*ru
= item
->util
;
1757 for (i
= 0; i
< 3; i
++) {
1760 if (!ru
->mode
[i
] || !S_ISREG(ru
->mode
[i
]))
1763 blob
= lookup_blob(revs
->repo
, &ru
->oid
[i
]);
1765 warning(_("resolve-undo records `%s` which is missing"),
1766 oid_to_hex(&ru
->oid
[i
]));
1769 add_pending_object_with_path(revs
, &blob
->object
, "",
1775 static void do_add_index_objects_to_pending(struct rev_info
*revs
,
1776 struct index_state
*istate
,
1781 /* TODO: audit for interaction with sparse-index. */
1782 ensure_full_index(istate
);
1783 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1784 struct cache_entry
*ce
= istate
->cache
[i
];
1787 if (S_ISGITLINK(ce
->ce_mode
))
1790 blob
= lookup_blob(revs
->repo
, &ce
->oid
);
1792 die("unable to add index blob to traversal");
1793 blob
->object
.flags
|= flags
;
1794 add_pending_object_with_path(revs
, &blob
->object
, "",
1795 ce
->ce_mode
, ce
->name
);
1798 if (istate
->cache_tree
) {
1799 struct strbuf path
= STRBUF_INIT
;
1800 add_cache_tree(istate
->cache_tree
, revs
, &path
, flags
);
1801 strbuf_release(&path
);
1804 add_resolve_undo_to_pending(istate
, revs
);
1807 void add_index_objects_to_pending(struct rev_info
*revs
, unsigned int flags
)
1809 struct worktree
**worktrees
, **p
;
1811 repo_read_index(revs
->repo
);
1812 do_add_index_objects_to_pending(revs
, revs
->repo
->index
, flags
);
1814 if (revs
->single_worktree
)
1817 worktrees
= get_worktrees();
1818 for (p
= worktrees
; *p
; p
++) {
1819 struct worktree
*wt
= *p
;
1820 struct index_state istate
= INDEX_STATE_INIT(revs
->repo
);
1823 continue; /* current index already taken care of */
1825 if (read_index_from(&istate
,
1826 worktree_git_path(wt
, "index"),
1827 get_worktree_git_dir(wt
)) > 0)
1828 do_add_index_objects_to_pending(revs
, &istate
, flags
);
1829 discard_index(&istate
);
1831 free_worktrees(worktrees
);
1834 struct add_alternate_refs_data
{
1835 struct rev_info
*revs
;
1839 static void add_one_alternate_ref(const struct object_id
*oid
,
1842 const char *name
= ".alternate";
1843 struct add_alternate_refs_data
*data
= vdata
;
1846 obj
= get_reference(data
->revs
, name
, oid
, data
->flags
);
1847 add_rev_cmdline(data
->revs
, obj
, name
, REV_CMD_REV
, data
->flags
);
1848 add_pending_object(data
->revs
, obj
, name
);
1851 static void add_alternate_refs_to_pending(struct rev_info
*revs
,
1854 struct add_alternate_refs_data data
;
1857 for_each_alternate_ref(add_one_alternate_ref
, &data
);
1860 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
,
1863 struct object_id oid
;
1865 struct commit
*commit
;
1866 struct commit_list
*parents
;
1868 const char *arg
= arg_
;
1871 flags
^= UNINTERESTING
| BOTTOM
;
1874 if (get_oid_committish(arg
, &oid
))
1877 it
= get_reference(revs
, arg
, &oid
, 0);
1878 if (!it
&& revs
->ignore_missing
)
1880 if (it
->type
!= OBJ_TAG
)
1882 if (!((struct tag
*)it
)->tagged
)
1884 oidcpy(&oid
, &((struct tag
*)it
)->tagged
->oid
);
1886 if (it
->type
!= OBJ_COMMIT
)
1888 commit
= (struct commit
*)it
;
1889 if (exclude_parent
&&
1890 exclude_parent
> commit_list_count(commit
->parents
))
1892 for (parents
= commit
->parents
, parent_number
= 1;
1894 parents
= parents
->next
, parent_number
++) {
1895 if (exclude_parent
&& parent_number
!= exclude_parent
)
1898 it
= &parents
->item
->object
;
1900 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1901 add_pending_object(revs
, it
, arg
);
1906 void repo_init_revisions(struct repository
*r
,
1907 struct rev_info
*revs
,
1910 struct rev_info blank
= REV_INFO_INIT
;
1911 memcpy(revs
, &blank
, sizeof(*revs
));
1914 revs
->pruning
.repo
= r
;
1915 revs
->pruning
.add_remove
= file_add_remove
;
1916 revs
->pruning
.change
= file_change
;
1917 revs
->pruning
.change_fn_data
= revs
;
1918 revs
->prefix
= prefix
;
1920 grep_init(&revs
->grep_filter
, revs
->repo
);
1921 revs
->grep_filter
.status_only
= 1;
1923 repo_diff_setup(revs
->repo
, &revs
->diffopt
);
1924 if (prefix
&& !revs
->diffopt
.prefix
) {
1925 revs
->diffopt
.prefix
= prefix
;
1926 revs
->diffopt
.prefix_length
= strlen(prefix
);
1929 init_display_notes(&revs
->notes_opt
);
1930 list_objects_filter_init(&revs
->filter
);
1931 init_ref_exclusions(&revs
->ref_excludes
);
1934 static void add_pending_commit_list(struct rev_info
*revs
,
1935 struct commit_list
*commit_list
,
1938 while (commit_list
) {
1939 struct object
*object
= &commit_list
->item
->object
;
1940 object
->flags
|= flags
;
1941 add_pending_object(revs
, object
, oid_to_hex(&object
->oid
));
1942 commit_list
= commit_list
->next
;
1946 static void prepare_show_merge(struct rev_info
*revs
)
1948 struct commit_list
*bases
;
1949 struct commit
*head
, *other
;
1950 struct object_id oid
;
1951 const char **prune
= NULL
;
1952 int i
, prune_num
= 1; /* counting terminating NULL */
1953 struct index_state
*istate
= revs
->repo
->index
;
1955 if (get_oid("HEAD", &oid
))
1956 die("--merge without HEAD?");
1957 head
= lookup_commit_or_die(&oid
, "HEAD");
1958 if (get_oid("MERGE_HEAD", &oid
))
1959 die("--merge without MERGE_HEAD?");
1960 other
= lookup_commit_or_die(&oid
, "MERGE_HEAD");
1961 add_pending_object(revs
, &head
->object
, "HEAD");
1962 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1963 bases
= get_merge_bases(head
, other
);
1964 add_rev_cmdline_list(revs
, bases
, REV_CMD_MERGE_BASE
, UNINTERESTING
| BOTTOM
);
1965 add_pending_commit_list(revs
, bases
, UNINTERESTING
| BOTTOM
);
1966 free_commit_list(bases
);
1967 head
->object
.flags
|= SYMMETRIC_LEFT
;
1969 if (!istate
->cache_nr
)
1970 repo_read_index(revs
->repo
);
1971 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1972 const struct cache_entry
*ce
= istate
->cache
[i
];
1975 if (ce_path_match(istate
, ce
, &revs
->prune_data
, NULL
)) {
1977 REALLOC_ARRAY(prune
, prune_num
);
1978 prune
[prune_num
-2] = ce
->name
;
1979 prune
[prune_num
-1] = NULL
;
1981 while ((i
+1 < istate
->cache_nr
) &&
1982 ce_same_name(ce
, istate
->cache
[i
+1]))
1985 clear_pathspec(&revs
->prune_data
);
1986 parse_pathspec(&revs
->prune_data
, PATHSPEC_ALL_MAGIC
& ~PATHSPEC_LITERAL
,
1987 PATHSPEC_PREFER_FULL
| PATHSPEC_LITERAL_PATH
, "", prune
);
1991 static int dotdot_missing(const char *arg
, char *dotdot
,
1992 struct rev_info
*revs
, int symmetric
)
1994 if (revs
->ignore_missing
)
1996 /* de-munge so we report the full argument */
1999 ? "Invalid symmetric difference expression %s"
2000 : "Invalid revision range %s", arg
);
2003 static int handle_dotdot_1(const char *arg
, char *dotdot
,
2004 struct rev_info
*revs
, int flags
,
2005 int cant_be_filename
,
2006 struct object_context
*a_oc
,
2007 struct object_context
*b_oc
)
2009 const char *a_name
, *b_name
;
2010 struct object_id a_oid
, b_oid
;
2011 struct object
*a_obj
, *b_obj
;
2012 unsigned int a_flags
, b_flags
;
2014 unsigned int flags_exclude
= flags
^ (UNINTERESTING
| BOTTOM
);
2015 unsigned int oc_flags
= GET_OID_COMMITTISH
| GET_OID_RECORD_PATH
;
2021 b_name
= dotdot
+ 2;
2022 if (*b_name
== '.') {
2029 if (get_oid_with_context(revs
->repo
, a_name
, oc_flags
, &a_oid
, a_oc
) ||
2030 get_oid_with_context(revs
->repo
, b_name
, oc_flags
, &b_oid
, b_oc
))
2033 if (!cant_be_filename
) {
2035 verify_non_filename(revs
->prefix
, arg
);
2039 a_obj
= parse_object(revs
->repo
, &a_oid
);
2040 b_obj
= parse_object(revs
->repo
, &b_oid
);
2041 if (!a_obj
|| !b_obj
)
2042 return dotdot_missing(arg
, dotdot
, revs
, symmetric
);
2047 a_flags
= flags_exclude
;
2049 /* A...B -- find merge bases between the two */
2050 struct commit
*a
, *b
;
2051 struct commit_list
*exclude
;
2053 a
= lookup_commit_reference(revs
->repo
, &a_obj
->oid
);
2054 b
= lookup_commit_reference(revs
->repo
, &b_obj
->oid
);
2056 return dotdot_missing(arg
, dotdot
, revs
, symmetric
);
2058 exclude
= get_merge_bases(a
, b
);
2059 add_rev_cmdline_list(revs
, exclude
, REV_CMD_MERGE_BASE
,
2061 add_pending_commit_list(revs
, exclude
, flags_exclude
);
2062 free_commit_list(exclude
);
2065 a_flags
= flags
| SYMMETRIC_LEFT
;
2068 a_obj
->flags
|= a_flags
;
2069 b_obj
->flags
|= b_flags
;
2070 add_rev_cmdline(revs
, a_obj
, a_name
, REV_CMD_LEFT
, a_flags
);
2071 add_rev_cmdline(revs
, b_obj
, b_name
, REV_CMD_RIGHT
, b_flags
);
2072 add_pending_object_with_path(revs
, a_obj
, a_name
, a_oc
->mode
, a_oc
->path
);
2073 add_pending_object_with_path(revs
, b_obj
, b_name
, b_oc
->mode
, b_oc
->path
);
2077 static int handle_dotdot(const char *arg
,
2078 struct rev_info
*revs
, int flags
,
2079 int cant_be_filename
)
2081 struct object_context a_oc
, b_oc
;
2082 char *dotdot
= strstr(arg
, "..");
2088 memset(&a_oc
, 0, sizeof(a_oc
));
2089 memset(&b_oc
, 0, sizeof(b_oc
));
2092 ret
= handle_dotdot_1(arg
, dotdot
, revs
, flags
, cant_be_filename
,
2102 static int handle_revision_arg_1(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
2104 struct object_context oc
;
2106 struct object
*object
;
2107 struct object_id oid
;
2109 const char *arg
= arg_
;
2110 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
2111 unsigned get_sha1_flags
= GET_OID_RECORD_PATH
;
2113 flags
= flags
& UNINTERESTING
? flags
| BOTTOM
: flags
& ~BOTTOM
;
2115 if (!cant_be_filename
&& !strcmp(arg
, "..")) {
2117 * Just ".."? That is not a range but the
2118 * pathspec for the parent directory.
2123 if (!handle_dotdot(arg
, revs
, flags
, revarg_opt
))
2126 mark
= strstr(arg
, "^@");
2127 if (mark
&& !mark
[2]) {
2129 if (add_parents_only(revs
, arg
, flags
, 0))
2133 mark
= strstr(arg
, "^!");
2134 if (mark
&& !mark
[2]) {
2136 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
), 0))
2139 mark
= strstr(arg
, "^-");
2141 int exclude_parent
= 1;
2144 if (strtol_i(mark
+ 2, 10, &exclude_parent
) ||
2150 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
), exclude_parent
))
2156 local_flags
= UNINTERESTING
| BOTTOM
;
2160 if (revarg_opt
& REVARG_COMMITTISH
)
2161 get_sha1_flags
|= GET_OID_COMMITTISH
;
2163 if (get_oid_with_context(revs
->repo
, arg
, get_sha1_flags
, &oid
, &oc
))
2164 return revs
->ignore_missing
? 0 : -1;
2165 if (!cant_be_filename
)
2166 verify_non_filename(revs
->prefix
, arg
);
2167 object
= get_reference(revs
, arg
, &oid
, flags
^ local_flags
);
2169 return revs
->ignore_missing
? 0 : -1;
2170 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
2171 add_pending_object_with_path(revs
, object
, arg
, oc
.mode
, oc
.path
);
2176 int handle_revision_arg(const char *arg
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
2178 int ret
= handle_revision_arg_1(arg
, revs
, flags
, revarg_opt
);
2180 revs
->rev_input_given
= 1;
2184 static void read_pathspec_from_stdin(struct strbuf
*sb
,
2185 struct strvec
*prune
)
2187 while (strbuf_getline(sb
, stdin
) != EOF
)
2188 strvec_push(prune
, sb
->buf
);
2191 static void read_revisions_from_stdin(struct rev_info
*revs
,
2192 struct strvec
*prune
)
2195 int seen_dashdash
= 0;
2198 save_warning
= warn_on_object_refname_ambiguity
;
2199 warn_on_object_refname_ambiguity
= 0;
2201 strbuf_init(&sb
, 1000);
2202 while (strbuf_getline(&sb
, stdin
) != EOF
) {
2206 if (sb
.buf
[0] == '-') {
2207 if (len
== 2 && sb
.buf
[1] == '-') {
2211 die("options not supported in --stdin mode");
2213 if (handle_revision_arg(sb
.buf
, revs
, 0,
2214 REVARG_CANNOT_BE_FILENAME
))
2215 die("bad revision '%s'", sb
.buf
);
2218 read_pathspec_from_stdin(&sb
, prune
);
2220 strbuf_release(&sb
);
2221 warn_on_object_refname_ambiguity
= save_warning
;
2224 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
2226 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
2229 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
2231 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
2234 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
2236 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
2239 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
2240 int *unkc
, const char **unkv
,
2241 const struct setup_revision_opt
* opt
)
2243 const char *arg
= argv
[0];
2244 const char *optarg
= NULL
;
2246 const unsigned hexsz
= the_hash_algo
->hexsz
;
2248 /* pseudo revision arguments */
2249 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
2250 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
2251 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
2252 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
2253 !strcmp(arg
, "--bisect") || starts_with(arg
, "--glob=") ||
2254 !strcmp(arg
, "--indexed-objects") ||
2255 !strcmp(arg
, "--alternate-refs") ||
2256 starts_with(arg
, "--exclude=") || starts_with(arg
, "--exclude-hidden=") ||
2257 starts_with(arg
, "--branches=") || starts_with(arg
, "--tags=") ||
2258 starts_with(arg
, "--remotes=") || starts_with(arg
, "--no-walk="))
2260 unkv
[(*unkc
)++] = arg
;
2264 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
2265 revs
->max_count
= atoi(optarg
);
2268 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
2269 revs
->skip_count
= atoi(optarg
);
2271 } else if ((*arg
== '-') && isdigit(arg
[1])) {
2272 /* accept -<digit>, like traditional "head" */
2273 if (strtol_i(arg
+ 1, 10, &revs
->max_count
) < 0 ||
2274 revs
->max_count
< 0)
2275 die("'%s': not a non-negative integer", arg
+ 1);
2277 } else if (!strcmp(arg
, "-n")) {
2279 return error("-n requires an argument");
2280 revs
->max_count
= atoi(argv
[1]);
2283 } else if (skip_prefix(arg
, "-n", &optarg
)) {
2284 revs
->max_count
= atoi(optarg
);
2286 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
2287 revs
->max_age
= atoi(optarg
);
2289 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
2290 revs
->max_age
= approxidate(optarg
);
2292 } else if ((argcount
= parse_long_opt("since-as-filter", argv
, &optarg
))) {
2293 revs
->max_age_as_filter
= approxidate(optarg
);
2295 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
2296 revs
->max_age
= approxidate(optarg
);
2298 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
2299 revs
->min_age
= atoi(optarg
);
2301 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
2302 revs
->min_age
= approxidate(optarg
);
2304 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
2305 revs
->min_age
= approxidate(optarg
);
2307 } else if (!strcmp(arg
, "--first-parent")) {
2308 revs
->first_parent_only
= 1;
2309 } else if (!strcmp(arg
, "--exclude-first-parent-only")) {
2310 revs
->exclude_first_parent_only
= 1;
2311 } else if (!strcmp(arg
, "--ancestry-path")) {
2312 revs
->ancestry_path
= 1;
2313 revs
->simplify_history
= 0;
2315 revs
->ancestry_path_implicit_bottoms
= 1;
2316 } else if (skip_prefix(arg
, "--ancestry-path=", &optarg
)) {
2318 struct object_id oid
;
2319 const char *msg
= _("could not get commit for ancestry-path argument %s");
2321 revs
->ancestry_path
= 1;
2322 revs
->simplify_history
= 0;
2325 if (repo_get_oid_committish(revs
->repo
, optarg
, &oid
))
2326 return error(msg
, optarg
);
2327 get_reference(revs
, optarg
, &oid
, ANCESTRY_PATH
);
2328 c
= lookup_commit_reference(revs
->repo
, &oid
);
2330 return error(msg
, optarg
);
2331 commit_list_insert(c
, &revs
->ancestry_path_bottoms
);
2332 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
2333 init_reflog_walk(&revs
->reflog_info
);
2334 } else if (!strcmp(arg
, "--default")) {
2336 return error("bad --default argument");
2337 revs
->def
= argv
[1];
2339 } else if (!strcmp(arg
, "--merge")) {
2340 revs
->show_merge
= 1;
2341 } else if (!strcmp(arg
, "--topo-order")) {
2342 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
2343 revs
->topo_order
= 1;
2344 } else if (!strcmp(arg
, "--simplify-merges")) {
2345 revs
->simplify_merges
= 1;
2346 revs
->topo_order
= 1;
2347 revs
->rewrite_parents
= 1;
2348 revs
->simplify_history
= 0;
2350 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
2351 revs
->simplify_merges
= 1;
2352 revs
->topo_order
= 1;
2353 revs
->rewrite_parents
= 1;
2354 revs
->simplify_history
= 0;
2355 revs
->simplify_by_decoration
= 1;
2358 } else if (!strcmp(arg
, "--date-order")) {
2359 revs
->sort_order
= REV_SORT_BY_COMMIT_DATE
;
2360 revs
->topo_order
= 1;
2361 } else if (!strcmp(arg
, "--author-date-order")) {
2362 revs
->sort_order
= REV_SORT_BY_AUTHOR_DATE
;
2363 revs
->topo_order
= 1;
2364 } else if (!strcmp(arg
, "--early-output")) {
2365 revs
->early_output
= 100;
2366 revs
->topo_order
= 1;
2367 } else if (skip_prefix(arg
, "--early-output=", &optarg
)) {
2368 if (strtoul_ui(optarg
, 10, &revs
->early_output
) < 0)
2369 die("'%s': not a non-negative integer", optarg
);
2370 revs
->topo_order
= 1;
2371 } else if (!strcmp(arg
, "--parents")) {
2372 revs
->rewrite_parents
= 1;
2373 revs
->print_parents
= 1;
2374 } else if (!strcmp(arg
, "--dense")) {
2376 } else if (!strcmp(arg
, "--sparse")) {
2378 } else if (!strcmp(arg
, "--in-commit-order")) {
2379 revs
->tree_blobs_in_commit_order
= 1;
2380 } else if (!strcmp(arg
, "--remove-empty")) {
2381 revs
->remove_empty_trees
= 1;
2382 } else if (!strcmp(arg
, "--merges")) {
2383 revs
->min_parents
= 2;
2384 } else if (!strcmp(arg
, "--no-merges")) {
2385 revs
->max_parents
= 1;
2386 } else if (skip_prefix(arg
, "--min-parents=", &optarg
)) {
2387 revs
->min_parents
= atoi(optarg
);
2388 } else if (!strcmp(arg
, "--no-min-parents")) {
2389 revs
->min_parents
= 0;
2390 } else if (skip_prefix(arg
, "--max-parents=", &optarg
)) {
2391 revs
->max_parents
= atoi(optarg
);
2392 } else if (!strcmp(arg
, "--no-max-parents")) {
2393 revs
->max_parents
= -1;
2394 } else if (!strcmp(arg
, "--boundary")) {
2396 } else if (!strcmp(arg
, "--left-right")) {
2397 revs
->left_right
= 1;
2398 } else if (!strcmp(arg
, "--left-only")) {
2399 if (revs
->right_only
)
2400 die("--left-only is incompatible with --right-only"
2402 revs
->left_only
= 1;
2403 } else if (!strcmp(arg
, "--right-only")) {
2404 if (revs
->left_only
)
2405 die(_("options '%s' and '%s' cannot be used together"), "--right-only", "--left-only");
2406 revs
->right_only
= 1;
2407 } else if (!strcmp(arg
, "--cherry")) {
2408 if (revs
->left_only
)
2409 die(_("options '%s' and '%s' cannot be used together"), "--cherry", "--left-only");
2410 revs
->cherry_mark
= 1;
2411 revs
->right_only
= 1;
2412 revs
->max_parents
= 1;
2414 } else if (!strcmp(arg
, "--count")) {
2416 } else if (!strcmp(arg
, "--cherry-mark")) {
2417 if (revs
->cherry_pick
)
2418 die(_("options '%s' and '%s' cannot be used together"), "--cherry-mark", "--cherry-pick");
2419 revs
->cherry_mark
= 1;
2420 revs
->limited
= 1; /* needs limit_list() */
2421 } else if (!strcmp(arg
, "--cherry-pick")) {
2422 if (revs
->cherry_mark
)
2423 die(_("options '%s' and '%s' cannot be used together"), "--cherry-pick", "--cherry-mark");
2424 revs
->cherry_pick
= 1;
2426 } else if (!strcmp(arg
, "--objects")) {
2427 revs
->tag_objects
= 1;
2428 revs
->tree_objects
= 1;
2429 revs
->blob_objects
= 1;
2430 } else if (!strcmp(arg
, "--objects-edge")) {
2431 revs
->tag_objects
= 1;
2432 revs
->tree_objects
= 1;
2433 revs
->blob_objects
= 1;
2434 revs
->edge_hint
= 1;
2435 } else if (!strcmp(arg
, "--objects-edge-aggressive")) {
2436 revs
->tag_objects
= 1;
2437 revs
->tree_objects
= 1;
2438 revs
->blob_objects
= 1;
2439 revs
->edge_hint
= 1;
2440 revs
->edge_hint_aggressive
= 1;
2441 } else if (!strcmp(arg
, "--verify-objects")) {
2442 revs
->tag_objects
= 1;
2443 revs
->tree_objects
= 1;
2444 revs
->blob_objects
= 1;
2445 revs
->verify_objects
= 1;
2446 disable_commit_graph(revs
->repo
);
2447 } else if (!strcmp(arg
, "--unpacked")) {
2449 } else if (starts_with(arg
, "--unpacked=")) {
2450 die(_("--unpacked=<packfile> no longer supported"));
2451 } else if (!strcmp(arg
, "--no-kept-objects")) {
2452 revs
->no_kept_objects
= 1;
2453 revs
->keep_pack_cache_flags
|= IN_CORE_KEEP_PACKS
;
2454 revs
->keep_pack_cache_flags
|= ON_DISK_KEEP_PACKS
;
2455 } else if (skip_prefix(arg
, "--no-kept-objects=", &optarg
)) {
2456 revs
->no_kept_objects
= 1;
2457 if (!strcmp(optarg
, "in-core"))
2458 revs
->keep_pack_cache_flags
|= IN_CORE_KEEP_PACKS
;
2459 if (!strcmp(optarg
, "on-disk"))
2460 revs
->keep_pack_cache_flags
|= ON_DISK_KEEP_PACKS
;
2461 } else if (!strcmp(arg
, "-r")) {
2463 revs
->diffopt
.flags
.recursive
= 1;
2464 } else if (!strcmp(arg
, "-t")) {
2466 revs
->diffopt
.flags
.recursive
= 1;
2467 revs
->diffopt
.flags
.tree_in_recursive
= 1;
2468 } else if ((argcount
= diff_merges_parse_opts(revs
, argv
))) {
2470 } else if (!strcmp(arg
, "-v")) {
2471 revs
->verbose_header
= 1;
2472 } else if (!strcmp(arg
, "--pretty")) {
2473 revs
->verbose_header
= 1;
2474 revs
->pretty_given
= 1;
2475 get_commit_format(NULL
, revs
);
2476 } else if (skip_prefix(arg
, "--pretty=", &optarg
) ||
2477 skip_prefix(arg
, "--format=", &optarg
)) {
2479 * Detached form ("--pretty X" as opposed to "--pretty=X")
2480 * not allowed, since the argument is optional.
2482 revs
->verbose_header
= 1;
2483 revs
->pretty_given
= 1;
2484 get_commit_format(optarg
, revs
);
2485 } else if (!strcmp(arg
, "--expand-tabs")) {
2486 revs
->expand_tabs_in_log
= 8;
2487 } else if (!strcmp(arg
, "--no-expand-tabs")) {
2488 revs
->expand_tabs_in_log
= 0;
2489 } else if (skip_prefix(arg
, "--expand-tabs=", &arg
)) {
2491 if (strtol_i(arg
, 10, &val
) < 0 || val
< 0)
2492 die("'%s': not a non-negative integer", arg
);
2493 revs
->expand_tabs_in_log
= val
;
2494 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
2495 enable_default_display_notes(&revs
->notes_opt
, &revs
->show_notes
);
2496 revs
->show_notes_given
= 1;
2497 } else if (!strcmp(arg
, "--show-signature")) {
2498 revs
->show_signature
= 1;
2499 } else if (!strcmp(arg
, "--no-show-signature")) {
2500 revs
->show_signature
= 0;
2501 } else if (!strcmp(arg
, "--show-linear-break")) {
2502 revs
->break_bar
= " ..........";
2503 revs
->track_linear
= 1;
2504 revs
->track_first_time
= 1;
2505 } else if (skip_prefix(arg
, "--show-linear-break=", &optarg
)) {
2506 revs
->break_bar
= xstrdup(optarg
);
2507 revs
->track_linear
= 1;
2508 revs
->track_first_time
= 1;
2509 } else if (skip_prefix(arg
, "--show-notes=", &optarg
) ||
2510 skip_prefix(arg
, "--notes=", &optarg
)) {
2511 if (starts_with(arg
, "--show-notes=") &&
2512 revs
->notes_opt
.use_default_notes
< 0)
2513 revs
->notes_opt
.use_default_notes
= 1;
2514 enable_ref_display_notes(&revs
->notes_opt
, &revs
->show_notes
, optarg
);
2515 revs
->show_notes_given
= 1;
2516 } else if (!strcmp(arg
, "--no-notes")) {
2517 disable_display_notes(&revs
->notes_opt
, &revs
->show_notes
);
2518 revs
->show_notes_given
= 1;
2519 } else if (!strcmp(arg
, "--standard-notes")) {
2520 revs
->show_notes_given
= 1;
2521 revs
->notes_opt
.use_default_notes
= 1;
2522 } else if (!strcmp(arg
, "--no-standard-notes")) {
2523 revs
->notes_opt
.use_default_notes
= 0;
2524 } else if (!strcmp(arg
, "--oneline")) {
2525 revs
->verbose_header
= 1;
2526 get_commit_format("oneline", revs
);
2527 revs
->pretty_given
= 1;
2528 revs
->abbrev_commit
= 1;
2529 } else if (!strcmp(arg
, "--graph")) {
2530 graph_clear(revs
->graph
);
2531 revs
->graph
= graph_init(revs
);
2532 } else if (!strcmp(arg
, "--no-graph")) {
2533 graph_clear(revs
->graph
);
2535 } else if (!strcmp(arg
, "--encode-email-headers")) {
2536 revs
->encode_email_headers
= 1;
2537 } else if (!strcmp(arg
, "--no-encode-email-headers")) {
2538 revs
->encode_email_headers
= 0;
2539 } else if (!strcmp(arg
, "--root")) {
2540 revs
->show_root_diff
= 1;
2541 } else if (!strcmp(arg
, "--no-commit-id")) {
2542 revs
->no_commit_id
= 1;
2543 } else if (!strcmp(arg
, "--always")) {
2544 revs
->always_show_header
= 1;
2545 } else if (!strcmp(arg
, "--no-abbrev")) {
2547 } else if (!strcmp(arg
, "--abbrev")) {
2548 revs
->abbrev
= DEFAULT_ABBREV
;
2549 } else if (skip_prefix(arg
, "--abbrev=", &optarg
)) {
2550 revs
->abbrev
= strtoul(optarg
, NULL
, 10);
2551 if (revs
->abbrev
< MINIMUM_ABBREV
)
2552 revs
->abbrev
= MINIMUM_ABBREV
;
2553 else if (revs
->abbrev
> hexsz
)
2554 revs
->abbrev
= hexsz
;
2555 } else if (!strcmp(arg
, "--abbrev-commit")) {
2556 revs
->abbrev_commit
= 1;
2557 revs
->abbrev_commit_given
= 1;
2558 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
2559 revs
->abbrev_commit
= 0;
2560 } else if (!strcmp(arg
, "--full-diff")) {
2562 revs
->full_diff
= 1;
2563 } else if (!strcmp(arg
, "--show-pulls")) {
2564 revs
->show_pulls
= 1;
2565 } else if (!strcmp(arg
, "--full-history")) {
2566 revs
->simplify_history
= 0;
2567 } else if (!strcmp(arg
, "--relative-date")) {
2568 revs
->date_mode
.type
= DATE_RELATIVE
;
2569 revs
->date_mode_explicit
= 1;
2570 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
2571 parse_date_format(optarg
, &revs
->date_mode
);
2572 revs
->date_mode_explicit
= 1;
2574 } else if (!strcmp(arg
, "--log-size")) {
2575 revs
->show_log_size
= 1;
2578 * Grepping the commit log
2580 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
2581 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
2583 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
2584 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
2586 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
2587 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
2589 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
2590 add_message_grep(revs
, optarg
);
2592 } else if (!strcmp(arg
, "--basic-regexp")) {
2593 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_BRE
;
2594 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
2595 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_ERE
;
2596 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
2597 revs
->grep_filter
.ignore_case
= 1;
2598 revs
->diffopt
.pickaxe_opts
|= DIFF_PICKAXE_IGNORE_CASE
;
2599 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
2600 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_FIXED
;
2601 } else if (!strcmp(arg
, "--perl-regexp") || !strcmp(arg
, "-P")) {
2602 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_PCRE
;
2603 } else if (!strcmp(arg
, "--all-match")) {
2604 revs
->grep_filter
.all_match
= 1;
2605 } else if (!strcmp(arg
, "--invert-grep")) {
2606 revs
->grep_filter
.no_body_match
= 1;
2607 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
2608 if (strcmp(optarg
, "none"))
2609 git_log_output_encoding
= xstrdup(optarg
);
2611 git_log_output_encoding
= "";
2613 } else if (!strcmp(arg
, "--reverse")) {
2615 } else if (!strcmp(arg
, "--children")) {
2616 revs
->children
.name
= "children";
2618 } else if (!strcmp(arg
, "--ignore-missing")) {
2619 revs
->ignore_missing
= 1;
2620 } else if (opt
&& opt
->allow_exclude_promisor_objects
&&
2621 !strcmp(arg
, "--exclude-promisor-objects")) {
2622 if (fetch_if_missing
)
2623 BUG("exclude_promisor_objects can only be used when fetch_if_missing is 0");
2624 revs
->exclude_promisor_objects
= 1;
2626 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
, revs
->prefix
);
2628 unkv
[(*unkc
)++] = arg
;
2635 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
2636 const struct option
*options
,
2637 const char * const usagestr
[])
2639 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
2640 &ctx
->cpidx
, ctx
->out
, NULL
);
2642 error("unknown option `%s'", ctx
->argv
[0]);
2643 usage_with_options(usagestr
, options
);
2649 void revision_opts_finish(struct rev_info
*revs
)
2651 if (revs
->graph
&& revs
->track_linear
)
2652 die(_("options '%s' and '%s' cannot be used together"), "--show-linear-break", "--graph");
2655 revs
->topo_order
= 1;
2656 revs
->rewrite_parents
= 1;
2660 static int for_each_bisect_ref(struct ref_store
*refs
, each_ref_fn fn
,
2661 void *cb_data
, const char *term
)
2663 struct strbuf bisect_refs
= STRBUF_INIT
;
2665 strbuf_addf(&bisect_refs
, "refs/bisect/%s", term
);
2666 status
= refs_for_each_fullref_in(refs
, bisect_refs
.buf
, fn
, cb_data
);
2667 strbuf_release(&bisect_refs
);
2671 static int for_each_bad_bisect_ref(struct ref_store
*refs
, each_ref_fn fn
, void *cb_data
)
2673 return for_each_bisect_ref(refs
, fn
, cb_data
, term_bad
);
2676 static int for_each_good_bisect_ref(struct ref_store
*refs
, each_ref_fn fn
, void *cb_data
)
2678 return for_each_bisect_ref(refs
, fn
, cb_data
, term_good
);
2681 static int handle_revision_pseudo_opt(struct rev_info
*revs
,
2682 const char **argv
, int *flags
)
2684 const char *arg
= argv
[0];
2686 struct ref_store
*refs
;
2689 if (revs
->repo
!= the_repository
) {
2691 * We need some something like get_submodule_worktrees()
2692 * before we can go through all worktrees of a submodule,
2693 * .e.g with adding all HEADs from --all, which is not
2694 * supported right now, so stick to single worktree.
2696 if (!revs
->single_worktree
)
2697 BUG("--single-worktree cannot be used together with submodule");
2699 refs
= get_main_ref_store(revs
->repo
);
2704 * Commands like "git shortlog" will not accept the options below
2705 * unless parse_revision_opt queues them (as opposed to erroring
2708 * When implementing your new pseudo-option, remember to
2709 * register it in the list at the top of handle_revision_opt.
2711 if (!strcmp(arg
, "--all")) {
2712 handle_refs(refs
, revs
, *flags
, refs_for_each_ref
);
2713 handle_refs(refs
, revs
, *flags
, refs_head_ref
);
2714 if (!revs
->single_worktree
) {
2715 struct all_refs_cb cb
;
2717 init_all_refs_cb(&cb
, revs
, *flags
);
2718 other_head_refs(handle_one_ref
, &cb
);
2720 clear_ref_exclusions(&revs
->ref_excludes
);
2721 } else if (!strcmp(arg
, "--branches")) {
2722 if (revs
->ref_excludes
.hidden_refs_configured
)
2723 return error(_("--exclude-hidden cannot be used together with --branches"));
2724 handle_refs(refs
, revs
, *flags
, refs_for_each_branch_ref
);
2725 clear_ref_exclusions(&revs
->ref_excludes
);
2726 } else if (!strcmp(arg
, "--bisect")) {
2727 read_bisect_terms(&term_bad
, &term_good
);
2728 handle_refs(refs
, revs
, *flags
, for_each_bad_bisect_ref
);
2729 handle_refs(refs
, revs
, *flags
^ (UNINTERESTING
| BOTTOM
),
2730 for_each_good_bisect_ref
);
2732 } else if (!strcmp(arg
, "--tags")) {
2733 if (revs
->ref_excludes
.hidden_refs_configured
)
2734 return error(_("--exclude-hidden cannot be used together with --tags"));
2735 handle_refs(refs
, revs
, *flags
, refs_for_each_tag_ref
);
2736 clear_ref_exclusions(&revs
->ref_excludes
);
2737 } else if (!strcmp(arg
, "--remotes")) {
2738 if (revs
->ref_excludes
.hidden_refs_configured
)
2739 return error(_("--exclude-hidden cannot be used together with --remotes"));
2740 handle_refs(refs
, revs
, *flags
, refs_for_each_remote_ref
);
2741 clear_ref_exclusions(&revs
->ref_excludes
);
2742 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
2743 struct all_refs_cb cb
;
2744 init_all_refs_cb(&cb
, revs
, *flags
);
2745 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
2746 clear_ref_exclusions(&revs
->ref_excludes
);
2748 } else if ((argcount
= parse_long_opt("exclude", argv
, &optarg
))) {
2749 add_ref_exclusion(&revs
->ref_excludes
, optarg
);
2751 } else if ((argcount
= parse_long_opt("exclude-hidden", argv
, &optarg
))) {
2752 exclude_hidden_refs(&revs
->ref_excludes
, optarg
);
2754 } else if (skip_prefix(arg
, "--branches=", &optarg
)) {
2755 struct all_refs_cb cb
;
2756 if (revs
->ref_excludes
.hidden_refs_configured
)
2757 return error(_("--exclude-hidden cannot be used together with --branches"));
2758 init_all_refs_cb(&cb
, revs
, *flags
);
2759 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/heads/", &cb
);
2760 clear_ref_exclusions(&revs
->ref_excludes
);
2761 } else if (skip_prefix(arg
, "--tags=", &optarg
)) {
2762 struct all_refs_cb cb
;
2763 if (revs
->ref_excludes
.hidden_refs_configured
)
2764 return error(_("--exclude-hidden cannot be used together with --tags"));
2765 init_all_refs_cb(&cb
, revs
, *flags
);
2766 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/tags/", &cb
);
2767 clear_ref_exclusions(&revs
->ref_excludes
);
2768 } else if (skip_prefix(arg
, "--remotes=", &optarg
)) {
2769 struct all_refs_cb cb
;
2770 if (revs
->ref_excludes
.hidden_refs_configured
)
2771 return error(_("--exclude-hidden cannot be used together with --remotes"));
2772 init_all_refs_cb(&cb
, revs
, *flags
);
2773 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/remotes/", &cb
);
2774 clear_ref_exclusions(&revs
->ref_excludes
);
2775 } else if (!strcmp(arg
, "--reflog")) {
2776 add_reflogs_to_pending(revs
, *flags
);
2777 } else if (!strcmp(arg
, "--indexed-objects")) {
2778 add_index_objects_to_pending(revs
, *flags
);
2779 } else if (!strcmp(arg
, "--alternate-refs")) {
2780 add_alternate_refs_to_pending(revs
, *flags
);
2781 } else if (!strcmp(arg
, "--not")) {
2782 *flags
^= UNINTERESTING
| BOTTOM
;
2783 } else if (!strcmp(arg
, "--no-walk")) {
2785 } else if (skip_prefix(arg
, "--no-walk=", &optarg
)) {
2787 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2788 * not allowed, since the argument is optional.
2791 if (!strcmp(optarg
, "sorted"))
2792 revs
->unsorted_input
= 0;
2793 else if (!strcmp(optarg
, "unsorted"))
2794 revs
->unsorted_input
= 1;
2796 return error("invalid argument to --no-walk");
2797 } else if (!strcmp(arg
, "--do-walk")) {
2799 } else if (!strcmp(arg
, "--single-worktree")) {
2800 revs
->single_worktree
= 1;
2801 } else if (skip_prefix(arg
, ("--filter="), &arg
)) {
2802 parse_list_objects_filter(&revs
->filter
, arg
);
2803 } else if (!strcmp(arg
, ("--no-filter"))) {
2804 list_objects_filter_set_no_filter(&revs
->filter
);
2812 static void NORETURN
diagnose_missing_default(const char *def
)
2815 const char *refname
;
2817 refname
= resolve_ref_unsafe(def
, 0, NULL
, &flags
);
2818 if (!refname
|| !(flags
& REF_ISSYMREF
) || (flags
& REF_ISBROKEN
))
2819 die(_("your current branch appears to be broken"));
2821 skip_prefix(refname
, "refs/heads/", &refname
);
2822 die(_("your current branch '%s' does not have any commits yet"),
2827 * Parse revision information, filling in the "rev_info" structure,
2828 * and removing the used arguments from the argument list.
2830 * Returns the number of arguments left that weren't recognized
2831 * (which are also moved to the head of the argument list)
2833 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
2835 int i
, flags
, left
, seen_dashdash
, revarg_opt
;
2836 struct strvec prune_data
= STRVEC_INIT
;
2837 int seen_end_of_options
= 0;
2839 /* First, search for "--" */
2840 if (opt
&& opt
->assume_dashdash
) {
2844 for (i
= 1; i
< argc
; i
++) {
2845 const char *arg
= argv
[i
];
2846 if (strcmp(arg
, "--"))
2848 if (opt
&& opt
->free_removed_argv_elements
)
2849 free((char *)argv
[i
]);
2853 strvec_pushv(&prune_data
, argv
+ i
+ 1);
2859 /* Second, deal with arguments and options */
2861 revarg_opt
= opt
? opt
->revarg_opt
: 0;
2863 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
2864 for (left
= i
= 1; i
< argc
; i
++) {
2865 const char *arg
= argv
[i
];
2866 if (!seen_end_of_options
&& *arg
== '-') {
2869 opts
= handle_revision_pseudo_opt(
2877 if (!strcmp(arg
, "--stdin")) {
2878 if (revs
->disable_stdin
) {
2882 if (revs
->read_from_stdin
++)
2883 die("--stdin given twice?");
2884 read_revisions_from_stdin(revs
, &prune_data
);
2888 if (!strcmp(arg
, "--end-of-options")) {
2889 seen_end_of_options
= 1;
2893 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
,
2905 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
2907 if (seen_dashdash
|| *arg
== '^')
2908 die("bad revision '%s'", arg
);
2910 /* If we didn't have a "--":
2911 * (1) all filenames must exist;
2912 * (2) all rev-args must not be interpretable
2913 * as a valid filename.
2914 * but the latter we have checked in the main loop.
2916 for (j
= i
; j
< argc
; j
++)
2917 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
2919 strvec_pushv(&prune_data
, argv
+ i
);
2923 revision_opts_finish(revs
);
2925 if (prune_data
.nr
) {
2927 * If we need to introduce the magic "a lone ':' means no
2928 * pathspec whatsoever", here is the place to do so.
2930 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2931 * prune_data.nr = 0;
2932 * prune_data.alloc = 0;
2933 * free(prune_data.path);
2934 * prune_data.path = NULL;
2936 * terminate prune_data.alloc with NULL and
2937 * call init_pathspec() to set revs->prune_data here.
2940 parse_pathspec(&revs
->prune_data
, 0, 0,
2941 revs
->prefix
, prune_data
.v
);
2943 strvec_clear(&prune_data
);
2946 revs
->def
= opt
? opt
->def
: NULL
;
2947 if (opt
&& opt
->tweak
)
2948 opt
->tweak(revs
, opt
);
2949 if (revs
->show_merge
)
2950 prepare_show_merge(revs
);
2951 if (revs
->def
&& !revs
->pending
.nr
&& !revs
->rev_input_given
) {
2952 struct object_id oid
;
2953 struct object
*object
;
2954 struct object_context oc
;
2955 if (get_oid_with_context(revs
->repo
, revs
->def
, 0, &oid
, &oc
))
2956 diagnose_missing_default(revs
->def
);
2957 object
= get_reference(revs
, revs
->def
, &oid
, 0);
2958 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
);
2961 /* Did the user ask for any diff output? Run the diff! */
2962 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
2965 /* Pickaxe, diff-filter and rename following need diffs */
2966 if ((revs
->diffopt
.pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
) ||
2967 revs
->diffopt
.filter
||
2968 revs
->diffopt
.flags
.follow_renames
)
2971 if (revs
->diffopt
.objfind
)
2972 revs
->simplify_history
= 0;
2974 if (revs
->line_level_traverse
) {
2975 if (want_ancestry(revs
))
2977 revs
->topo_order
= 1;
2980 if (revs
->topo_order
&& !generation_numbers_enabled(the_repository
))
2983 if (revs
->prune_data
.nr
) {
2984 copy_pathspec(&revs
->pruning
.pathspec
, &revs
->prune_data
);
2985 /* Can't prune commits with rename following: the paths change.. */
2986 if (!revs
->diffopt
.flags
.follow_renames
)
2988 if (!revs
->full_diff
)
2989 copy_pathspec(&revs
->diffopt
.pathspec
,
2993 diff_merges_setup_revs(revs
);
2995 revs
->diffopt
.abbrev
= revs
->abbrev
;
2997 diff_setup_done(&revs
->diffopt
);
2999 if (!is_encoding_utf8(get_log_output_encoding()))
3000 revs
->grep_filter
.ignore_locale
= 1;
3001 compile_grep_patterns(&revs
->grep_filter
);
3003 if (revs
->reverse
&& revs
->reflog_info
)
3004 die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--walk-reflogs");
3005 if (revs
->reflog_info
&& revs
->limited
)
3006 die("cannot combine --walk-reflogs with history-limiting options");
3007 if (revs
->rewrite_parents
&& revs
->children
.name
)
3008 die(_("options '%s' and '%s' cannot be used together"), "--parents", "--children");
3009 if (revs
->filter
.choice
&& !revs
->blob_objects
)
3010 die(_("object filtering requires --objects"));
3013 * Limitations on the graph functionality
3015 if (revs
->reverse
&& revs
->graph
)
3016 die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--graph");
3018 if (revs
->reflog_info
&& revs
->graph
)
3019 die(_("options '%s' and '%s' cannot be used together"), "--walk-reflogs", "--graph");
3020 if (revs
->no_walk
&& revs
->graph
)
3021 die(_("options '%s' and '%s' cannot be used together"), "--no-walk", "--graph");
3022 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
3023 die(_("the option '%s' requires '%s'"), "--grep-reflog", "--walk-reflogs");
3025 if (revs
->line_level_traverse
&&
3026 (revs
->diffopt
.output_format
& ~(DIFF_FORMAT_PATCH
| DIFF_FORMAT_NO_OUTPUT
)))
3027 die(_("-L does not yet support diff formats besides -p and -s"));
3029 if (revs
->expand_tabs_in_log
< 0)
3030 revs
->expand_tabs_in_log
= revs
->expand_tabs_in_log_default
;
3035 static void release_revisions_cmdline(struct rev_cmdline_info
*cmdline
)
3039 for (i
= 0; i
< cmdline
->nr
; i
++)
3040 free((char *)cmdline
->rev
[i
].name
);
3044 static void release_revisions_mailmap(struct string_list
*mailmap
)
3048 clear_mailmap(mailmap
);
3052 static void release_revisions_topo_walk_info(struct topo_walk_info
*info
);
3054 void release_revisions(struct rev_info
*revs
)
3056 free_commit_list(revs
->commits
);
3057 free_commit_list(revs
->ancestry_path_bottoms
);
3058 object_array_clear(&revs
->pending
);
3059 object_array_clear(&revs
->boundary_commits
);
3060 release_revisions_cmdline(&revs
->cmdline
);
3061 list_objects_filter_release(&revs
->filter
);
3062 clear_pathspec(&revs
->prune_data
);
3063 date_mode_release(&revs
->date_mode
);
3064 release_revisions_mailmap(revs
->mailmap
);
3065 free_grep_patterns(&revs
->grep_filter
);
3066 graph_clear(revs
->graph
);
3067 /* TODO (need to handle "no_free"): diff_free(&revs->diffopt) */
3068 diff_free(&revs
->pruning
);
3069 reflog_walk_info_release(revs
->reflog_info
);
3070 release_revisions_topo_walk_info(revs
->topo_walk_info
);
3073 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
3075 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
3078 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
3081 static int remove_duplicate_parents(struct rev_info
*revs
, struct commit
*commit
)
3083 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
3084 struct commit_list
**pp
, *p
;
3085 int surviving_parents
;
3087 /* Examine existing parents while marking ones we have seen... */
3088 pp
= &commit
->parents
;
3089 surviving_parents
= 0;
3090 while ((p
= *pp
) != NULL
) {
3091 struct commit
*parent
= p
->item
;
3092 if (parent
->object
.flags
& TMP_MARK
) {
3095 compact_treesame(revs
, commit
, surviving_parents
);
3098 parent
->object
.flags
|= TMP_MARK
;
3099 surviving_parents
++;
3102 /* clear the temporary mark */
3103 for (p
= commit
->parents
; p
; p
= p
->next
) {
3104 p
->item
->object
.flags
&= ~TMP_MARK
;
3106 /* no update_treesame() - removing duplicates can't affect TREESAME */
3107 return surviving_parents
;
3110 struct merge_simplify_state
{
3111 struct commit
*simplified
;
3114 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
3116 struct merge_simplify_state
*st
;
3118 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
3120 CALLOC_ARRAY(st
, 1);
3121 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
3126 static int mark_redundant_parents(struct commit
*commit
)
3128 struct commit_list
*h
= reduce_heads(commit
->parents
);
3129 int i
= 0, marked
= 0;
3130 struct commit_list
*po
, *pn
;
3132 /* Want these for sanity-checking only */
3133 int orig_cnt
= commit_list_count(commit
->parents
);
3134 int cnt
= commit_list_count(h
);
3137 * Not ready to remove items yet, just mark them for now, based
3138 * on the output of reduce_heads(). reduce_heads outputs the reduced
3139 * set in its original order, so this isn't too hard.
3141 po
= commit
->parents
;
3144 if (pn
&& po
->item
== pn
->item
) {
3148 po
->item
->object
.flags
|= TMP_MARK
;
3154 if (i
!= cnt
|| cnt
+marked
!= orig_cnt
)
3155 die("mark_redundant_parents %d %d %d %d", orig_cnt
, cnt
, i
, marked
);
3157 free_commit_list(h
);
3162 static int mark_treesame_root_parents(struct commit
*commit
)
3164 struct commit_list
*p
;
3167 for (p
= commit
->parents
; p
; p
= p
->next
) {
3168 struct commit
*parent
= p
->item
;
3169 if (!parent
->parents
&& (parent
->object
.flags
& TREESAME
)) {
3170 parent
->object
.flags
|= TMP_MARK
;
3179 * Awkward naming - this means one parent we are TREESAME to.
3180 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
3181 * empty tree). Better name suggestions?
3183 static int leave_one_treesame_to_parent(struct rev_info
*revs
, struct commit
*commit
)
3185 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
3186 struct commit
*unmarked
= NULL
, *marked
= NULL
;
3187 struct commit_list
*p
;
3190 for (p
= commit
->parents
, n
= 0; p
; p
= p
->next
, n
++) {
3191 if (ts
->treesame
[n
]) {
3192 if (p
->item
->object
.flags
& TMP_MARK
) {
3205 * If we are TREESAME to a marked-for-deletion parent, but not to any
3206 * unmarked parents, unmark the first TREESAME parent. This is the
3207 * parent that the default simplify_history==1 scan would have followed,
3208 * and it doesn't make sense to omit that path when asking for a
3209 * simplified full history. Retaining it improves the chances of
3210 * understanding odd missed merges that took an old version of a file.
3214 * I--------*X A modified the file, but mainline merge X used
3215 * \ / "-s ours", so took the version from I. X is
3216 * `-*A--' TREESAME to I and !TREESAME to A.
3218 * Default log from X would produce "I". Without this check,
3219 * --full-history --simplify-merges would produce "I-A-X", showing
3220 * the merge commit X and that it changed A, but not making clear that
3221 * it had just taken the I version. With this check, the topology above
3224 * Note that it is possible that the simplification chooses a different
3225 * TREESAME parent from the default, in which case this test doesn't
3226 * activate, and we _do_ drop the default parent. Example:
3228 * I------X A modified the file, but it was reverted in B,
3229 * \ / meaning mainline merge X is TREESAME to both
3232 * Default log would produce "I" by following the first parent;
3233 * --full-history --simplify-merges will produce "I-A-B". But this is a
3234 * reasonable result - it presents a logical full history leading from
3235 * I to X, and X is not an important merge.
3237 if (!unmarked
&& marked
) {
3238 marked
->object
.flags
&= ~TMP_MARK
;
3245 static int remove_marked_parents(struct rev_info
*revs
, struct commit
*commit
)
3247 struct commit_list
**pp
, *p
;
3248 int nth_parent
, removed
= 0;
3250 pp
= &commit
->parents
;
3252 while ((p
= *pp
) != NULL
) {
3253 struct commit
*parent
= p
->item
;
3254 if (parent
->object
.flags
& TMP_MARK
) {
3255 parent
->object
.flags
&= ~TMP_MARK
;
3259 compact_treesame(revs
, commit
, nth_parent
);
3266 /* Removing parents can only increase TREESAMEness */
3267 if (removed
&& !(commit
->object
.flags
& TREESAME
))
3268 update_treesame(revs
, commit
);
3273 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
3275 struct commit_list
*p
;
3276 struct commit
*parent
;
3277 struct merge_simplify_state
*st
, *pst
;
3280 st
= locate_simplify_state(revs
, commit
);
3283 * Have we handled this one?
3289 * An UNINTERESTING commit simplifies to itself, so does a
3290 * root commit. We do not rewrite parents of such commit
3293 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
3294 st
->simplified
= commit
;
3299 * Do we know what commit all of our parents that matter
3300 * should be rewritten to? Otherwise we are not ready to
3301 * rewrite this one yet.
3303 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
3304 pst
= locate_simplify_state(revs
, p
->item
);
3305 if (!pst
->simplified
) {
3306 tail
= &commit_list_insert(p
->item
, tail
)->next
;
3309 if (revs
->first_parent_only
)
3313 tail
= &commit_list_insert(commit
, tail
)->next
;
3318 * Rewrite our list of parents. Note that this cannot
3319 * affect our TREESAME flags in any way - a commit is
3320 * always TREESAME to its simplification.
3322 for (p
= commit
->parents
; p
; p
= p
->next
) {
3323 pst
= locate_simplify_state(revs
, p
->item
);
3324 p
->item
= pst
->simplified
;
3325 if (revs
->first_parent_only
)
3329 if (revs
->first_parent_only
)
3332 cnt
= remove_duplicate_parents(revs
, commit
);
3335 * It is possible that we are a merge and one side branch
3336 * does not have any commit that touches the given paths;
3337 * in such a case, the immediate parent from that branch
3338 * will be rewritten to be the merge base.
3340 * o----X X: the commit we are looking at;
3341 * / / o: a commit that touches the paths;
3344 * Further, a merge of an independent branch that doesn't
3345 * touch the path will reduce to a treesame root parent:
3347 * ----o----X X: the commit we are looking at;
3348 * / o: a commit that touches the paths;
3349 * r r: a root commit not touching the paths
3351 * Detect and simplify both cases.
3354 int marked
= mark_redundant_parents(commit
);
3355 marked
+= mark_treesame_root_parents(commit
);
3357 marked
-= leave_one_treesame_to_parent(revs
, commit
);
3359 cnt
= remove_marked_parents(revs
, commit
);
3363 * A commit simplifies to itself if it is a root, if it is
3364 * UNINTERESTING, if it touches the given paths, or if it is a
3365 * merge and its parents don't simplify to one relevant commit
3366 * (the first two cases are already handled at the beginning of
3369 * Otherwise, it simplifies to what its sole relevant parent
3373 (commit
->object
.flags
& UNINTERESTING
) ||
3374 !(commit
->object
.flags
& TREESAME
) ||
3375 (parent
= one_relevant_parent(revs
, commit
->parents
)) == NULL
||
3376 (revs
->show_pulls
&& (commit
->object
.flags
& PULL_MERGE
)))
3377 st
->simplified
= commit
;
3379 pst
= locate_simplify_state(revs
, parent
);
3380 st
->simplified
= pst
->simplified
;
3385 static void simplify_merges(struct rev_info
*revs
)
3387 struct commit_list
*list
, *next
;
3388 struct commit_list
*yet_to_do
, **tail
;
3389 struct commit
*commit
;
3394 /* feed the list reversed */
3396 for (list
= revs
->commits
; list
; list
= next
) {
3397 commit
= list
->item
;
3400 * Do not free(list) here yet; the original list
3401 * is used later in this function.
3403 commit_list_insert(commit
, &yet_to_do
);
3410 commit
= pop_commit(&list
);
3411 tail
= simplify_one(revs
, commit
, tail
);
3415 /* clean up the result, removing the simplified ones */
3416 list
= revs
->commits
;
3417 revs
->commits
= NULL
;
3418 tail
= &revs
->commits
;
3420 struct merge_simplify_state
*st
;
3422 commit
= pop_commit(&list
);
3423 st
= locate_simplify_state(revs
, commit
);
3424 if (st
->simplified
== commit
)
3425 tail
= &commit_list_insert(commit
, tail
)->next
;
3429 static void set_children(struct rev_info
*revs
)
3431 struct commit_list
*l
;
3432 for (l
= revs
->commits
; l
; l
= l
->next
) {
3433 struct commit
*commit
= l
->item
;
3434 struct commit_list
*p
;
3436 for (p
= commit
->parents
; p
; p
= p
->next
)
3437 add_child(revs
, p
->item
, commit
);
3441 void reset_revision_walk(void)
3443 clear_object_flags(SEEN
| ADDED
| SHOWN
| TOPO_WALK_EXPLORED
| TOPO_WALK_INDEGREE
);
3446 static int mark_uninteresting(const struct object_id
*oid
,
3447 struct packed_git
*pack UNUSED
,
3448 uint32_t pos UNUSED
,
3451 struct rev_info
*revs
= cb
;
3452 struct object
*o
= lookup_unknown_object(revs
->repo
, oid
);
3453 o
->flags
|= UNINTERESTING
| SEEN
;
3457 define_commit_slab(indegree_slab
, int);
3458 define_commit_slab(author_date_slab
, timestamp_t
);
3460 struct topo_walk_info
{
3461 timestamp_t min_generation
;
3462 struct prio_queue explore_queue
;
3463 struct prio_queue indegree_queue
;
3464 struct prio_queue topo_queue
;
3465 struct indegree_slab indegree
;
3466 struct author_date_slab author_date
;
3469 static int topo_walk_atexit_registered
;
3470 static unsigned int count_explore_walked
;
3471 static unsigned int count_indegree_walked
;
3472 static unsigned int count_topo_walked
;
3474 static void trace2_topo_walk_statistics_atexit(void)
3476 struct json_writer jw
= JSON_WRITER_INIT
;
3478 jw_object_begin(&jw
, 0);
3479 jw_object_intmax(&jw
, "count_explore_walked", count_explore_walked
);
3480 jw_object_intmax(&jw
, "count_indegree_walked", count_indegree_walked
);
3481 jw_object_intmax(&jw
, "count_topo_walked", count_topo_walked
);
3484 trace2_data_json("topo_walk", the_repository
, "statistics", &jw
);
3489 static inline void test_flag_and_insert(struct prio_queue
*q
, struct commit
*c
, int flag
)
3491 if (c
->object
.flags
& flag
)
3494 c
->object
.flags
|= flag
;
3495 prio_queue_put(q
, c
);
3498 static void explore_walk_step(struct rev_info
*revs
)
3500 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3501 struct commit_list
*p
;
3502 struct commit
*c
= prio_queue_get(&info
->explore_queue
);
3507 if (repo_parse_commit_gently(revs
->repo
, c
, 1) < 0)
3510 count_explore_walked
++;
3512 if (revs
->sort_order
== REV_SORT_BY_AUTHOR_DATE
)
3513 record_author_date(&info
->author_date
, c
);
3515 if (revs
->max_age
!= -1 && (c
->date
< revs
->max_age
))
3516 c
->object
.flags
|= UNINTERESTING
;
3518 if (process_parents(revs
, c
, NULL
, NULL
) < 0)
3521 if (c
->object
.flags
& UNINTERESTING
)
3522 mark_parents_uninteresting(revs
, c
);
3524 for (p
= c
->parents
; p
; p
= p
->next
)
3525 test_flag_and_insert(&info
->explore_queue
, p
->item
, TOPO_WALK_EXPLORED
);
3528 static void explore_to_depth(struct rev_info
*revs
,
3529 timestamp_t gen_cutoff
)
3531 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3533 while ((c
= prio_queue_peek(&info
->explore_queue
)) &&
3534 commit_graph_generation(c
) >= gen_cutoff
)
3535 explore_walk_step(revs
);
3538 static void indegree_walk_step(struct rev_info
*revs
)
3540 struct commit_list
*p
;
3541 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3542 struct commit
*c
= prio_queue_get(&info
->indegree_queue
);
3547 if (repo_parse_commit_gently(revs
->repo
, c
, 1) < 0)
3550 count_indegree_walked
++;
3552 explore_to_depth(revs
, commit_graph_generation(c
));
3554 for (p
= c
->parents
; p
; p
= p
->next
) {
3555 struct commit
*parent
= p
->item
;
3556 int *pi
= indegree_slab_at(&info
->indegree
, parent
);
3558 if (repo_parse_commit_gently(revs
->repo
, parent
, 1) < 0)
3566 test_flag_and_insert(&info
->indegree_queue
, parent
, TOPO_WALK_INDEGREE
);
3568 if (revs
->first_parent_only
)
3573 static void compute_indegrees_to_depth(struct rev_info
*revs
,
3574 timestamp_t gen_cutoff
)
3576 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3578 while ((c
= prio_queue_peek(&info
->indegree_queue
)) &&
3579 commit_graph_generation(c
) >= gen_cutoff
)
3580 indegree_walk_step(revs
);
3583 static void release_revisions_topo_walk_info(struct topo_walk_info
*info
)
3587 clear_prio_queue(&info
->explore_queue
);
3588 clear_prio_queue(&info
->indegree_queue
);
3589 clear_prio_queue(&info
->topo_queue
);
3590 clear_indegree_slab(&info
->indegree
);
3591 clear_author_date_slab(&info
->author_date
);
3595 static void reset_topo_walk(struct rev_info
*revs
)
3597 release_revisions_topo_walk_info(revs
->topo_walk_info
);
3598 revs
->topo_walk_info
= NULL
;
3601 static void init_topo_walk(struct rev_info
*revs
)
3603 struct topo_walk_info
*info
;
3604 struct commit_list
*list
;
3605 if (revs
->topo_walk_info
)
3606 reset_topo_walk(revs
);
3608 revs
->topo_walk_info
= xmalloc(sizeof(struct topo_walk_info
));
3609 info
= revs
->topo_walk_info
;
3610 memset(info
, 0, sizeof(struct topo_walk_info
));
3612 init_indegree_slab(&info
->indegree
);
3613 memset(&info
->explore_queue
, 0, sizeof(info
->explore_queue
));
3614 memset(&info
->indegree_queue
, 0, sizeof(info
->indegree_queue
));
3615 memset(&info
->topo_queue
, 0, sizeof(info
->topo_queue
));
3617 switch (revs
->sort_order
) {
3618 default: /* REV_SORT_IN_GRAPH_ORDER */
3619 info
->topo_queue
.compare
= NULL
;
3621 case REV_SORT_BY_COMMIT_DATE
:
3622 info
->topo_queue
.compare
= compare_commits_by_commit_date
;
3624 case REV_SORT_BY_AUTHOR_DATE
:
3625 init_author_date_slab(&info
->author_date
);
3626 info
->topo_queue
.compare
= compare_commits_by_author_date
;
3627 info
->topo_queue
.cb_data
= &info
->author_date
;
3631 info
->explore_queue
.compare
= compare_commits_by_gen_then_commit_date
;
3632 info
->indegree_queue
.compare
= compare_commits_by_gen_then_commit_date
;
3634 info
->min_generation
= GENERATION_NUMBER_INFINITY
;
3635 for (list
= revs
->commits
; list
; list
= list
->next
) {
3636 struct commit
*c
= list
->item
;
3637 timestamp_t generation
;
3639 if (repo_parse_commit_gently(revs
->repo
, c
, 1))
3642 test_flag_and_insert(&info
->explore_queue
, c
, TOPO_WALK_EXPLORED
);
3643 test_flag_and_insert(&info
->indegree_queue
, c
, TOPO_WALK_INDEGREE
);
3645 generation
= commit_graph_generation(c
);
3646 if (generation
< info
->min_generation
)
3647 info
->min_generation
= generation
;
3649 *(indegree_slab_at(&info
->indegree
, c
)) = 1;
3651 if (revs
->sort_order
== REV_SORT_BY_AUTHOR_DATE
)
3652 record_author_date(&info
->author_date
, c
);
3654 compute_indegrees_to_depth(revs
, info
->min_generation
);
3656 for (list
= revs
->commits
; list
; list
= list
->next
) {
3657 struct commit
*c
= list
->item
;
3659 if (*(indegree_slab_at(&info
->indegree
, c
)) == 1)
3660 prio_queue_put(&info
->topo_queue
, c
);
3664 * This is unfortunate; the initial tips need to be shown
3665 * in the order given from the revision traversal machinery.
3667 if (revs
->sort_order
== REV_SORT_IN_GRAPH_ORDER
)
3668 prio_queue_reverse(&info
->topo_queue
);
3670 if (trace2_is_enabled() && !topo_walk_atexit_registered
) {
3671 atexit(trace2_topo_walk_statistics_atexit
);
3672 topo_walk_atexit_registered
= 1;
3676 static struct commit
*next_topo_commit(struct rev_info
*revs
)
3679 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3681 /* pop next off of topo_queue */
3682 c
= prio_queue_get(&info
->topo_queue
);
3685 *(indegree_slab_at(&info
->indegree
, c
)) = 0;
3690 static void expand_topo_walk(struct rev_info
*revs
, struct commit
*commit
)
3692 struct commit_list
*p
;
3693 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3694 if (process_parents(revs
, commit
, NULL
, NULL
) < 0) {
3695 if (!revs
->ignore_missing_links
)
3696 die("Failed to traverse parents of commit %s",
3697 oid_to_hex(&commit
->object
.oid
));
3700 count_topo_walked
++;
3702 for (p
= commit
->parents
; p
; p
= p
->next
) {
3703 struct commit
*parent
= p
->item
;
3705 timestamp_t generation
;
3707 if (parent
->object
.flags
& UNINTERESTING
)
3710 if (repo_parse_commit_gently(revs
->repo
, parent
, 1) < 0)
3713 generation
= commit_graph_generation(parent
);
3714 if (generation
< info
->min_generation
) {
3715 info
->min_generation
= generation
;
3716 compute_indegrees_to_depth(revs
, info
->min_generation
);
3719 pi
= indegree_slab_at(&info
->indegree
, parent
);
3723 prio_queue_put(&info
->topo_queue
, parent
);
3725 if (revs
->first_parent_only
)
3730 int prepare_revision_walk(struct rev_info
*revs
)
3733 struct object_array old_pending
;
3734 struct commit_list
**next
= &revs
->commits
;
3736 memcpy(&old_pending
, &revs
->pending
, sizeof(old_pending
));
3737 revs
->pending
.nr
= 0;
3738 revs
->pending
.alloc
= 0;
3739 revs
->pending
.objects
= NULL
;
3740 for (i
= 0; i
< old_pending
.nr
; i
++) {
3741 struct object_array_entry
*e
= old_pending
.objects
+ i
;
3742 struct commit
*commit
= handle_commit(revs
, e
);
3744 if (!(commit
->object
.flags
& SEEN
)) {
3745 commit
->object
.flags
|= SEEN
;
3746 next
= commit_list_append(commit
, next
);
3750 object_array_clear(&old_pending
);
3752 /* Signal whether we need per-parent treesame decoration */
3753 if (revs
->simplify_merges
||
3754 (revs
->limited
&& limiting_can_increase_treesame(revs
)))
3755 revs
->treesame
.name
= "treesame";
3757 if (revs
->exclude_promisor_objects
) {
3758 for_each_packed_object(mark_uninteresting
, revs
,
3759 FOR_EACH_OBJECT_PROMISOR_ONLY
);
3762 if (!revs
->reflog_info
)
3763 prepare_to_use_bloom_filter(revs
);
3764 if (!revs
->unsorted_input
)
3765 commit_list_sort_by_date(&revs
->commits
);
3768 if (revs
->limited
) {
3769 if (limit_list(revs
) < 0)
3771 if (revs
->topo_order
)
3772 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
3773 } else if (revs
->topo_order
)
3774 init_topo_walk(revs
);
3775 if (revs
->line_level_traverse
&& want_ancestry(revs
))
3777 * At the moment we can only do line-level log with parent
3778 * rewriting by performing this expensive pre-filtering step.
3779 * If parent rewriting is not requested, then we rather
3780 * perform the line-level log filtering during the regular
3781 * history traversal.
3783 line_log_filter(revs
);
3784 if (revs
->simplify_merges
)
3785 simplify_merges(revs
);
3786 if (revs
->children
.name
)
3792 static enum rewrite_result
rewrite_one_1(struct rev_info
*revs
,
3794 struct prio_queue
*queue
)
3797 struct commit
*p
= *pp
;
3799 if (process_parents(revs
, p
, NULL
, queue
) < 0)
3800 return rewrite_one_error
;
3801 if (p
->object
.flags
& UNINTERESTING
)
3802 return rewrite_one_ok
;
3803 if (!(p
->object
.flags
& TREESAME
))
3804 return rewrite_one_ok
;
3806 return rewrite_one_noparents
;
3807 if (!(p
= one_relevant_parent(revs
, p
->parents
)))
3808 return rewrite_one_ok
;
3813 static void merge_queue_into_list(struct prio_queue
*q
, struct commit_list
**list
)
3816 struct commit
*item
= prio_queue_peek(q
);
3817 struct commit_list
*p
= *list
;
3819 if (p
&& p
->item
->date
>= item
->date
)
3822 p
= commit_list_insert(item
, list
);
3823 list
= &p
->next
; /* skip newly added item */
3824 prio_queue_get(q
); /* pop item */
3829 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
3831 struct prio_queue queue
= { compare_commits_by_commit_date
};
3832 enum rewrite_result ret
= rewrite_one_1(revs
, pp
, &queue
);
3833 merge_queue_into_list(&queue
, &revs
->commits
);
3834 clear_prio_queue(&queue
);
3838 int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
,
3839 rewrite_parent_fn_t rewrite_parent
)
3841 struct commit_list
**pp
= &commit
->parents
;
3843 struct commit_list
*parent
= *pp
;
3844 switch (rewrite_parent(revs
, &parent
->item
)) {
3845 case rewrite_one_ok
:
3847 case rewrite_one_noparents
:
3850 case rewrite_one_error
:
3855 remove_duplicate_parents(revs
, commit
);
3859 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
3862 const char *encoding
;
3863 const char *message
;
3864 struct strbuf buf
= STRBUF_INIT
;
3866 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
3869 /* Prepend "fake" headers as needed */
3870 if (opt
->grep_filter
.use_reflog_filter
) {
3871 strbuf_addstr(&buf
, "reflog ");
3872 get_reflog_message(&buf
, opt
->reflog_info
);
3873 strbuf_addch(&buf
, '\n');
3877 * We grep in the user's output encoding, under the assumption that it
3878 * is the encoding they are most likely to write their grep pattern
3879 * for. In addition, it means we will match the "notes" encoding below,
3880 * so we will not end up with a buffer that has two different encodings
3883 encoding
= get_log_output_encoding();
3884 message
= logmsg_reencode(commit
, NULL
, encoding
);
3886 /* Copy the commit to temporary if we are using "fake" headers */
3888 strbuf_addstr(&buf
, message
);
3890 if (opt
->grep_filter
.header_list
&& opt
->mailmap
) {
3891 const char *commit_headers
[] = { "author ", "committer ", NULL
};
3894 strbuf_addstr(&buf
, message
);
3896 apply_mailmap_to_header(&buf
, commit_headers
, opt
->mailmap
);
3899 /* Append "fake" message parts as needed */
3900 if (opt
->show_notes
) {
3902 strbuf_addstr(&buf
, message
);
3903 format_display_notes(&commit
->object
.oid
, &buf
, encoding
, 1);
3907 * Find either in the original commit message, or in the temporary.
3908 * Note that we cast away the constness of "message" here. It is
3909 * const because it may come from the cached commit buffer. That's OK,
3910 * because we know that it is modifiable heap memory, and that while
3911 * grep_buffer may modify it for speed, it will restore any
3912 * changes before returning.
3915 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
3917 retval
= grep_buffer(&opt
->grep_filter
,
3918 (char *)message
, strlen(message
));
3919 strbuf_release(&buf
);
3920 unuse_commit_buffer(commit
, message
);
3924 static inline int want_ancestry(const struct rev_info
*revs
)
3926 return (revs
->rewrite_parents
|| revs
->children
.name
);
3930 * Return a timestamp to be used for --since/--until comparisons for this
3931 * commit, based on the revision options.
3933 static timestamp_t
comparison_date(const struct rev_info
*revs
,
3934 struct commit
*commit
)
3936 return revs
->reflog_info
?
3937 get_reflog_timestamp(revs
->reflog_info
) :
3941 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
3943 if (commit
->object
.flags
& SHOWN
)
3944 return commit_ignore
;
3945 if (revs
->unpacked
&& has_object_pack(&commit
->object
.oid
))
3946 return commit_ignore
;
3947 if (revs
->no_kept_objects
) {
3948 if (has_object_kept_pack(&commit
->object
.oid
,
3949 revs
->keep_pack_cache_flags
))
3950 return commit_ignore
;
3952 if (commit
->object
.flags
& UNINTERESTING
)
3953 return commit_ignore
;
3954 if (revs
->line_level_traverse
&& !want_ancestry(revs
)) {
3956 * In case of line-level log with parent rewriting
3957 * prepare_revision_walk() already took care of all line-level
3958 * log filtering, and there is nothing left to do here.
3960 * If parent rewriting was not requested, then this is the
3961 * place to perform the line-level log filtering. Notably,
3962 * this check, though expensive, must come before the other,
3963 * cheaper filtering conditions, because the tracked line
3964 * ranges must be adjusted even when the commit will end up
3965 * being ignored based on other conditions.
3967 if (!line_log_process_ranges_arbitrary_commit(revs
, commit
))
3968 return commit_ignore
;
3970 if (revs
->min_age
!= -1 &&
3971 comparison_date(revs
, commit
) > revs
->min_age
)
3972 return commit_ignore
;
3973 if (revs
->max_age_as_filter
!= -1 &&
3974 comparison_date(revs
, commit
) < revs
->max_age_as_filter
)
3975 return commit_ignore
;
3976 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
3977 int n
= commit_list_count(commit
->parents
);
3978 if ((n
< revs
->min_parents
) ||
3979 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
3980 return commit_ignore
;
3982 if (!commit_match(commit
, revs
))
3983 return commit_ignore
;
3984 if (revs
->prune
&& revs
->dense
) {
3985 /* Commit without changes? */
3986 if (commit
->object
.flags
& TREESAME
) {
3988 struct commit_list
*p
;
3989 /* drop merges unless we want parenthood */
3990 if (!want_ancestry(revs
))
3991 return commit_ignore
;
3993 if (revs
->show_pulls
&& (commit
->object
.flags
& PULL_MERGE
))
3997 * If we want ancestry, then need to keep any merges
3998 * between relevant commits to tie together topology.
3999 * For consistency with TREESAME and simplification
4000 * use "relevant" here rather than just INTERESTING,
4001 * to treat bottom commit(s) as part of the topology.
4003 for (n
= 0, p
= commit
->parents
; p
; p
= p
->next
)
4004 if (relevant_commit(p
->item
))
4007 return commit_ignore
;
4013 define_commit_slab(saved_parents
, struct commit_list
*);
4015 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
4018 * You may only call save_parents() once per commit (this is checked
4019 * for non-root commits).
4021 static void save_parents(struct rev_info
*revs
, struct commit
*commit
)
4023 struct commit_list
**pp
;
4025 if (!revs
->saved_parents_slab
) {
4026 revs
->saved_parents_slab
= xmalloc(sizeof(struct saved_parents
));
4027 init_saved_parents(revs
->saved_parents_slab
);
4030 pp
= saved_parents_at(revs
->saved_parents_slab
, commit
);
4033 * When walking with reflogs, we may visit the same commit
4034 * several times: once for each appearance in the reflog.
4036 * In this case, save_parents() will be called multiple times.
4037 * We want to keep only the first set of parents. We need to
4038 * store a sentinel value for an empty (i.e., NULL) parent
4039 * list to distinguish it from a not-yet-saved list, however.
4043 if (commit
->parents
)
4044 *pp
= copy_commit_list(commit
->parents
);
4046 *pp
= EMPTY_PARENT_LIST
;
4049 static void free_saved_parents(struct rev_info
*revs
)
4051 if (revs
->saved_parents_slab
)
4052 clear_saved_parents(revs
->saved_parents_slab
);
4055 struct commit_list
*get_saved_parents(struct rev_info
*revs
, const struct commit
*commit
)
4057 struct commit_list
*parents
;
4059 if (!revs
->saved_parents_slab
)
4060 return commit
->parents
;
4062 parents
= *saved_parents_at(revs
->saved_parents_slab
, commit
);
4063 if (parents
== EMPTY_PARENT_LIST
)
4068 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
4070 enum commit_action action
= get_commit_action(revs
, commit
);
4072 if (action
== commit_show
&&
4073 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
4075 * --full-diff on simplified parents is no good: it
4076 * will show spurious changes from the commits that
4077 * were elided. So we save the parents on the side
4078 * when --full-diff is in effect.
4080 if (revs
->full_diff
)
4081 save_parents(revs
, commit
);
4082 if (rewrite_parents(revs
, commit
, rewrite_one
) < 0)
4083 return commit_error
;
4088 static void track_linear(struct rev_info
*revs
, struct commit
*commit
)
4090 if (revs
->track_first_time
) {
4092 revs
->track_first_time
= 0;
4094 struct commit_list
*p
;
4095 for (p
= revs
->previous_parents
; p
; p
= p
->next
)
4096 if (p
->item
== NULL
|| /* first commit */
4097 oideq(&p
->item
->object
.oid
, &commit
->object
.oid
))
4099 revs
->linear
= p
!= NULL
;
4101 if (revs
->reverse
) {
4103 commit
->object
.flags
|= TRACK_LINEAR
;
4105 free_commit_list(revs
->previous_parents
);
4106 revs
->previous_parents
= copy_commit_list(commit
->parents
);
4109 static struct commit
*get_revision_1(struct rev_info
*revs
)
4112 struct commit
*commit
;
4114 if (revs
->reflog_info
)
4115 commit
= next_reflog_entry(revs
->reflog_info
);
4116 else if (revs
->topo_walk_info
)
4117 commit
= next_topo_commit(revs
);
4119 commit
= pop_commit(&revs
->commits
);
4124 if (revs
->reflog_info
)
4125 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
4128 * If we haven't done the list limiting, we need to look at
4129 * the parents here. We also need to do the date-based limiting
4130 * that we'd otherwise have done in limit_list().
4132 if (!revs
->limited
) {
4133 if (revs
->max_age
!= -1 &&
4134 comparison_date(revs
, commit
) < revs
->max_age
)
4137 if (revs
->reflog_info
)
4138 try_to_simplify_commit(revs
, commit
);
4139 else if (revs
->topo_walk_info
)
4140 expand_topo_walk(revs
, commit
);
4141 else if (process_parents(revs
, commit
, &revs
->commits
, NULL
) < 0) {
4142 if (!revs
->ignore_missing_links
)
4143 die("Failed to traverse parents of commit %s",
4144 oid_to_hex(&commit
->object
.oid
));
4148 switch (simplify_commit(revs
, commit
)) {
4152 die("Failed to simplify parents of commit %s",
4153 oid_to_hex(&commit
->object
.oid
));
4155 if (revs
->track_linear
)
4156 track_linear(revs
, commit
);
4163 * Return true for entries that have not yet been shown. (This is an
4164 * object_array_each_func_t.)
4166 static int entry_unshown(struct object_array_entry
*entry
, void *cb_data UNUSED
)
4168 return !(entry
->item
->flags
& SHOWN
);
4172 * If array is on the verge of a realloc, garbage-collect any entries
4173 * that have already been shown to try to free up some space.
4175 static void gc_boundary(struct object_array
*array
)
4177 if (array
->nr
== array
->alloc
)
4178 object_array_filter(array
, entry_unshown
, NULL
);
4181 static void create_boundary_commit_list(struct rev_info
*revs
)
4185 struct object_array
*array
= &revs
->boundary_commits
;
4186 struct object_array_entry
*objects
= array
->objects
;
4189 * If revs->commits is non-NULL at this point, an error occurred in
4190 * get_revision_1(). Ignore the error and continue printing the
4191 * boundary commits anyway. (This is what the code has always
4194 free_commit_list(revs
->commits
);
4195 revs
->commits
= NULL
;
4198 * Put all of the actual boundary commits from revs->boundary_commits
4199 * into revs->commits
4201 for (i
= 0; i
< array
->nr
; i
++) {
4202 c
= (struct commit
*)(objects
[i
].item
);
4205 if (!(c
->object
.flags
& CHILD_SHOWN
))
4207 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
4209 c
->object
.flags
|= BOUNDARY
;
4210 commit_list_insert(c
, &revs
->commits
);
4214 * If revs->topo_order is set, sort the boundary commits
4215 * in topological order
4217 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
4220 static struct commit
*get_revision_internal(struct rev_info
*revs
)
4222 struct commit
*c
= NULL
;
4223 struct commit_list
*l
;
4225 if (revs
->boundary
== 2) {
4227 * All of the normal commits have already been returned,
4228 * and we are now returning boundary commits.
4229 * create_boundary_commit_list() has populated
4230 * revs->commits with the remaining commits to return.
4232 c
= pop_commit(&revs
->commits
);
4234 c
->object
.flags
|= SHOWN
;
4239 * If our max_count counter has reached zero, then we are done. We
4240 * don't simply return NULL because we still might need to show
4241 * boundary commits. But we want to avoid calling get_revision_1, which
4242 * might do a considerable amount of work finding the next commit only
4243 * for us to throw it away.
4245 * If it is non-zero, then either we don't have a max_count at all
4246 * (-1), or it is still counting, in which case we decrement.
4248 if (revs
->max_count
) {
4249 c
= get_revision_1(revs
);
4251 while (revs
->skip_count
> 0) {
4253 c
= get_revision_1(revs
);
4259 if (revs
->max_count
> 0)
4264 c
->object
.flags
|= SHOWN
;
4266 if (!revs
->boundary
)
4271 * get_revision_1() runs out the commits, and
4272 * we are done computing the boundaries.
4273 * switch to boundary commits output mode.
4278 * Update revs->commits to contain the list of
4281 create_boundary_commit_list(revs
);
4283 return get_revision_internal(revs
);
4287 * boundary commits are the commits that are parents of the
4288 * ones we got from get_revision_1() but they themselves are
4289 * not returned from get_revision_1(). Before returning
4290 * 'c', we need to mark its parents that they could be boundaries.
4293 for (l
= c
->parents
; l
; l
= l
->next
) {
4295 p
= &(l
->item
->object
);
4296 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
4298 p
->flags
|= CHILD_SHOWN
;
4299 gc_boundary(&revs
->boundary_commits
);
4300 add_object_array(p
, NULL
, &revs
->boundary_commits
);
4306 struct commit
*get_revision(struct rev_info
*revs
)
4309 struct commit_list
*reversed
;
4311 if (revs
->reverse
) {
4313 while ((c
= get_revision_internal(revs
)))
4314 commit_list_insert(c
, &reversed
);
4315 revs
->commits
= reversed
;
4317 revs
->reverse_output_stage
= 1;
4320 if (revs
->reverse_output_stage
) {
4321 c
= pop_commit(&revs
->commits
);
4322 if (revs
->track_linear
)
4323 revs
->linear
= !!(c
&& c
->object
.flags
& TRACK_LINEAR
);
4327 c
= get_revision_internal(revs
);
4328 if (c
&& revs
->graph
)
4329 graph_update(revs
->graph
, c
);
4331 free_saved_parents(revs
);
4332 free_commit_list(revs
->previous_parents
);
4333 revs
->previous_parents
= NULL
;
4338 const char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
4340 if (commit
->object
.flags
& BOUNDARY
)
4342 else if (commit
->object
.flags
& UNINTERESTING
)
4344 else if (commit
->object
.flags
& PATCHSAME
)
4346 else if (!revs
|| revs
->left_right
) {
4347 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
4351 } else if (revs
->graph
)
4353 else if (revs
->cherry_mark
)
4358 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
4360 const char *mark
= get_revision_mark(revs
, commit
);
4363 fputs(mark
, stdout
);