2 #include "object-store.h"
8 #include "diff-merges.h"
11 #include "repository.h"
14 #include "reflog-walk.h"
15 #include "patch-ids.h"
18 #include "string-list.h"
21 #include "commit-slab.h"
23 #include "cache-tree.h"
28 #include "commit-reach.h"
29 #include "commit-graph.h"
30 #include "prio-queue.h"
34 #include "json-writer.h"
36 volatile show_early_output_fn_t show_early_output
;
38 static const char *term_bad
;
39 static const char *term_good
;
41 implement_shared_commit_slab(revision_sources
, char *);
43 static inline int want_ancestry(const struct rev_info
*revs
);
45 void show_object_with_name(FILE *out
, struct object
*obj
, const char *name
)
49 fprintf(out
, "%s ", oid_to_hex(&obj
->oid
));
50 for (p
= name
; *p
&& *p
!= '\n'; p
++)
55 static void mark_blob_uninteresting(struct blob
*blob
)
59 if (blob
->object
.flags
& UNINTERESTING
)
61 blob
->object
.flags
|= UNINTERESTING
;
64 static void mark_tree_contents_uninteresting(struct repository
*r
,
67 struct tree_desc desc
;
68 struct name_entry entry
;
70 if (parse_tree_gently(tree
, 1) < 0)
73 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
74 while (tree_entry(&desc
, &entry
)) {
75 switch (object_type(entry
.mode
)) {
77 mark_tree_uninteresting(r
, lookup_tree(r
, &entry
.oid
));
80 mark_blob_uninteresting(lookup_blob(r
, &entry
.oid
));
83 /* Subproject commit - not in this repository */
89 * We don't care about the tree any more
90 * after it has been marked uninteresting.
92 free_tree_buffer(tree
);
95 void mark_tree_uninteresting(struct repository
*r
, struct tree
*tree
)
103 if (obj
->flags
& UNINTERESTING
)
105 obj
->flags
|= UNINTERESTING
;
106 mark_tree_contents_uninteresting(r
, tree
);
109 struct path_and_oids_entry
{
110 struct hashmap_entry ent
;
115 static int path_and_oids_cmp(const void *hashmap_cmp_fn_data
,
116 const struct hashmap_entry
*eptr
,
117 const struct hashmap_entry
*entry_or_key
,
120 const struct path_and_oids_entry
*e1
, *e2
;
122 e1
= container_of(eptr
, const struct path_and_oids_entry
, ent
);
123 e2
= container_of(entry_or_key
, const struct path_and_oids_entry
, ent
);
125 return strcmp(e1
->path
, e2
->path
);
128 static void paths_and_oids_clear(struct hashmap
*map
)
130 struct hashmap_iter iter
;
131 struct path_and_oids_entry
*entry
;
133 hashmap_for_each_entry(map
, &iter
, entry
, ent
/* member name */) {
134 oidset_clear(&entry
->trees
);
138 hashmap_clear_and_free(map
, struct path_and_oids_entry
, ent
);
141 static void paths_and_oids_insert(struct hashmap
*map
,
143 const struct object_id
*oid
)
145 int hash
= strhash(path
);
146 struct path_and_oids_entry key
;
147 struct path_and_oids_entry
*entry
;
149 hashmap_entry_init(&key
.ent
, hash
);
151 /* use a shallow copy for the lookup */
152 key
.path
= (char *)path
;
153 oidset_init(&key
.trees
, 0);
155 entry
= hashmap_get_entry(map
, &key
, ent
, NULL
);
157 CALLOC_ARRAY(entry
, 1);
158 hashmap_entry_init(&entry
->ent
, hash
);
159 entry
->path
= xstrdup(key
.path
);
160 oidset_init(&entry
->trees
, 16);
161 hashmap_put(map
, &entry
->ent
);
164 oidset_insert(&entry
->trees
, oid
);
167 static void add_children_by_path(struct repository
*r
,
171 struct tree_desc desc
;
172 struct name_entry entry
;
177 if (parse_tree_gently(tree
, 1) < 0)
180 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
181 while (tree_entry(&desc
, &entry
)) {
182 switch (object_type(entry
.mode
)) {
184 paths_and_oids_insert(map
, entry
.path
, &entry
.oid
);
186 if (tree
->object
.flags
& UNINTERESTING
) {
187 struct tree
*child
= lookup_tree(r
, &entry
.oid
);
189 child
->object
.flags
|= UNINTERESTING
;
193 if (tree
->object
.flags
& UNINTERESTING
) {
194 struct blob
*child
= lookup_blob(r
, &entry
.oid
);
196 child
->object
.flags
|= UNINTERESTING
;
200 /* Subproject commit - not in this repository */
205 free_tree_buffer(tree
);
208 void mark_trees_uninteresting_sparse(struct repository
*r
,
209 struct oidset
*trees
)
211 unsigned has_interesting
= 0, has_uninteresting
= 0;
212 struct hashmap map
= HASHMAP_INIT(path_and_oids_cmp
, NULL
);
213 struct hashmap_iter map_iter
;
214 struct path_and_oids_entry
*entry
;
215 struct object_id
*oid
;
216 struct oidset_iter iter
;
218 oidset_iter_init(trees
, &iter
);
219 while ((!has_interesting
|| !has_uninteresting
) &&
220 (oid
= oidset_iter_next(&iter
))) {
221 struct tree
*tree
= lookup_tree(r
, oid
);
226 if (tree
->object
.flags
& UNINTERESTING
)
227 has_uninteresting
= 1;
232 /* Do not walk unless we have both types of trees. */
233 if (!has_uninteresting
|| !has_interesting
)
236 oidset_iter_init(trees
, &iter
);
237 while ((oid
= oidset_iter_next(&iter
))) {
238 struct tree
*tree
= lookup_tree(r
, oid
);
239 add_children_by_path(r
, tree
, &map
);
242 hashmap_for_each_entry(&map
, &map_iter
, entry
, ent
/* member name */)
243 mark_trees_uninteresting_sparse(r
, &entry
->trees
);
245 paths_and_oids_clear(&map
);
248 struct commit_stack
{
249 struct commit
**items
;
252 #define COMMIT_STACK_INIT { NULL, 0, 0 }
254 static void commit_stack_push(struct commit_stack
*stack
, struct commit
*commit
)
256 ALLOC_GROW(stack
->items
, stack
->nr
+ 1, stack
->alloc
);
257 stack
->items
[stack
->nr
++] = commit
;
260 static struct commit
*commit_stack_pop(struct commit_stack
*stack
)
262 return stack
->nr
? stack
->items
[--stack
->nr
] : NULL
;
265 static void commit_stack_clear(struct commit_stack
*stack
)
267 FREE_AND_NULL(stack
->items
);
268 stack
->nr
= stack
->alloc
= 0;
271 static void mark_one_parent_uninteresting(struct commit
*commit
,
272 struct commit_stack
*pending
)
274 struct commit_list
*l
;
276 if (commit
->object
.flags
& UNINTERESTING
)
278 commit
->object
.flags
|= UNINTERESTING
;
281 * Normally we haven't parsed the parent
282 * yet, so we won't have a parent of a parent
283 * here. However, it may turn out that we've
284 * reached this commit some other way (where it
285 * wasn't uninteresting), in which case we need
286 * to mark its parents recursively too..
288 for (l
= commit
->parents
; l
; l
= l
->next
)
289 commit_stack_push(pending
, l
->item
);
292 void mark_parents_uninteresting(struct commit
*commit
)
294 struct commit_stack pending
= COMMIT_STACK_INIT
;
295 struct commit_list
*l
;
297 for (l
= commit
->parents
; l
; l
= l
->next
)
298 mark_one_parent_uninteresting(l
->item
, &pending
);
300 while (pending
.nr
> 0)
301 mark_one_parent_uninteresting(commit_stack_pop(&pending
),
304 commit_stack_clear(&pending
);
307 static void add_pending_object_with_path(struct rev_info
*revs
,
309 const char *name
, unsigned mode
,
312 struct interpret_branch_name_options options
= { 0 };
315 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
317 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
318 struct strbuf buf
= STRBUF_INIT
;
319 size_t namelen
= strlen(name
);
320 int len
= interpret_branch_name(name
, namelen
, &buf
, &options
);
322 if (0 < len
&& len
< namelen
&& buf
.len
)
323 strbuf_addstr(&buf
, name
+ len
);
324 add_reflog_for_walk(revs
->reflog_info
,
325 (struct commit
*)obj
,
326 buf
.buf
[0] ? buf
.buf
: name
);
327 strbuf_release(&buf
);
328 return; /* do not add the commit itself */
330 add_object_array_with_path(obj
, name
, &revs
->pending
, mode
, path
);
333 static void add_pending_object_with_mode(struct rev_info
*revs
,
335 const char *name
, unsigned mode
)
337 add_pending_object_with_path(revs
, obj
, name
, mode
, NULL
);
340 void add_pending_object(struct rev_info
*revs
,
341 struct object
*obj
, const char *name
)
343 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
346 void add_head_to_pending(struct rev_info
*revs
)
348 struct object_id oid
;
350 if (get_oid("HEAD", &oid
))
352 obj
= parse_object(revs
->repo
, &oid
);
355 add_pending_object(revs
, obj
, "HEAD");
358 static struct object
*get_reference(struct rev_info
*revs
, const char *name
,
359 const struct object_id
*oid
,
362 struct object
*object
;
365 * If the repository has commit graphs, repo_parse_commit() avoids
366 * reading the object buffer, so use it whenever possible.
368 if (oid_object_info(revs
->repo
, oid
, NULL
) == OBJ_COMMIT
) {
369 struct commit
*c
= lookup_commit(revs
->repo
, oid
);
370 if (!repo_parse_commit(revs
->repo
, c
))
371 object
= (struct object
*) c
;
375 object
= parse_object(revs
->repo
, oid
);
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(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 static int tree_difference
= REV_TREE_SAME
;
601 static void file_add_remove(struct diff_options
*options
,
602 int addremove
, unsigned mode
,
603 const struct object_id
*oid
,
605 const char *fullpath
, unsigned dirty_submodule
)
607 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
608 struct rev_info
*revs
= options
->change_fn_data
;
610 tree_difference
|= diff
;
611 if (!revs
->remove_empty_trees
|| tree_difference
!= REV_TREE_NEW
)
612 options
->flags
.has_changes
= 1;
615 static void file_change(struct diff_options
*options
,
616 unsigned old_mode
, unsigned new_mode
,
617 const struct object_id
*old_oid
,
618 const struct object_id
*new_oid
,
619 int old_oid_valid
, int new_oid_valid
,
620 const char *fullpath
,
621 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
623 tree_difference
= REV_TREE_DIFFERENT
;
624 options
->flags
.has_changes
= 1;
627 static int bloom_filter_atexit_registered
;
628 static unsigned int count_bloom_filter_maybe
;
629 static unsigned int count_bloom_filter_definitely_not
;
630 static unsigned int count_bloom_filter_false_positive
;
631 static unsigned int count_bloom_filter_not_present
;
633 static void trace2_bloom_filter_statistics_atexit(void)
635 struct json_writer jw
= JSON_WRITER_INIT
;
637 jw_object_begin(&jw
, 0);
638 jw_object_intmax(&jw
, "filter_not_present", count_bloom_filter_not_present
);
639 jw_object_intmax(&jw
, "maybe", count_bloom_filter_maybe
);
640 jw_object_intmax(&jw
, "definitely_not", count_bloom_filter_definitely_not
);
641 jw_object_intmax(&jw
, "false_positive", count_bloom_filter_false_positive
);
644 trace2_data_json("bloom", the_repository
, "statistics", &jw
);
649 static int forbid_bloom_filters(struct pathspec
*spec
)
651 if (spec
->has_wildcard
)
655 if (spec
->magic
& ~PATHSPEC_LITERAL
)
657 if (spec
->nr
&& (spec
->items
[0].magic
& ~PATHSPEC_LITERAL
))
663 static void prepare_to_use_bloom_filter(struct rev_info
*revs
)
665 struct pathspec_item
*pi
;
666 char *path_alloc
= NULL
;
667 const char *path
, *p
;
669 int path_component_nr
= 1;
674 if (forbid_bloom_filters(&revs
->prune_data
))
677 repo_parse_commit(revs
->repo
, revs
->commits
->item
);
679 revs
->bloom_filter_settings
= get_bloom_filter_settings(revs
->repo
);
680 if (!revs
->bloom_filter_settings
)
683 if (!revs
->pruning
.pathspec
.nr
)
686 pi
= &revs
->pruning
.pathspec
.items
[0];
688 /* remove single trailing slash from path, if needed */
689 if (pi
->len
> 0 && pi
->match
[pi
->len
- 1] == '/') {
690 path_alloc
= xmemdupz(pi
->match
, pi
->len
- 1);
697 revs
->bloom_filter_settings
= NULL
;
705 * At this point, the path is normalized to use Unix-style
706 * path separators. This is required due to how the
707 * changed-path Bloom filters store the paths.
714 revs
->bloom_keys_nr
= path_component_nr
;
715 ALLOC_ARRAY(revs
->bloom_keys
, revs
->bloom_keys_nr
);
717 fill_bloom_key(path
, len
, &revs
->bloom_keys
[0],
718 revs
->bloom_filter_settings
);
719 path_component_nr
= 1;
724 fill_bloom_key(path
, p
- path
,
725 &revs
->bloom_keys
[path_component_nr
++],
726 revs
->bloom_filter_settings
);
730 if (trace2_is_enabled() && !bloom_filter_atexit_registered
) {
731 atexit(trace2_bloom_filter_statistics_atexit
);
732 bloom_filter_atexit_registered
= 1;
738 static int check_maybe_different_in_bloom_filter(struct rev_info
*revs
,
739 struct commit
*commit
)
741 struct bloom_filter
*filter
;
744 if (!revs
->repo
->objects
->commit_graph
)
747 if (commit_graph_generation(commit
) == GENERATION_NUMBER_INFINITY
)
750 filter
= get_bloom_filter(revs
->repo
, commit
);
753 count_bloom_filter_not_present
++;
757 for (j
= 0; result
&& j
< revs
->bloom_keys_nr
; j
++) {
758 result
= bloom_filter_contains(filter
,
759 &revs
->bloom_keys
[j
],
760 revs
->bloom_filter_settings
);
764 count_bloom_filter_maybe
++;
766 count_bloom_filter_definitely_not
++;
771 static int rev_compare_tree(struct rev_info
*revs
,
772 struct commit
*parent
, struct commit
*commit
, int nth_parent
)
774 struct tree
*t1
= get_commit_tree(parent
);
775 struct tree
*t2
= get_commit_tree(commit
);
783 if (revs
->simplify_by_decoration
) {
785 * If we are simplifying by decoration, then the commit
786 * is worth showing if it has a tag pointing at it.
788 if (get_name_decoration(&commit
->object
))
789 return REV_TREE_DIFFERENT
;
791 * A commit that is not pointed by a tag is uninteresting
792 * if we are not limited by path. This means that you will
793 * see the usual "commits that touch the paths" plus any
794 * tagged commit by specifying both --simplify-by-decoration
797 if (!revs
->prune_data
.nr
)
798 return REV_TREE_SAME
;
801 if (revs
->bloom_keys_nr
&& !nth_parent
) {
802 bloom_ret
= check_maybe_different_in_bloom_filter(revs
, commit
);
805 return REV_TREE_SAME
;
808 tree_difference
= REV_TREE_SAME
;
809 revs
->pruning
.flags
.has_changes
= 0;
810 diff_tree_oid(&t1
->object
.oid
, &t2
->object
.oid
, "", &revs
->pruning
);
813 if (bloom_ret
== 1 && tree_difference
== REV_TREE_SAME
)
814 count_bloom_filter_false_positive
++;
816 return tree_difference
;
819 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
821 struct tree
*t1
= get_commit_tree(commit
);
826 tree_difference
= REV_TREE_SAME
;
827 revs
->pruning
.flags
.has_changes
= 0;
828 diff_tree_oid(NULL
, &t1
->object
.oid
, "", &revs
->pruning
);
830 return tree_difference
== REV_TREE_SAME
;
833 struct treesame_state
{
834 unsigned int nparents
;
835 unsigned char treesame
[FLEX_ARRAY
];
838 static struct treesame_state
*initialise_treesame(struct rev_info
*revs
, struct commit
*commit
)
840 unsigned n
= commit_list_count(commit
->parents
);
841 struct treesame_state
*st
= xcalloc(1, st_add(sizeof(*st
), n
));
843 add_decoration(&revs
->treesame
, &commit
->object
, st
);
848 * Must be called immediately after removing the nth_parent from a commit's
849 * parent list, if we are maintaining the per-parent treesame[] decoration.
850 * This does not recalculate the master TREESAME flag - update_treesame()
851 * should be called to update it after a sequence of treesame[] modifications
852 * that may have affected it.
854 static int compact_treesame(struct rev_info
*revs
, struct commit
*commit
, unsigned nth_parent
)
856 struct treesame_state
*st
;
859 if (!commit
->parents
) {
861 * Have just removed the only parent from a non-merge.
862 * Different handling, as we lack decoration.
865 die("compact_treesame %u", nth_parent
);
866 old_same
= !!(commit
->object
.flags
& TREESAME
);
867 if (rev_same_tree_as_empty(revs
, commit
))
868 commit
->object
.flags
|= TREESAME
;
870 commit
->object
.flags
&= ~TREESAME
;
874 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
875 if (!st
|| nth_parent
>= st
->nparents
)
876 die("compact_treesame %u", nth_parent
);
878 old_same
= st
->treesame
[nth_parent
];
879 memmove(st
->treesame
+ nth_parent
,
880 st
->treesame
+ nth_parent
+ 1,
881 st
->nparents
- nth_parent
- 1);
884 * If we've just become a non-merge commit, update TREESAME
885 * immediately, and remove the no-longer-needed decoration.
886 * If still a merge, defer update until update_treesame().
888 if (--st
->nparents
== 1) {
889 if (commit
->parents
->next
)
890 die("compact_treesame parents mismatch");
891 if (st
->treesame
[0] && revs
->dense
)
892 commit
->object
.flags
|= TREESAME
;
894 commit
->object
.flags
&= ~TREESAME
;
895 free(add_decoration(&revs
->treesame
, &commit
->object
, NULL
));
901 static unsigned update_treesame(struct rev_info
*revs
, struct commit
*commit
)
903 if (commit
->parents
&& commit
->parents
->next
) {
905 struct treesame_state
*st
;
906 struct commit_list
*p
;
907 unsigned relevant_parents
;
908 unsigned relevant_change
, irrelevant_change
;
910 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
912 die("update_treesame %s", oid_to_hex(&commit
->object
.oid
));
913 relevant_parents
= 0;
914 relevant_change
= irrelevant_change
= 0;
915 for (p
= commit
->parents
, n
= 0; p
; n
++, p
= p
->next
) {
916 if (relevant_commit(p
->item
)) {
917 relevant_change
|= !st
->treesame
[n
];
920 irrelevant_change
|= !st
->treesame
[n
];
922 if (relevant_parents
? relevant_change
: irrelevant_change
)
923 commit
->object
.flags
&= ~TREESAME
;
925 commit
->object
.flags
|= TREESAME
;
928 return commit
->object
.flags
& TREESAME
;
931 static inline int limiting_can_increase_treesame(const struct rev_info
*revs
)
934 * TREESAME is irrelevant unless prune && dense;
935 * if simplify_history is set, we can't have a mixture of TREESAME and
936 * !TREESAME INTERESTING parents (and we don't have treesame[]
937 * decoration anyway);
938 * if first_parent_only is set, then the TREESAME flag is locked
939 * against the first parent (and again we lack treesame[] decoration).
941 return revs
->prune
&& revs
->dense
&&
942 !revs
->simplify_history
&&
943 !revs
->first_parent_only
;
946 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
948 struct commit_list
**pp
, *parent
;
949 struct treesame_state
*ts
= NULL
;
950 int relevant_change
= 0, irrelevant_change
= 0;
951 int relevant_parents
, nth_parent
;
954 * If we don't do pruning, everything is interesting
959 if (!get_commit_tree(commit
))
962 if (!commit
->parents
) {
963 if (rev_same_tree_as_empty(revs
, commit
))
964 commit
->object
.flags
|= TREESAME
;
969 * Normal non-merge commit? If we don't want to make the
970 * history dense, we consider it always to be a change..
972 if (!revs
->dense
&& !commit
->parents
->next
)
975 for (pp
= &commit
->parents
, nth_parent
= 0, relevant_parents
= 0;
976 (parent
= *pp
) != NULL
;
977 pp
= &parent
->next
, nth_parent
++) {
978 struct commit
*p
= parent
->item
;
979 if (relevant_commit(p
))
982 if (nth_parent
== 1) {
984 * This our second loop iteration - so we now know
985 * we're dealing with a merge.
987 * Do not compare with later parents when we care only about
988 * the first parent chain, in order to avoid derailing the
989 * traversal to follow a side branch that brought everything
990 * in the path we are limited to by the pathspec.
992 if (revs
->first_parent_only
)
995 * If this will remain a potentially-simplifiable
996 * merge, remember per-parent treesame if needed.
997 * Initialise the array with the comparison from our
1000 if (revs
->treesame
.name
&&
1001 !revs
->simplify_history
&&
1002 !(commit
->object
.flags
& UNINTERESTING
)) {
1003 ts
= initialise_treesame(revs
, commit
);
1004 if (!(irrelevant_change
|| relevant_change
))
1005 ts
->treesame
[0] = 1;
1008 if (repo_parse_commit(revs
->repo
, p
) < 0)
1009 die("cannot simplify commit %s (because of %s)",
1010 oid_to_hex(&commit
->object
.oid
),
1011 oid_to_hex(&p
->object
.oid
));
1012 switch (rev_compare_tree(revs
, p
, commit
, nth_parent
)) {
1014 if (!revs
->simplify_history
|| !relevant_commit(p
)) {
1015 /* Even if a merge with an uninteresting
1016 * side branch brought the entire change
1017 * we are interested in, we do not want
1018 * to lose the other branches of this
1019 * merge, so we just keep going.
1022 ts
->treesame
[nth_parent
] = 1;
1025 parent
->next
= NULL
;
1026 commit
->parents
= parent
;
1029 * A merge commit is a "diversion" if it is not
1030 * TREESAME to its first parent but is TREESAME
1031 * to a later parent. In the simplified history,
1032 * we "divert" the history walk to the later
1033 * parent. These commits are shown when "show_pulls"
1034 * is enabled, so do not mark the object as
1037 if (!revs
->show_pulls
|| !nth_parent
)
1038 commit
->object
.flags
|= TREESAME
;
1043 if (revs
->remove_empty_trees
&&
1044 rev_same_tree_as_empty(revs
, p
)) {
1045 /* We are adding all the specified
1046 * paths from this parent, so the
1047 * history beyond this parent is not
1048 * interesting. Remove its parents
1049 * (they are grandparents for us).
1050 * IOW, we pretend this parent is a
1053 if (repo_parse_commit(revs
->repo
, p
) < 0)
1054 die("cannot simplify commit %s (invalid %s)",
1055 oid_to_hex(&commit
->object
.oid
),
1056 oid_to_hex(&p
->object
.oid
));
1061 case REV_TREE_DIFFERENT
:
1062 if (relevant_commit(p
))
1063 relevant_change
= 1;
1065 irrelevant_change
= 1;
1068 commit
->object
.flags
|= PULL_MERGE
;
1072 die("bad tree compare for commit %s", oid_to_hex(&commit
->object
.oid
));
1076 * TREESAME is straightforward for single-parent commits. For merge
1077 * commits, it is most useful to define it so that "irrelevant"
1078 * parents cannot make us !TREESAME - if we have any relevant
1079 * parents, then we only consider TREESAMEness with respect to them,
1080 * allowing irrelevant merges from uninteresting branches to be
1081 * simplified away. Only if we have only irrelevant parents do we
1082 * base TREESAME on them. Note that this logic is replicated in
1083 * update_treesame, which should be kept in sync.
1085 if (relevant_parents
? !relevant_change
: !irrelevant_change
)
1086 commit
->object
.flags
|= TREESAME
;
1089 static int process_parents(struct rev_info
*revs
, struct commit
*commit
,
1090 struct commit_list
**list
, struct prio_queue
*queue
)
1092 struct commit_list
*parent
= commit
->parents
;
1095 if (commit
->object
.flags
& ADDED
)
1097 commit
->object
.flags
|= ADDED
;
1099 if (revs
->include_check
&&
1100 !revs
->include_check(commit
, revs
->include_check_data
))
1104 * If the commit is uninteresting, don't try to
1105 * prune parents - we want the maximal uninteresting
1108 * Normally we haven't parsed the parent
1109 * yet, so we won't have a parent of a parent
1110 * here. However, it may turn out that we've
1111 * reached this commit some other way (where it
1112 * wasn't uninteresting), in which case we need
1113 * to mark its parents recursively too..
1115 if (commit
->object
.flags
& UNINTERESTING
) {
1117 struct commit
*p
= parent
->item
;
1118 parent
= parent
->next
;
1120 p
->object
.flags
|= UNINTERESTING
;
1121 if (repo_parse_commit_gently(revs
->repo
, p
, 1) < 0)
1124 mark_parents_uninteresting(p
);
1125 if (p
->object
.flags
& SEEN
)
1127 p
->object
.flags
|= (SEEN
| NOT_USER_GIVEN
);
1129 commit_list_insert_by_date(p
, list
);
1131 prio_queue_put(queue
, p
);
1137 * Ok, the commit wasn't uninteresting. Try to
1138 * simplify the commit history and find the parent
1139 * that has no differences in the path set if one exists.
1141 try_to_simplify_commit(revs
, commit
);
1146 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
1148 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
1149 struct commit
*p
= parent
->item
;
1150 int gently
= revs
->ignore_missing_links
||
1151 revs
->exclude_promisor_objects
;
1152 if (repo_parse_commit_gently(revs
->repo
, p
, gently
) < 0) {
1153 if (revs
->exclude_promisor_objects
&&
1154 is_promisor_object(&p
->object
.oid
)) {
1155 if (revs
->first_parent_only
)
1161 if (revs
->sources
) {
1162 char **slot
= revision_sources_at(revs
->sources
, p
);
1165 *slot
= *revision_sources_at(revs
->sources
, commit
);
1167 p
->object
.flags
|= left_flag
;
1168 if (!(p
->object
.flags
& SEEN
)) {
1169 p
->object
.flags
|= (SEEN
| NOT_USER_GIVEN
);
1171 commit_list_insert_by_date(p
, list
);
1173 prio_queue_put(queue
, p
);
1175 if (revs
->first_parent_only
)
1181 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
1183 struct commit_list
*p
;
1184 int left_count
= 0, right_count
= 0;
1186 struct patch_ids ids
;
1187 unsigned cherry_flag
;
1189 /* First count the commits on the left and on the right */
1190 for (p
= list
; p
; p
= p
->next
) {
1191 struct commit
*commit
= p
->item
;
1192 unsigned flags
= commit
->object
.flags
;
1193 if (flags
& BOUNDARY
)
1195 else if (flags
& SYMMETRIC_LEFT
)
1201 if (!left_count
|| !right_count
)
1204 left_first
= left_count
< right_count
;
1205 init_patch_ids(revs
->repo
, &ids
);
1206 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
1208 /* Compute patch-ids for one side */
1209 for (p
= list
; p
; p
= p
->next
) {
1210 struct commit
*commit
= p
->item
;
1211 unsigned flags
= commit
->object
.flags
;
1213 if (flags
& BOUNDARY
)
1216 * If we have fewer left, left_first is set and we omit
1217 * commits on the right branch in this loop. If we have
1218 * fewer right, we skip the left ones.
1220 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
1222 add_commit_patch_id(commit
, &ids
);
1225 /* either cherry_mark or cherry_pick are true */
1226 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
1228 /* Check the other side */
1229 for (p
= list
; p
; p
= p
->next
) {
1230 struct commit
*commit
= p
->item
;
1231 struct patch_id
*id
;
1232 unsigned flags
= commit
->object
.flags
;
1234 if (flags
& BOUNDARY
)
1237 * If we have fewer left, left_first is set and we omit
1238 * commits on the left branch in this loop.
1240 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
1244 * Have we seen the same patch id?
1246 id
= patch_id_iter_first(commit
, &ids
);
1250 commit
->object
.flags
|= cherry_flag
;
1252 id
->commit
->object
.flags
|= cherry_flag
;
1253 } while ((id
= patch_id_iter_next(id
, &ids
)));
1256 free_patch_ids(&ids
);
1259 /* How many extra uninteresting commits we want to see.. */
1262 static int still_interesting(struct commit_list
*src
, timestamp_t date
, int slop
,
1263 struct commit
**interesting_cache
)
1266 * No source list at all? We're definitely done..
1272 * Does the destination list contain entries with a date
1273 * before the source list? Definitely _not_ done.
1275 if (date
<= src
->item
->date
)
1279 * Does the source list still have interesting commits in
1280 * it? Definitely not done..
1282 if (!everybody_uninteresting(src
, interesting_cache
))
1285 /* Ok, we're closing in.. */
1290 * "rev-list --ancestry-path A..B" computes commits that are ancestors
1291 * of B but not ancestors of A but further limits the result to those
1292 * that are descendants of A. This takes the list of bottom commits and
1293 * the result of "A..B" without --ancestry-path, and limits the latter
1294 * further to the ones that can reach one of the commits in "bottom".
1296 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
1298 struct commit_list
*p
;
1299 struct commit_list
*rlist
= NULL
;
1303 * Reverse the list so that it will be likely that we would
1304 * process parents before children.
1306 for (p
= list
; p
; p
= p
->next
)
1307 commit_list_insert(p
->item
, &rlist
);
1309 for (p
= bottom
; p
; p
= p
->next
)
1310 p
->item
->object
.flags
|= TMP_MARK
;
1313 * Mark the ones that can reach bottom commits in "list",
1314 * in a bottom-up fashion.
1318 for (p
= rlist
; p
; p
= p
->next
) {
1319 struct commit
*c
= p
->item
;
1320 struct commit_list
*parents
;
1321 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
1323 for (parents
= c
->parents
;
1325 parents
= parents
->next
) {
1326 if (!(parents
->item
->object
.flags
& TMP_MARK
))
1328 c
->object
.flags
|= TMP_MARK
;
1333 } while (made_progress
);
1336 * NEEDSWORK: decide if we want to remove parents that are
1337 * not marked with TMP_MARK from commit->parents for commits
1338 * in the resulting list. We may not want to do that, though.
1342 * The ones that are not marked with TMP_MARK are uninteresting
1344 for (p
= list
; p
; p
= p
->next
) {
1345 struct commit
*c
= p
->item
;
1346 if (c
->object
.flags
& TMP_MARK
)
1348 c
->object
.flags
|= UNINTERESTING
;
1351 /* We are done with the TMP_MARK */
1352 for (p
= list
; p
; p
= p
->next
)
1353 p
->item
->object
.flags
&= ~TMP_MARK
;
1354 for (p
= bottom
; p
; p
= p
->next
)
1355 p
->item
->object
.flags
&= ~TMP_MARK
;
1356 free_commit_list(rlist
);
1360 * Before walking the history, keep the set of "negative" refs the
1361 * caller has asked to exclude.
1363 * This is used to compute "rev-list --ancestry-path A..B", as we need
1364 * to filter the result of "A..B" further to the ones that can actually
1367 static struct commit_list
*collect_bottom_commits(struct commit_list
*list
)
1369 struct commit_list
*elem
, *bottom
= NULL
;
1370 for (elem
= list
; elem
; elem
= elem
->next
)
1371 if (elem
->item
->object
.flags
& BOTTOM
)
1372 commit_list_insert(elem
->item
, &bottom
);
1376 /* Assumes either left_only or right_only is set */
1377 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
1379 struct commit_list
*p
;
1381 for (p
= list
; p
; p
= p
->next
) {
1382 struct commit
*commit
= p
->item
;
1384 if (revs
->right_only
) {
1385 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
1386 commit
->object
.flags
|= SHOWN
;
1387 } else /* revs->left_only is set */
1388 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
1389 commit
->object
.flags
|= SHOWN
;
1393 static int limit_list(struct rev_info
*revs
)
1396 timestamp_t date
= TIME_MAX
;
1397 struct commit_list
*original_list
= revs
->commits
;
1398 struct commit_list
*newlist
= NULL
;
1399 struct commit_list
**p
= &newlist
;
1400 struct commit_list
*bottom
= NULL
;
1401 struct commit
*interesting_cache
= NULL
;
1403 if (revs
->ancestry_path
) {
1404 bottom
= collect_bottom_commits(original_list
);
1406 die("--ancestry-path given but there are no bottom commits");
1409 while (original_list
) {
1410 struct commit
*commit
= pop_commit(&original_list
);
1411 struct object
*obj
= &commit
->object
;
1412 show_early_output_fn_t show
;
1414 if (commit
== interesting_cache
)
1415 interesting_cache
= NULL
;
1417 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
1418 obj
->flags
|= UNINTERESTING
;
1419 if (process_parents(revs
, commit
, &original_list
, NULL
) < 0)
1421 if (obj
->flags
& UNINTERESTING
) {
1422 mark_parents_uninteresting(commit
);
1423 slop
= still_interesting(original_list
, date
, slop
, &interesting_cache
);
1428 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
) &&
1429 !revs
->line_level_traverse
)
1431 date
= commit
->date
;
1432 p
= &commit_list_insert(commit
, p
)->next
;
1434 show
= show_early_output
;
1438 show(revs
, newlist
);
1439 show_early_output
= NULL
;
1441 if (revs
->cherry_pick
|| revs
->cherry_mark
)
1442 cherry_pick_list(newlist
, revs
);
1444 if (revs
->left_only
|| revs
->right_only
)
1445 limit_left_right(newlist
, revs
);
1448 limit_to_ancestry(bottom
, newlist
);
1449 free_commit_list(bottom
);
1453 * Check if any commits have become TREESAME by some of their parents
1454 * becoming UNINTERESTING.
1456 if (limiting_can_increase_treesame(revs
)) {
1457 struct commit_list
*list
= NULL
;
1458 for (list
= newlist
; list
; list
= list
->next
) {
1459 struct commit
*c
= list
->item
;
1460 if (c
->object
.flags
& (UNINTERESTING
| TREESAME
))
1462 update_treesame(revs
, c
);
1466 free_commit_list(original_list
);
1467 revs
->commits
= newlist
;
1472 * Add an entry to refs->cmdline with the specified information.
1475 static void add_rev_cmdline(struct rev_info
*revs
,
1476 struct object
*item
,
1481 struct rev_cmdline_info
*info
= &revs
->cmdline
;
1482 unsigned int nr
= info
->nr
;
1484 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
1485 info
->rev
[nr
].item
= item
;
1486 info
->rev
[nr
].name
= xstrdup(name
);
1487 info
->rev
[nr
].whence
= whence
;
1488 info
->rev
[nr
].flags
= flags
;
1492 static void add_rev_cmdline_list(struct rev_info
*revs
,
1493 struct commit_list
*commit_list
,
1497 while (commit_list
) {
1498 struct object
*object
= &commit_list
->item
->object
;
1499 add_rev_cmdline(revs
, object
, oid_to_hex(&object
->oid
),
1501 commit_list
= commit_list
->next
;
1505 struct all_refs_cb
{
1507 int warned_bad_reflog
;
1508 struct rev_info
*all_revs
;
1509 const char *name_for_errormsg
;
1510 struct worktree
*wt
;
1513 int ref_excluded(struct string_list
*ref_excludes
, const char *path
)
1515 struct string_list_item
*item
;
1519 for_each_string_list_item(item
, ref_excludes
) {
1520 if (!wildmatch(item
->string
, path
, 0))
1526 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
1527 int flag
, void *cb_data
)
1529 struct all_refs_cb
*cb
= cb_data
;
1530 struct object
*object
;
1532 if (ref_excluded(cb
->all_revs
->ref_excludes
, path
))
1535 object
= get_reference(cb
->all_revs
, path
, oid
, cb
->all_flags
);
1536 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
1537 add_pending_oid(cb
->all_revs
, path
, oid
, cb
->all_flags
);
1541 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
1544 cb
->all_revs
= revs
;
1545 cb
->all_flags
= flags
;
1546 revs
->rev_input_given
= 1;
1550 void clear_ref_exclusion(struct string_list
**ref_excludes_p
)
1552 if (*ref_excludes_p
) {
1553 string_list_clear(*ref_excludes_p
, 0);
1554 free(*ref_excludes_p
);
1556 *ref_excludes_p
= NULL
;
1559 void add_ref_exclusion(struct string_list
**ref_excludes_p
, const char *exclude
)
1561 if (!*ref_excludes_p
) {
1562 CALLOC_ARRAY(*ref_excludes_p
, 1);
1563 (*ref_excludes_p
)->strdup_strings
= 1;
1565 string_list_append(*ref_excludes_p
, exclude
);
1568 static void handle_refs(struct ref_store
*refs
,
1569 struct rev_info
*revs
, unsigned flags
,
1570 int (*for_each
)(struct ref_store
*, each_ref_fn
, void *))
1572 struct all_refs_cb cb
;
1575 /* this could happen with uninitialized submodules */
1579 init_all_refs_cb(&cb
, revs
, flags
);
1580 for_each(refs
, handle_one_ref
, &cb
);
1583 static void handle_one_reflog_commit(struct object_id
*oid
, void *cb_data
)
1585 struct all_refs_cb
*cb
= cb_data
;
1586 if (!is_null_oid(oid
)) {
1587 struct object
*o
= parse_object(cb
->all_revs
->repo
, oid
);
1589 o
->flags
|= cb
->all_flags
;
1590 /* ??? CMDLINEFLAGS ??? */
1591 add_pending_object(cb
->all_revs
, o
, "");
1593 else if (!cb
->warned_bad_reflog
) {
1594 warning("reflog of '%s' references pruned commits",
1595 cb
->name_for_errormsg
);
1596 cb
->warned_bad_reflog
= 1;
1601 static int handle_one_reflog_ent(struct object_id
*ooid
, struct object_id
*noid
,
1602 const char *email
, timestamp_t timestamp
, int tz
,
1603 const char *message
, void *cb_data
)
1605 handle_one_reflog_commit(ooid
, cb_data
);
1606 handle_one_reflog_commit(noid
, cb_data
);
1610 static int handle_one_reflog(const char *refname_in_wt
,
1611 const struct object_id
*oid
,
1612 int flag
, void *cb_data
)
1614 struct all_refs_cb
*cb
= cb_data
;
1615 struct strbuf refname
= STRBUF_INIT
;
1617 cb
->warned_bad_reflog
= 0;
1618 strbuf_worktree_ref(cb
->wt
, &refname
, refname_in_wt
);
1619 cb
->name_for_errormsg
= refname
.buf
;
1620 refs_for_each_reflog_ent(get_main_ref_store(the_repository
),
1622 handle_one_reflog_ent
, cb_data
);
1623 strbuf_release(&refname
);
1627 static void add_other_reflogs_to_pending(struct all_refs_cb
*cb
)
1629 struct worktree
**worktrees
, **p
;
1631 worktrees
= get_worktrees();
1632 for (p
= worktrees
; *p
; p
++) {
1633 struct worktree
*wt
= *p
;
1639 refs_for_each_reflog(get_worktree_ref_store(wt
),
1643 free_worktrees(worktrees
);
1646 void add_reflogs_to_pending(struct rev_info
*revs
, unsigned flags
)
1648 struct all_refs_cb cb
;
1651 cb
.all_flags
= flags
;
1653 for_each_reflog(handle_one_reflog
, &cb
);
1655 if (!revs
->single_worktree
)
1656 add_other_reflogs_to_pending(&cb
);
1659 static void add_cache_tree(struct cache_tree
*it
, struct rev_info
*revs
,
1660 struct strbuf
*path
, unsigned int flags
)
1662 size_t baselen
= path
->len
;
1665 if (it
->entry_count
>= 0) {
1666 struct tree
*tree
= lookup_tree(revs
->repo
, &it
->oid
);
1667 tree
->object
.flags
|= flags
;
1668 add_pending_object_with_path(revs
, &tree
->object
, "",
1672 for (i
= 0; i
< it
->subtree_nr
; i
++) {
1673 struct cache_tree_sub
*sub
= it
->down
[i
];
1674 strbuf_addf(path
, "%s%s", baselen
? "/" : "", sub
->name
);
1675 add_cache_tree(sub
->cache_tree
, revs
, path
, flags
);
1676 strbuf_setlen(path
, baselen
);
1681 static void do_add_index_objects_to_pending(struct rev_info
*revs
,
1682 struct index_state
*istate
,
1687 /* TODO: audit for interaction with sparse-index. */
1688 ensure_full_index(istate
);
1689 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1690 struct cache_entry
*ce
= istate
->cache
[i
];
1693 if (S_ISGITLINK(ce
->ce_mode
))
1696 blob
= lookup_blob(revs
->repo
, &ce
->oid
);
1698 die("unable to add index blob to traversal");
1699 blob
->object
.flags
|= flags
;
1700 add_pending_object_with_path(revs
, &blob
->object
, "",
1701 ce
->ce_mode
, ce
->name
);
1704 if (istate
->cache_tree
) {
1705 struct strbuf path
= STRBUF_INIT
;
1706 add_cache_tree(istate
->cache_tree
, revs
, &path
, flags
);
1707 strbuf_release(&path
);
1711 void add_index_objects_to_pending(struct rev_info
*revs
, unsigned int flags
)
1713 struct worktree
**worktrees
, **p
;
1715 repo_read_index(revs
->repo
);
1716 do_add_index_objects_to_pending(revs
, revs
->repo
->index
, flags
);
1718 if (revs
->single_worktree
)
1721 worktrees
= get_worktrees();
1722 for (p
= worktrees
; *p
; p
++) {
1723 struct worktree
*wt
= *p
;
1724 struct index_state istate
= { NULL
};
1727 continue; /* current index already taken care of */
1729 if (read_index_from(&istate
,
1730 worktree_git_path(wt
, "index"),
1731 get_worktree_git_dir(wt
)) > 0)
1732 do_add_index_objects_to_pending(revs
, &istate
, flags
);
1733 discard_index(&istate
);
1735 free_worktrees(worktrees
);
1738 struct add_alternate_refs_data
{
1739 struct rev_info
*revs
;
1743 static void add_one_alternate_ref(const struct object_id
*oid
,
1746 const char *name
= ".alternate";
1747 struct add_alternate_refs_data
*data
= vdata
;
1750 obj
= get_reference(data
->revs
, name
, oid
, data
->flags
);
1751 add_rev_cmdline(data
->revs
, obj
, name
, REV_CMD_REV
, data
->flags
);
1752 add_pending_object(data
->revs
, obj
, name
);
1755 static void add_alternate_refs_to_pending(struct rev_info
*revs
,
1758 struct add_alternate_refs_data data
;
1761 for_each_alternate_ref(add_one_alternate_ref
, &data
);
1764 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
,
1767 struct object_id oid
;
1769 struct commit
*commit
;
1770 struct commit_list
*parents
;
1772 const char *arg
= arg_
;
1775 flags
^= UNINTERESTING
| BOTTOM
;
1778 if (get_oid_committish(arg
, &oid
))
1781 it
= get_reference(revs
, arg
, &oid
, 0);
1782 if (!it
&& revs
->ignore_missing
)
1784 if (it
->type
!= OBJ_TAG
)
1786 if (!((struct tag
*)it
)->tagged
)
1788 oidcpy(&oid
, &((struct tag
*)it
)->tagged
->oid
);
1790 if (it
->type
!= OBJ_COMMIT
)
1792 commit
= (struct commit
*)it
;
1793 if (exclude_parent
&&
1794 exclude_parent
> commit_list_count(commit
->parents
))
1796 for (parents
= commit
->parents
, parent_number
= 1;
1798 parents
= parents
->next
, parent_number
++) {
1799 if (exclude_parent
&& parent_number
!= exclude_parent
)
1802 it
= &parents
->item
->object
;
1804 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1805 add_pending_object(revs
, it
, arg
);
1810 void repo_init_revisions(struct repository
*r
,
1811 struct rev_info
*revs
,
1814 memset(revs
, 0, sizeof(*revs
));
1817 revs
->abbrev
= DEFAULT_ABBREV
;
1818 revs
->simplify_history
= 1;
1819 revs
->pruning
.repo
= r
;
1820 revs
->pruning
.flags
.recursive
= 1;
1821 revs
->pruning
.flags
.quick
= 1;
1822 revs
->pruning
.add_remove
= file_add_remove
;
1823 revs
->pruning
.change
= file_change
;
1824 revs
->pruning
.change_fn_data
= revs
;
1825 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1827 revs
->prefix
= prefix
;
1830 revs
->skip_count
= -1;
1831 revs
->max_count
= -1;
1832 revs
->max_parents
= -1;
1833 revs
->expand_tabs_in_log
= -1;
1835 revs
->commit_format
= CMIT_FMT_DEFAULT
;
1836 revs
->expand_tabs_in_log_default
= 8;
1838 grep_init(&revs
->grep_filter
, revs
->repo
, prefix
);
1839 revs
->grep_filter
.status_only
= 1;
1841 repo_diff_setup(revs
->repo
, &revs
->diffopt
);
1842 if (prefix
&& !revs
->diffopt
.prefix
) {
1843 revs
->diffopt
.prefix
= prefix
;
1844 revs
->diffopt
.prefix_length
= strlen(prefix
);
1847 init_display_notes(&revs
->notes_opt
);
1850 static void add_pending_commit_list(struct rev_info
*revs
,
1851 struct commit_list
*commit_list
,
1854 while (commit_list
) {
1855 struct object
*object
= &commit_list
->item
->object
;
1856 object
->flags
|= flags
;
1857 add_pending_object(revs
, object
, oid_to_hex(&object
->oid
));
1858 commit_list
= commit_list
->next
;
1862 static void prepare_show_merge(struct rev_info
*revs
)
1864 struct commit_list
*bases
;
1865 struct commit
*head
, *other
;
1866 struct object_id oid
;
1867 const char **prune
= NULL
;
1868 int i
, prune_num
= 1; /* counting terminating NULL */
1869 struct index_state
*istate
= revs
->repo
->index
;
1871 if (get_oid("HEAD", &oid
))
1872 die("--merge without HEAD?");
1873 head
= lookup_commit_or_die(&oid
, "HEAD");
1874 if (get_oid("MERGE_HEAD", &oid
))
1875 die("--merge without MERGE_HEAD?");
1876 other
= lookup_commit_or_die(&oid
, "MERGE_HEAD");
1877 add_pending_object(revs
, &head
->object
, "HEAD");
1878 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1879 bases
= get_merge_bases(head
, other
);
1880 add_rev_cmdline_list(revs
, bases
, REV_CMD_MERGE_BASE
, UNINTERESTING
| BOTTOM
);
1881 add_pending_commit_list(revs
, bases
, UNINTERESTING
| BOTTOM
);
1882 free_commit_list(bases
);
1883 head
->object
.flags
|= SYMMETRIC_LEFT
;
1885 if (!istate
->cache_nr
)
1886 repo_read_index(revs
->repo
);
1887 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1888 const struct cache_entry
*ce
= istate
->cache
[i
];
1891 if (ce_path_match(istate
, ce
, &revs
->prune_data
, NULL
)) {
1893 REALLOC_ARRAY(prune
, prune_num
);
1894 prune
[prune_num
-2] = ce
->name
;
1895 prune
[prune_num
-1] = NULL
;
1897 while ((i
+1 < istate
->cache_nr
) &&
1898 ce_same_name(ce
, istate
->cache
[i
+1]))
1901 clear_pathspec(&revs
->prune_data
);
1902 parse_pathspec(&revs
->prune_data
, PATHSPEC_ALL_MAGIC
& ~PATHSPEC_LITERAL
,
1903 PATHSPEC_PREFER_FULL
| PATHSPEC_LITERAL_PATH
, "", prune
);
1907 static int dotdot_missing(const char *arg
, char *dotdot
,
1908 struct rev_info
*revs
, int symmetric
)
1910 if (revs
->ignore_missing
)
1912 /* de-munge so we report the full argument */
1915 ? "Invalid symmetric difference expression %s"
1916 : "Invalid revision range %s", arg
);
1919 static int handle_dotdot_1(const char *arg
, char *dotdot
,
1920 struct rev_info
*revs
, int flags
,
1921 int cant_be_filename
,
1922 struct object_context
*a_oc
,
1923 struct object_context
*b_oc
)
1925 const char *a_name
, *b_name
;
1926 struct object_id a_oid
, b_oid
;
1927 struct object
*a_obj
, *b_obj
;
1928 unsigned int a_flags
, b_flags
;
1930 unsigned int flags_exclude
= flags
^ (UNINTERESTING
| BOTTOM
);
1931 unsigned int oc_flags
= GET_OID_COMMITTISH
| GET_OID_RECORD_PATH
;
1937 b_name
= dotdot
+ 2;
1938 if (*b_name
== '.') {
1945 if (get_oid_with_context(revs
->repo
, a_name
, oc_flags
, &a_oid
, a_oc
) ||
1946 get_oid_with_context(revs
->repo
, b_name
, oc_flags
, &b_oid
, b_oc
))
1949 if (!cant_be_filename
) {
1951 verify_non_filename(revs
->prefix
, arg
);
1955 a_obj
= parse_object(revs
->repo
, &a_oid
);
1956 b_obj
= parse_object(revs
->repo
, &b_oid
);
1957 if (!a_obj
|| !b_obj
)
1958 return dotdot_missing(arg
, dotdot
, revs
, symmetric
);
1963 a_flags
= flags_exclude
;
1965 /* A...B -- find merge bases between the two */
1966 struct commit
*a
, *b
;
1967 struct commit_list
*exclude
;
1969 a
= lookup_commit_reference(revs
->repo
, &a_obj
->oid
);
1970 b
= lookup_commit_reference(revs
->repo
, &b_obj
->oid
);
1972 return dotdot_missing(arg
, dotdot
, revs
, symmetric
);
1974 exclude
= get_merge_bases(a
, b
);
1975 add_rev_cmdline_list(revs
, exclude
, REV_CMD_MERGE_BASE
,
1977 add_pending_commit_list(revs
, exclude
, flags_exclude
);
1978 free_commit_list(exclude
);
1981 a_flags
= flags
| SYMMETRIC_LEFT
;
1984 a_obj
->flags
|= a_flags
;
1985 b_obj
->flags
|= b_flags
;
1986 add_rev_cmdline(revs
, a_obj
, a_name
, REV_CMD_LEFT
, a_flags
);
1987 add_rev_cmdline(revs
, b_obj
, b_name
, REV_CMD_RIGHT
, b_flags
);
1988 add_pending_object_with_path(revs
, a_obj
, a_name
, a_oc
->mode
, a_oc
->path
);
1989 add_pending_object_with_path(revs
, b_obj
, b_name
, b_oc
->mode
, b_oc
->path
);
1993 static int handle_dotdot(const char *arg
,
1994 struct rev_info
*revs
, int flags
,
1995 int cant_be_filename
)
1997 struct object_context a_oc
, b_oc
;
1998 char *dotdot
= strstr(arg
, "..");
2004 memset(&a_oc
, 0, sizeof(a_oc
));
2005 memset(&b_oc
, 0, sizeof(b_oc
));
2008 ret
= handle_dotdot_1(arg
, dotdot
, revs
, flags
, cant_be_filename
,
2018 static int handle_revision_arg_1(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
2020 struct object_context oc
;
2022 struct object
*object
;
2023 struct object_id oid
;
2025 const char *arg
= arg_
;
2026 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
2027 unsigned get_sha1_flags
= GET_OID_RECORD_PATH
;
2029 flags
= flags
& UNINTERESTING
? flags
| BOTTOM
: flags
& ~BOTTOM
;
2031 if (!cant_be_filename
&& !strcmp(arg
, "..")) {
2033 * Just ".."? That is not a range but the
2034 * pathspec for the parent directory.
2039 if (!handle_dotdot(arg
, revs
, flags
, revarg_opt
))
2042 mark
= strstr(arg
, "^@");
2043 if (mark
&& !mark
[2]) {
2045 if (add_parents_only(revs
, arg
, flags
, 0))
2049 mark
= strstr(arg
, "^!");
2050 if (mark
&& !mark
[2]) {
2052 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
), 0))
2055 mark
= strstr(arg
, "^-");
2057 int exclude_parent
= 1;
2061 exclude_parent
= strtoul(mark
+ 2, &end
, 10);
2062 if (*end
!= '\0' || !exclude_parent
)
2067 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
), exclude_parent
))
2073 local_flags
= UNINTERESTING
| BOTTOM
;
2077 if (revarg_opt
& REVARG_COMMITTISH
)
2078 get_sha1_flags
|= GET_OID_COMMITTISH
;
2080 if (get_oid_with_context(revs
->repo
, arg
, get_sha1_flags
, &oid
, &oc
))
2081 return revs
->ignore_missing
? 0 : -1;
2082 if (!cant_be_filename
)
2083 verify_non_filename(revs
->prefix
, arg
);
2084 object
= get_reference(revs
, arg
, &oid
, flags
^ local_flags
);
2086 return revs
->ignore_missing
? 0 : -1;
2087 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
2088 add_pending_object_with_path(revs
, object
, arg
, oc
.mode
, oc
.path
);
2093 int handle_revision_arg(const char *arg
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
2095 int ret
= handle_revision_arg_1(arg
, revs
, flags
, revarg_opt
);
2097 revs
->rev_input_given
= 1;
2101 static void read_pathspec_from_stdin(struct strbuf
*sb
,
2102 struct strvec
*prune
)
2104 while (strbuf_getline(sb
, stdin
) != EOF
)
2105 strvec_push(prune
, sb
->buf
);
2108 static void read_revisions_from_stdin(struct rev_info
*revs
,
2109 struct strvec
*prune
)
2112 int seen_dashdash
= 0;
2115 save_warning
= warn_on_object_refname_ambiguity
;
2116 warn_on_object_refname_ambiguity
= 0;
2118 strbuf_init(&sb
, 1000);
2119 while (strbuf_getline(&sb
, stdin
) != EOF
) {
2123 if (sb
.buf
[0] == '-') {
2124 if (len
== 2 && sb
.buf
[1] == '-') {
2128 die("options not supported in --stdin mode");
2130 if (handle_revision_arg(sb
.buf
, revs
, 0,
2131 REVARG_CANNOT_BE_FILENAME
))
2132 die("bad revision '%s'", sb
.buf
);
2135 read_pathspec_from_stdin(&sb
, prune
);
2137 strbuf_release(&sb
);
2138 warn_on_object_refname_ambiguity
= save_warning
;
2141 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
2143 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
2146 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
2148 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
2151 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
2153 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
2156 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
2157 int *unkc
, const char **unkv
,
2158 const struct setup_revision_opt
* opt
)
2160 const char *arg
= argv
[0];
2163 const unsigned hexsz
= the_hash_algo
->hexsz
;
2165 /* pseudo revision arguments */
2166 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
2167 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
2168 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
2169 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
2170 !strcmp(arg
, "--bisect") || starts_with(arg
, "--glob=") ||
2171 !strcmp(arg
, "--indexed-objects") ||
2172 !strcmp(arg
, "--alternate-refs") ||
2173 starts_with(arg
, "--exclude=") ||
2174 starts_with(arg
, "--branches=") || starts_with(arg
, "--tags=") ||
2175 starts_with(arg
, "--remotes=") || starts_with(arg
, "--no-walk="))
2177 unkv
[(*unkc
)++] = arg
;
2181 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
2182 revs
->max_count
= atoi(optarg
);
2185 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
2186 revs
->skip_count
= atoi(optarg
);
2188 } else if ((*arg
== '-') && isdigit(arg
[1])) {
2189 /* accept -<digit>, like traditional "head" */
2190 if (strtol_i(arg
+ 1, 10, &revs
->max_count
) < 0 ||
2191 revs
->max_count
< 0)
2192 die("'%s': not a non-negative integer", arg
+ 1);
2194 } else if (!strcmp(arg
, "-n")) {
2196 return error("-n requires an argument");
2197 revs
->max_count
= atoi(argv
[1]);
2200 } else if (skip_prefix(arg
, "-n", &optarg
)) {
2201 revs
->max_count
= atoi(optarg
);
2203 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
2204 revs
->max_age
= atoi(optarg
);
2206 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
2207 revs
->max_age
= approxidate(optarg
);
2209 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
2210 revs
->max_age
= approxidate(optarg
);
2212 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
2213 revs
->min_age
= atoi(optarg
);
2215 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
2216 revs
->min_age
= approxidate(optarg
);
2218 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
2219 revs
->min_age
= approxidate(optarg
);
2221 } else if (!strcmp(arg
, "--first-parent")) {
2222 revs
->first_parent_only
= 1;
2223 } else if (!strcmp(arg
, "--ancestry-path")) {
2224 revs
->ancestry_path
= 1;
2225 revs
->simplify_history
= 0;
2227 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
2228 init_reflog_walk(&revs
->reflog_info
);
2229 } else if (!strcmp(arg
, "--default")) {
2231 return error("bad --default argument");
2232 revs
->def
= argv
[1];
2234 } else if (!strcmp(arg
, "--merge")) {
2235 revs
->show_merge
= 1;
2236 } else if (!strcmp(arg
, "--topo-order")) {
2237 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
2238 revs
->topo_order
= 1;
2239 } else if (!strcmp(arg
, "--simplify-merges")) {
2240 revs
->simplify_merges
= 1;
2241 revs
->topo_order
= 1;
2242 revs
->rewrite_parents
= 1;
2243 revs
->simplify_history
= 0;
2245 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
2246 revs
->simplify_merges
= 1;
2247 revs
->topo_order
= 1;
2248 revs
->rewrite_parents
= 1;
2249 revs
->simplify_history
= 0;
2250 revs
->simplify_by_decoration
= 1;
2253 } else if (!strcmp(arg
, "--date-order")) {
2254 revs
->sort_order
= REV_SORT_BY_COMMIT_DATE
;
2255 revs
->topo_order
= 1;
2256 } else if (!strcmp(arg
, "--author-date-order")) {
2257 revs
->sort_order
= REV_SORT_BY_AUTHOR_DATE
;
2258 revs
->topo_order
= 1;
2259 } else if (!strcmp(arg
, "--early-output")) {
2260 revs
->early_output
= 100;
2261 revs
->topo_order
= 1;
2262 } else if (skip_prefix(arg
, "--early-output=", &optarg
)) {
2263 if (strtoul_ui(optarg
, 10, &revs
->early_output
) < 0)
2264 die("'%s': not a non-negative integer", optarg
);
2265 revs
->topo_order
= 1;
2266 } else if (!strcmp(arg
, "--parents")) {
2267 revs
->rewrite_parents
= 1;
2268 revs
->print_parents
= 1;
2269 } else if (!strcmp(arg
, "--dense")) {
2271 } else if (!strcmp(arg
, "--sparse")) {
2273 } else if (!strcmp(arg
, "--in-commit-order")) {
2274 revs
->tree_blobs_in_commit_order
= 1;
2275 } else if (!strcmp(arg
, "--remove-empty")) {
2276 revs
->remove_empty_trees
= 1;
2277 } else if (!strcmp(arg
, "--merges")) {
2278 revs
->min_parents
= 2;
2279 } else if (!strcmp(arg
, "--no-merges")) {
2280 revs
->max_parents
= 1;
2281 } else if (skip_prefix(arg
, "--min-parents=", &optarg
)) {
2282 revs
->min_parents
= atoi(optarg
);
2283 } else if (!strcmp(arg
, "--no-min-parents")) {
2284 revs
->min_parents
= 0;
2285 } else if (skip_prefix(arg
, "--max-parents=", &optarg
)) {
2286 revs
->max_parents
= atoi(optarg
);
2287 } else if (!strcmp(arg
, "--no-max-parents")) {
2288 revs
->max_parents
= -1;
2289 } else if (!strcmp(arg
, "--boundary")) {
2291 } else if (!strcmp(arg
, "--left-right")) {
2292 revs
->left_right
= 1;
2293 } else if (!strcmp(arg
, "--left-only")) {
2294 if (revs
->right_only
)
2295 die("--left-only is incompatible with --right-only"
2297 revs
->left_only
= 1;
2298 } else if (!strcmp(arg
, "--right-only")) {
2299 if (revs
->left_only
)
2300 die("--right-only is incompatible with --left-only");
2301 revs
->right_only
= 1;
2302 } else if (!strcmp(arg
, "--cherry")) {
2303 if (revs
->left_only
)
2304 die("--cherry is incompatible with --left-only");
2305 revs
->cherry_mark
= 1;
2306 revs
->right_only
= 1;
2307 revs
->max_parents
= 1;
2309 } else if (!strcmp(arg
, "--count")) {
2311 } else if (!strcmp(arg
, "--cherry-mark")) {
2312 if (revs
->cherry_pick
)
2313 die("--cherry-mark is incompatible with --cherry-pick");
2314 revs
->cherry_mark
= 1;
2315 revs
->limited
= 1; /* needs limit_list() */
2316 } else if (!strcmp(arg
, "--cherry-pick")) {
2317 if (revs
->cherry_mark
)
2318 die("--cherry-pick is incompatible with --cherry-mark");
2319 revs
->cherry_pick
= 1;
2321 } else if (!strcmp(arg
, "--objects")) {
2322 revs
->tag_objects
= 1;
2323 revs
->tree_objects
= 1;
2324 revs
->blob_objects
= 1;
2325 } else if (!strcmp(arg
, "--objects-edge")) {
2326 revs
->tag_objects
= 1;
2327 revs
->tree_objects
= 1;
2328 revs
->blob_objects
= 1;
2329 revs
->edge_hint
= 1;
2330 } else if (!strcmp(arg
, "--objects-edge-aggressive")) {
2331 revs
->tag_objects
= 1;
2332 revs
->tree_objects
= 1;
2333 revs
->blob_objects
= 1;
2334 revs
->edge_hint
= 1;
2335 revs
->edge_hint_aggressive
= 1;
2336 } else if (!strcmp(arg
, "--verify-objects")) {
2337 revs
->tag_objects
= 1;
2338 revs
->tree_objects
= 1;
2339 revs
->blob_objects
= 1;
2340 revs
->verify_objects
= 1;
2341 } else if (!strcmp(arg
, "--unpacked")) {
2343 } else if (starts_with(arg
, "--unpacked=")) {
2344 die(_("--unpacked=<packfile> no longer supported"));
2345 } else if (!strcmp(arg
, "--no-kept-objects")) {
2346 revs
->no_kept_objects
= 1;
2347 revs
->keep_pack_cache_flags
|= IN_CORE_KEEP_PACKS
;
2348 revs
->keep_pack_cache_flags
|= ON_DISK_KEEP_PACKS
;
2349 } else if (skip_prefix(arg
, "--no-kept-objects=", &optarg
)) {
2350 revs
->no_kept_objects
= 1;
2351 if (!strcmp(optarg
, "in-core"))
2352 revs
->keep_pack_cache_flags
|= IN_CORE_KEEP_PACKS
;
2353 if (!strcmp(optarg
, "on-disk"))
2354 revs
->keep_pack_cache_flags
|= ON_DISK_KEEP_PACKS
;
2355 } else if (!strcmp(arg
, "-r")) {
2357 revs
->diffopt
.flags
.recursive
= 1;
2358 } else if (!strcmp(arg
, "-t")) {
2360 revs
->diffopt
.flags
.recursive
= 1;
2361 revs
->diffopt
.flags
.tree_in_recursive
= 1;
2362 } else if ((argcount
= diff_merges_parse_opts(revs
, argv
))) {
2364 } else if (!strcmp(arg
, "-v")) {
2365 revs
->verbose_header
= 1;
2366 } else if (!strcmp(arg
, "--pretty")) {
2367 revs
->verbose_header
= 1;
2368 revs
->pretty_given
= 1;
2369 get_commit_format(NULL
, revs
);
2370 } else if (skip_prefix(arg
, "--pretty=", &optarg
) ||
2371 skip_prefix(arg
, "--format=", &optarg
)) {
2373 * Detached form ("--pretty X" as opposed to "--pretty=X")
2374 * not allowed, since the argument is optional.
2376 revs
->verbose_header
= 1;
2377 revs
->pretty_given
= 1;
2378 get_commit_format(optarg
, revs
);
2379 } else if (!strcmp(arg
, "--expand-tabs")) {
2380 revs
->expand_tabs_in_log
= 8;
2381 } else if (!strcmp(arg
, "--no-expand-tabs")) {
2382 revs
->expand_tabs_in_log
= 0;
2383 } else if (skip_prefix(arg
, "--expand-tabs=", &arg
)) {
2385 if (strtol_i(arg
, 10, &val
) < 0 || val
< 0)
2386 die("'%s': not a non-negative integer", arg
);
2387 revs
->expand_tabs_in_log
= val
;
2388 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
2389 enable_default_display_notes(&revs
->notes_opt
, &revs
->show_notes
);
2390 revs
->show_notes_given
= 1;
2391 } else if (!strcmp(arg
, "--show-signature")) {
2392 revs
->show_signature
= 1;
2393 } else if (!strcmp(arg
, "--no-show-signature")) {
2394 revs
->show_signature
= 0;
2395 } else if (!strcmp(arg
, "--show-linear-break")) {
2396 revs
->break_bar
= " ..........";
2397 revs
->track_linear
= 1;
2398 revs
->track_first_time
= 1;
2399 } else if (skip_prefix(arg
, "--show-linear-break=", &optarg
)) {
2400 revs
->break_bar
= xstrdup(optarg
);
2401 revs
->track_linear
= 1;
2402 revs
->track_first_time
= 1;
2403 } else if (skip_prefix(arg
, "--show-notes=", &optarg
) ||
2404 skip_prefix(arg
, "--notes=", &optarg
)) {
2405 if (starts_with(arg
, "--show-notes=") &&
2406 revs
->notes_opt
.use_default_notes
< 0)
2407 revs
->notes_opt
.use_default_notes
= 1;
2408 enable_ref_display_notes(&revs
->notes_opt
, &revs
->show_notes
, optarg
);
2409 revs
->show_notes_given
= 1;
2410 } else if (!strcmp(arg
, "--no-notes")) {
2411 disable_display_notes(&revs
->notes_opt
, &revs
->show_notes
);
2412 revs
->show_notes_given
= 1;
2413 } else if (!strcmp(arg
, "--standard-notes")) {
2414 revs
->show_notes_given
= 1;
2415 revs
->notes_opt
.use_default_notes
= 1;
2416 } else if (!strcmp(arg
, "--no-standard-notes")) {
2417 revs
->notes_opt
.use_default_notes
= 0;
2418 } else if (!strcmp(arg
, "--oneline")) {
2419 revs
->verbose_header
= 1;
2420 get_commit_format("oneline", revs
);
2421 revs
->pretty_given
= 1;
2422 revs
->abbrev_commit
= 1;
2423 } else if (!strcmp(arg
, "--graph")) {
2424 revs
->topo_order
= 1;
2425 revs
->rewrite_parents
= 1;
2426 revs
->graph
= graph_init(revs
);
2427 } else if (!strcmp(arg
, "--encode-email-headers")) {
2428 revs
->encode_email_headers
= 1;
2429 } else if (!strcmp(arg
, "--no-encode-email-headers")) {
2430 revs
->encode_email_headers
= 0;
2431 } else if (!strcmp(arg
, "--root")) {
2432 revs
->show_root_diff
= 1;
2433 } else if (!strcmp(arg
, "--no-commit-id")) {
2434 revs
->no_commit_id
= 1;
2435 } else if (!strcmp(arg
, "--always")) {
2436 revs
->always_show_header
= 1;
2437 } else if (!strcmp(arg
, "--no-abbrev")) {
2439 } else if (!strcmp(arg
, "--abbrev")) {
2440 revs
->abbrev
= DEFAULT_ABBREV
;
2441 } else if (skip_prefix(arg
, "--abbrev=", &optarg
)) {
2442 revs
->abbrev
= strtoul(optarg
, NULL
, 10);
2443 if (revs
->abbrev
< MINIMUM_ABBREV
)
2444 revs
->abbrev
= MINIMUM_ABBREV
;
2445 else if (revs
->abbrev
> hexsz
)
2446 revs
->abbrev
= hexsz
;
2447 } else if (!strcmp(arg
, "--abbrev-commit")) {
2448 revs
->abbrev_commit
= 1;
2449 revs
->abbrev_commit_given
= 1;
2450 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
2451 revs
->abbrev_commit
= 0;
2452 } else if (!strcmp(arg
, "--full-diff")) {
2454 revs
->full_diff
= 1;
2455 } else if (!strcmp(arg
, "--show-pulls")) {
2456 revs
->show_pulls
= 1;
2457 } else if (!strcmp(arg
, "--full-history")) {
2458 revs
->simplify_history
= 0;
2459 } else if (!strcmp(arg
, "--relative-date")) {
2460 revs
->date_mode
.type
= DATE_RELATIVE
;
2461 revs
->date_mode_explicit
= 1;
2462 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
2463 parse_date_format(optarg
, &revs
->date_mode
);
2464 revs
->date_mode_explicit
= 1;
2466 } else if (!strcmp(arg
, "--log-size")) {
2467 revs
->show_log_size
= 1;
2470 * Grepping the commit log
2472 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
2473 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
2475 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
2476 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
2478 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
2479 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
2481 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
2482 add_message_grep(revs
, optarg
);
2484 } else if (!strcmp(arg
, "--basic-regexp")) {
2485 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_BRE
;
2486 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
2487 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_ERE
;
2488 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
2489 revs
->grep_filter
.ignore_case
= 1;
2490 revs
->diffopt
.pickaxe_opts
|= DIFF_PICKAXE_IGNORE_CASE
;
2491 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
2492 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_FIXED
;
2493 } else if (!strcmp(arg
, "--perl-regexp") || !strcmp(arg
, "-P")) {
2494 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_PCRE
;
2495 } else if (!strcmp(arg
, "--all-match")) {
2496 revs
->grep_filter
.all_match
= 1;
2497 } else if (!strcmp(arg
, "--invert-grep")) {
2498 revs
->invert_grep
= 1;
2499 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
2500 if (strcmp(optarg
, "none"))
2501 git_log_output_encoding
= xstrdup(optarg
);
2503 git_log_output_encoding
= "";
2505 } else if (!strcmp(arg
, "--reverse")) {
2507 } else if (!strcmp(arg
, "--children")) {
2508 revs
->children
.name
= "children";
2510 } else if (!strcmp(arg
, "--ignore-missing")) {
2511 revs
->ignore_missing
= 1;
2512 } else if (opt
&& opt
->allow_exclude_promisor_objects
&&
2513 !strcmp(arg
, "--exclude-promisor-objects")) {
2514 if (fetch_if_missing
)
2515 BUG("exclude_promisor_objects can only be used when fetch_if_missing is 0");
2516 revs
->exclude_promisor_objects
= 1;
2518 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
, revs
->prefix
);
2520 unkv
[(*unkc
)++] = arg
;
2523 if (revs
->graph
&& revs
->track_linear
)
2524 die("--show-linear-break and --graph are incompatible");
2529 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
2530 const struct option
*options
,
2531 const char * const usagestr
[])
2533 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
2534 &ctx
->cpidx
, ctx
->out
, NULL
);
2536 error("unknown option `%s'", ctx
->argv
[0]);
2537 usage_with_options(usagestr
, options
);
2543 static int for_each_bisect_ref(struct ref_store
*refs
, each_ref_fn fn
,
2544 void *cb_data
, const char *term
)
2546 struct strbuf bisect_refs
= STRBUF_INIT
;
2548 strbuf_addf(&bisect_refs
, "refs/bisect/%s", term
);
2549 status
= refs_for_each_fullref_in(refs
, bisect_refs
.buf
, fn
, cb_data
, 0);
2550 strbuf_release(&bisect_refs
);
2554 static int for_each_bad_bisect_ref(struct ref_store
*refs
, each_ref_fn fn
, void *cb_data
)
2556 return for_each_bisect_ref(refs
, fn
, cb_data
, term_bad
);
2559 static int for_each_good_bisect_ref(struct ref_store
*refs
, each_ref_fn fn
, void *cb_data
)
2561 return for_each_bisect_ref(refs
, fn
, cb_data
, term_good
);
2564 static int handle_revision_pseudo_opt(const char *submodule
,
2565 struct rev_info
*revs
,
2566 const char **argv
, int *flags
)
2568 const char *arg
= argv
[0];
2570 struct ref_store
*refs
;
2575 * We need some something like get_submodule_worktrees()
2576 * before we can go through all worktrees of a submodule,
2577 * .e.g with adding all HEADs from --all, which is not
2578 * supported right now, so stick to single worktree.
2580 if (!revs
->single_worktree
)
2581 BUG("--single-worktree cannot be used together with submodule");
2582 refs
= get_submodule_ref_store(submodule
);
2584 refs
= get_main_ref_store(revs
->repo
);
2589 * Commands like "git shortlog" will not accept the options below
2590 * unless parse_revision_opt queues them (as opposed to erroring
2593 * When implementing your new pseudo-option, remember to
2594 * register it in the list at the top of handle_revision_opt.
2596 if (!strcmp(arg
, "--all")) {
2597 handle_refs(refs
, revs
, *flags
, refs_for_each_ref
);
2598 handle_refs(refs
, revs
, *flags
, refs_head_ref
);
2599 if (!revs
->single_worktree
) {
2600 struct all_refs_cb cb
;
2602 init_all_refs_cb(&cb
, revs
, *flags
);
2603 other_head_refs(handle_one_ref
, &cb
);
2605 clear_ref_exclusion(&revs
->ref_excludes
);
2606 } else if (!strcmp(arg
, "--branches")) {
2607 handle_refs(refs
, revs
, *flags
, refs_for_each_branch_ref
);
2608 clear_ref_exclusion(&revs
->ref_excludes
);
2609 } else if (!strcmp(arg
, "--bisect")) {
2610 read_bisect_terms(&term_bad
, &term_good
);
2611 handle_refs(refs
, revs
, *flags
, for_each_bad_bisect_ref
);
2612 handle_refs(refs
, revs
, *flags
^ (UNINTERESTING
| BOTTOM
),
2613 for_each_good_bisect_ref
);
2615 } else if (!strcmp(arg
, "--tags")) {
2616 handle_refs(refs
, revs
, *flags
, refs_for_each_tag_ref
);
2617 clear_ref_exclusion(&revs
->ref_excludes
);
2618 } else if (!strcmp(arg
, "--remotes")) {
2619 handle_refs(refs
, revs
, *flags
, refs_for_each_remote_ref
);
2620 clear_ref_exclusion(&revs
->ref_excludes
);
2621 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
2622 struct all_refs_cb cb
;
2623 init_all_refs_cb(&cb
, revs
, *flags
);
2624 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
2625 clear_ref_exclusion(&revs
->ref_excludes
);
2627 } else if ((argcount
= parse_long_opt("exclude", argv
, &optarg
))) {
2628 add_ref_exclusion(&revs
->ref_excludes
, optarg
);
2630 } else if (skip_prefix(arg
, "--branches=", &optarg
)) {
2631 struct all_refs_cb cb
;
2632 init_all_refs_cb(&cb
, revs
, *flags
);
2633 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/heads/", &cb
);
2634 clear_ref_exclusion(&revs
->ref_excludes
);
2635 } else if (skip_prefix(arg
, "--tags=", &optarg
)) {
2636 struct all_refs_cb cb
;
2637 init_all_refs_cb(&cb
, revs
, *flags
);
2638 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/tags/", &cb
);
2639 clear_ref_exclusion(&revs
->ref_excludes
);
2640 } else if (skip_prefix(arg
, "--remotes=", &optarg
)) {
2641 struct all_refs_cb cb
;
2642 init_all_refs_cb(&cb
, revs
, *flags
);
2643 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/remotes/", &cb
);
2644 clear_ref_exclusion(&revs
->ref_excludes
);
2645 } else if (!strcmp(arg
, "--reflog")) {
2646 add_reflogs_to_pending(revs
, *flags
);
2647 } else if (!strcmp(arg
, "--indexed-objects")) {
2648 add_index_objects_to_pending(revs
, *flags
);
2649 } else if (!strcmp(arg
, "--alternate-refs")) {
2650 add_alternate_refs_to_pending(revs
, *flags
);
2651 } else if (!strcmp(arg
, "--not")) {
2652 *flags
^= UNINTERESTING
| BOTTOM
;
2653 } else if (!strcmp(arg
, "--no-walk")) {
2655 } else if (skip_prefix(arg
, "--no-walk=", &optarg
)) {
2657 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2658 * not allowed, since the argument is optional.
2661 if (!strcmp(optarg
, "sorted"))
2662 revs
->unsorted_input
= 0;
2663 else if (!strcmp(optarg
, "unsorted"))
2664 revs
->unsorted_input
= 1;
2666 return error("invalid argument to --no-walk");
2667 } else if (!strcmp(arg
, "--do-walk")) {
2669 } else if (!strcmp(arg
, "--single-worktree")) {
2670 revs
->single_worktree
= 1;
2678 static void NORETURN
diagnose_missing_default(const char *def
)
2681 const char *refname
;
2683 refname
= resolve_ref_unsafe(def
, 0, NULL
, &flags
);
2684 if (!refname
|| !(flags
& REF_ISSYMREF
) || (flags
& REF_ISBROKEN
))
2685 die(_("your current branch appears to be broken"));
2687 skip_prefix(refname
, "refs/heads/", &refname
);
2688 die(_("your current branch '%s' does not have any commits yet"),
2693 * Parse revision information, filling in the "rev_info" structure,
2694 * and removing the used arguments from the argument list.
2696 * Returns the number of arguments left that weren't recognized
2697 * (which are also moved to the head of the argument list)
2699 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
2701 int i
, flags
, left
, seen_dashdash
, revarg_opt
;
2702 struct strvec prune_data
= STRVEC_INIT
;
2703 const char *submodule
= NULL
;
2704 int seen_end_of_options
= 0;
2707 submodule
= opt
->submodule
;
2709 /* First, search for "--" */
2710 if (opt
&& opt
->assume_dashdash
) {
2714 for (i
= 1; i
< argc
; i
++) {
2715 const char *arg
= argv
[i
];
2716 if (strcmp(arg
, "--"))
2721 strvec_pushv(&prune_data
, argv
+ i
+ 1);
2727 /* Second, deal with arguments and options */
2729 revarg_opt
= opt
? opt
->revarg_opt
: 0;
2731 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
2732 for (left
= i
= 1; i
< argc
; i
++) {
2733 const char *arg
= argv
[i
];
2734 if (!seen_end_of_options
&& *arg
== '-') {
2737 opts
= handle_revision_pseudo_opt(submodule
,
2745 if (!strcmp(arg
, "--stdin")) {
2746 if (revs
->disable_stdin
) {
2750 if (revs
->read_from_stdin
++)
2751 die("--stdin given twice?");
2752 read_revisions_from_stdin(revs
, &prune_data
);
2756 if (!strcmp(arg
, "--end-of-options")) {
2757 seen_end_of_options
= 1;
2761 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
,
2773 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
2775 if (seen_dashdash
|| *arg
== '^')
2776 die("bad revision '%s'", arg
);
2778 /* If we didn't have a "--":
2779 * (1) all filenames must exist;
2780 * (2) all rev-args must not be interpretable
2781 * as a valid filename.
2782 * but the latter we have checked in the main loop.
2784 for (j
= i
; j
< argc
; j
++)
2785 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
2787 strvec_pushv(&prune_data
, argv
+ i
);
2792 if (prune_data
.nr
) {
2794 * If we need to introduce the magic "a lone ':' means no
2795 * pathspec whatsoever", here is the place to do so.
2797 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2798 * prune_data.nr = 0;
2799 * prune_data.alloc = 0;
2800 * free(prune_data.path);
2801 * prune_data.path = NULL;
2803 * terminate prune_data.alloc with NULL and
2804 * call init_pathspec() to set revs->prune_data here.
2807 parse_pathspec(&revs
->prune_data
, 0, 0,
2808 revs
->prefix
, prune_data
.v
);
2810 strvec_clear(&prune_data
);
2812 if (revs
->def
== NULL
)
2813 revs
->def
= opt
? opt
->def
: NULL
;
2814 if (opt
&& opt
->tweak
)
2815 opt
->tweak(revs
, opt
);
2816 if (revs
->show_merge
)
2817 prepare_show_merge(revs
);
2818 if (revs
->def
&& !revs
->pending
.nr
&& !revs
->rev_input_given
) {
2819 struct object_id oid
;
2820 struct object
*object
;
2821 struct object_context oc
;
2822 if (get_oid_with_context(revs
->repo
, revs
->def
, 0, &oid
, &oc
))
2823 diagnose_missing_default(revs
->def
);
2824 object
= get_reference(revs
, revs
->def
, &oid
, 0);
2825 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
);
2828 /* Did the user ask for any diff output? Run the diff! */
2829 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
2832 /* Pickaxe, diff-filter and rename following need diffs */
2833 if ((revs
->diffopt
.pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
) ||
2834 revs
->diffopt
.filter
||
2835 revs
->diffopt
.flags
.follow_renames
)
2838 if (revs
->diffopt
.objfind
)
2839 revs
->simplify_history
= 0;
2841 if (revs
->line_level_traverse
) {
2842 if (want_ancestry(revs
))
2844 revs
->topo_order
= 1;
2847 if (revs
->topo_order
&& !generation_numbers_enabled(the_repository
))
2850 if (revs
->prune_data
.nr
) {
2851 copy_pathspec(&revs
->pruning
.pathspec
, &revs
->prune_data
);
2852 /* Can't prune commits with rename following: the paths change.. */
2853 if (!revs
->diffopt
.flags
.follow_renames
)
2855 if (!revs
->full_diff
)
2856 copy_pathspec(&revs
->diffopt
.pathspec
,
2860 diff_merges_setup_revs(revs
);
2862 revs
->diffopt
.abbrev
= revs
->abbrev
;
2864 diff_setup_done(&revs
->diffopt
);
2866 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED
,
2867 &revs
->grep_filter
);
2868 if (!is_encoding_utf8(get_log_output_encoding()))
2869 revs
->grep_filter
.ignore_locale
= 1;
2870 compile_grep_patterns(&revs
->grep_filter
);
2872 if (revs
->reverse
&& revs
->reflog_info
)
2873 die("cannot combine --reverse with --walk-reflogs");
2874 if (revs
->reflog_info
&& revs
->limited
)
2875 die("cannot combine --walk-reflogs with history-limiting options");
2876 if (revs
->rewrite_parents
&& revs
->children
.name
)
2877 die("cannot combine --parents and --children");
2880 * Limitations on the graph functionality
2882 if (revs
->reverse
&& revs
->graph
)
2883 die("cannot combine --reverse with --graph");
2885 if (revs
->reflog_info
&& revs
->graph
)
2886 die("cannot combine --walk-reflogs with --graph");
2887 if (revs
->no_walk
&& revs
->graph
)
2888 die("cannot combine --no-walk with --graph");
2889 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
2890 die("cannot use --grep-reflog without --walk-reflogs");
2892 if (revs
->line_level_traverse
&&
2893 (revs
->diffopt
.output_format
& ~(DIFF_FORMAT_PATCH
| DIFF_FORMAT_NO_OUTPUT
)))
2894 die(_("-L does not yet support diff formats besides -p and -s"));
2896 if (revs
->expand_tabs_in_log
< 0)
2897 revs
->expand_tabs_in_log
= revs
->expand_tabs_in_log_default
;
2902 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
2904 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
2907 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
2910 static int remove_duplicate_parents(struct rev_info
*revs
, struct commit
*commit
)
2912 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2913 struct commit_list
**pp
, *p
;
2914 int surviving_parents
;
2916 /* Examine existing parents while marking ones we have seen... */
2917 pp
= &commit
->parents
;
2918 surviving_parents
= 0;
2919 while ((p
= *pp
) != NULL
) {
2920 struct commit
*parent
= p
->item
;
2921 if (parent
->object
.flags
& TMP_MARK
) {
2924 compact_treesame(revs
, commit
, surviving_parents
);
2927 parent
->object
.flags
|= TMP_MARK
;
2928 surviving_parents
++;
2931 /* clear the temporary mark */
2932 for (p
= commit
->parents
; p
; p
= p
->next
) {
2933 p
->item
->object
.flags
&= ~TMP_MARK
;
2935 /* no update_treesame() - removing duplicates can't affect TREESAME */
2936 return surviving_parents
;
2939 struct merge_simplify_state
{
2940 struct commit
*simplified
;
2943 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
2945 struct merge_simplify_state
*st
;
2947 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
2949 CALLOC_ARRAY(st
, 1);
2950 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
2955 static int mark_redundant_parents(struct commit
*commit
)
2957 struct commit_list
*h
= reduce_heads(commit
->parents
);
2958 int i
= 0, marked
= 0;
2959 struct commit_list
*po
, *pn
;
2961 /* Want these for sanity-checking only */
2962 int orig_cnt
= commit_list_count(commit
->parents
);
2963 int cnt
= commit_list_count(h
);
2966 * Not ready to remove items yet, just mark them for now, based
2967 * on the output of reduce_heads(). reduce_heads outputs the reduced
2968 * set in its original order, so this isn't too hard.
2970 po
= commit
->parents
;
2973 if (pn
&& po
->item
== pn
->item
) {
2977 po
->item
->object
.flags
|= TMP_MARK
;
2983 if (i
!= cnt
|| cnt
+marked
!= orig_cnt
)
2984 die("mark_redundant_parents %d %d %d %d", orig_cnt
, cnt
, i
, marked
);
2986 free_commit_list(h
);
2991 static int mark_treesame_root_parents(struct commit
*commit
)
2993 struct commit_list
*p
;
2996 for (p
= commit
->parents
; p
; p
= p
->next
) {
2997 struct commit
*parent
= p
->item
;
2998 if (!parent
->parents
&& (parent
->object
.flags
& TREESAME
)) {
2999 parent
->object
.flags
|= TMP_MARK
;
3008 * Awkward naming - this means one parent we are TREESAME to.
3009 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
3010 * empty tree). Better name suggestions?
3012 static int leave_one_treesame_to_parent(struct rev_info
*revs
, struct commit
*commit
)
3014 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
3015 struct commit
*unmarked
= NULL
, *marked
= NULL
;
3016 struct commit_list
*p
;
3019 for (p
= commit
->parents
, n
= 0; p
; p
= p
->next
, n
++) {
3020 if (ts
->treesame
[n
]) {
3021 if (p
->item
->object
.flags
& TMP_MARK
) {
3034 * If we are TREESAME to a marked-for-deletion parent, but not to any
3035 * unmarked parents, unmark the first TREESAME parent. This is the
3036 * parent that the default simplify_history==1 scan would have followed,
3037 * and it doesn't make sense to omit that path when asking for a
3038 * simplified full history. Retaining it improves the chances of
3039 * understanding odd missed merges that took an old version of a file.
3043 * I--------*X A modified the file, but mainline merge X used
3044 * \ / "-s ours", so took the version from I. X is
3045 * `-*A--' TREESAME to I and !TREESAME to A.
3047 * Default log from X would produce "I". Without this check,
3048 * --full-history --simplify-merges would produce "I-A-X", showing
3049 * the merge commit X and that it changed A, but not making clear that
3050 * it had just taken the I version. With this check, the topology above
3053 * Note that it is possible that the simplification chooses a different
3054 * TREESAME parent from the default, in which case this test doesn't
3055 * activate, and we _do_ drop the default parent. Example:
3057 * I------X A modified the file, but it was reverted in B,
3058 * \ / meaning mainline merge X is TREESAME to both
3061 * Default log would produce "I" by following the first parent;
3062 * --full-history --simplify-merges will produce "I-A-B". But this is a
3063 * reasonable result - it presents a logical full history leading from
3064 * I to X, and X is not an important merge.
3066 if (!unmarked
&& marked
) {
3067 marked
->object
.flags
&= ~TMP_MARK
;
3074 static int remove_marked_parents(struct rev_info
*revs
, struct commit
*commit
)
3076 struct commit_list
**pp
, *p
;
3077 int nth_parent
, removed
= 0;
3079 pp
= &commit
->parents
;
3081 while ((p
= *pp
) != NULL
) {
3082 struct commit
*parent
= p
->item
;
3083 if (parent
->object
.flags
& TMP_MARK
) {
3084 parent
->object
.flags
&= ~TMP_MARK
;
3088 compact_treesame(revs
, commit
, nth_parent
);
3095 /* Removing parents can only increase TREESAMEness */
3096 if (removed
&& !(commit
->object
.flags
& TREESAME
))
3097 update_treesame(revs
, commit
);
3102 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
3104 struct commit_list
*p
;
3105 struct commit
*parent
;
3106 struct merge_simplify_state
*st
, *pst
;
3109 st
= locate_simplify_state(revs
, commit
);
3112 * Have we handled this one?
3118 * An UNINTERESTING commit simplifies to itself, so does a
3119 * root commit. We do not rewrite parents of such commit
3122 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
3123 st
->simplified
= commit
;
3128 * Do we know what commit all of our parents that matter
3129 * should be rewritten to? Otherwise we are not ready to
3130 * rewrite this one yet.
3132 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
3133 pst
= locate_simplify_state(revs
, p
->item
);
3134 if (!pst
->simplified
) {
3135 tail
= &commit_list_insert(p
->item
, tail
)->next
;
3138 if (revs
->first_parent_only
)
3142 tail
= &commit_list_insert(commit
, tail
)->next
;
3147 * Rewrite our list of parents. Note that this cannot
3148 * affect our TREESAME flags in any way - a commit is
3149 * always TREESAME to its simplification.
3151 for (p
= commit
->parents
; p
; p
= p
->next
) {
3152 pst
= locate_simplify_state(revs
, p
->item
);
3153 p
->item
= pst
->simplified
;
3154 if (revs
->first_parent_only
)
3158 if (revs
->first_parent_only
)
3161 cnt
= remove_duplicate_parents(revs
, commit
);
3164 * It is possible that we are a merge and one side branch
3165 * does not have any commit that touches the given paths;
3166 * in such a case, the immediate parent from that branch
3167 * will be rewritten to be the merge base.
3169 * o----X X: the commit we are looking at;
3170 * / / o: a commit that touches the paths;
3173 * Further, a merge of an independent branch that doesn't
3174 * touch the path will reduce to a treesame root parent:
3176 * ----o----X X: the commit we are looking at;
3177 * / o: a commit that touches the paths;
3178 * r r: a root commit not touching the paths
3180 * Detect and simplify both cases.
3183 int marked
= mark_redundant_parents(commit
);
3184 marked
+= mark_treesame_root_parents(commit
);
3186 marked
-= leave_one_treesame_to_parent(revs
, commit
);
3188 cnt
= remove_marked_parents(revs
, commit
);
3192 * A commit simplifies to itself if it is a root, if it is
3193 * UNINTERESTING, if it touches the given paths, or if it is a
3194 * merge and its parents don't simplify to one relevant commit
3195 * (the first two cases are already handled at the beginning of
3198 * Otherwise, it simplifies to what its sole relevant parent
3202 (commit
->object
.flags
& UNINTERESTING
) ||
3203 !(commit
->object
.flags
& TREESAME
) ||
3204 (parent
= one_relevant_parent(revs
, commit
->parents
)) == NULL
||
3205 (revs
->show_pulls
&& (commit
->object
.flags
& PULL_MERGE
)))
3206 st
->simplified
= commit
;
3208 pst
= locate_simplify_state(revs
, parent
);
3209 st
->simplified
= pst
->simplified
;
3214 static void simplify_merges(struct rev_info
*revs
)
3216 struct commit_list
*list
, *next
;
3217 struct commit_list
*yet_to_do
, **tail
;
3218 struct commit
*commit
;
3223 /* feed the list reversed */
3225 for (list
= revs
->commits
; list
; list
= next
) {
3226 commit
= list
->item
;
3229 * Do not free(list) here yet; the original list
3230 * is used later in this function.
3232 commit_list_insert(commit
, &yet_to_do
);
3239 commit
= pop_commit(&list
);
3240 tail
= simplify_one(revs
, commit
, tail
);
3244 /* clean up the result, removing the simplified ones */
3245 list
= revs
->commits
;
3246 revs
->commits
= NULL
;
3247 tail
= &revs
->commits
;
3249 struct merge_simplify_state
*st
;
3251 commit
= pop_commit(&list
);
3252 st
= locate_simplify_state(revs
, commit
);
3253 if (st
->simplified
== commit
)
3254 tail
= &commit_list_insert(commit
, tail
)->next
;
3258 static void set_children(struct rev_info
*revs
)
3260 struct commit_list
*l
;
3261 for (l
= revs
->commits
; l
; l
= l
->next
) {
3262 struct commit
*commit
= l
->item
;
3263 struct commit_list
*p
;
3265 for (p
= commit
->parents
; p
; p
= p
->next
)
3266 add_child(revs
, p
->item
, commit
);
3270 void reset_revision_walk(void)
3272 clear_object_flags(SEEN
| ADDED
| SHOWN
| TOPO_WALK_EXPLORED
| TOPO_WALK_INDEGREE
);
3275 static int mark_uninteresting(const struct object_id
*oid
,
3276 struct packed_git
*pack
,
3280 struct rev_info
*revs
= cb
;
3281 struct object
*o
= lookup_unknown_object(revs
->repo
, oid
);
3282 o
->flags
|= UNINTERESTING
| SEEN
;
3286 define_commit_slab(indegree_slab
, int);
3287 define_commit_slab(author_date_slab
, timestamp_t
);
3289 struct topo_walk_info
{
3290 timestamp_t min_generation
;
3291 struct prio_queue explore_queue
;
3292 struct prio_queue indegree_queue
;
3293 struct prio_queue topo_queue
;
3294 struct indegree_slab indegree
;
3295 struct author_date_slab author_date
;
3298 static int topo_walk_atexit_registered
;
3299 static unsigned int count_explore_walked
;
3300 static unsigned int count_indegree_walked
;
3301 static unsigned int count_topo_walked
;
3303 static void trace2_topo_walk_statistics_atexit(void)
3305 struct json_writer jw
= JSON_WRITER_INIT
;
3307 jw_object_begin(&jw
, 0);
3308 jw_object_intmax(&jw
, "count_explore_walked", count_explore_walked
);
3309 jw_object_intmax(&jw
, "count_indegree_walked", count_indegree_walked
);
3310 jw_object_intmax(&jw
, "count_topo_walked", count_topo_walked
);
3313 trace2_data_json("topo_walk", the_repository
, "statistics", &jw
);
3318 static inline void test_flag_and_insert(struct prio_queue
*q
, struct commit
*c
, int flag
)
3320 if (c
->object
.flags
& flag
)
3323 c
->object
.flags
|= flag
;
3324 prio_queue_put(q
, c
);
3327 static void explore_walk_step(struct rev_info
*revs
)
3329 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3330 struct commit_list
*p
;
3331 struct commit
*c
= prio_queue_get(&info
->explore_queue
);
3336 if (repo_parse_commit_gently(revs
->repo
, c
, 1) < 0)
3339 count_explore_walked
++;
3341 if (revs
->sort_order
== REV_SORT_BY_AUTHOR_DATE
)
3342 record_author_date(&info
->author_date
, c
);
3344 if (revs
->max_age
!= -1 && (c
->date
< revs
->max_age
))
3345 c
->object
.flags
|= UNINTERESTING
;
3347 if (process_parents(revs
, c
, NULL
, NULL
) < 0)
3350 if (c
->object
.flags
& UNINTERESTING
)
3351 mark_parents_uninteresting(c
);
3353 for (p
= c
->parents
; p
; p
= p
->next
)
3354 test_flag_and_insert(&info
->explore_queue
, p
->item
, TOPO_WALK_EXPLORED
);
3357 static void explore_to_depth(struct rev_info
*revs
,
3358 timestamp_t gen_cutoff
)
3360 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3362 while ((c
= prio_queue_peek(&info
->explore_queue
)) &&
3363 commit_graph_generation(c
) >= gen_cutoff
)
3364 explore_walk_step(revs
);
3367 static void indegree_walk_step(struct rev_info
*revs
)
3369 struct commit_list
*p
;
3370 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3371 struct commit
*c
= prio_queue_get(&info
->indegree_queue
);
3376 if (repo_parse_commit_gently(revs
->repo
, c
, 1) < 0)
3379 count_indegree_walked
++;
3381 explore_to_depth(revs
, commit_graph_generation(c
));
3383 for (p
= c
->parents
; p
; p
= p
->next
) {
3384 struct commit
*parent
= p
->item
;
3385 int *pi
= indegree_slab_at(&info
->indegree
, parent
);
3387 if (repo_parse_commit_gently(revs
->repo
, parent
, 1) < 0)
3395 test_flag_and_insert(&info
->indegree_queue
, parent
, TOPO_WALK_INDEGREE
);
3397 if (revs
->first_parent_only
)
3402 static void compute_indegrees_to_depth(struct rev_info
*revs
,
3403 timestamp_t gen_cutoff
)
3405 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3407 while ((c
= prio_queue_peek(&info
->indegree_queue
)) &&
3408 commit_graph_generation(c
) >= gen_cutoff
)
3409 indegree_walk_step(revs
);
3412 static void reset_topo_walk(struct rev_info
*revs
)
3414 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3416 clear_prio_queue(&info
->explore_queue
);
3417 clear_prio_queue(&info
->indegree_queue
);
3418 clear_prio_queue(&info
->topo_queue
);
3419 clear_indegree_slab(&info
->indegree
);
3420 clear_author_date_slab(&info
->author_date
);
3422 FREE_AND_NULL(revs
->topo_walk_info
);
3425 static void init_topo_walk(struct rev_info
*revs
)
3427 struct topo_walk_info
*info
;
3428 struct commit_list
*list
;
3429 if (revs
->topo_walk_info
)
3430 reset_topo_walk(revs
);
3432 revs
->topo_walk_info
= xmalloc(sizeof(struct topo_walk_info
));
3433 info
= revs
->topo_walk_info
;
3434 memset(info
, 0, sizeof(struct topo_walk_info
));
3436 init_indegree_slab(&info
->indegree
);
3437 memset(&info
->explore_queue
, 0, sizeof(info
->explore_queue
));
3438 memset(&info
->indegree_queue
, 0, sizeof(info
->indegree_queue
));
3439 memset(&info
->topo_queue
, 0, sizeof(info
->topo_queue
));
3441 switch (revs
->sort_order
) {
3442 default: /* REV_SORT_IN_GRAPH_ORDER */
3443 info
->topo_queue
.compare
= NULL
;
3445 case REV_SORT_BY_COMMIT_DATE
:
3446 info
->topo_queue
.compare
= compare_commits_by_commit_date
;
3448 case REV_SORT_BY_AUTHOR_DATE
:
3449 init_author_date_slab(&info
->author_date
);
3450 info
->topo_queue
.compare
= compare_commits_by_author_date
;
3451 info
->topo_queue
.cb_data
= &info
->author_date
;
3455 info
->explore_queue
.compare
= compare_commits_by_gen_then_commit_date
;
3456 info
->indegree_queue
.compare
= compare_commits_by_gen_then_commit_date
;
3458 info
->min_generation
= GENERATION_NUMBER_INFINITY
;
3459 for (list
= revs
->commits
; list
; list
= list
->next
) {
3460 struct commit
*c
= list
->item
;
3461 timestamp_t generation
;
3463 if (repo_parse_commit_gently(revs
->repo
, c
, 1))
3466 test_flag_and_insert(&info
->explore_queue
, c
, TOPO_WALK_EXPLORED
);
3467 test_flag_and_insert(&info
->indegree_queue
, c
, TOPO_WALK_INDEGREE
);
3469 generation
= commit_graph_generation(c
);
3470 if (generation
< info
->min_generation
)
3471 info
->min_generation
= generation
;
3473 *(indegree_slab_at(&info
->indegree
, c
)) = 1;
3475 if (revs
->sort_order
== REV_SORT_BY_AUTHOR_DATE
)
3476 record_author_date(&info
->author_date
, c
);
3478 compute_indegrees_to_depth(revs
, info
->min_generation
);
3480 for (list
= revs
->commits
; list
; list
= list
->next
) {
3481 struct commit
*c
= list
->item
;
3483 if (*(indegree_slab_at(&info
->indegree
, c
)) == 1)
3484 prio_queue_put(&info
->topo_queue
, c
);
3488 * This is unfortunate; the initial tips need to be shown
3489 * in the order given from the revision traversal machinery.
3491 if (revs
->sort_order
== REV_SORT_IN_GRAPH_ORDER
)
3492 prio_queue_reverse(&info
->topo_queue
);
3494 if (trace2_is_enabled() && !topo_walk_atexit_registered
) {
3495 atexit(trace2_topo_walk_statistics_atexit
);
3496 topo_walk_atexit_registered
= 1;
3500 static struct commit
*next_topo_commit(struct rev_info
*revs
)
3503 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3505 /* pop next off of topo_queue */
3506 c
= prio_queue_get(&info
->topo_queue
);
3509 *(indegree_slab_at(&info
->indegree
, c
)) = 0;
3514 static void expand_topo_walk(struct rev_info
*revs
, struct commit
*commit
)
3516 struct commit_list
*p
;
3517 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3518 if (process_parents(revs
, commit
, NULL
, NULL
) < 0) {
3519 if (!revs
->ignore_missing_links
)
3520 die("Failed to traverse parents of commit %s",
3521 oid_to_hex(&commit
->object
.oid
));
3524 count_topo_walked
++;
3526 for (p
= commit
->parents
; p
; p
= p
->next
) {
3527 struct commit
*parent
= p
->item
;
3529 timestamp_t generation
;
3531 if (parent
->object
.flags
& UNINTERESTING
)
3534 if (repo_parse_commit_gently(revs
->repo
, parent
, 1) < 0)
3537 generation
= commit_graph_generation(parent
);
3538 if (generation
< info
->min_generation
) {
3539 info
->min_generation
= generation
;
3540 compute_indegrees_to_depth(revs
, info
->min_generation
);
3543 pi
= indegree_slab_at(&info
->indegree
, parent
);
3547 prio_queue_put(&info
->topo_queue
, parent
);
3549 if (revs
->first_parent_only
)
3554 int prepare_revision_walk(struct rev_info
*revs
)
3557 struct object_array old_pending
;
3558 struct commit_list
**next
= &revs
->commits
;
3560 memcpy(&old_pending
, &revs
->pending
, sizeof(old_pending
));
3561 revs
->pending
.nr
= 0;
3562 revs
->pending
.alloc
= 0;
3563 revs
->pending
.objects
= NULL
;
3564 for (i
= 0; i
< old_pending
.nr
; i
++) {
3565 struct object_array_entry
*e
= old_pending
.objects
+ i
;
3566 struct commit
*commit
= handle_commit(revs
, e
);
3568 if (!(commit
->object
.flags
& SEEN
)) {
3569 commit
->object
.flags
|= SEEN
;
3570 next
= commit_list_append(commit
, next
);
3574 object_array_clear(&old_pending
);
3576 /* Signal whether we need per-parent treesame decoration */
3577 if (revs
->simplify_merges
||
3578 (revs
->limited
&& limiting_can_increase_treesame(revs
)))
3579 revs
->treesame
.name
= "treesame";
3581 if (revs
->exclude_promisor_objects
) {
3582 for_each_packed_object(mark_uninteresting
, revs
,
3583 FOR_EACH_OBJECT_PROMISOR_ONLY
);
3586 if (!revs
->reflog_info
)
3587 prepare_to_use_bloom_filter(revs
);
3588 if (!revs
->unsorted_input
)
3589 commit_list_sort_by_date(&revs
->commits
);
3592 if (revs
->limited
) {
3593 if (limit_list(revs
) < 0)
3595 if (revs
->topo_order
)
3596 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
3597 } else if (revs
->topo_order
)
3598 init_topo_walk(revs
);
3599 if (revs
->line_level_traverse
&& want_ancestry(revs
))
3601 * At the moment we can only do line-level log with parent
3602 * rewriting by performing this expensive pre-filtering step.
3603 * If parent rewriting is not requested, then we rather
3604 * perform the line-level log filtering during the regular
3605 * history traversal.
3607 line_log_filter(revs
);
3608 if (revs
->simplify_merges
)
3609 simplify_merges(revs
);
3610 if (revs
->children
.name
)
3616 static enum rewrite_result
rewrite_one_1(struct rev_info
*revs
,
3618 struct prio_queue
*queue
)
3621 struct commit
*p
= *pp
;
3623 if (process_parents(revs
, p
, NULL
, queue
) < 0)
3624 return rewrite_one_error
;
3625 if (p
->object
.flags
& UNINTERESTING
)
3626 return rewrite_one_ok
;
3627 if (!(p
->object
.flags
& TREESAME
))
3628 return rewrite_one_ok
;
3630 return rewrite_one_noparents
;
3631 if ((p
= one_relevant_parent(revs
, p
->parents
)) == NULL
)
3632 return rewrite_one_ok
;
3637 static void merge_queue_into_list(struct prio_queue
*q
, struct commit_list
**list
)
3640 struct commit
*item
= prio_queue_peek(q
);
3641 struct commit_list
*p
= *list
;
3643 if (p
&& p
->item
->date
>= item
->date
)
3646 p
= commit_list_insert(item
, list
);
3647 list
= &p
->next
; /* skip newly added item */
3648 prio_queue_get(q
); /* pop item */
3653 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
3655 struct prio_queue queue
= { compare_commits_by_commit_date
};
3656 enum rewrite_result ret
= rewrite_one_1(revs
, pp
, &queue
);
3657 merge_queue_into_list(&queue
, &revs
->commits
);
3658 clear_prio_queue(&queue
);
3662 int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
,
3663 rewrite_parent_fn_t rewrite_parent
)
3665 struct commit_list
**pp
= &commit
->parents
;
3667 struct commit_list
*parent
= *pp
;
3668 switch (rewrite_parent(revs
, &parent
->item
)) {
3669 case rewrite_one_ok
:
3671 case rewrite_one_noparents
:
3674 case rewrite_one_error
:
3679 remove_duplicate_parents(revs
, commit
);
3683 static int commit_rewrite_person(struct strbuf
*buf
, const char *what
, struct string_list
*mailmap
)
3685 char *person
, *endp
;
3686 size_t len
, namelen
, maillen
;
3689 struct ident_split ident
;
3691 person
= strstr(buf
->buf
, what
);
3695 person
+= strlen(what
);
3696 endp
= strchr(person
, '\n');
3700 len
= endp
- person
;
3702 if (split_ident_line(&ident
, person
, len
))
3705 mail
= ident
.mail_begin
;
3706 maillen
= ident
.mail_end
- ident
.mail_begin
;
3707 name
= ident
.name_begin
;
3708 namelen
= ident
.name_end
- ident
.name_begin
;
3710 if (map_user(mailmap
, &mail
, &maillen
, &name
, &namelen
)) {
3711 struct strbuf namemail
= STRBUF_INIT
;
3713 strbuf_addf(&namemail
, "%.*s <%.*s>",
3714 (int)namelen
, name
, (int)maillen
, mail
);
3716 strbuf_splice(buf
, ident
.name_begin
- buf
->buf
,
3717 ident
.mail_end
- ident
.name_begin
+ 1,
3718 namemail
.buf
, namemail
.len
);
3720 strbuf_release(&namemail
);
3728 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
3731 const char *encoding
;
3732 const char *message
;
3733 struct strbuf buf
= STRBUF_INIT
;
3735 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
3738 /* Prepend "fake" headers as needed */
3739 if (opt
->grep_filter
.use_reflog_filter
) {
3740 strbuf_addstr(&buf
, "reflog ");
3741 get_reflog_message(&buf
, opt
->reflog_info
);
3742 strbuf_addch(&buf
, '\n');
3746 * We grep in the user's output encoding, under the assumption that it
3747 * is the encoding they are most likely to write their grep pattern
3748 * for. In addition, it means we will match the "notes" encoding below,
3749 * so we will not end up with a buffer that has two different encodings
3752 encoding
= get_log_output_encoding();
3753 message
= logmsg_reencode(commit
, NULL
, encoding
);
3755 /* Copy the commit to temporary if we are using "fake" headers */
3757 strbuf_addstr(&buf
, message
);
3759 if (opt
->grep_filter
.header_list
&& opt
->mailmap
) {
3761 strbuf_addstr(&buf
, message
);
3763 commit_rewrite_person(&buf
, "\nauthor ", opt
->mailmap
);
3764 commit_rewrite_person(&buf
, "\ncommitter ", opt
->mailmap
);
3767 /* Append "fake" message parts as needed */
3768 if (opt
->show_notes
) {
3770 strbuf_addstr(&buf
, message
);
3771 format_display_notes(&commit
->object
.oid
, &buf
, encoding
, 1);
3775 * Find either in the original commit message, or in the temporary.
3776 * Note that we cast away the constness of "message" here. It is
3777 * const because it may come from the cached commit buffer. That's OK,
3778 * because we know that it is modifiable heap memory, and that while
3779 * grep_buffer may modify it for speed, it will restore any
3780 * changes before returning.
3783 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
3785 retval
= grep_buffer(&opt
->grep_filter
,
3786 (char *)message
, strlen(message
));
3787 strbuf_release(&buf
);
3788 unuse_commit_buffer(commit
, message
);
3789 return opt
->invert_grep
? !retval
: retval
;
3792 static inline int want_ancestry(const struct rev_info
*revs
)
3794 return (revs
->rewrite_parents
|| revs
->children
.name
);
3798 * Return a timestamp to be used for --since/--until comparisons for this
3799 * commit, based on the revision options.
3801 static timestamp_t
comparison_date(const struct rev_info
*revs
,
3802 struct commit
*commit
)
3804 return revs
->reflog_info
?
3805 get_reflog_timestamp(revs
->reflog_info
) :
3809 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
3811 if (commit
->object
.flags
& SHOWN
)
3812 return commit_ignore
;
3813 if (revs
->unpacked
&& has_object_pack(&commit
->object
.oid
))
3814 return commit_ignore
;
3815 if (revs
->no_kept_objects
) {
3816 if (has_object_kept_pack(&commit
->object
.oid
,
3817 revs
->keep_pack_cache_flags
))
3818 return commit_ignore
;
3820 if (commit
->object
.flags
& UNINTERESTING
)
3821 return commit_ignore
;
3822 if (revs
->line_level_traverse
&& !want_ancestry(revs
)) {
3824 * In case of line-level log with parent rewriting
3825 * prepare_revision_walk() already took care of all line-level
3826 * log filtering, and there is nothing left to do here.
3828 * If parent rewriting was not requested, then this is the
3829 * place to perform the line-level log filtering. Notably,
3830 * this check, though expensive, must come before the other,
3831 * cheaper filtering conditions, because the tracked line
3832 * ranges must be adjusted even when the commit will end up
3833 * being ignored based on other conditions.
3835 if (!line_log_process_ranges_arbitrary_commit(revs
, commit
))
3836 return commit_ignore
;
3838 if (revs
->min_age
!= -1 &&
3839 comparison_date(revs
, commit
) > revs
->min_age
)
3840 return commit_ignore
;
3841 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
3842 int n
= commit_list_count(commit
->parents
);
3843 if ((n
< revs
->min_parents
) ||
3844 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
3845 return commit_ignore
;
3847 if (!commit_match(commit
, revs
))
3848 return commit_ignore
;
3849 if (revs
->prune
&& revs
->dense
) {
3850 /* Commit without changes? */
3851 if (commit
->object
.flags
& TREESAME
) {
3853 struct commit_list
*p
;
3854 /* drop merges unless we want parenthood */
3855 if (!want_ancestry(revs
))
3856 return commit_ignore
;
3858 if (revs
->show_pulls
&& (commit
->object
.flags
& PULL_MERGE
))
3862 * If we want ancestry, then need to keep any merges
3863 * between relevant commits to tie together topology.
3864 * For consistency with TREESAME and simplification
3865 * use "relevant" here rather than just INTERESTING,
3866 * to treat bottom commit(s) as part of the topology.
3868 for (n
= 0, p
= commit
->parents
; p
; p
= p
->next
)
3869 if (relevant_commit(p
->item
))
3872 return commit_ignore
;
3878 define_commit_slab(saved_parents
, struct commit_list
*);
3880 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3883 * You may only call save_parents() once per commit (this is checked
3884 * for non-root commits).
3886 static void save_parents(struct rev_info
*revs
, struct commit
*commit
)
3888 struct commit_list
**pp
;
3890 if (!revs
->saved_parents_slab
) {
3891 revs
->saved_parents_slab
= xmalloc(sizeof(struct saved_parents
));
3892 init_saved_parents(revs
->saved_parents_slab
);
3895 pp
= saved_parents_at(revs
->saved_parents_slab
, commit
);
3898 * When walking with reflogs, we may visit the same commit
3899 * several times: once for each appearance in the reflog.
3901 * In this case, save_parents() will be called multiple times.
3902 * We want to keep only the first set of parents. We need to
3903 * store a sentinel value for an empty (i.e., NULL) parent
3904 * list to distinguish it from a not-yet-saved list, however.
3908 if (commit
->parents
)
3909 *pp
= copy_commit_list(commit
->parents
);
3911 *pp
= EMPTY_PARENT_LIST
;
3914 static void free_saved_parents(struct rev_info
*revs
)
3916 if (revs
->saved_parents_slab
)
3917 clear_saved_parents(revs
->saved_parents_slab
);
3920 struct commit_list
*get_saved_parents(struct rev_info
*revs
, const struct commit
*commit
)
3922 struct commit_list
*parents
;
3924 if (!revs
->saved_parents_slab
)
3925 return commit
->parents
;
3927 parents
= *saved_parents_at(revs
->saved_parents_slab
, commit
);
3928 if (parents
== EMPTY_PARENT_LIST
)
3933 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
3935 enum commit_action action
= get_commit_action(revs
, commit
);
3937 if (action
== commit_show
&&
3938 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
3940 * --full-diff on simplified parents is no good: it
3941 * will show spurious changes from the commits that
3942 * were elided. So we save the parents on the side
3943 * when --full-diff is in effect.
3945 if (revs
->full_diff
)
3946 save_parents(revs
, commit
);
3947 if (rewrite_parents(revs
, commit
, rewrite_one
) < 0)
3948 return commit_error
;
3953 static void track_linear(struct rev_info
*revs
, struct commit
*commit
)
3955 if (revs
->track_first_time
) {
3957 revs
->track_first_time
= 0;
3959 struct commit_list
*p
;
3960 for (p
= revs
->previous_parents
; p
; p
= p
->next
)
3961 if (p
->item
== NULL
|| /* first commit */
3962 oideq(&p
->item
->object
.oid
, &commit
->object
.oid
))
3964 revs
->linear
= p
!= NULL
;
3966 if (revs
->reverse
) {
3968 commit
->object
.flags
|= TRACK_LINEAR
;
3970 free_commit_list(revs
->previous_parents
);
3971 revs
->previous_parents
= copy_commit_list(commit
->parents
);
3974 static struct commit
*get_revision_1(struct rev_info
*revs
)
3977 struct commit
*commit
;
3979 if (revs
->reflog_info
)
3980 commit
= next_reflog_entry(revs
->reflog_info
);
3981 else if (revs
->topo_walk_info
)
3982 commit
= next_topo_commit(revs
);
3984 commit
= pop_commit(&revs
->commits
);
3989 if (revs
->reflog_info
)
3990 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
3993 * If we haven't done the list limiting, we need to look at
3994 * the parents here. We also need to do the date-based limiting
3995 * that we'd otherwise have done in limit_list().
3997 if (!revs
->limited
) {
3998 if (revs
->max_age
!= -1 &&
3999 comparison_date(revs
, commit
) < revs
->max_age
)
4002 if (revs
->reflog_info
)
4003 try_to_simplify_commit(revs
, commit
);
4004 else if (revs
->topo_walk_info
)
4005 expand_topo_walk(revs
, commit
);
4006 else if (process_parents(revs
, commit
, &revs
->commits
, NULL
) < 0) {
4007 if (!revs
->ignore_missing_links
)
4008 die("Failed to traverse parents of commit %s",
4009 oid_to_hex(&commit
->object
.oid
));
4013 switch (simplify_commit(revs
, commit
)) {
4017 die("Failed to simplify parents of commit %s",
4018 oid_to_hex(&commit
->object
.oid
));
4020 if (revs
->track_linear
)
4021 track_linear(revs
, commit
);
4028 * Return true for entries that have not yet been shown. (This is an
4029 * object_array_each_func_t.)
4031 static int entry_unshown(struct object_array_entry
*entry
, void *cb_data_unused
)
4033 return !(entry
->item
->flags
& SHOWN
);
4037 * If array is on the verge of a realloc, garbage-collect any entries
4038 * that have already been shown to try to free up some space.
4040 static void gc_boundary(struct object_array
*array
)
4042 if (array
->nr
== array
->alloc
)
4043 object_array_filter(array
, entry_unshown
, NULL
);
4046 static void create_boundary_commit_list(struct rev_info
*revs
)
4050 struct object_array
*array
= &revs
->boundary_commits
;
4051 struct object_array_entry
*objects
= array
->objects
;
4054 * If revs->commits is non-NULL at this point, an error occurred in
4055 * get_revision_1(). Ignore the error and continue printing the
4056 * boundary commits anyway. (This is what the code has always
4059 if (revs
->commits
) {
4060 free_commit_list(revs
->commits
);
4061 revs
->commits
= NULL
;
4065 * Put all of the actual boundary commits from revs->boundary_commits
4066 * into revs->commits
4068 for (i
= 0; i
< array
->nr
; i
++) {
4069 c
= (struct commit
*)(objects
[i
].item
);
4072 if (!(c
->object
.flags
& CHILD_SHOWN
))
4074 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
4076 c
->object
.flags
|= BOUNDARY
;
4077 commit_list_insert(c
, &revs
->commits
);
4081 * If revs->topo_order is set, sort the boundary commits
4082 * in topological order
4084 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
4087 static struct commit
*get_revision_internal(struct rev_info
*revs
)
4089 struct commit
*c
= NULL
;
4090 struct commit_list
*l
;
4092 if (revs
->boundary
== 2) {
4094 * All of the normal commits have already been returned,
4095 * and we are now returning boundary commits.
4096 * create_boundary_commit_list() has populated
4097 * revs->commits with the remaining commits to return.
4099 c
= pop_commit(&revs
->commits
);
4101 c
->object
.flags
|= SHOWN
;
4106 * If our max_count counter has reached zero, then we are done. We
4107 * don't simply return NULL because we still might need to show
4108 * boundary commits. But we want to avoid calling get_revision_1, which
4109 * might do a considerable amount of work finding the next commit only
4110 * for us to throw it away.
4112 * If it is non-zero, then either we don't have a max_count at all
4113 * (-1), or it is still counting, in which case we decrement.
4115 if (revs
->max_count
) {
4116 c
= get_revision_1(revs
);
4118 while (revs
->skip_count
> 0) {
4120 c
= get_revision_1(revs
);
4126 if (revs
->max_count
> 0)
4131 c
->object
.flags
|= SHOWN
;
4133 if (!revs
->boundary
)
4138 * get_revision_1() runs out the commits, and
4139 * we are done computing the boundaries.
4140 * switch to boundary commits output mode.
4145 * Update revs->commits to contain the list of
4148 create_boundary_commit_list(revs
);
4150 return get_revision_internal(revs
);
4154 * boundary commits are the commits that are parents of the
4155 * ones we got from get_revision_1() but they themselves are
4156 * not returned from get_revision_1(). Before returning
4157 * 'c', we need to mark its parents that they could be boundaries.
4160 for (l
= c
->parents
; l
; l
= l
->next
) {
4162 p
= &(l
->item
->object
);
4163 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
4165 p
->flags
|= CHILD_SHOWN
;
4166 gc_boundary(&revs
->boundary_commits
);
4167 add_object_array(p
, NULL
, &revs
->boundary_commits
);
4173 struct commit
*get_revision(struct rev_info
*revs
)
4176 struct commit_list
*reversed
;
4178 if (revs
->reverse
) {
4180 while ((c
= get_revision_internal(revs
)))
4181 commit_list_insert(c
, &reversed
);
4182 revs
->commits
= reversed
;
4184 revs
->reverse_output_stage
= 1;
4187 if (revs
->reverse_output_stage
) {
4188 c
= pop_commit(&revs
->commits
);
4189 if (revs
->track_linear
)
4190 revs
->linear
= !!(c
&& c
->object
.flags
& TRACK_LINEAR
);
4194 c
= get_revision_internal(revs
);
4195 if (c
&& revs
->graph
)
4196 graph_update(revs
->graph
, c
);
4198 free_saved_parents(revs
);
4199 if (revs
->previous_parents
) {
4200 free_commit_list(revs
->previous_parents
);
4201 revs
->previous_parents
= NULL
;
4207 const char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
4209 if (commit
->object
.flags
& BOUNDARY
)
4211 else if (commit
->object
.flags
& UNINTERESTING
)
4213 else if (commit
->object
.flags
& PATCHSAME
)
4215 else if (!revs
|| revs
->left_right
) {
4216 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
4220 } else if (revs
->graph
)
4222 else if (revs
->cherry_mark
)
4227 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
4229 const char *mark
= get_revision_mark(revs
, commit
);
4232 fputs(mark
, stdout
);