2 #include "object-store.h"
10 #include "repository.h"
13 #include "reflog-walk.h"
14 #include "patch-ids.h"
17 #include "string-list.h"
20 #include "commit-slab.h"
22 #include "cache-tree.h"
26 #include "argv-array.h"
27 #include "commit-reach.h"
28 #include "commit-graph.h"
29 #include "prio-queue.h"
33 #include "json-writer.h"
35 volatile show_early_output_fn_t show_early_output
;
37 static const char *term_bad
;
38 static const char *term_good
;
40 implement_shared_commit_slab(revision_sources
, char *);
42 static inline int want_ancestry(const struct rev_info
*revs
);
44 void show_object_with_name(FILE *out
, struct object
*obj
, const char *name
)
48 fprintf(out
, "%s ", oid_to_hex(&obj
->oid
));
49 for (p
= name
; *p
&& *p
!= '\n'; p
++)
54 static void mark_blob_uninteresting(struct blob
*blob
)
58 if (blob
->object
.flags
& UNINTERESTING
)
60 blob
->object
.flags
|= UNINTERESTING
;
63 static void mark_tree_contents_uninteresting(struct repository
*r
,
66 struct tree_desc desc
;
67 struct name_entry entry
;
69 if (parse_tree_gently(tree
, 1) < 0)
72 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
73 while (tree_entry(&desc
, &entry
)) {
74 switch (object_type(entry
.mode
)) {
76 mark_tree_uninteresting(r
, lookup_tree(r
, &entry
.oid
));
79 mark_blob_uninteresting(lookup_blob(r
, &entry
.oid
));
82 /* Subproject commit - not in this repository */
88 * We don't care about the tree any more
89 * after it has been marked uninteresting.
91 free_tree_buffer(tree
);
94 void mark_tree_uninteresting(struct repository
*r
, struct tree
*tree
)
102 if (obj
->flags
& UNINTERESTING
)
104 obj
->flags
|= UNINTERESTING
;
105 mark_tree_contents_uninteresting(r
, tree
);
108 struct path_and_oids_entry
{
109 struct hashmap_entry ent
;
114 static int path_and_oids_cmp(const void *hashmap_cmp_fn_data
,
115 const struct hashmap_entry
*eptr
,
116 const struct hashmap_entry
*entry_or_key
,
119 const struct path_and_oids_entry
*e1
, *e2
;
121 e1
= container_of(eptr
, const struct path_and_oids_entry
, ent
);
122 e2
= container_of(entry_or_key
, const struct path_and_oids_entry
, ent
);
124 return strcmp(e1
->path
, e2
->path
);
127 static void paths_and_oids_init(struct hashmap
*map
)
129 hashmap_init(map
, path_and_oids_cmp
, NULL
, 0);
132 static void paths_and_oids_clear(struct hashmap
*map
)
134 struct hashmap_iter iter
;
135 struct path_and_oids_entry
*entry
;
137 hashmap_for_each_entry(map
, &iter
, entry
, ent
/* member name */) {
138 oidset_clear(&entry
->trees
);
142 hashmap_free_entries(map
, struct path_and_oids_entry
, ent
);
145 static void paths_and_oids_insert(struct hashmap
*map
,
147 const struct object_id
*oid
)
149 int hash
= strhash(path
);
150 struct path_and_oids_entry key
;
151 struct path_and_oids_entry
*entry
;
153 hashmap_entry_init(&key
.ent
, hash
);
155 /* use a shallow copy for the lookup */
156 key
.path
= (char *)path
;
157 oidset_init(&key
.trees
, 0);
159 entry
= hashmap_get_entry(map
, &key
, ent
, NULL
);
161 entry
= xcalloc(1, sizeof(struct path_and_oids_entry
));
162 hashmap_entry_init(&entry
->ent
, hash
);
163 entry
->path
= xstrdup(key
.path
);
164 oidset_init(&entry
->trees
, 16);
165 hashmap_put(map
, &entry
->ent
);
168 oidset_insert(&entry
->trees
, oid
);
171 static void add_children_by_path(struct repository
*r
,
175 struct tree_desc desc
;
176 struct name_entry entry
;
181 if (parse_tree_gently(tree
, 1) < 0)
184 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
185 while (tree_entry(&desc
, &entry
)) {
186 switch (object_type(entry
.mode
)) {
188 paths_and_oids_insert(map
, entry
.path
, &entry
.oid
);
190 if (tree
->object
.flags
& UNINTERESTING
) {
191 struct tree
*child
= lookup_tree(r
, &entry
.oid
);
193 child
->object
.flags
|= UNINTERESTING
;
197 if (tree
->object
.flags
& UNINTERESTING
) {
198 struct blob
*child
= lookup_blob(r
, &entry
.oid
);
200 child
->object
.flags
|= UNINTERESTING
;
204 /* Subproject commit - not in this repository */
209 free_tree_buffer(tree
);
212 void mark_trees_uninteresting_sparse(struct repository
*r
,
213 struct oidset
*trees
)
215 unsigned has_interesting
= 0, has_uninteresting
= 0;
217 struct hashmap_iter map_iter
;
218 struct path_and_oids_entry
*entry
;
219 struct object_id
*oid
;
220 struct oidset_iter iter
;
222 oidset_iter_init(trees
, &iter
);
223 while ((!has_interesting
|| !has_uninteresting
) &&
224 (oid
= oidset_iter_next(&iter
))) {
225 struct tree
*tree
= lookup_tree(r
, oid
);
230 if (tree
->object
.flags
& UNINTERESTING
)
231 has_uninteresting
= 1;
236 /* Do not walk unless we have both types of trees. */
237 if (!has_uninteresting
|| !has_interesting
)
240 paths_and_oids_init(&map
);
242 oidset_iter_init(trees
, &iter
);
243 while ((oid
= oidset_iter_next(&iter
))) {
244 struct tree
*tree
= lookup_tree(r
, oid
);
245 add_children_by_path(r
, tree
, &map
);
248 hashmap_for_each_entry(&map
, &map_iter
, entry
, ent
/* member name */)
249 mark_trees_uninteresting_sparse(r
, &entry
->trees
);
251 paths_and_oids_clear(&map
);
254 struct commit_stack
{
255 struct commit
**items
;
258 #define COMMIT_STACK_INIT { NULL, 0, 0 }
260 static void commit_stack_push(struct commit_stack
*stack
, struct commit
*commit
)
262 ALLOC_GROW(stack
->items
, stack
->nr
+ 1, stack
->alloc
);
263 stack
->items
[stack
->nr
++] = commit
;
266 static struct commit
*commit_stack_pop(struct commit_stack
*stack
)
268 return stack
->nr
? stack
->items
[--stack
->nr
] : NULL
;
271 static void commit_stack_clear(struct commit_stack
*stack
)
273 FREE_AND_NULL(stack
->items
);
274 stack
->nr
= stack
->alloc
= 0;
277 static void mark_one_parent_uninteresting(struct commit
*commit
,
278 struct commit_stack
*pending
)
280 struct commit_list
*l
;
282 if (commit
->object
.flags
& UNINTERESTING
)
284 commit
->object
.flags
|= UNINTERESTING
;
287 * Normally we haven't parsed the parent
288 * yet, so we won't have a parent of a parent
289 * here. However, it may turn out that we've
290 * reached this commit some other way (where it
291 * wasn't uninteresting), in which case we need
292 * to mark its parents recursively too..
294 for (l
= commit
->parents
; l
; l
= l
->next
)
295 commit_stack_push(pending
, l
->item
);
298 void mark_parents_uninteresting(struct commit
*commit
)
300 struct commit_stack pending
= COMMIT_STACK_INIT
;
301 struct commit_list
*l
;
303 for (l
= commit
->parents
; l
; l
= l
->next
)
304 mark_one_parent_uninteresting(l
->item
, &pending
);
306 while (pending
.nr
> 0)
307 mark_one_parent_uninteresting(commit_stack_pop(&pending
),
310 commit_stack_clear(&pending
);
313 static void add_pending_object_with_path(struct rev_info
*revs
,
315 const char *name
, unsigned mode
,
320 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
322 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
323 struct strbuf buf
= STRBUF_INIT
;
324 int len
= interpret_branch_name(name
, 0, &buf
, 0);
326 if (0 < len
&& name
[len
] && buf
.len
)
327 strbuf_addstr(&buf
, name
+ len
);
328 add_reflog_for_walk(revs
->reflog_info
,
329 (struct commit
*)obj
,
330 buf
.buf
[0] ? buf
.buf
: name
);
331 strbuf_release(&buf
);
332 return; /* do not add the commit itself */
334 add_object_array_with_path(obj
, name
, &revs
->pending
, mode
, path
);
337 static void add_pending_object_with_mode(struct rev_info
*revs
,
339 const char *name
, unsigned mode
)
341 add_pending_object_with_path(revs
, obj
, name
, mode
, NULL
);
344 void add_pending_object(struct rev_info
*revs
,
345 struct object
*obj
, const char *name
)
347 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
350 void add_head_to_pending(struct rev_info
*revs
)
352 struct object_id oid
;
354 if (get_oid("HEAD", &oid
))
356 obj
= parse_object(revs
->repo
, &oid
);
359 add_pending_object(revs
, obj
, "HEAD");
362 static struct object
*get_reference(struct rev_info
*revs
, const char *name
,
363 const struct object_id
*oid
,
366 struct object
*object
;
369 * If the repository has commit graphs, repo_parse_commit() avoids
370 * reading the object buffer, so use it whenever possible.
372 if (oid_object_info(revs
->repo
, oid
, NULL
) == OBJ_COMMIT
) {
373 struct commit
*c
= lookup_commit(revs
->repo
, oid
);
374 if (!repo_parse_commit(revs
->repo
, c
))
375 object
= (struct object
*) c
;
379 object
= parse_object(revs
->repo
, oid
);
383 if (revs
->ignore_missing
)
385 if (revs
->exclude_promisor_objects
&& is_promisor_object(oid
))
387 die("bad object %s", name
);
389 object
->flags
|= flags
;
393 void add_pending_oid(struct rev_info
*revs
, const char *name
,
394 const struct object_id
*oid
, unsigned int flags
)
396 struct object
*object
= get_reference(revs
, name
, oid
, flags
);
397 add_pending_object(revs
, object
, name
);
400 static struct commit
*handle_commit(struct rev_info
*revs
,
401 struct object_array_entry
*entry
)
403 struct object
*object
= entry
->item
;
404 const char *name
= entry
->name
;
405 const char *path
= entry
->path
;
406 unsigned int mode
= entry
->mode
;
407 unsigned long flags
= object
->flags
;
410 * Tag object? Look what it points to..
412 while (object
->type
== OBJ_TAG
) {
413 struct tag
*tag
= (struct tag
*) object
;
414 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
415 add_pending_object(revs
, object
, tag
->tag
);
416 object
= parse_object(revs
->repo
, get_tagged_oid(tag
));
418 if (revs
->ignore_missing_links
|| (flags
& UNINTERESTING
))
420 if (revs
->exclude_promisor_objects
&&
421 is_promisor_object(&tag
->tagged
->oid
))
423 die("bad object %s", oid_to_hex(&tag
->tagged
->oid
));
425 object
->flags
|= flags
;
427 * We'll handle the tagged object by looping or dropping
428 * through to the non-tag handlers below. Do not
429 * propagate path data from the tag's pending entry.
436 * Commit object? Just return it, we'll do all the complex
439 if (object
->type
== OBJ_COMMIT
) {
440 struct commit
*commit
= (struct commit
*)object
;
442 if (parse_commit(commit
) < 0)
443 die("unable to parse commit %s", name
);
444 if (flags
& UNINTERESTING
) {
445 mark_parents_uninteresting(commit
);
447 if (!revs
->topo_order
|| !generation_numbers_enabled(the_repository
))
451 char **slot
= revision_sources_at(revs
->sources
, commit
);
454 *slot
= xstrdup(name
);
460 * Tree object? Either mark it uninteresting, or add it
461 * to the list of objects to look at later..
463 if (object
->type
== OBJ_TREE
) {
464 struct tree
*tree
= (struct tree
*)object
;
465 if (!revs
->tree_objects
)
467 if (flags
& UNINTERESTING
) {
468 mark_tree_contents_uninteresting(revs
->repo
, tree
);
471 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
476 * Blob object? You know the drill by now..
478 if (object
->type
== OBJ_BLOB
) {
479 if (!revs
->blob_objects
)
481 if (flags
& UNINTERESTING
)
483 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
486 die("%s is unknown object", name
);
489 static int everybody_uninteresting(struct commit_list
*orig
,
490 struct commit
**interesting_cache
)
492 struct commit_list
*list
= orig
;
494 if (*interesting_cache
) {
495 struct commit
*commit
= *interesting_cache
;
496 if (!(commit
->object
.flags
& UNINTERESTING
))
501 struct commit
*commit
= list
->item
;
503 if (commit
->object
.flags
& UNINTERESTING
)
506 *interesting_cache
= commit
;
513 * A definition of "relevant" commit that we can use to simplify limited graphs
514 * by eliminating side branches.
516 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
517 * in our list), or that is a specified BOTTOM commit. Then after computing
518 * a limited list, during processing we can generally ignore boundary merges
519 * coming from outside the graph, (ie from irrelevant parents), and treat
520 * those merges as if they were single-parent. TREESAME is defined to consider
521 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
522 * we don't care if we were !TREESAME to non-graph parents.
524 * Treating bottom commits as relevant ensures that a limited graph's
525 * connection to the actual bottom commit is not viewed as a side branch, but
526 * treated as part of the graph. For example:
528 * ....Z...A---X---o---o---B
532 * When computing "A..B", the A-X connection is at least as important as
533 * Y-X, despite A being flagged UNINTERESTING.
535 * And when computing --ancestry-path "A..B", the A-X connection is more
536 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
538 static inline int relevant_commit(struct commit
*commit
)
540 return (commit
->object
.flags
& (UNINTERESTING
| BOTTOM
)) != UNINTERESTING
;
544 * Return a single relevant commit from a parent list. If we are a TREESAME
545 * commit, and this selects one of our parents, then we can safely simplify to
548 static struct commit
*one_relevant_parent(const struct rev_info
*revs
,
549 struct commit_list
*orig
)
551 struct commit_list
*list
= orig
;
552 struct commit
*relevant
= NULL
;
558 * For 1-parent commits, or if first-parent-only, then return that
559 * first parent (even if not "relevant" by the above definition).
560 * TREESAME will have been set purely on that parent.
562 if (revs
->first_parent_only
|| !orig
->next
)
566 * For multi-parent commits, identify a sole relevant parent, if any.
567 * If we have only one relevant parent, then TREESAME will be set purely
568 * with regard to that parent, and we can simplify accordingly.
570 * If we have more than one relevant parent, or no relevant parents
571 * (and multiple irrelevant ones), then we can't select a parent here
575 struct commit
*commit
= list
->item
;
577 if (relevant_commit(commit
)) {
587 * The goal is to get REV_TREE_NEW as the result only if the
588 * diff consists of all '+' (and no other changes), REV_TREE_OLD
589 * if the whole diff is removal of old data, and otherwise
590 * REV_TREE_DIFFERENT (of course if the trees are the same we
591 * want REV_TREE_SAME).
593 * The only time we care about the distinction is when
594 * remove_empty_trees is in effect, in which case we care only about
595 * whether the whole change is REV_TREE_NEW, or if there's another type
596 * of change. Which means we can stop the diff early in either of these
599 * 1. We're not using remove_empty_trees at all.
601 * 2. We saw anything except REV_TREE_NEW.
603 static int tree_difference
= REV_TREE_SAME
;
605 static void file_add_remove(struct diff_options
*options
,
606 int addremove
, unsigned mode
,
607 const struct object_id
*oid
,
609 const char *fullpath
, unsigned dirty_submodule
)
611 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
612 struct rev_info
*revs
= options
->change_fn_data
;
614 tree_difference
|= diff
;
615 if (!revs
->remove_empty_trees
|| tree_difference
!= REV_TREE_NEW
)
616 options
->flags
.has_changes
= 1;
619 static void file_change(struct diff_options
*options
,
620 unsigned old_mode
, unsigned new_mode
,
621 const struct object_id
*old_oid
,
622 const struct object_id
*new_oid
,
623 int old_oid_valid
, int new_oid_valid
,
624 const char *fullpath
,
625 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
627 tree_difference
= REV_TREE_DIFFERENT
;
628 options
->flags
.has_changes
= 1;
631 static int bloom_filter_atexit_registered
;
632 static unsigned int count_bloom_filter_maybe
;
633 static unsigned int count_bloom_filter_definitely_not
;
634 static unsigned int count_bloom_filter_false_positive
;
635 static unsigned int count_bloom_filter_not_present
;
636 static unsigned int count_bloom_filter_length_zero
;
638 static void trace2_bloom_filter_statistics_atexit(void)
640 struct json_writer jw
= JSON_WRITER_INIT
;
642 jw_object_begin(&jw
, 0);
643 jw_object_intmax(&jw
, "filter_not_present", count_bloom_filter_not_present
);
644 jw_object_intmax(&jw
, "zero_length_filter", count_bloom_filter_length_zero
);
645 jw_object_intmax(&jw
, "maybe", count_bloom_filter_maybe
);
646 jw_object_intmax(&jw
, "definitely_not", count_bloom_filter_definitely_not
);
647 jw_object_intmax(&jw
, "false_positive", count_bloom_filter_false_positive
);
650 trace2_data_json("bloom", the_repository
, "statistics", &jw
);
655 static int forbid_bloom_filters(struct pathspec
*spec
)
657 if (spec
->has_wildcard
)
661 if (spec
->magic
& ~PATHSPEC_LITERAL
)
663 if (spec
->nr
&& (spec
->items
[0].magic
& ~PATHSPEC_LITERAL
))
669 static void prepare_to_use_bloom_filter(struct rev_info
*revs
)
671 struct pathspec_item
*pi
;
672 char *path_alloc
= NULL
;
680 if (forbid_bloom_filters(&revs
->prune_data
))
683 repo_parse_commit(revs
->repo
, revs
->commits
->item
);
685 if (!revs
->repo
->objects
->commit_graph
)
688 revs
->bloom_filter_settings
= revs
->repo
->objects
->commit_graph
->bloom_filter_settings
;
689 if (!revs
->bloom_filter_settings
)
692 if (!revs
->pruning
.pathspec
.nr
)
695 pi
= &revs
->pruning
.pathspec
.items
[0];
696 last_index
= pi
->len
- 1;
698 /* remove single trailing slash from path, if needed */
699 if (pi
->match
[last_index
] == '/') {
700 path_alloc
= xstrdup(pi
->match
);
701 path_alloc
[last_index
] = '\0';
708 revs
->bloom_key
= xmalloc(sizeof(struct bloom_key
));
709 fill_bloom_key(path
, len
, revs
->bloom_key
, revs
->bloom_filter_settings
);
711 if (trace2_is_enabled() && !bloom_filter_atexit_registered
) {
712 atexit(trace2_bloom_filter_statistics_atexit
);
713 bloom_filter_atexit_registered
= 1;
719 static int check_maybe_different_in_bloom_filter(struct rev_info
*revs
,
720 struct commit
*commit
)
722 struct bloom_filter
*filter
;
725 if (!revs
->repo
->objects
->commit_graph
)
728 if (commit
->generation
== GENERATION_NUMBER_INFINITY
)
731 filter
= get_bloom_filter(revs
->repo
, commit
, 0);
734 count_bloom_filter_not_present
++;
739 count_bloom_filter_length_zero
++;
743 result
= bloom_filter_contains(filter
,
745 revs
->bloom_filter_settings
);
748 count_bloom_filter_maybe
++;
750 count_bloom_filter_definitely_not
++;
755 static int rev_compare_tree(struct rev_info
*revs
,
756 struct commit
*parent
, struct commit
*commit
, int nth_parent
)
758 struct tree
*t1
= get_commit_tree(parent
);
759 struct tree
*t2
= get_commit_tree(commit
);
767 if (revs
->simplify_by_decoration
) {
769 * If we are simplifying by decoration, then the commit
770 * is worth showing if it has a tag pointing at it.
772 if (get_name_decoration(&commit
->object
))
773 return REV_TREE_DIFFERENT
;
775 * A commit that is not pointed by a tag is uninteresting
776 * if we are not limited by path. This means that you will
777 * see the usual "commits that touch the paths" plus any
778 * tagged commit by specifying both --simplify-by-decoration
781 if (!revs
->prune_data
.nr
)
782 return REV_TREE_SAME
;
785 if (revs
->bloom_key
&& !nth_parent
) {
786 bloom_ret
= check_maybe_different_in_bloom_filter(revs
, commit
);
789 return REV_TREE_SAME
;
792 tree_difference
= REV_TREE_SAME
;
793 revs
->pruning
.flags
.has_changes
= 0;
794 diff_tree_oid(&t1
->object
.oid
, &t2
->object
.oid
, "", &revs
->pruning
);
797 if (bloom_ret
== 1 && tree_difference
== REV_TREE_SAME
)
798 count_bloom_filter_false_positive
++;
800 return tree_difference
;
803 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
805 struct tree
*t1
= get_commit_tree(commit
);
810 tree_difference
= REV_TREE_SAME
;
811 revs
->pruning
.flags
.has_changes
= 0;
812 diff_tree_oid(NULL
, &t1
->object
.oid
, "", &revs
->pruning
);
814 return tree_difference
== REV_TREE_SAME
;
817 struct treesame_state
{
818 unsigned int nparents
;
819 unsigned char treesame
[FLEX_ARRAY
];
822 static struct treesame_state
*initialise_treesame(struct rev_info
*revs
, struct commit
*commit
)
824 unsigned n
= commit_list_count(commit
->parents
);
825 struct treesame_state
*st
= xcalloc(1, st_add(sizeof(*st
), n
));
827 add_decoration(&revs
->treesame
, &commit
->object
, st
);
832 * Must be called immediately after removing the nth_parent from a commit's
833 * parent list, if we are maintaining the per-parent treesame[] decoration.
834 * This does not recalculate the master TREESAME flag - update_treesame()
835 * should be called to update it after a sequence of treesame[] modifications
836 * that may have affected it.
838 static int compact_treesame(struct rev_info
*revs
, struct commit
*commit
, unsigned nth_parent
)
840 struct treesame_state
*st
;
843 if (!commit
->parents
) {
845 * Have just removed the only parent from a non-merge.
846 * Different handling, as we lack decoration.
849 die("compact_treesame %u", nth_parent
);
850 old_same
= !!(commit
->object
.flags
& TREESAME
);
851 if (rev_same_tree_as_empty(revs
, commit
))
852 commit
->object
.flags
|= TREESAME
;
854 commit
->object
.flags
&= ~TREESAME
;
858 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
859 if (!st
|| nth_parent
>= st
->nparents
)
860 die("compact_treesame %u", nth_parent
);
862 old_same
= st
->treesame
[nth_parent
];
863 memmove(st
->treesame
+ nth_parent
,
864 st
->treesame
+ nth_parent
+ 1,
865 st
->nparents
- nth_parent
- 1);
868 * If we've just become a non-merge commit, update TREESAME
869 * immediately, and remove the no-longer-needed decoration.
870 * If still a merge, defer update until update_treesame().
872 if (--st
->nparents
== 1) {
873 if (commit
->parents
->next
)
874 die("compact_treesame parents mismatch");
875 if (st
->treesame
[0] && revs
->dense
)
876 commit
->object
.flags
|= TREESAME
;
878 commit
->object
.flags
&= ~TREESAME
;
879 free(add_decoration(&revs
->treesame
, &commit
->object
, NULL
));
885 static unsigned update_treesame(struct rev_info
*revs
, struct commit
*commit
)
887 if (commit
->parents
&& commit
->parents
->next
) {
889 struct treesame_state
*st
;
890 struct commit_list
*p
;
891 unsigned relevant_parents
;
892 unsigned relevant_change
, irrelevant_change
;
894 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
896 die("update_treesame %s", oid_to_hex(&commit
->object
.oid
));
897 relevant_parents
= 0;
898 relevant_change
= irrelevant_change
= 0;
899 for (p
= commit
->parents
, n
= 0; p
; n
++, p
= p
->next
) {
900 if (relevant_commit(p
->item
)) {
901 relevant_change
|= !st
->treesame
[n
];
904 irrelevant_change
|= !st
->treesame
[n
];
906 if (relevant_parents
? relevant_change
: irrelevant_change
)
907 commit
->object
.flags
&= ~TREESAME
;
909 commit
->object
.flags
|= TREESAME
;
912 return commit
->object
.flags
& TREESAME
;
915 static inline int limiting_can_increase_treesame(const struct rev_info
*revs
)
918 * TREESAME is irrelevant unless prune && dense;
919 * if simplify_history is set, we can't have a mixture of TREESAME and
920 * !TREESAME INTERESTING parents (and we don't have treesame[]
921 * decoration anyway);
922 * if first_parent_only is set, then the TREESAME flag is locked
923 * against the first parent (and again we lack treesame[] decoration).
925 return revs
->prune
&& revs
->dense
&&
926 !revs
->simplify_history
&&
927 !revs
->first_parent_only
;
930 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
932 struct commit_list
**pp
, *parent
;
933 struct treesame_state
*ts
= NULL
;
934 int relevant_change
= 0, irrelevant_change
= 0;
935 int relevant_parents
, nth_parent
;
938 * If we don't do pruning, everything is interesting
943 if (!get_commit_tree(commit
))
946 if (!commit
->parents
) {
947 if (rev_same_tree_as_empty(revs
, commit
))
948 commit
->object
.flags
|= TREESAME
;
953 * Normal non-merge commit? If we don't want to make the
954 * history dense, we consider it always to be a change..
956 if (!revs
->dense
&& !commit
->parents
->next
)
959 for (pp
= &commit
->parents
, nth_parent
= 0, relevant_parents
= 0;
960 (parent
= *pp
) != NULL
;
961 pp
= &parent
->next
, nth_parent
++) {
962 struct commit
*p
= parent
->item
;
963 if (relevant_commit(p
))
966 if (nth_parent
== 1) {
968 * This our second loop iteration - so we now know
969 * we're dealing with a merge.
971 * Do not compare with later parents when we care only about
972 * the first parent chain, in order to avoid derailing the
973 * traversal to follow a side branch that brought everything
974 * in the path we are limited to by the pathspec.
976 if (revs
->first_parent_only
)
979 * If this will remain a potentially-simplifiable
980 * merge, remember per-parent treesame if needed.
981 * Initialise the array with the comparison from our
984 if (revs
->treesame
.name
&&
985 !revs
->simplify_history
&&
986 !(commit
->object
.flags
& UNINTERESTING
)) {
987 ts
= initialise_treesame(revs
, commit
);
988 if (!(irrelevant_change
|| relevant_change
))
992 if (parse_commit(p
) < 0)
993 die("cannot simplify commit %s (because of %s)",
994 oid_to_hex(&commit
->object
.oid
),
995 oid_to_hex(&p
->object
.oid
));
996 switch (rev_compare_tree(revs
, p
, commit
, nth_parent
)) {
998 if (!revs
->simplify_history
|| !relevant_commit(p
)) {
999 /* Even if a merge with an uninteresting
1000 * side branch brought the entire change
1001 * we are interested in, we do not want
1002 * to lose the other branches of this
1003 * merge, so we just keep going.
1006 ts
->treesame
[nth_parent
] = 1;
1009 parent
->next
= NULL
;
1010 commit
->parents
= parent
;
1011 commit
->object
.flags
|= TREESAME
;
1015 if (revs
->remove_empty_trees
&&
1016 rev_same_tree_as_empty(revs
, p
)) {
1017 /* We are adding all the specified
1018 * paths from this parent, so the
1019 * history beyond this parent is not
1020 * interesting. Remove its parents
1021 * (they are grandparents for us).
1022 * IOW, we pretend this parent is a
1025 if (parse_commit(p
) < 0)
1026 die("cannot simplify commit %s (invalid %s)",
1027 oid_to_hex(&commit
->object
.oid
),
1028 oid_to_hex(&p
->object
.oid
));
1033 case REV_TREE_DIFFERENT
:
1034 if (relevant_commit(p
))
1035 relevant_change
= 1;
1037 irrelevant_change
= 1;
1040 die("bad tree compare for commit %s", oid_to_hex(&commit
->object
.oid
));
1044 * TREESAME is straightforward for single-parent commits. For merge
1045 * commits, it is most useful to define it so that "irrelevant"
1046 * parents cannot make us !TREESAME - if we have any relevant
1047 * parents, then we only consider TREESAMEness with respect to them,
1048 * allowing irrelevant merges from uninteresting branches to be
1049 * simplified away. Only if we have only irrelevant parents do we
1050 * base TREESAME on them. Note that this logic is replicated in
1051 * update_treesame, which should be kept in sync.
1053 if (relevant_parents
? !relevant_change
: !irrelevant_change
)
1054 commit
->object
.flags
|= TREESAME
;
1057 static int process_parents(struct rev_info
*revs
, struct commit
*commit
,
1058 struct commit_list
**list
, struct prio_queue
*queue
)
1060 struct commit_list
*parent
= commit
->parents
;
1063 if (commit
->object
.flags
& ADDED
)
1065 commit
->object
.flags
|= ADDED
;
1067 if (revs
->include_check
&&
1068 !revs
->include_check(commit
, revs
->include_check_data
))
1072 * If the commit is uninteresting, don't try to
1073 * prune parents - we want the maximal uninteresting
1076 * Normally we haven't parsed the parent
1077 * yet, so we won't have a parent of a parent
1078 * here. However, it may turn out that we've
1079 * reached this commit some other way (where it
1080 * wasn't uninteresting), in which case we need
1081 * to mark its parents recursively too..
1083 if (commit
->object
.flags
& UNINTERESTING
) {
1085 struct commit
*p
= parent
->item
;
1086 parent
= parent
->next
;
1088 p
->object
.flags
|= UNINTERESTING
;
1089 if (parse_commit_gently(p
, 1) < 0)
1092 mark_parents_uninteresting(p
);
1093 if (p
->object
.flags
& SEEN
)
1095 p
->object
.flags
|= SEEN
;
1097 commit_list_insert_by_date(p
, list
);
1099 prio_queue_put(queue
, p
);
1105 * Ok, the commit wasn't uninteresting. Try to
1106 * simplify the commit history and find the parent
1107 * that has no differences in the path set if one exists.
1109 try_to_simplify_commit(revs
, commit
);
1114 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
1116 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
1117 struct commit
*p
= parent
->item
;
1118 int gently
= revs
->ignore_missing_links
||
1119 revs
->exclude_promisor_objects
;
1120 if (parse_commit_gently(p
, gently
) < 0) {
1121 if (revs
->exclude_promisor_objects
&&
1122 is_promisor_object(&p
->object
.oid
)) {
1123 if (revs
->first_parent_only
)
1129 if (revs
->sources
) {
1130 char **slot
= revision_sources_at(revs
->sources
, p
);
1133 *slot
= *revision_sources_at(revs
->sources
, commit
);
1135 p
->object
.flags
|= left_flag
;
1136 if (!(p
->object
.flags
& SEEN
)) {
1137 p
->object
.flags
|= SEEN
;
1139 commit_list_insert_by_date(p
, list
);
1141 prio_queue_put(queue
, p
);
1143 if (revs
->first_parent_only
)
1149 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
1151 struct commit_list
*p
;
1152 int left_count
= 0, right_count
= 0;
1154 struct patch_ids ids
;
1155 unsigned cherry_flag
;
1157 /* First count the commits on the left and on the right */
1158 for (p
= list
; p
; p
= p
->next
) {
1159 struct commit
*commit
= p
->item
;
1160 unsigned flags
= commit
->object
.flags
;
1161 if (flags
& BOUNDARY
)
1163 else if (flags
& SYMMETRIC_LEFT
)
1169 if (!left_count
|| !right_count
)
1172 left_first
= left_count
< right_count
;
1173 init_patch_ids(revs
->repo
, &ids
);
1174 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
1176 /* Compute patch-ids for one side */
1177 for (p
= list
; p
; p
= p
->next
) {
1178 struct commit
*commit
= p
->item
;
1179 unsigned flags
= commit
->object
.flags
;
1181 if (flags
& BOUNDARY
)
1184 * If we have fewer left, left_first is set and we omit
1185 * commits on the right branch in this loop. If we have
1186 * fewer right, we skip the left ones.
1188 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
1190 add_commit_patch_id(commit
, &ids
);
1193 /* either cherry_mark or cherry_pick are true */
1194 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
1196 /* Check the other side */
1197 for (p
= list
; p
; p
= p
->next
) {
1198 struct commit
*commit
= p
->item
;
1199 struct patch_id
*id
;
1200 unsigned flags
= commit
->object
.flags
;
1202 if (flags
& BOUNDARY
)
1205 * If we have fewer left, left_first is set and we omit
1206 * commits on the left branch in this loop.
1208 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
1212 * Have we seen the same patch id?
1214 id
= has_commit_patch_id(commit
, &ids
);
1218 commit
->object
.flags
|= cherry_flag
;
1219 id
->commit
->object
.flags
|= cherry_flag
;
1222 free_patch_ids(&ids
);
1225 /* How many extra uninteresting commits we want to see.. */
1228 static int still_interesting(struct commit_list
*src
, timestamp_t date
, int slop
,
1229 struct commit
**interesting_cache
)
1232 * No source list at all? We're definitely done..
1238 * Does the destination list contain entries with a date
1239 * before the source list? Definitely _not_ done.
1241 if (date
<= src
->item
->date
)
1245 * Does the source list still have interesting commits in
1246 * it? Definitely not done..
1248 if (!everybody_uninteresting(src
, interesting_cache
))
1251 /* Ok, we're closing in.. */
1256 * "rev-list --ancestry-path A..B" computes commits that are ancestors
1257 * of B but not ancestors of A but further limits the result to those
1258 * that are descendants of A. This takes the list of bottom commits and
1259 * the result of "A..B" without --ancestry-path, and limits the latter
1260 * further to the ones that can reach one of the commits in "bottom".
1262 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
1264 struct commit_list
*p
;
1265 struct commit_list
*rlist
= NULL
;
1269 * Reverse the list so that it will be likely that we would
1270 * process parents before children.
1272 for (p
= list
; p
; p
= p
->next
)
1273 commit_list_insert(p
->item
, &rlist
);
1275 for (p
= bottom
; p
; p
= p
->next
)
1276 p
->item
->object
.flags
|= TMP_MARK
;
1279 * Mark the ones that can reach bottom commits in "list",
1280 * in a bottom-up fashion.
1284 for (p
= rlist
; p
; p
= p
->next
) {
1285 struct commit
*c
= p
->item
;
1286 struct commit_list
*parents
;
1287 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
1289 for (parents
= c
->parents
;
1291 parents
= parents
->next
) {
1292 if (!(parents
->item
->object
.flags
& TMP_MARK
))
1294 c
->object
.flags
|= TMP_MARK
;
1299 } while (made_progress
);
1302 * NEEDSWORK: decide if we want to remove parents that are
1303 * not marked with TMP_MARK from commit->parents for commits
1304 * in the resulting list. We may not want to do that, though.
1308 * The ones that are not marked with TMP_MARK are uninteresting
1310 for (p
= list
; p
; p
= p
->next
) {
1311 struct commit
*c
= p
->item
;
1312 if (c
->object
.flags
& TMP_MARK
)
1314 c
->object
.flags
|= UNINTERESTING
;
1317 /* We are done with the TMP_MARK */
1318 for (p
= list
; p
; p
= p
->next
)
1319 p
->item
->object
.flags
&= ~TMP_MARK
;
1320 for (p
= bottom
; p
; p
= p
->next
)
1321 p
->item
->object
.flags
&= ~TMP_MARK
;
1322 free_commit_list(rlist
);
1326 * Before walking the history, keep the set of "negative" refs the
1327 * caller has asked to exclude.
1329 * This is used to compute "rev-list --ancestry-path A..B", as we need
1330 * to filter the result of "A..B" further to the ones that can actually
1333 static struct commit_list
*collect_bottom_commits(struct commit_list
*list
)
1335 struct commit_list
*elem
, *bottom
= NULL
;
1336 for (elem
= list
; elem
; elem
= elem
->next
)
1337 if (elem
->item
->object
.flags
& BOTTOM
)
1338 commit_list_insert(elem
->item
, &bottom
);
1342 /* Assumes either left_only or right_only is set */
1343 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
1345 struct commit_list
*p
;
1347 for (p
= list
; p
; p
= p
->next
) {
1348 struct commit
*commit
= p
->item
;
1350 if (revs
->right_only
) {
1351 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
1352 commit
->object
.flags
|= SHOWN
;
1353 } else /* revs->left_only is set */
1354 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
1355 commit
->object
.flags
|= SHOWN
;
1359 static int limit_list(struct rev_info
*revs
)
1362 timestamp_t date
= TIME_MAX
;
1363 struct commit_list
*list
= revs
->commits
;
1364 struct commit_list
*newlist
= NULL
;
1365 struct commit_list
**p
= &newlist
;
1366 struct commit_list
*bottom
= NULL
;
1367 struct commit
*interesting_cache
= NULL
;
1369 if (revs
->ancestry_path
) {
1370 bottom
= collect_bottom_commits(list
);
1372 die("--ancestry-path given but there are no bottom commits");
1376 struct commit
*commit
= pop_commit(&list
);
1377 struct object
*obj
= &commit
->object
;
1378 show_early_output_fn_t show
;
1380 if (commit
== interesting_cache
)
1381 interesting_cache
= NULL
;
1383 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
1384 obj
->flags
|= UNINTERESTING
;
1385 if (process_parents(revs
, commit
, &list
, NULL
) < 0)
1387 if (obj
->flags
& UNINTERESTING
) {
1388 mark_parents_uninteresting(commit
);
1389 slop
= still_interesting(list
, date
, slop
, &interesting_cache
);
1394 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
1396 date
= commit
->date
;
1397 p
= &commit_list_insert(commit
, p
)->next
;
1399 show
= show_early_output
;
1403 show(revs
, newlist
);
1404 show_early_output
= NULL
;
1406 if (revs
->cherry_pick
|| revs
->cherry_mark
)
1407 cherry_pick_list(newlist
, revs
);
1409 if (revs
->left_only
|| revs
->right_only
)
1410 limit_left_right(newlist
, revs
);
1413 limit_to_ancestry(bottom
, newlist
);
1414 free_commit_list(bottom
);
1418 * Check if any commits have become TREESAME by some of their parents
1419 * becoming UNINTERESTING.
1421 if (limiting_can_increase_treesame(revs
))
1422 for (list
= newlist
; list
; list
= list
->next
) {
1423 struct commit
*c
= list
->item
;
1424 if (c
->object
.flags
& (UNINTERESTING
| TREESAME
))
1426 update_treesame(revs
, c
);
1429 revs
->commits
= newlist
;
1434 * Add an entry to refs->cmdline with the specified information.
1437 static void add_rev_cmdline(struct rev_info
*revs
,
1438 struct object
*item
,
1443 struct rev_cmdline_info
*info
= &revs
->cmdline
;
1444 unsigned int nr
= info
->nr
;
1446 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
1447 info
->rev
[nr
].item
= item
;
1448 info
->rev
[nr
].name
= xstrdup(name
);
1449 info
->rev
[nr
].whence
= whence
;
1450 info
->rev
[nr
].flags
= flags
;
1454 static void add_rev_cmdline_list(struct rev_info
*revs
,
1455 struct commit_list
*commit_list
,
1459 while (commit_list
) {
1460 struct object
*object
= &commit_list
->item
->object
;
1461 add_rev_cmdline(revs
, object
, oid_to_hex(&object
->oid
),
1463 commit_list
= commit_list
->next
;
1467 struct all_refs_cb
{
1469 int warned_bad_reflog
;
1470 struct rev_info
*all_revs
;
1471 const char *name_for_errormsg
;
1472 struct worktree
*wt
;
1475 int ref_excluded(struct string_list
*ref_excludes
, const char *path
)
1477 struct string_list_item
*item
;
1481 for_each_string_list_item(item
, ref_excludes
) {
1482 if (!wildmatch(item
->string
, path
, 0))
1488 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
1489 int flag
, void *cb_data
)
1491 struct all_refs_cb
*cb
= cb_data
;
1492 struct object
*object
;
1494 if (ref_excluded(cb
->all_revs
->ref_excludes
, path
))
1497 object
= get_reference(cb
->all_revs
, path
, oid
, cb
->all_flags
);
1498 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
1499 add_pending_oid(cb
->all_revs
, path
, oid
, cb
->all_flags
);
1503 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
1506 cb
->all_revs
= revs
;
1507 cb
->all_flags
= flags
;
1508 revs
->rev_input_given
= 1;
1512 void clear_ref_exclusion(struct string_list
**ref_excludes_p
)
1514 if (*ref_excludes_p
) {
1515 string_list_clear(*ref_excludes_p
, 0);
1516 free(*ref_excludes_p
);
1518 *ref_excludes_p
= NULL
;
1521 void add_ref_exclusion(struct string_list
**ref_excludes_p
, const char *exclude
)
1523 if (!*ref_excludes_p
) {
1524 *ref_excludes_p
= xcalloc(1, sizeof(**ref_excludes_p
));
1525 (*ref_excludes_p
)->strdup_strings
= 1;
1527 string_list_append(*ref_excludes_p
, exclude
);
1530 static void handle_refs(struct ref_store
*refs
,
1531 struct rev_info
*revs
, unsigned flags
,
1532 int (*for_each
)(struct ref_store
*, each_ref_fn
, void *))
1534 struct all_refs_cb cb
;
1537 /* this could happen with uninitialized submodules */
1541 init_all_refs_cb(&cb
, revs
, flags
);
1542 for_each(refs
, handle_one_ref
, &cb
);
1545 static void handle_one_reflog_commit(struct object_id
*oid
, void *cb_data
)
1547 struct all_refs_cb
*cb
= cb_data
;
1548 if (!is_null_oid(oid
)) {
1549 struct object
*o
= parse_object(cb
->all_revs
->repo
, oid
);
1551 o
->flags
|= cb
->all_flags
;
1552 /* ??? CMDLINEFLAGS ??? */
1553 add_pending_object(cb
->all_revs
, o
, "");
1555 else if (!cb
->warned_bad_reflog
) {
1556 warning("reflog of '%s' references pruned commits",
1557 cb
->name_for_errormsg
);
1558 cb
->warned_bad_reflog
= 1;
1563 static int handle_one_reflog_ent(struct object_id
*ooid
, struct object_id
*noid
,
1564 const char *email
, timestamp_t timestamp
, int tz
,
1565 const char *message
, void *cb_data
)
1567 handle_one_reflog_commit(ooid
, cb_data
);
1568 handle_one_reflog_commit(noid
, cb_data
);
1572 static int handle_one_reflog(const char *refname_in_wt
,
1573 const struct object_id
*oid
,
1574 int flag
, void *cb_data
)
1576 struct all_refs_cb
*cb
= cb_data
;
1577 struct strbuf refname
= STRBUF_INIT
;
1579 cb
->warned_bad_reflog
= 0;
1580 strbuf_worktree_ref(cb
->wt
, &refname
, refname_in_wt
);
1581 cb
->name_for_errormsg
= refname
.buf
;
1582 refs_for_each_reflog_ent(get_main_ref_store(the_repository
),
1584 handle_one_reflog_ent
, cb_data
);
1585 strbuf_release(&refname
);
1589 static void add_other_reflogs_to_pending(struct all_refs_cb
*cb
)
1591 struct worktree
**worktrees
, **p
;
1593 worktrees
= get_worktrees(0);
1594 for (p
= worktrees
; *p
; p
++) {
1595 struct worktree
*wt
= *p
;
1601 refs_for_each_reflog(get_worktree_ref_store(wt
),
1605 free_worktrees(worktrees
);
1608 void add_reflogs_to_pending(struct rev_info
*revs
, unsigned flags
)
1610 struct all_refs_cb cb
;
1613 cb
.all_flags
= flags
;
1615 for_each_reflog(handle_one_reflog
, &cb
);
1617 if (!revs
->single_worktree
)
1618 add_other_reflogs_to_pending(&cb
);
1621 static void add_cache_tree(struct cache_tree
*it
, struct rev_info
*revs
,
1622 struct strbuf
*path
, unsigned int flags
)
1624 size_t baselen
= path
->len
;
1627 if (it
->entry_count
>= 0) {
1628 struct tree
*tree
= lookup_tree(revs
->repo
, &it
->oid
);
1629 tree
->object
.flags
|= flags
;
1630 add_pending_object_with_path(revs
, &tree
->object
, "",
1634 for (i
= 0; i
< it
->subtree_nr
; i
++) {
1635 struct cache_tree_sub
*sub
= it
->down
[i
];
1636 strbuf_addf(path
, "%s%s", baselen
? "/" : "", sub
->name
);
1637 add_cache_tree(sub
->cache_tree
, revs
, path
, flags
);
1638 strbuf_setlen(path
, baselen
);
1643 static void do_add_index_objects_to_pending(struct rev_info
*revs
,
1644 struct index_state
*istate
,
1649 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1650 struct cache_entry
*ce
= istate
->cache
[i
];
1653 if (S_ISGITLINK(ce
->ce_mode
))
1656 blob
= lookup_blob(revs
->repo
, &ce
->oid
);
1658 die("unable to add index blob to traversal");
1659 blob
->object
.flags
|= flags
;
1660 add_pending_object_with_path(revs
, &blob
->object
, "",
1661 ce
->ce_mode
, ce
->name
);
1664 if (istate
->cache_tree
) {
1665 struct strbuf path
= STRBUF_INIT
;
1666 add_cache_tree(istate
->cache_tree
, revs
, &path
, flags
);
1667 strbuf_release(&path
);
1671 void add_index_objects_to_pending(struct rev_info
*revs
, unsigned int flags
)
1673 struct worktree
**worktrees
, **p
;
1675 repo_read_index(revs
->repo
);
1676 do_add_index_objects_to_pending(revs
, revs
->repo
->index
, flags
);
1678 if (revs
->single_worktree
)
1681 worktrees
= get_worktrees(0);
1682 for (p
= worktrees
; *p
; p
++) {
1683 struct worktree
*wt
= *p
;
1684 struct index_state istate
= { NULL
};
1687 continue; /* current index already taken care of */
1689 if (read_index_from(&istate
,
1690 worktree_git_path(wt
, "index"),
1691 get_worktree_git_dir(wt
)) > 0)
1692 do_add_index_objects_to_pending(revs
, &istate
, flags
);
1693 discard_index(&istate
);
1695 free_worktrees(worktrees
);
1698 struct add_alternate_refs_data
{
1699 struct rev_info
*revs
;
1703 static void add_one_alternate_ref(const struct object_id
*oid
,
1706 const char *name
= ".alternate";
1707 struct add_alternate_refs_data
*data
= vdata
;
1710 obj
= get_reference(data
->revs
, name
, oid
, data
->flags
);
1711 add_rev_cmdline(data
->revs
, obj
, name
, REV_CMD_REV
, data
->flags
);
1712 add_pending_object(data
->revs
, obj
, name
);
1715 static void add_alternate_refs_to_pending(struct rev_info
*revs
,
1718 struct add_alternate_refs_data data
;
1721 for_each_alternate_ref(add_one_alternate_ref
, &data
);
1724 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
,
1727 struct object_id oid
;
1729 struct commit
*commit
;
1730 struct commit_list
*parents
;
1732 const char *arg
= arg_
;
1735 flags
^= UNINTERESTING
| BOTTOM
;
1738 if (get_oid_committish(arg
, &oid
))
1741 it
= get_reference(revs
, arg
, &oid
, 0);
1742 if (!it
&& revs
->ignore_missing
)
1744 if (it
->type
!= OBJ_TAG
)
1746 if (!((struct tag
*)it
)->tagged
)
1748 oidcpy(&oid
, &((struct tag
*)it
)->tagged
->oid
);
1750 if (it
->type
!= OBJ_COMMIT
)
1752 commit
= (struct commit
*)it
;
1753 if (exclude_parent
&&
1754 exclude_parent
> commit_list_count(commit
->parents
))
1756 for (parents
= commit
->parents
, parent_number
= 1;
1758 parents
= parents
->next
, parent_number
++) {
1759 if (exclude_parent
&& parent_number
!= exclude_parent
)
1762 it
= &parents
->item
->object
;
1764 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1765 add_pending_object(revs
, it
, arg
);
1770 void repo_init_revisions(struct repository
*r
,
1771 struct rev_info
*revs
,
1774 memset(revs
, 0, sizeof(*revs
));
1777 revs
->abbrev
= DEFAULT_ABBREV
;
1778 revs
->ignore_merges
= 1;
1779 revs
->simplify_history
= 1;
1780 revs
->pruning
.repo
= r
;
1781 revs
->pruning
.flags
.recursive
= 1;
1782 revs
->pruning
.flags
.quick
= 1;
1783 revs
->pruning
.add_remove
= file_add_remove
;
1784 revs
->pruning
.change
= file_change
;
1785 revs
->pruning
.change_fn_data
= revs
;
1786 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1788 revs
->prefix
= prefix
;
1791 revs
->skip_count
= -1;
1792 revs
->max_count
= -1;
1793 revs
->max_parents
= -1;
1794 revs
->expand_tabs_in_log
= -1;
1796 revs
->commit_format
= CMIT_FMT_DEFAULT
;
1797 revs
->expand_tabs_in_log_default
= 8;
1799 init_grep_defaults(revs
->repo
);
1800 grep_init(&revs
->grep_filter
, revs
->repo
, prefix
);
1801 revs
->grep_filter
.status_only
= 1;
1803 repo_diff_setup(revs
->repo
, &revs
->diffopt
);
1804 if (prefix
&& !revs
->diffopt
.prefix
) {
1805 revs
->diffopt
.prefix
= prefix
;
1806 revs
->diffopt
.prefix_length
= strlen(prefix
);
1809 init_display_notes(&revs
->notes_opt
);
1812 static void add_pending_commit_list(struct rev_info
*revs
,
1813 struct commit_list
*commit_list
,
1816 while (commit_list
) {
1817 struct object
*object
= &commit_list
->item
->object
;
1818 object
->flags
|= flags
;
1819 add_pending_object(revs
, object
, oid_to_hex(&object
->oid
));
1820 commit_list
= commit_list
->next
;
1824 static void prepare_show_merge(struct rev_info
*revs
)
1826 struct commit_list
*bases
;
1827 struct commit
*head
, *other
;
1828 struct object_id oid
;
1829 const char **prune
= NULL
;
1830 int i
, prune_num
= 1; /* counting terminating NULL */
1831 struct index_state
*istate
= revs
->repo
->index
;
1833 if (get_oid("HEAD", &oid
))
1834 die("--merge without HEAD?");
1835 head
= lookup_commit_or_die(&oid
, "HEAD");
1836 if (get_oid("MERGE_HEAD", &oid
))
1837 die("--merge without MERGE_HEAD?");
1838 other
= lookup_commit_or_die(&oid
, "MERGE_HEAD");
1839 add_pending_object(revs
, &head
->object
, "HEAD");
1840 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1841 bases
= get_merge_bases(head
, other
);
1842 add_rev_cmdline_list(revs
, bases
, REV_CMD_MERGE_BASE
, UNINTERESTING
| BOTTOM
);
1843 add_pending_commit_list(revs
, bases
, UNINTERESTING
| BOTTOM
);
1844 free_commit_list(bases
);
1845 head
->object
.flags
|= SYMMETRIC_LEFT
;
1847 if (!istate
->cache_nr
)
1848 repo_read_index(revs
->repo
);
1849 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1850 const struct cache_entry
*ce
= istate
->cache
[i
];
1853 if (ce_path_match(istate
, ce
, &revs
->prune_data
, NULL
)) {
1855 REALLOC_ARRAY(prune
, prune_num
);
1856 prune
[prune_num
-2] = ce
->name
;
1857 prune
[prune_num
-1] = NULL
;
1859 while ((i
+1 < istate
->cache_nr
) &&
1860 ce_same_name(ce
, istate
->cache
[i
+1]))
1863 clear_pathspec(&revs
->prune_data
);
1864 parse_pathspec(&revs
->prune_data
, PATHSPEC_ALL_MAGIC
& ~PATHSPEC_LITERAL
,
1865 PATHSPEC_PREFER_FULL
| PATHSPEC_LITERAL_PATH
, "", prune
);
1869 static int dotdot_missing(const char *arg
, char *dotdot
,
1870 struct rev_info
*revs
, int symmetric
)
1872 if (revs
->ignore_missing
)
1874 /* de-munge so we report the full argument */
1877 ? "Invalid symmetric difference expression %s"
1878 : "Invalid revision range %s", arg
);
1881 static int handle_dotdot_1(const char *arg
, char *dotdot
,
1882 struct rev_info
*revs
, int flags
,
1883 int cant_be_filename
,
1884 struct object_context
*a_oc
,
1885 struct object_context
*b_oc
)
1887 const char *a_name
, *b_name
;
1888 struct object_id a_oid
, b_oid
;
1889 struct object
*a_obj
, *b_obj
;
1890 unsigned int a_flags
, b_flags
;
1892 unsigned int flags_exclude
= flags
^ (UNINTERESTING
| BOTTOM
);
1893 unsigned int oc_flags
= GET_OID_COMMITTISH
| GET_OID_RECORD_PATH
;
1899 b_name
= dotdot
+ 2;
1900 if (*b_name
== '.') {
1907 if (get_oid_with_context(revs
->repo
, a_name
, oc_flags
, &a_oid
, a_oc
) ||
1908 get_oid_with_context(revs
->repo
, b_name
, oc_flags
, &b_oid
, b_oc
))
1911 if (!cant_be_filename
) {
1913 verify_non_filename(revs
->prefix
, arg
);
1917 a_obj
= parse_object(revs
->repo
, &a_oid
);
1918 b_obj
= parse_object(revs
->repo
, &b_oid
);
1919 if (!a_obj
|| !b_obj
)
1920 return dotdot_missing(arg
, dotdot
, revs
, symmetric
);
1925 a_flags
= flags_exclude
;
1927 /* A...B -- find merge bases between the two */
1928 struct commit
*a
, *b
;
1929 struct commit_list
*exclude
;
1931 a
= lookup_commit_reference(revs
->repo
, &a_obj
->oid
);
1932 b
= lookup_commit_reference(revs
->repo
, &b_obj
->oid
);
1934 return dotdot_missing(arg
, dotdot
, revs
, symmetric
);
1936 exclude
= get_merge_bases(a
, b
);
1937 add_rev_cmdline_list(revs
, exclude
, REV_CMD_MERGE_BASE
,
1939 add_pending_commit_list(revs
, exclude
, flags_exclude
);
1940 free_commit_list(exclude
);
1943 a_flags
= flags
| SYMMETRIC_LEFT
;
1946 a_obj
->flags
|= a_flags
;
1947 b_obj
->flags
|= b_flags
;
1948 add_rev_cmdline(revs
, a_obj
, a_name
, REV_CMD_LEFT
, a_flags
);
1949 add_rev_cmdline(revs
, b_obj
, b_name
, REV_CMD_RIGHT
, b_flags
);
1950 add_pending_object_with_path(revs
, a_obj
, a_name
, a_oc
->mode
, a_oc
->path
);
1951 add_pending_object_with_path(revs
, b_obj
, b_name
, b_oc
->mode
, b_oc
->path
);
1955 static int handle_dotdot(const char *arg
,
1956 struct rev_info
*revs
, int flags
,
1957 int cant_be_filename
)
1959 struct object_context a_oc
, b_oc
;
1960 char *dotdot
= strstr(arg
, "..");
1966 memset(&a_oc
, 0, sizeof(a_oc
));
1967 memset(&b_oc
, 0, sizeof(b_oc
));
1970 ret
= handle_dotdot_1(arg
, dotdot
, revs
, flags
, cant_be_filename
,
1980 int handle_revision_arg(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
1982 struct object_context oc
;
1984 struct object
*object
;
1985 struct object_id oid
;
1987 const char *arg
= arg_
;
1988 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
1989 unsigned get_sha1_flags
= GET_OID_RECORD_PATH
;
1991 flags
= flags
& UNINTERESTING
? flags
| BOTTOM
: flags
& ~BOTTOM
;
1993 if (!cant_be_filename
&& !strcmp(arg
, "..")) {
1995 * Just ".."? That is not a range but the
1996 * pathspec for the parent directory.
2001 if (!handle_dotdot(arg
, revs
, flags
, revarg_opt
))
2004 mark
= strstr(arg
, "^@");
2005 if (mark
&& !mark
[2]) {
2007 if (add_parents_only(revs
, arg
, flags
, 0))
2011 mark
= strstr(arg
, "^!");
2012 if (mark
&& !mark
[2]) {
2014 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
), 0))
2017 mark
= strstr(arg
, "^-");
2019 int exclude_parent
= 1;
2023 exclude_parent
= strtoul(mark
+ 2, &end
, 10);
2024 if (*end
!= '\0' || !exclude_parent
)
2029 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
), exclude_parent
))
2035 local_flags
= UNINTERESTING
| BOTTOM
;
2039 if (revarg_opt
& REVARG_COMMITTISH
)
2040 get_sha1_flags
|= GET_OID_COMMITTISH
;
2042 if (get_oid_with_context(revs
->repo
, arg
, get_sha1_flags
, &oid
, &oc
))
2043 return revs
->ignore_missing
? 0 : -1;
2044 if (!cant_be_filename
)
2045 verify_non_filename(revs
->prefix
, arg
);
2046 object
= get_reference(revs
, arg
, &oid
, flags
^ local_flags
);
2048 return revs
->ignore_missing
? 0 : -1;
2049 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
2050 add_pending_object_with_path(revs
, object
, arg
, oc
.mode
, oc
.path
);
2055 static void read_pathspec_from_stdin(struct strbuf
*sb
,
2056 struct argv_array
*prune
)
2058 while (strbuf_getline(sb
, stdin
) != EOF
)
2059 argv_array_push(prune
, sb
->buf
);
2062 static void read_revisions_from_stdin(struct rev_info
*revs
,
2063 struct argv_array
*prune
)
2066 int seen_dashdash
= 0;
2069 save_warning
= warn_on_object_refname_ambiguity
;
2070 warn_on_object_refname_ambiguity
= 0;
2072 strbuf_init(&sb
, 1000);
2073 while (strbuf_getline(&sb
, stdin
) != EOF
) {
2077 if (sb
.buf
[0] == '-') {
2078 if (len
== 2 && sb
.buf
[1] == '-') {
2082 die("options not supported in --stdin mode");
2084 if (handle_revision_arg(sb
.buf
, revs
, 0,
2085 REVARG_CANNOT_BE_FILENAME
))
2086 die("bad revision '%s'", sb
.buf
);
2089 read_pathspec_from_stdin(&sb
, prune
);
2091 strbuf_release(&sb
);
2092 warn_on_object_refname_ambiguity
= save_warning
;
2095 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
2097 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
2100 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
2102 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
2105 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
2107 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
2110 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
2111 int *unkc
, const char **unkv
,
2112 const struct setup_revision_opt
* opt
)
2114 const char *arg
= argv
[0];
2117 const unsigned hexsz
= the_hash_algo
->hexsz
;
2119 /* pseudo revision arguments */
2120 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
2121 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
2122 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
2123 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
2124 !strcmp(arg
, "--bisect") || starts_with(arg
, "--glob=") ||
2125 !strcmp(arg
, "--indexed-objects") ||
2126 !strcmp(arg
, "--alternate-refs") ||
2127 starts_with(arg
, "--exclude=") ||
2128 starts_with(arg
, "--branches=") || starts_with(arg
, "--tags=") ||
2129 starts_with(arg
, "--remotes=") || starts_with(arg
, "--no-walk="))
2131 unkv
[(*unkc
)++] = arg
;
2135 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
2136 revs
->max_count
= atoi(optarg
);
2139 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
2140 revs
->skip_count
= atoi(optarg
);
2142 } else if ((*arg
== '-') && isdigit(arg
[1])) {
2143 /* accept -<digit>, like traditional "head" */
2144 if (strtol_i(arg
+ 1, 10, &revs
->max_count
) < 0 ||
2145 revs
->max_count
< 0)
2146 die("'%s': not a non-negative integer", arg
+ 1);
2148 } else if (!strcmp(arg
, "-n")) {
2150 return error("-n requires an argument");
2151 revs
->max_count
= atoi(argv
[1]);
2154 } else if (skip_prefix(arg
, "-n", &optarg
)) {
2155 revs
->max_count
= atoi(optarg
);
2157 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
2158 revs
->max_age
= atoi(optarg
);
2160 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
2161 revs
->max_age
= approxidate(optarg
);
2163 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
2164 revs
->max_age
= approxidate(optarg
);
2166 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
2167 revs
->min_age
= atoi(optarg
);
2169 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
2170 revs
->min_age
= approxidate(optarg
);
2172 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
2173 revs
->min_age
= approxidate(optarg
);
2175 } else if (!strcmp(arg
, "--first-parent")) {
2176 revs
->first_parent_only
= 1;
2177 } else if (!strcmp(arg
, "--ancestry-path")) {
2178 revs
->ancestry_path
= 1;
2179 revs
->simplify_history
= 0;
2181 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
2182 init_reflog_walk(&revs
->reflog_info
);
2183 } else if (!strcmp(arg
, "--default")) {
2185 return error("bad --default argument");
2186 revs
->def
= argv
[1];
2188 } else if (!strcmp(arg
, "--merge")) {
2189 revs
->show_merge
= 1;
2190 } else if (!strcmp(arg
, "--topo-order")) {
2191 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
2192 revs
->topo_order
= 1;
2193 } else if (!strcmp(arg
, "--simplify-merges")) {
2194 revs
->simplify_merges
= 1;
2195 revs
->topo_order
= 1;
2196 revs
->rewrite_parents
= 1;
2197 revs
->simplify_history
= 0;
2199 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
2200 revs
->simplify_merges
= 1;
2201 revs
->topo_order
= 1;
2202 revs
->rewrite_parents
= 1;
2203 revs
->simplify_history
= 0;
2204 revs
->simplify_by_decoration
= 1;
2207 } else if (!strcmp(arg
, "--date-order")) {
2208 revs
->sort_order
= REV_SORT_BY_COMMIT_DATE
;
2209 revs
->topo_order
= 1;
2210 } else if (!strcmp(arg
, "--author-date-order")) {
2211 revs
->sort_order
= REV_SORT_BY_AUTHOR_DATE
;
2212 revs
->topo_order
= 1;
2213 } else if (!strcmp(arg
, "--early-output")) {
2214 revs
->early_output
= 100;
2215 revs
->topo_order
= 1;
2216 } else if (skip_prefix(arg
, "--early-output=", &optarg
)) {
2217 if (strtoul_ui(optarg
, 10, &revs
->early_output
) < 0)
2218 die("'%s': not a non-negative integer", optarg
);
2219 revs
->topo_order
= 1;
2220 } else if (!strcmp(arg
, "--parents")) {
2221 revs
->rewrite_parents
= 1;
2222 revs
->print_parents
= 1;
2223 } else if (!strcmp(arg
, "--dense")) {
2225 } else if (!strcmp(arg
, "--sparse")) {
2227 } else if (!strcmp(arg
, "--in-commit-order")) {
2228 revs
->tree_blobs_in_commit_order
= 1;
2229 } else if (!strcmp(arg
, "--remove-empty")) {
2230 revs
->remove_empty_trees
= 1;
2231 } else if (!strcmp(arg
, "--merges")) {
2232 revs
->min_parents
= 2;
2233 } else if (!strcmp(arg
, "--no-merges")) {
2234 revs
->max_parents
= 1;
2235 } else if (skip_prefix(arg
, "--min-parents=", &optarg
)) {
2236 revs
->min_parents
= atoi(optarg
);
2237 } else if (!strcmp(arg
, "--no-min-parents")) {
2238 revs
->min_parents
= 0;
2239 } else if (skip_prefix(arg
, "--max-parents=", &optarg
)) {
2240 revs
->max_parents
= atoi(optarg
);
2241 } else if (!strcmp(arg
, "--no-max-parents")) {
2242 revs
->max_parents
= -1;
2243 } else if (!strcmp(arg
, "--boundary")) {
2245 } else if (!strcmp(arg
, "--left-right")) {
2246 revs
->left_right
= 1;
2247 } else if (!strcmp(arg
, "--left-only")) {
2248 if (revs
->right_only
)
2249 die("--left-only is incompatible with --right-only"
2251 revs
->left_only
= 1;
2252 } else if (!strcmp(arg
, "--right-only")) {
2253 if (revs
->left_only
)
2254 die("--right-only is incompatible with --left-only");
2255 revs
->right_only
= 1;
2256 } else if (!strcmp(arg
, "--cherry")) {
2257 if (revs
->left_only
)
2258 die("--cherry is incompatible with --left-only");
2259 revs
->cherry_mark
= 1;
2260 revs
->right_only
= 1;
2261 revs
->max_parents
= 1;
2263 } else if (!strcmp(arg
, "--count")) {
2265 } else if (!strcmp(arg
, "--cherry-mark")) {
2266 if (revs
->cherry_pick
)
2267 die("--cherry-mark is incompatible with --cherry-pick");
2268 revs
->cherry_mark
= 1;
2269 revs
->limited
= 1; /* needs limit_list() */
2270 } else if (!strcmp(arg
, "--cherry-pick")) {
2271 if (revs
->cherry_mark
)
2272 die("--cherry-pick is incompatible with --cherry-mark");
2273 revs
->cherry_pick
= 1;
2275 } else if (!strcmp(arg
, "--objects")) {
2276 revs
->tag_objects
= 1;
2277 revs
->tree_objects
= 1;
2278 revs
->blob_objects
= 1;
2279 } else if (!strcmp(arg
, "--objects-edge")) {
2280 revs
->tag_objects
= 1;
2281 revs
->tree_objects
= 1;
2282 revs
->blob_objects
= 1;
2283 revs
->edge_hint
= 1;
2284 } else if (!strcmp(arg
, "--objects-edge-aggressive")) {
2285 revs
->tag_objects
= 1;
2286 revs
->tree_objects
= 1;
2287 revs
->blob_objects
= 1;
2288 revs
->edge_hint
= 1;
2289 revs
->edge_hint_aggressive
= 1;
2290 } else if (!strcmp(arg
, "--verify-objects")) {
2291 revs
->tag_objects
= 1;
2292 revs
->tree_objects
= 1;
2293 revs
->blob_objects
= 1;
2294 revs
->verify_objects
= 1;
2295 } else if (!strcmp(arg
, "--unpacked")) {
2297 } else if (starts_with(arg
, "--unpacked=")) {
2298 die("--unpacked=<packfile> no longer supported.");
2299 } else if (!strcmp(arg
, "-r")) {
2301 revs
->diffopt
.flags
.recursive
= 1;
2302 } else if (!strcmp(arg
, "-t")) {
2304 revs
->diffopt
.flags
.recursive
= 1;
2305 revs
->diffopt
.flags
.tree_in_recursive
= 1;
2306 } else if (!strcmp(arg
, "-m")) {
2307 revs
->ignore_merges
= 0;
2308 } else if (!strcmp(arg
, "-c")) {
2310 revs
->dense_combined_merges
= 0;
2311 revs
->combine_merges
= 1;
2312 } else if (!strcmp(arg
, "--combined-all-paths")) {
2314 revs
->combined_all_paths
= 1;
2315 } else if (!strcmp(arg
, "--cc")) {
2317 revs
->dense_combined_merges
= 1;
2318 revs
->combine_merges
= 1;
2319 } else if (!strcmp(arg
, "-v")) {
2320 revs
->verbose_header
= 1;
2321 } else if (!strcmp(arg
, "--pretty")) {
2322 revs
->verbose_header
= 1;
2323 revs
->pretty_given
= 1;
2324 get_commit_format(NULL
, revs
);
2325 } else if (skip_prefix(arg
, "--pretty=", &optarg
) ||
2326 skip_prefix(arg
, "--format=", &optarg
)) {
2328 * Detached form ("--pretty X" as opposed to "--pretty=X")
2329 * not allowed, since the argument is optional.
2331 revs
->verbose_header
= 1;
2332 revs
->pretty_given
= 1;
2333 get_commit_format(optarg
, revs
);
2334 } else if (!strcmp(arg
, "--expand-tabs")) {
2335 revs
->expand_tabs_in_log
= 8;
2336 } else if (!strcmp(arg
, "--no-expand-tabs")) {
2337 revs
->expand_tabs_in_log
= 0;
2338 } else if (skip_prefix(arg
, "--expand-tabs=", &arg
)) {
2340 if (strtol_i(arg
, 10, &val
) < 0 || val
< 0)
2341 die("'%s': not a non-negative integer", arg
);
2342 revs
->expand_tabs_in_log
= val
;
2343 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
2344 enable_default_display_notes(&revs
->notes_opt
, &revs
->show_notes
);
2345 revs
->show_notes_given
= 1;
2346 } else if (!strcmp(arg
, "--show-signature")) {
2347 revs
->show_signature
= 1;
2348 } else if (!strcmp(arg
, "--no-show-signature")) {
2349 revs
->show_signature
= 0;
2350 } else if (!strcmp(arg
, "--show-linear-break")) {
2351 revs
->break_bar
= " ..........";
2352 revs
->track_linear
= 1;
2353 revs
->track_first_time
= 1;
2354 } else if (skip_prefix(arg
, "--show-linear-break=", &optarg
)) {
2355 revs
->break_bar
= xstrdup(optarg
);
2356 revs
->track_linear
= 1;
2357 revs
->track_first_time
= 1;
2358 } else if (skip_prefix(arg
, "--show-notes=", &optarg
) ||
2359 skip_prefix(arg
, "--notes=", &optarg
)) {
2360 if (starts_with(arg
, "--show-notes=") &&
2361 revs
->notes_opt
.use_default_notes
< 0)
2362 revs
->notes_opt
.use_default_notes
= 1;
2363 enable_ref_display_notes(&revs
->notes_opt
, &revs
->show_notes
, optarg
);
2364 revs
->show_notes_given
= 1;
2365 } else if (!strcmp(arg
, "--no-notes")) {
2366 disable_display_notes(&revs
->notes_opt
, &revs
->show_notes
);
2367 revs
->show_notes_given
= 1;
2368 } else if (!strcmp(arg
, "--standard-notes")) {
2369 revs
->show_notes_given
= 1;
2370 revs
->notes_opt
.use_default_notes
= 1;
2371 } else if (!strcmp(arg
, "--no-standard-notes")) {
2372 revs
->notes_opt
.use_default_notes
= 0;
2373 } else if (!strcmp(arg
, "--oneline")) {
2374 revs
->verbose_header
= 1;
2375 get_commit_format("oneline", revs
);
2376 revs
->pretty_given
= 1;
2377 revs
->abbrev_commit
= 1;
2378 } else if (!strcmp(arg
, "--graph")) {
2379 revs
->topo_order
= 1;
2380 revs
->rewrite_parents
= 1;
2381 revs
->graph
= graph_init(revs
);
2382 } else if (!strcmp(arg
, "--root")) {
2383 revs
->show_root_diff
= 1;
2384 } else if (!strcmp(arg
, "--no-commit-id")) {
2385 revs
->no_commit_id
= 1;
2386 } else if (!strcmp(arg
, "--always")) {
2387 revs
->always_show_header
= 1;
2388 } else if (!strcmp(arg
, "--no-abbrev")) {
2390 } else if (!strcmp(arg
, "--abbrev")) {
2391 revs
->abbrev
= DEFAULT_ABBREV
;
2392 } else if (skip_prefix(arg
, "--abbrev=", &optarg
)) {
2393 revs
->abbrev
= strtoul(optarg
, NULL
, 10);
2394 if (revs
->abbrev
< MINIMUM_ABBREV
)
2395 revs
->abbrev
= MINIMUM_ABBREV
;
2396 else if (revs
->abbrev
> hexsz
)
2397 revs
->abbrev
= hexsz
;
2398 } else if (!strcmp(arg
, "--abbrev-commit")) {
2399 revs
->abbrev_commit
= 1;
2400 revs
->abbrev_commit_given
= 1;
2401 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
2402 revs
->abbrev_commit
= 0;
2403 } else if (!strcmp(arg
, "--full-diff")) {
2405 revs
->full_diff
= 1;
2406 } else if (!strcmp(arg
, "--full-history")) {
2407 revs
->simplify_history
= 0;
2408 } else if (!strcmp(arg
, "--relative-date")) {
2409 revs
->date_mode
.type
= DATE_RELATIVE
;
2410 revs
->date_mode_explicit
= 1;
2411 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
2412 parse_date_format(optarg
, &revs
->date_mode
);
2413 revs
->date_mode_explicit
= 1;
2415 } else if (!strcmp(arg
, "--log-size")) {
2416 revs
->show_log_size
= 1;
2419 * Grepping the commit log
2421 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
2422 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
2424 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
2425 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
2427 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
2428 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
2430 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
2431 add_message_grep(revs
, optarg
);
2433 } else if (!strcmp(arg
, "--grep-debug")) {
2434 revs
->grep_filter
.debug
= 1;
2435 } else if (!strcmp(arg
, "--basic-regexp")) {
2436 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_BRE
;
2437 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
2438 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_ERE
;
2439 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
2440 revs
->grep_filter
.ignore_case
= 1;
2441 revs
->diffopt
.pickaxe_opts
|= DIFF_PICKAXE_IGNORE_CASE
;
2442 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
2443 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_FIXED
;
2444 } else if (!strcmp(arg
, "--perl-regexp") || !strcmp(arg
, "-P")) {
2445 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_PCRE
;
2446 } else if (!strcmp(arg
, "--all-match")) {
2447 revs
->grep_filter
.all_match
= 1;
2448 } else if (!strcmp(arg
, "--invert-grep")) {
2449 revs
->invert_grep
= 1;
2450 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
2451 if (strcmp(optarg
, "none"))
2452 git_log_output_encoding
= xstrdup(optarg
);
2454 git_log_output_encoding
= "";
2456 } else if (!strcmp(arg
, "--reverse")) {
2458 } else if (!strcmp(arg
, "--children")) {
2459 revs
->children
.name
= "children";
2461 } else if (!strcmp(arg
, "--ignore-missing")) {
2462 revs
->ignore_missing
= 1;
2463 } else if (opt
&& opt
->allow_exclude_promisor_objects
&&
2464 !strcmp(arg
, "--exclude-promisor-objects")) {
2465 if (fetch_if_missing
)
2466 BUG("exclude_promisor_objects can only be used when fetch_if_missing is 0");
2467 revs
->exclude_promisor_objects
= 1;
2469 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
, revs
->prefix
);
2471 unkv
[(*unkc
)++] = arg
;
2474 if (revs
->graph
&& revs
->track_linear
)
2475 die("--show-linear-break and --graph are incompatible");
2480 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
2481 const struct option
*options
,
2482 const char * const usagestr
[])
2484 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
2485 &ctx
->cpidx
, ctx
->out
, NULL
);
2487 error("unknown option `%s'", ctx
->argv
[0]);
2488 usage_with_options(usagestr
, options
);
2494 static int for_each_bisect_ref(struct ref_store
*refs
, each_ref_fn fn
,
2495 void *cb_data
, const char *term
)
2497 struct strbuf bisect_refs
= STRBUF_INIT
;
2499 strbuf_addf(&bisect_refs
, "refs/bisect/%s", term
);
2500 status
= refs_for_each_fullref_in(refs
, bisect_refs
.buf
, fn
, cb_data
, 0);
2501 strbuf_release(&bisect_refs
);
2505 static int for_each_bad_bisect_ref(struct ref_store
*refs
, each_ref_fn fn
, void *cb_data
)
2507 return for_each_bisect_ref(refs
, fn
, cb_data
, term_bad
);
2510 static int for_each_good_bisect_ref(struct ref_store
*refs
, each_ref_fn fn
, void *cb_data
)
2512 return for_each_bisect_ref(refs
, fn
, cb_data
, term_good
);
2515 static int handle_revision_pseudo_opt(const char *submodule
,
2516 struct rev_info
*revs
,
2517 int argc
, const char **argv
, int *flags
)
2519 const char *arg
= argv
[0];
2521 struct ref_store
*refs
;
2526 * We need some something like get_submodule_worktrees()
2527 * before we can go through all worktrees of a submodule,
2528 * .e.g with adding all HEADs from --all, which is not
2529 * supported right now, so stick to single worktree.
2531 if (!revs
->single_worktree
)
2532 BUG("--single-worktree cannot be used together with submodule");
2533 refs
= get_submodule_ref_store(submodule
);
2535 refs
= get_main_ref_store(revs
->repo
);
2540 * Commands like "git shortlog" will not accept the options below
2541 * unless parse_revision_opt queues them (as opposed to erroring
2544 * When implementing your new pseudo-option, remember to
2545 * register it in the list at the top of handle_revision_opt.
2547 if (!strcmp(arg
, "--all")) {
2548 handle_refs(refs
, revs
, *flags
, refs_for_each_ref
);
2549 handle_refs(refs
, revs
, *flags
, refs_head_ref
);
2550 if (!revs
->single_worktree
) {
2551 struct all_refs_cb cb
;
2553 init_all_refs_cb(&cb
, revs
, *flags
);
2554 other_head_refs(handle_one_ref
, &cb
);
2556 clear_ref_exclusion(&revs
->ref_excludes
);
2557 } else if (!strcmp(arg
, "--branches")) {
2558 handle_refs(refs
, revs
, *flags
, refs_for_each_branch_ref
);
2559 clear_ref_exclusion(&revs
->ref_excludes
);
2560 } else if (!strcmp(arg
, "--bisect")) {
2561 read_bisect_terms(&term_bad
, &term_good
);
2562 handle_refs(refs
, revs
, *flags
, for_each_bad_bisect_ref
);
2563 handle_refs(refs
, revs
, *flags
^ (UNINTERESTING
| BOTTOM
),
2564 for_each_good_bisect_ref
);
2566 } else if (!strcmp(arg
, "--tags")) {
2567 handle_refs(refs
, revs
, *flags
, refs_for_each_tag_ref
);
2568 clear_ref_exclusion(&revs
->ref_excludes
);
2569 } else if (!strcmp(arg
, "--remotes")) {
2570 handle_refs(refs
, revs
, *flags
, refs_for_each_remote_ref
);
2571 clear_ref_exclusion(&revs
->ref_excludes
);
2572 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
2573 struct all_refs_cb cb
;
2574 init_all_refs_cb(&cb
, revs
, *flags
);
2575 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
2576 clear_ref_exclusion(&revs
->ref_excludes
);
2578 } else if ((argcount
= parse_long_opt("exclude", argv
, &optarg
))) {
2579 add_ref_exclusion(&revs
->ref_excludes
, optarg
);
2581 } else if (skip_prefix(arg
, "--branches=", &optarg
)) {
2582 struct all_refs_cb cb
;
2583 init_all_refs_cb(&cb
, revs
, *flags
);
2584 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/heads/", &cb
);
2585 clear_ref_exclusion(&revs
->ref_excludes
);
2586 } else if (skip_prefix(arg
, "--tags=", &optarg
)) {
2587 struct all_refs_cb cb
;
2588 init_all_refs_cb(&cb
, revs
, *flags
);
2589 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/tags/", &cb
);
2590 clear_ref_exclusion(&revs
->ref_excludes
);
2591 } else if (skip_prefix(arg
, "--remotes=", &optarg
)) {
2592 struct all_refs_cb cb
;
2593 init_all_refs_cb(&cb
, revs
, *flags
);
2594 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/remotes/", &cb
);
2595 clear_ref_exclusion(&revs
->ref_excludes
);
2596 } else if (!strcmp(arg
, "--reflog")) {
2597 add_reflogs_to_pending(revs
, *flags
);
2598 } else if (!strcmp(arg
, "--indexed-objects")) {
2599 add_index_objects_to_pending(revs
, *flags
);
2600 } else if (!strcmp(arg
, "--alternate-refs")) {
2601 add_alternate_refs_to_pending(revs
, *flags
);
2602 } else if (!strcmp(arg
, "--not")) {
2603 *flags
^= UNINTERESTING
| BOTTOM
;
2604 } else if (!strcmp(arg
, "--no-walk")) {
2605 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2606 } else if (skip_prefix(arg
, "--no-walk=", &optarg
)) {
2608 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2609 * not allowed, since the argument is optional.
2611 if (!strcmp(optarg
, "sorted"))
2612 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2613 else if (!strcmp(optarg
, "unsorted"))
2614 revs
->no_walk
= REVISION_WALK_NO_WALK_UNSORTED
;
2616 return error("invalid argument to --no-walk");
2617 } else if (!strcmp(arg
, "--do-walk")) {
2619 } else if (!strcmp(arg
, "--single-worktree")) {
2620 revs
->single_worktree
= 1;
2628 static void NORETURN
diagnose_missing_default(const char *def
)
2631 const char *refname
;
2633 refname
= resolve_ref_unsafe(def
, 0, NULL
, &flags
);
2634 if (!refname
|| !(flags
& REF_ISSYMREF
) || (flags
& REF_ISBROKEN
))
2635 die(_("your current branch appears to be broken"));
2637 skip_prefix(refname
, "refs/heads/", &refname
);
2638 die(_("your current branch '%s' does not have any commits yet"),
2643 * Parse revision information, filling in the "rev_info" structure,
2644 * and removing the used arguments from the argument list.
2646 * Returns the number of arguments left that weren't recognized
2647 * (which are also moved to the head of the argument list)
2649 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
2651 int i
, flags
, left
, seen_dashdash
, got_rev_arg
= 0, revarg_opt
;
2652 struct argv_array prune_data
= ARGV_ARRAY_INIT
;
2653 const char *submodule
= NULL
;
2654 int seen_end_of_options
= 0;
2657 submodule
= opt
->submodule
;
2659 /* First, search for "--" */
2660 if (opt
&& opt
->assume_dashdash
) {
2664 for (i
= 1; i
< argc
; i
++) {
2665 const char *arg
= argv
[i
];
2666 if (strcmp(arg
, "--"))
2671 argv_array_pushv(&prune_data
, argv
+ i
+ 1);
2677 /* Second, deal with arguments and options */
2679 revarg_opt
= opt
? opt
->revarg_opt
: 0;
2681 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
2682 for (left
= i
= 1; i
< argc
; i
++) {
2683 const char *arg
= argv
[i
];
2684 if (!seen_end_of_options
&& *arg
== '-') {
2687 opts
= handle_revision_pseudo_opt(submodule
,
2688 revs
, argc
- i
, argv
+ i
,
2695 if (!strcmp(arg
, "--stdin")) {
2696 if (revs
->disable_stdin
) {
2700 if (revs
->read_from_stdin
++)
2701 die("--stdin given twice?");
2702 read_revisions_from_stdin(revs
, &prune_data
);
2706 if (!strcmp(arg
, "--end-of-options")) {
2707 seen_end_of_options
= 1;
2711 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
,
2723 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
2725 if (seen_dashdash
|| *arg
== '^')
2726 die("bad revision '%s'", arg
);
2728 /* If we didn't have a "--":
2729 * (1) all filenames must exist;
2730 * (2) all rev-args must not be interpretable
2731 * as a valid filename.
2732 * but the latter we have checked in the main loop.
2734 for (j
= i
; j
< argc
; j
++)
2735 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
2737 argv_array_pushv(&prune_data
, argv
+ i
);
2744 if (prune_data
.argc
) {
2746 * If we need to introduce the magic "a lone ':' means no
2747 * pathspec whatsoever", here is the place to do so.
2749 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2750 * prune_data.nr = 0;
2751 * prune_data.alloc = 0;
2752 * free(prune_data.path);
2753 * prune_data.path = NULL;
2755 * terminate prune_data.alloc with NULL and
2756 * call init_pathspec() to set revs->prune_data here.
2759 parse_pathspec(&revs
->prune_data
, 0, 0,
2760 revs
->prefix
, prune_data
.argv
);
2762 argv_array_clear(&prune_data
);
2764 if (revs
->def
== NULL
)
2765 revs
->def
= opt
? opt
->def
: NULL
;
2766 if (opt
&& opt
->tweak
)
2767 opt
->tweak(revs
, opt
);
2768 if (revs
->show_merge
)
2769 prepare_show_merge(revs
);
2770 if (revs
->def
&& !revs
->pending
.nr
&& !revs
->rev_input_given
&& !got_rev_arg
) {
2771 struct object_id oid
;
2772 struct object
*object
;
2773 struct object_context oc
;
2774 if (get_oid_with_context(revs
->repo
, revs
->def
, 0, &oid
, &oc
))
2775 diagnose_missing_default(revs
->def
);
2776 object
= get_reference(revs
, revs
->def
, &oid
, 0);
2777 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
);
2780 /* Did the user ask for any diff output? Run the diff! */
2781 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
2784 /* Pickaxe, diff-filter and rename following need diffs */
2785 if ((revs
->diffopt
.pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
) ||
2786 revs
->diffopt
.filter
||
2787 revs
->diffopt
.flags
.follow_renames
)
2790 if (revs
->diffopt
.objfind
)
2791 revs
->simplify_history
= 0;
2793 if (revs
->line_level_traverse
) {
2794 if (want_ancestry(revs
))
2796 revs
->topo_order
= 1;
2799 if (revs
->topo_order
&& !generation_numbers_enabled(the_repository
))
2802 if (revs
->prune_data
.nr
) {
2803 copy_pathspec(&revs
->pruning
.pathspec
, &revs
->prune_data
);
2804 /* Can't prune commits with rename following: the paths change.. */
2805 if (!revs
->diffopt
.flags
.follow_renames
)
2807 if (!revs
->full_diff
)
2808 copy_pathspec(&revs
->diffopt
.pathspec
,
2811 if (revs
->combine_merges
)
2812 revs
->ignore_merges
= 0;
2813 if (revs
->combined_all_paths
&& !revs
->combine_merges
)
2814 die("--combined-all-paths makes no sense without -c or --cc");
2816 revs
->diffopt
.abbrev
= revs
->abbrev
;
2818 diff_setup_done(&revs
->diffopt
);
2820 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED
,
2821 &revs
->grep_filter
);
2822 if (!is_encoding_utf8(get_log_output_encoding()))
2823 revs
->grep_filter
.ignore_locale
= 1;
2824 compile_grep_patterns(&revs
->grep_filter
);
2826 if (revs
->reverse
&& revs
->reflog_info
)
2827 die("cannot combine --reverse with --walk-reflogs");
2828 if (revs
->reflog_info
&& revs
->limited
)
2829 die("cannot combine --walk-reflogs with history-limiting options");
2830 if (revs
->rewrite_parents
&& revs
->children
.name
)
2831 die("cannot combine --parents and --children");
2834 * Limitations on the graph functionality
2836 if (revs
->reverse
&& revs
->graph
)
2837 die("cannot combine --reverse with --graph");
2839 if (revs
->reflog_info
&& revs
->graph
)
2840 die("cannot combine --walk-reflogs with --graph");
2841 if (revs
->no_walk
&& revs
->graph
)
2842 die("cannot combine --no-walk with --graph");
2843 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
2844 die("cannot use --grep-reflog without --walk-reflogs");
2846 if (revs
->first_parent_only
&& revs
->bisect
)
2847 die(_("--first-parent is incompatible with --bisect"));
2849 if (revs
->line_level_traverse
&&
2850 (revs
->diffopt
.output_format
& ~(DIFF_FORMAT_PATCH
| DIFF_FORMAT_NO_OUTPUT
)))
2851 die(_("-L does not yet support diff formats besides -p and -s"));
2853 if (revs
->expand_tabs_in_log
< 0)
2854 revs
->expand_tabs_in_log
= revs
->expand_tabs_in_log_default
;
2859 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
2861 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
2864 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
2867 static int remove_duplicate_parents(struct rev_info
*revs
, struct commit
*commit
)
2869 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2870 struct commit_list
**pp
, *p
;
2871 int surviving_parents
;
2873 /* Examine existing parents while marking ones we have seen... */
2874 pp
= &commit
->parents
;
2875 surviving_parents
= 0;
2876 while ((p
= *pp
) != NULL
) {
2877 struct commit
*parent
= p
->item
;
2878 if (parent
->object
.flags
& TMP_MARK
) {
2881 compact_treesame(revs
, commit
, surviving_parents
);
2884 parent
->object
.flags
|= TMP_MARK
;
2885 surviving_parents
++;
2888 /* clear the temporary mark */
2889 for (p
= commit
->parents
; p
; p
= p
->next
) {
2890 p
->item
->object
.flags
&= ~TMP_MARK
;
2892 /* no update_treesame() - removing duplicates can't affect TREESAME */
2893 return surviving_parents
;
2896 struct merge_simplify_state
{
2897 struct commit
*simplified
;
2900 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
2902 struct merge_simplify_state
*st
;
2904 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
2906 st
= xcalloc(1, sizeof(*st
));
2907 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
2912 static int mark_redundant_parents(struct commit
*commit
)
2914 struct commit_list
*h
= reduce_heads(commit
->parents
);
2915 int i
= 0, marked
= 0;
2916 struct commit_list
*po
, *pn
;
2918 /* Want these for sanity-checking only */
2919 int orig_cnt
= commit_list_count(commit
->parents
);
2920 int cnt
= commit_list_count(h
);
2923 * Not ready to remove items yet, just mark them for now, based
2924 * on the output of reduce_heads(). reduce_heads outputs the reduced
2925 * set in its original order, so this isn't too hard.
2927 po
= commit
->parents
;
2930 if (pn
&& po
->item
== pn
->item
) {
2934 po
->item
->object
.flags
|= TMP_MARK
;
2940 if (i
!= cnt
|| cnt
+marked
!= orig_cnt
)
2941 die("mark_redundant_parents %d %d %d %d", orig_cnt
, cnt
, i
, marked
);
2943 free_commit_list(h
);
2948 static int mark_treesame_root_parents(struct commit
*commit
)
2950 struct commit_list
*p
;
2953 for (p
= commit
->parents
; p
; p
= p
->next
) {
2954 struct commit
*parent
= p
->item
;
2955 if (!parent
->parents
&& (parent
->object
.flags
& TREESAME
)) {
2956 parent
->object
.flags
|= TMP_MARK
;
2965 * Awkward naming - this means one parent we are TREESAME to.
2966 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2967 * empty tree). Better name suggestions?
2969 static int leave_one_treesame_to_parent(struct rev_info
*revs
, struct commit
*commit
)
2971 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2972 struct commit
*unmarked
= NULL
, *marked
= NULL
;
2973 struct commit_list
*p
;
2976 for (p
= commit
->parents
, n
= 0; p
; p
= p
->next
, n
++) {
2977 if (ts
->treesame
[n
]) {
2978 if (p
->item
->object
.flags
& TMP_MARK
) {
2991 * If we are TREESAME to a marked-for-deletion parent, but not to any
2992 * unmarked parents, unmark the first TREESAME parent. This is the
2993 * parent that the default simplify_history==1 scan would have followed,
2994 * and it doesn't make sense to omit that path when asking for a
2995 * simplified full history. Retaining it improves the chances of
2996 * understanding odd missed merges that took an old version of a file.
3000 * I--------*X A modified the file, but mainline merge X used
3001 * \ / "-s ours", so took the version from I. X is
3002 * `-*A--' TREESAME to I and !TREESAME to A.
3004 * Default log from X would produce "I". Without this check,
3005 * --full-history --simplify-merges would produce "I-A-X", showing
3006 * the merge commit X and that it changed A, but not making clear that
3007 * it had just taken the I version. With this check, the topology above
3010 * Note that it is possible that the simplification chooses a different
3011 * TREESAME parent from the default, in which case this test doesn't
3012 * activate, and we _do_ drop the default parent. Example:
3014 * I------X A modified the file, but it was reverted in B,
3015 * \ / meaning mainline merge X is TREESAME to both
3018 * Default log would produce "I" by following the first parent;
3019 * --full-history --simplify-merges will produce "I-A-B". But this is a
3020 * reasonable result - it presents a logical full history leading from
3021 * I to X, and X is not an important merge.
3023 if (!unmarked
&& marked
) {
3024 marked
->object
.flags
&= ~TMP_MARK
;
3031 static int remove_marked_parents(struct rev_info
*revs
, struct commit
*commit
)
3033 struct commit_list
**pp
, *p
;
3034 int nth_parent
, removed
= 0;
3036 pp
= &commit
->parents
;
3038 while ((p
= *pp
) != NULL
) {
3039 struct commit
*parent
= p
->item
;
3040 if (parent
->object
.flags
& TMP_MARK
) {
3041 parent
->object
.flags
&= ~TMP_MARK
;
3045 compact_treesame(revs
, commit
, nth_parent
);
3052 /* Removing parents can only increase TREESAMEness */
3053 if (removed
&& !(commit
->object
.flags
& TREESAME
))
3054 update_treesame(revs
, commit
);
3059 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
3061 struct commit_list
*p
;
3062 struct commit
*parent
;
3063 struct merge_simplify_state
*st
, *pst
;
3066 st
= locate_simplify_state(revs
, commit
);
3069 * Have we handled this one?
3075 * An UNINTERESTING commit simplifies to itself, so does a
3076 * root commit. We do not rewrite parents of such commit
3079 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
3080 st
->simplified
= commit
;
3085 * Do we know what commit all of our parents that matter
3086 * should be rewritten to? Otherwise we are not ready to
3087 * rewrite this one yet.
3089 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
3090 pst
= locate_simplify_state(revs
, p
->item
);
3091 if (!pst
->simplified
) {
3092 tail
= &commit_list_insert(p
->item
, tail
)->next
;
3095 if (revs
->first_parent_only
)
3099 tail
= &commit_list_insert(commit
, tail
)->next
;
3104 * Rewrite our list of parents. Note that this cannot
3105 * affect our TREESAME flags in any way - a commit is
3106 * always TREESAME to its simplification.
3108 for (p
= commit
->parents
; p
; p
= p
->next
) {
3109 pst
= locate_simplify_state(revs
, p
->item
);
3110 p
->item
= pst
->simplified
;
3111 if (revs
->first_parent_only
)
3115 if (revs
->first_parent_only
)
3118 cnt
= remove_duplicate_parents(revs
, commit
);
3121 * It is possible that we are a merge and one side branch
3122 * does not have any commit that touches the given paths;
3123 * in such a case, the immediate parent from that branch
3124 * will be rewritten to be the merge base.
3126 * o----X X: the commit we are looking at;
3127 * / / o: a commit that touches the paths;
3130 * Further, a merge of an independent branch that doesn't
3131 * touch the path will reduce to a treesame root parent:
3133 * ----o----X X: the commit we are looking at;
3134 * / o: a commit that touches the paths;
3135 * r r: a root commit not touching the paths
3137 * Detect and simplify both cases.
3140 int marked
= mark_redundant_parents(commit
);
3141 marked
+= mark_treesame_root_parents(commit
);
3143 marked
-= leave_one_treesame_to_parent(revs
, commit
);
3145 cnt
= remove_marked_parents(revs
, commit
);
3149 * A commit simplifies to itself if it is a root, if it is
3150 * UNINTERESTING, if it touches the given paths, or if it is a
3151 * merge and its parents don't simplify to one relevant commit
3152 * (the first two cases are already handled at the beginning of
3155 * Otherwise, it simplifies to what its sole relevant parent
3159 (commit
->object
.flags
& UNINTERESTING
) ||
3160 !(commit
->object
.flags
& TREESAME
) ||
3161 (parent
= one_relevant_parent(revs
, commit
->parents
)) == NULL
)
3162 st
->simplified
= commit
;
3164 pst
= locate_simplify_state(revs
, parent
);
3165 st
->simplified
= pst
->simplified
;
3170 static void simplify_merges(struct rev_info
*revs
)
3172 struct commit_list
*list
, *next
;
3173 struct commit_list
*yet_to_do
, **tail
;
3174 struct commit
*commit
;
3179 /* feed the list reversed */
3181 for (list
= revs
->commits
; list
; list
= next
) {
3182 commit
= list
->item
;
3185 * Do not free(list) here yet; the original list
3186 * is used later in this function.
3188 commit_list_insert(commit
, &yet_to_do
);
3195 commit
= pop_commit(&list
);
3196 tail
= simplify_one(revs
, commit
, tail
);
3200 /* clean up the result, removing the simplified ones */
3201 list
= revs
->commits
;
3202 revs
->commits
= NULL
;
3203 tail
= &revs
->commits
;
3205 struct merge_simplify_state
*st
;
3207 commit
= pop_commit(&list
);
3208 st
= locate_simplify_state(revs
, commit
);
3209 if (st
->simplified
== commit
)
3210 tail
= &commit_list_insert(commit
, tail
)->next
;
3214 static void set_children(struct rev_info
*revs
)
3216 struct commit_list
*l
;
3217 for (l
= revs
->commits
; l
; l
= l
->next
) {
3218 struct commit
*commit
= l
->item
;
3219 struct commit_list
*p
;
3221 for (p
= commit
->parents
; p
; p
= p
->next
)
3222 add_child(revs
, p
->item
, commit
);
3226 void reset_revision_walk(void)
3228 clear_object_flags(SEEN
| ADDED
| SHOWN
| TOPO_WALK_EXPLORED
| TOPO_WALK_INDEGREE
);
3231 static int mark_uninteresting(const struct object_id
*oid
,
3232 struct packed_git
*pack
,
3236 struct rev_info
*revs
= cb
;
3237 struct object
*o
= parse_object(revs
->repo
, oid
);
3238 o
->flags
|= UNINTERESTING
| SEEN
;
3242 define_commit_slab(indegree_slab
, int);
3243 define_commit_slab(author_date_slab
, timestamp_t
);
3245 struct topo_walk_info
{
3246 uint32_t min_generation
;
3247 struct prio_queue explore_queue
;
3248 struct prio_queue indegree_queue
;
3249 struct prio_queue topo_queue
;
3250 struct indegree_slab indegree
;
3251 struct author_date_slab author_date
;
3254 static inline void test_flag_and_insert(struct prio_queue
*q
, struct commit
*c
, int flag
)
3256 if (c
->object
.flags
& flag
)
3259 c
->object
.flags
|= flag
;
3260 prio_queue_put(q
, c
);
3263 static void explore_walk_step(struct rev_info
*revs
)
3265 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3266 struct commit_list
*p
;
3267 struct commit
*c
= prio_queue_get(&info
->explore_queue
);
3272 if (parse_commit_gently(c
, 1) < 0)
3275 if (revs
->sort_order
== REV_SORT_BY_AUTHOR_DATE
)
3276 record_author_date(&info
->author_date
, c
);
3278 if (revs
->max_age
!= -1 && (c
->date
< revs
->max_age
))
3279 c
->object
.flags
|= UNINTERESTING
;
3281 if (process_parents(revs
, c
, NULL
, NULL
) < 0)
3284 if (c
->object
.flags
& UNINTERESTING
)
3285 mark_parents_uninteresting(c
);
3287 for (p
= c
->parents
; p
; p
= p
->next
)
3288 test_flag_and_insert(&info
->explore_queue
, p
->item
, TOPO_WALK_EXPLORED
);
3291 static void explore_to_depth(struct rev_info
*revs
,
3292 uint32_t gen_cutoff
)
3294 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3296 while ((c
= prio_queue_peek(&info
->explore_queue
)) &&
3297 c
->generation
>= gen_cutoff
)
3298 explore_walk_step(revs
);
3301 static void indegree_walk_step(struct rev_info
*revs
)
3303 struct commit_list
*p
;
3304 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3305 struct commit
*c
= prio_queue_get(&info
->indegree_queue
);
3310 if (parse_commit_gently(c
, 1) < 0)
3313 explore_to_depth(revs
, c
->generation
);
3315 for (p
= c
->parents
; p
; p
= p
->next
) {
3316 struct commit
*parent
= p
->item
;
3317 int *pi
= indegree_slab_at(&info
->indegree
, parent
);
3324 test_flag_and_insert(&info
->indegree_queue
, parent
, TOPO_WALK_INDEGREE
);
3326 if (revs
->first_parent_only
)
3331 static void compute_indegrees_to_depth(struct rev_info
*revs
,
3332 uint32_t gen_cutoff
)
3334 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3336 while ((c
= prio_queue_peek(&info
->indegree_queue
)) &&
3337 c
->generation
>= gen_cutoff
)
3338 indegree_walk_step(revs
);
3341 static void reset_topo_walk(struct rev_info
*revs
)
3343 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3345 clear_prio_queue(&info
->explore_queue
);
3346 clear_prio_queue(&info
->indegree_queue
);
3347 clear_prio_queue(&info
->topo_queue
);
3348 clear_indegree_slab(&info
->indegree
);
3349 clear_author_date_slab(&info
->author_date
);
3351 FREE_AND_NULL(revs
->topo_walk_info
);
3354 static void init_topo_walk(struct rev_info
*revs
)
3356 struct topo_walk_info
*info
;
3357 struct commit_list
*list
;
3358 if (revs
->topo_walk_info
)
3359 reset_topo_walk(revs
);
3361 revs
->topo_walk_info
= xmalloc(sizeof(struct topo_walk_info
));
3362 info
= revs
->topo_walk_info
;
3363 memset(info
, 0, sizeof(struct topo_walk_info
));
3365 init_indegree_slab(&info
->indegree
);
3366 memset(&info
->explore_queue
, 0, sizeof(info
->explore_queue
));
3367 memset(&info
->indegree_queue
, 0, sizeof(info
->indegree_queue
));
3368 memset(&info
->topo_queue
, 0, sizeof(info
->topo_queue
));
3370 switch (revs
->sort_order
) {
3371 default: /* REV_SORT_IN_GRAPH_ORDER */
3372 info
->topo_queue
.compare
= NULL
;
3374 case REV_SORT_BY_COMMIT_DATE
:
3375 info
->topo_queue
.compare
= compare_commits_by_commit_date
;
3377 case REV_SORT_BY_AUTHOR_DATE
:
3378 init_author_date_slab(&info
->author_date
);
3379 info
->topo_queue
.compare
= compare_commits_by_author_date
;
3380 info
->topo_queue
.cb_data
= &info
->author_date
;
3384 info
->explore_queue
.compare
= compare_commits_by_gen_then_commit_date
;
3385 info
->indegree_queue
.compare
= compare_commits_by_gen_then_commit_date
;
3387 info
->min_generation
= GENERATION_NUMBER_INFINITY
;
3388 for (list
= revs
->commits
; list
; list
= list
->next
) {
3389 struct commit
*c
= list
->item
;
3391 if (parse_commit_gently(c
, 1))
3394 test_flag_and_insert(&info
->explore_queue
, c
, TOPO_WALK_EXPLORED
);
3395 test_flag_and_insert(&info
->indegree_queue
, c
, TOPO_WALK_INDEGREE
);
3397 if (c
->generation
< info
->min_generation
)
3398 info
->min_generation
= c
->generation
;
3400 *(indegree_slab_at(&info
->indegree
, c
)) = 1;
3402 if (revs
->sort_order
== REV_SORT_BY_AUTHOR_DATE
)
3403 record_author_date(&info
->author_date
, c
);
3405 compute_indegrees_to_depth(revs
, info
->min_generation
);
3407 for (list
= revs
->commits
; list
; list
= list
->next
) {
3408 struct commit
*c
= list
->item
;
3410 if (*(indegree_slab_at(&info
->indegree
, c
)) == 1)
3411 prio_queue_put(&info
->topo_queue
, c
);
3415 * This is unfortunate; the initial tips need to be shown
3416 * in the order given from the revision traversal machinery.
3418 if (revs
->sort_order
== REV_SORT_IN_GRAPH_ORDER
)
3419 prio_queue_reverse(&info
->topo_queue
);
3422 static struct commit
*next_topo_commit(struct rev_info
*revs
)
3425 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3427 /* pop next off of topo_queue */
3428 c
= prio_queue_get(&info
->topo_queue
);
3431 *(indegree_slab_at(&info
->indegree
, c
)) = 0;
3436 static void expand_topo_walk(struct rev_info
*revs
, struct commit
*commit
)
3438 struct commit_list
*p
;
3439 struct topo_walk_info
*info
= revs
->topo_walk_info
;
3440 if (process_parents(revs
, commit
, NULL
, NULL
) < 0) {
3441 if (!revs
->ignore_missing_links
)
3442 die("Failed to traverse parents of commit %s",
3443 oid_to_hex(&commit
->object
.oid
));
3446 for (p
= commit
->parents
; p
; p
= p
->next
) {
3447 struct commit
*parent
= p
->item
;
3450 if (parent
->object
.flags
& UNINTERESTING
)
3453 if (parse_commit_gently(parent
, 1) < 0)
3456 if (parent
->generation
< info
->min_generation
) {
3457 info
->min_generation
= parent
->generation
;
3458 compute_indegrees_to_depth(revs
, info
->min_generation
);
3461 pi
= indegree_slab_at(&info
->indegree
, parent
);
3465 prio_queue_put(&info
->topo_queue
, parent
);
3467 if (revs
->first_parent_only
)
3472 int prepare_revision_walk(struct rev_info
*revs
)
3475 struct object_array old_pending
;
3476 struct commit_list
**next
= &revs
->commits
;
3478 memcpy(&old_pending
, &revs
->pending
, sizeof(old_pending
));
3479 revs
->pending
.nr
= 0;
3480 revs
->pending
.alloc
= 0;
3481 revs
->pending
.objects
= NULL
;
3482 for (i
= 0; i
< old_pending
.nr
; i
++) {
3483 struct object_array_entry
*e
= old_pending
.objects
+ i
;
3484 struct commit
*commit
= handle_commit(revs
, e
);
3486 if (!(commit
->object
.flags
& SEEN
)) {
3487 commit
->object
.flags
|= SEEN
;
3488 next
= commit_list_append(commit
, next
);
3492 object_array_clear(&old_pending
);
3494 /* Signal whether we need per-parent treesame decoration */
3495 if (revs
->simplify_merges
||
3496 (revs
->limited
&& limiting_can_increase_treesame(revs
)))
3497 revs
->treesame
.name
= "treesame";
3499 if (revs
->exclude_promisor_objects
) {
3500 for_each_packed_object(mark_uninteresting
, revs
,
3501 FOR_EACH_OBJECT_PROMISOR_ONLY
);
3504 if (!revs
->reflog_info
)
3505 prepare_to_use_bloom_filter(revs
);
3506 if (revs
->no_walk
!= REVISION_WALK_NO_WALK_UNSORTED
)
3507 commit_list_sort_by_date(&revs
->commits
);
3510 if (revs
->limited
) {
3511 if (limit_list(revs
) < 0)
3513 if (revs
->topo_order
)
3514 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
3515 } else if (revs
->topo_order
)
3516 init_topo_walk(revs
);
3517 if (revs
->line_level_traverse
&& want_ancestry(revs
))
3519 * At the moment we can only do line-level log with parent
3520 * rewriting by performing this expensive pre-filtering step.
3521 * If parent rewriting is not requested, then we rather
3522 * perform the line-level log filtering during the regular
3523 * history traversal.
3525 line_log_filter(revs
);
3526 if (revs
->simplify_merges
)
3527 simplify_merges(revs
);
3528 if (revs
->children
.name
)
3534 static enum rewrite_result
rewrite_one_1(struct rev_info
*revs
,
3536 struct prio_queue
*queue
)
3539 struct commit
*p
= *pp
;
3541 if (process_parents(revs
, p
, NULL
, queue
) < 0)
3542 return rewrite_one_error
;
3543 if (p
->object
.flags
& UNINTERESTING
)
3544 return rewrite_one_ok
;
3545 if (!(p
->object
.flags
& TREESAME
))
3546 return rewrite_one_ok
;
3548 return rewrite_one_noparents
;
3549 if ((p
= one_relevant_parent(revs
, p
->parents
)) == NULL
)
3550 return rewrite_one_ok
;
3555 static void merge_queue_into_list(struct prio_queue
*q
, struct commit_list
**list
)
3558 struct commit
*item
= prio_queue_peek(q
);
3559 struct commit_list
*p
= *list
;
3561 if (p
&& p
->item
->date
>= item
->date
)
3564 p
= commit_list_insert(item
, list
);
3565 list
= &p
->next
; /* skip newly added item */
3566 prio_queue_get(q
); /* pop item */
3571 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
3573 struct prio_queue queue
= { compare_commits_by_commit_date
};
3574 enum rewrite_result ret
= rewrite_one_1(revs
, pp
, &queue
);
3575 merge_queue_into_list(&queue
, &revs
->commits
);
3576 clear_prio_queue(&queue
);
3580 int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
,
3581 rewrite_parent_fn_t rewrite_parent
)
3583 struct commit_list
**pp
= &commit
->parents
;
3585 struct commit_list
*parent
= *pp
;
3586 switch (rewrite_parent(revs
, &parent
->item
)) {
3587 case rewrite_one_ok
:
3589 case rewrite_one_noparents
:
3592 case rewrite_one_error
:
3597 remove_duplicate_parents(revs
, commit
);
3601 static int commit_rewrite_person(struct strbuf
*buf
, const char *what
, struct string_list
*mailmap
)
3603 char *person
, *endp
;
3604 size_t len
, namelen
, maillen
;
3607 struct ident_split ident
;
3609 person
= strstr(buf
->buf
, what
);
3613 person
+= strlen(what
);
3614 endp
= strchr(person
, '\n');
3618 len
= endp
- person
;
3620 if (split_ident_line(&ident
, person
, len
))
3623 mail
= ident
.mail_begin
;
3624 maillen
= ident
.mail_end
- ident
.mail_begin
;
3625 name
= ident
.name_begin
;
3626 namelen
= ident
.name_end
- ident
.name_begin
;
3628 if (map_user(mailmap
, &mail
, &maillen
, &name
, &namelen
)) {
3629 struct strbuf namemail
= STRBUF_INIT
;
3631 strbuf_addf(&namemail
, "%.*s <%.*s>",
3632 (int)namelen
, name
, (int)maillen
, mail
);
3634 strbuf_splice(buf
, ident
.name_begin
- buf
->buf
,
3635 ident
.mail_end
- ident
.name_begin
+ 1,
3636 namemail
.buf
, namemail
.len
);
3638 strbuf_release(&namemail
);
3646 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
3649 const char *encoding
;
3650 const char *message
;
3651 struct strbuf buf
= STRBUF_INIT
;
3653 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
3656 /* Prepend "fake" headers as needed */
3657 if (opt
->grep_filter
.use_reflog_filter
) {
3658 strbuf_addstr(&buf
, "reflog ");
3659 get_reflog_message(&buf
, opt
->reflog_info
);
3660 strbuf_addch(&buf
, '\n');
3664 * We grep in the user's output encoding, under the assumption that it
3665 * is the encoding they are most likely to write their grep pattern
3666 * for. In addition, it means we will match the "notes" encoding below,
3667 * so we will not end up with a buffer that has two different encodings
3670 encoding
= get_log_output_encoding();
3671 message
= logmsg_reencode(commit
, NULL
, encoding
);
3673 /* Copy the commit to temporary if we are using "fake" headers */
3675 strbuf_addstr(&buf
, message
);
3677 if (opt
->grep_filter
.header_list
&& opt
->mailmap
) {
3679 strbuf_addstr(&buf
, message
);
3681 commit_rewrite_person(&buf
, "\nauthor ", opt
->mailmap
);
3682 commit_rewrite_person(&buf
, "\ncommitter ", opt
->mailmap
);
3685 /* Append "fake" message parts as needed */
3686 if (opt
->show_notes
) {
3688 strbuf_addstr(&buf
, message
);
3689 format_display_notes(&commit
->object
.oid
, &buf
, encoding
, 1);
3693 * Find either in the original commit message, or in the temporary.
3694 * Note that we cast away the constness of "message" here. It is
3695 * const because it may come from the cached commit buffer. That's OK,
3696 * because we know that it is modifiable heap memory, and that while
3697 * grep_buffer may modify it for speed, it will restore any
3698 * changes before returning.
3701 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
3703 retval
= grep_buffer(&opt
->grep_filter
,
3704 (char *)message
, strlen(message
));
3705 strbuf_release(&buf
);
3706 unuse_commit_buffer(commit
, message
);
3707 return opt
->invert_grep
? !retval
: retval
;
3710 static inline int want_ancestry(const struct rev_info
*revs
)
3712 return (revs
->rewrite_parents
|| revs
->children
.name
);
3716 * Return a timestamp to be used for --since/--until comparisons for this
3717 * commit, based on the revision options.
3719 static timestamp_t
comparison_date(const struct rev_info
*revs
,
3720 struct commit
*commit
)
3722 return revs
->reflog_info
?
3723 get_reflog_timestamp(revs
->reflog_info
) :
3727 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
3729 if (commit
->object
.flags
& SHOWN
)
3730 return commit_ignore
;
3731 if (revs
->unpacked
&& has_object_pack(&commit
->object
.oid
))
3732 return commit_ignore
;
3733 if (commit
->object
.flags
& UNINTERESTING
)
3734 return commit_ignore
;
3735 if (revs
->line_level_traverse
&& !want_ancestry(revs
)) {
3737 * In case of line-level log with parent rewriting
3738 * prepare_revision_walk() already took care of all line-level
3739 * log filtering, and there is nothing left to do here.
3741 * If parent rewriting was not requested, then this is the
3742 * place to perform the line-level log filtering. Notably,
3743 * this check, though expensive, must come before the other,
3744 * cheaper filtering conditions, because the tracked line
3745 * ranges must be adjusted even when the commit will end up
3746 * being ignored based on other conditions.
3748 if (!line_log_process_ranges_arbitrary_commit(revs
, commit
))
3749 return commit_ignore
;
3751 if (revs
->min_age
!= -1 &&
3752 comparison_date(revs
, commit
) > revs
->min_age
)
3753 return commit_ignore
;
3754 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
3755 int n
= commit_list_count(commit
->parents
);
3756 if ((n
< revs
->min_parents
) ||
3757 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
3758 return commit_ignore
;
3760 if (!commit_match(commit
, revs
))
3761 return commit_ignore
;
3762 if (revs
->prune
&& revs
->dense
) {
3763 /* Commit without changes? */
3764 if (commit
->object
.flags
& TREESAME
) {
3766 struct commit_list
*p
;
3767 /* drop merges unless we want parenthood */
3768 if (!want_ancestry(revs
))
3769 return commit_ignore
;
3771 * If we want ancestry, then need to keep any merges
3772 * between relevant commits to tie together topology.
3773 * For consistency with TREESAME and simplification
3774 * use "relevant" here rather than just INTERESTING,
3775 * to treat bottom commit(s) as part of the topology.
3777 for (n
= 0, p
= commit
->parents
; p
; p
= p
->next
)
3778 if (relevant_commit(p
->item
))
3781 return commit_ignore
;
3787 define_commit_slab(saved_parents
, struct commit_list
*);
3789 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3792 * You may only call save_parents() once per commit (this is checked
3793 * for non-root commits).
3795 static void save_parents(struct rev_info
*revs
, struct commit
*commit
)
3797 struct commit_list
**pp
;
3799 if (!revs
->saved_parents_slab
) {
3800 revs
->saved_parents_slab
= xmalloc(sizeof(struct saved_parents
));
3801 init_saved_parents(revs
->saved_parents_slab
);
3804 pp
= saved_parents_at(revs
->saved_parents_slab
, commit
);
3807 * When walking with reflogs, we may visit the same commit
3808 * several times: once for each appearance in the reflog.
3810 * In this case, save_parents() will be called multiple times.
3811 * We want to keep only the first set of parents. We need to
3812 * store a sentinel value for an empty (i.e., NULL) parent
3813 * list to distinguish it from a not-yet-saved list, however.
3817 if (commit
->parents
)
3818 *pp
= copy_commit_list(commit
->parents
);
3820 *pp
= EMPTY_PARENT_LIST
;
3823 static void free_saved_parents(struct rev_info
*revs
)
3825 if (revs
->saved_parents_slab
)
3826 clear_saved_parents(revs
->saved_parents_slab
);
3829 struct commit_list
*get_saved_parents(struct rev_info
*revs
, const struct commit
*commit
)
3831 struct commit_list
*parents
;
3833 if (!revs
->saved_parents_slab
)
3834 return commit
->parents
;
3836 parents
= *saved_parents_at(revs
->saved_parents_slab
, commit
);
3837 if (parents
== EMPTY_PARENT_LIST
)
3842 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
3844 enum commit_action action
= get_commit_action(revs
, commit
);
3846 if (action
== commit_show
&&
3847 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
3849 * --full-diff on simplified parents is no good: it
3850 * will show spurious changes from the commits that
3851 * were elided. So we save the parents on the side
3852 * when --full-diff is in effect.
3854 if (revs
->full_diff
)
3855 save_parents(revs
, commit
);
3856 if (rewrite_parents(revs
, commit
, rewrite_one
) < 0)
3857 return commit_error
;
3862 static void track_linear(struct rev_info
*revs
, struct commit
*commit
)
3864 if (revs
->track_first_time
) {
3866 revs
->track_first_time
= 0;
3868 struct commit_list
*p
;
3869 for (p
= revs
->previous_parents
; p
; p
= p
->next
)
3870 if (p
->item
== NULL
|| /* first commit */
3871 oideq(&p
->item
->object
.oid
, &commit
->object
.oid
))
3873 revs
->linear
= p
!= NULL
;
3875 if (revs
->reverse
) {
3877 commit
->object
.flags
|= TRACK_LINEAR
;
3879 free_commit_list(revs
->previous_parents
);
3880 revs
->previous_parents
= copy_commit_list(commit
->parents
);
3883 static struct commit
*get_revision_1(struct rev_info
*revs
)
3886 struct commit
*commit
;
3888 if (revs
->reflog_info
)
3889 commit
= next_reflog_entry(revs
->reflog_info
);
3890 else if (revs
->topo_walk_info
)
3891 commit
= next_topo_commit(revs
);
3893 commit
= pop_commit(&revs
->commits
);
3898 if (revs
->reflog_info
)
3899 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
3902 * If we haven't done the list limiting, we need to look at
3903 * the parents here. We also need to do the date-based limiting
3904 * that we'd otherwise have done in limit_list().
3906 if (!revs
->limited
) {
3907 if (revs
->max_age
!= -1 &&
3908 comparison_date(revs
, commit
) < revs
->max_age
)
3911 if (revs
->reflog_info
)
3912 try_to_simplify_commit(revs
, commit
);
3913 else if (revs
->topo_walk_info
)
3914 expand_topo_walk(revs
, commit
);
3915 else if (process_parents(revs
, commit
, &revs
->commits
, NULL
) < 0) {
3916 if (!revs
->ignore_missing_links
)
3917 die("Failed to traverse parents of commit %s",
3918 oid_to_hex(&commit
->object
.oid
));
3922 switch (simplify_commit(revs
, commit
)) {
3926 die("Failed to simplify parents of commit %s",
3927 oid_to_hex(&commit
->object
.oid
));
3929 if (revs
->track_linear
)
3930 track_linear(revs
, commit
);
3937 * Return true for entries that have not yet been shown. (This is an
3938 * object_array_each_func_t.)
3940 static int entry_unshown(struct object_array_entry
*entry
, void *cb_data_unused
)
3942 return !(entry
->item
->flags
& SHOWN
);
3946 * If array is on the verge of a realloc, garbage-collect any entries
3947 * that have already been shown to try to free up some space.
3949 static void gc_boundary(struct object_array
*array
)
3951 if (array
->nr
== array
->alloc
)
3952 object_array_filter(array
, entry_unshown
, NULL
);
3955 static void create_boundary_commit_list(struct rev_info
*revs
)
3959 struct object_array
*array
= &revs
->boundary_commits
;
3960 struct object_array_entry
*objects
= array
->objects
;
3963 * If revs->commits is non-NULL at this point, an error occurred in
3964 * get_revision_1(). Ignore the error and continue printing the
3965 * boundary commits anyway. (This is what the code has always
3968 if (revs
->commits
) {
3969 free_commit_list(revs
->commits
);
3970 revs
->commits
= NULL
;
3974 * Put all of the actual boundary commits from revs->boundary_commits
3975 * into revs->commits
3977 for (i
= 0; i
< array
->nr
; i
++) {
3978 c
= (struct commit
*)(objects
[i
].item
);
3981 if (!(c
->object
.flags
& CHILD_SHOWN
))
3983 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
3985 c
->object
.flags
|= BOUNDARY
;
3986 commit_list_insert(c
, &revs
->commits
);
3990 * If revs->topo_order is set, sort the boundary commits
3991 * in topological order
3993 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
3996 static struct commit
*get_revision_internal(struct rev_info
*revs
)
3998 struct commit
*c
= NULL
;
3999 struct commit_list
*l
;
4001 if (revs
->boundary
== 2) {
4003 * All of the normal commits have already been returned,
4004 * and we are now returning boundary commits.
4005 * create_boundary_commit_list() has populated
4006 * revs->commits with the remaining commits to return.
4008 c
= pop_commit(&revs
->commits
);
4010 c
->object
.flags
|= SHOWN
;
4015 * If our max_count counter has reached zero, then we are done. We
4016 * don't simply return NULL because we still might need to show
4017 * boundary commits. But we want to avoid calling get_revision_1, which
4018 * might do a considerable amount of work finding the next commit only
4019 * for us to throw it away.
4021 * If it is non-zero, then either we don't have a max_count at all
4022 * (-1), or it is still counting, in which case we decrement.
4024 if (revs
->max_count
) {
4025 c
= get_revision_1(revs
);
4027 while (revs
->skip_count
> 0) {
4029 c
= get_revision_1(revs
);
4035 if (revs
->max_count
> 0)
4040 c
->object
.flags
|= SHOWN
;
4042 if (!revs
->boundary
)
4047 * get_revision_1() runs out the commits, and
4048 * we are done computing the boundaries.
4049 * switch to boundary commits output mode.
4054 * Update revs->commits to contain the list of
4057 create_boundary_commit_list(revs
);
4059 return get_revision_internal(revs
);
4063 * boundary commits are the commits that are parents of the
4064 * ones we got from get_revision_1() but they themselves are
4065 * not returned from get_revision_1(). Before returning
4066 * 'c', we need to mark its parents that they could be boundaries.
4069 for (l
= c
->parents
; l
; l
= l
->next
) {
4071 p
= &(l
->item
->object
);
4072 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
4074 p
->flags
|= CHILD_SHOWN
;
4075 gc_boundary(&revs
->boundary_commits
);
4076 add_object_array(p
, NULL
, &revs
->boundary_commits
);
4082 struct commit
*get_revision(struct rev_info
*revs
)
4085 struct commit_list
*reversed
;
4087 if (revs
->reverse
) {
4089 while ((c
= get_revision_internal(revs
)))
4090 commit_list_insert(c
, &reversed
);
4091 revs
->commits
= reversed
;
4093 revs
->reverse_output_stage
= 1;
4096 if (revs
->reverse_output_stage
) {
4097 c
= pop_commit(&revs
->commits
);
4098 if (revs
->track_linear
)
4099 revs
->linear
= !!(c
&& c
->object
.flags
& TRACK_LINEAR
);
4103 c
= get_revision_internal(revs
);
4104 if (c
&& revs
->graph
)
4105 graph_update(revs
->graph
, c
);
4107 free_saved_parents(revs
);
4108 if (revs
->previous_parents
) {
4109 free_commit_list(revs
->previous_parents
);
4110 revs
->previous_parents
= NULL
;
4116 const char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
4118 if (commit
->object
.flags
& BOUNDARY
)
4120 else if (commit
->object
.flags
& UNINTERESTING
)
4122 else if (commit
->object
.flags
& PATCHSAME
)
4124 else if (!revs
|| revs
->left_right
) {
4125 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
4129 } else if (revs
->graph
)
4131 else if (revs
->cherry_mark
)
4136 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
4138 const char *mark
= get_revision_mark(revs
, commit
);
4141 fputs(mark
, stdout
);