11 #include "reflog-walk.h"
12 #include "patch-ids.h"
15 #include "string-list.h"
18 #include "commit-slab.h"
20 #include "cache-tree.h"
23 volatile show_early_output_fn_t show_early_output
;
25 static const char *term_bad
;
26 static const char *term_good
;
28 void show_object_with_name(FILE *out
, struct object
*obj
, const char *name
)
32 fprintf(out
, "%s ", oid_to_hex(&obj
->oid
));
33 for (p
= name
; *p
&& *p
!= '\n'; p
++)
38 static void mark_blob_uninteresting(struct blob
*blob
)
42 if (blob
->object
.flags
& UNINTERESTING
)
44 blob
->object
.flags
|= UNINTERESTING
;
47 static void mark_tree_contents_uninteresting(struct tree
*tree
)
49 struct tree_desc desc
;
50 struct name_entry entry
;
51 struct object
*obj
= &tree
->object
;
53 if (!has_object_file(&obj
->oid
))
55 if (parse_tree(tree
) < 0)
56 die("bad tree %s", oid_to_hex(&obj
->oid
));
58 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
59 while (tree_entry(&desc
, &entry
)) {
60 switch (object_type(entry
.mode
)) {
62 mark_tree_uninteresting(lookup_tree(entry
.oid
));
65 mark_blob_uninteresting(lookup_blob(entry
.oid
));
68 /* Subproject commit - not in this repository */
74 * We don't care about the tree any more
75 * after it has been marked uninteresting.
77 free_tree_buffer(tree
);
80 void mark_tree_uninteresting(struct tree
*tree
)
88 if (obj
->flags
& UNINTERESTING
)
90 obj
->flags
|= UNINTERESTING
;
91 mark_tree_contents_uninteresting(tree
);
94 void mark_parents_uninteresting(struct commit
*commit
)
96 struct commit_list
*parents
= NULL
, *l
;
98 for (l
= commit
->parents
; l
; l
= l
->next
)
99 commit_list_insert(l
->item
, &parents
);
102 struct commit
*commit
= pop_commit(&parents
);
106 * A missing commit is ok iff its parent is marked
109 * We just mark such a thing parsed, so that when
110 * it is popped next time around, we won't be trying
111 * to parse it and get an error.
113 if (!has_object_file(&commit
->object
.oid
))
114 commit
->object
.parsed
= 1;
116 if (commit
->object
.flags
& UNINTERESTING
)
119 commit
->object
.flags
|= UNINTERESTING
;
122 * Normally we haven't parsed the parent
123 * yet, so we won't have a parent of a parent
124 * here. However, it may turn out that we've
125 * reached this commit some other way (where it
126 * wasn't uninteresting), in which case we need
127 * to mark its parents recursively too..
129 if (!commit
->parents
)
132 for (l
= commit
->parents
->next
; l
; l
= l
->next
)
133 commit_list_insert(l
->item
, &parents
);
134 commit
= commit
->parents
->item
;
139 static void add_pending_object_with_path(struct rev_info
*revs
,
141 const char *name
, unsigned mode
,
146 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
148 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
149 struct strbuf buf
= STRBUF_INIT
;
150 int len
= interpret_branch_name(name
, 0, &buf
, 0);
152 if (0 < len
&& name
[len
] && buf
.len
)
153 strbuf_addstr(&buf
, name
+ len
);
154 add_reflog_for_walk(revs
->reflog_info
,
155 (struct commit
*)obj
,
156 buf
.buf
[0] ? buf
.buf
: name
);
157 strbuf_release(&buf
);
158 return; /* do not add the commit itself */
160 add_object_array_with_path(obj
, name
, &revs
->pending
, mode
, path
);
163 static void add_pending_object_with_mode(struct rev_info
*revs
,
165 const char *name
, unsigned mode
)
167 add_pending_object_with_path(revs
, obj
, name
, mode
, NULL
);
170 void add_pending_object(struct rev_info
*revs
,
171 struct object
*obj
, const char *name
)
173 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
176 void add_head_to_pending(struct rev_info
*revs
)
178 struct object_id oid
;
180 if (get_oid("HEAD", &oid
))
182 obj
= parse_object(&oid
);
185 add_pending_object(revs
, obj
, "HEAD");
188 static struct object
*get_reference(struct rev_info
*revs
, const char *name
,
189 const struct object_id
*oid
,
192 struct object
*object
;
194 object
= parse_object(oid
);
196 if (revs
->ignore_missing
)
198 die("bad object %s", name
);
200 object
->flags
|= flags
;
204 void add_pending_oid(struct rev_info
*revs
, const char *name
,
205 const struct object_id
*oid
, unsigned int flags
)
207 struct object
*object
= get_reference(revs
, name
, oid
, flags
);
208 add_pending_object(revs
, object
, name
);
211 static struct commit
*handle_commit(struct rev_info
*revs
,
212 struct object_array_entry
*entry
)
214 struct object
*object
= entry
->item
;
215 const char *name
= entry
->name
;
216 const char *path
= entry
->path
;
217 unsigned int mode
= entry
->mode
;
218 unsigned long flags
= object
->flags
;
221 * Tag object? Look what it points to..
223 while (object
->type
== OBJ_TAG
) {
224 struct tag
*tag
= (struct tag
*) object
;
225 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
226 add_pending_object(revs
, object
, tag
->tag
);
229 object
= parse_object(&tag
->tagged
->oid
);
231 if (revs
->ignore_missing_links
|| (flags
& UNINTERESTING
))
233 die("bad object %s", oid_to_hex(&tag
->tagged
->oid
));
235 object
->flags
|= flags
;
237 * We'll handle the tagged object by looping or dropping
238 * through to the non-tag handlers below. Do not
239 * propagate path data from the tag's pending entry.
246 * Commit object? Just return it, we'll do all the complex
249 if (object
->type
== OBJ_COMMIT
) {
250 struct commit
*commit
= (struct commit
*)object
;
251 if (parse_commit(commit
) < 0)
252 die("unable to parse commit %s", name
);
253 if (flags
& UNINTERESTING
) {
254 mark_parents_uninteresting(commit
);
257 if (revs
->show_source
&& !commit
->util
)
258 commit
->util
= xstrdup(name
);
263 * Tree object? Either mark it uninteresting, or add it
264 * to the list of objects to look at later..
266 if (object
->type
== OBJ_TREE
) {
267 struct tree
*tree
= (struct tree
*)object
;
268 if (!revs
->tree_objects
)
270 if (flags
& UNINTERESTING
) {
271 mark_tree_contents_uninteresting(tree
);
274 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
279 * Blob object? You know the drill by now..
281 if (object
->type
== OBJ_BLOB
) {
282 if (!revs
->blob_objects
)
284 if (flags
& UNINTERESTING
)
286 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
289 die("%s is unknown object", name
);
292 static int everybody_uninteresting(struct commit_list
*orig
,
293 struct commit
**interesting_cache
)
295 struct commit_list
*list
= orig
;
297 if (*interesting_cache
) {
298 struct commit
*commit
= *interesting_cache
;
299 if (!(commit
->object
.flags
& UNINTERESTING
))
304 struct commit
*commit
= list
->item
;
306 if (commit
->object
.flags
& UNINTERESTING
)
309 *interesting_cache
= commit
;
316 * A definition of "relevant" commit that we can use to simplify limited graphs
317 * by eliminating side branches.
319 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
320 * in our list), or that is a specified BOTTOM commit. Then after computing
321 * a limited list, during processing we can generally ignore boundary merges
322 * coming from outside the graph, (ie from irrelevant parents), and treat
323 * those merges as if they were single-parent. TREESAME is defined to consider
324 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
325 * we don't care if we were !TREESAME to non-graph parents.
327 * Treating bottom commits as relevant ensures that a limited graph's
328 * connection to the actual bottom commit is not viewed as a side branch, but
329 * treated as part of the graph. For example:
331 * ....Z...A---X---o---o---B
335 * When computing "A..B", the A-X connection is at least as important as
336 * Y-X, despite A being flagged UNINTERESTING.
338 * And when computing --ancestry-path "A..B", the A-X connection is more
339 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
341 static inline int relevant_commit(struct commit
*commit
)
343 return (commit
->object
.flags
& (UNINTERESTING
| BOTTOM
)) != UNINTERESTING
;
347 * Return a single relevant commit from a parent list. If we are a TREESAME
348 * commit, and this selects one of our parents, then we can safely simplify to
351 static struct commit
*one_relevant_parent(const struct rev_info
*revs
,
352 struct commit_list
*orig
)
354 struct commit_list
*list
= orig
;
355 struct commit
*relevant
= NULL
;
361 * For 1-parent commits, or if first-parent-only, then return that
362 * first parent (even if not "relevant" by the above definition).
363 * TREESAME will have been set purely on that parent.
365 if (revs
->first_parent_only
|| !orig
->next
)
369 * For multi-parent commits, identify a sole relevant parent, if any.
370 * If we have only one relevant parent, then TREESAME will be set purely
371 * with regard to that parent, and we can simplify accordingly.
373 * If we have more than one relevant parent, or no relevant parents
374 * (and multiple irrelevant ones), then we can't select a parent here
378 struct commit
*commit
= list
->item
;
380 if (relevant_commit(commit
)) {
390 * The goal is to get REV_TREE_NEW as the result only if the
391 * diff consists of all '+' (and no other changes), REV_TREE_OLD
392 * if the whole diff is removal of old data, and otherwise
393 * REV_TREE_DIFFERENT (of course if the trees are the same we
394 * want REV_TREE_SAME).
395 * That means that once we get to REV_TREE_DIFFERENT, we do not
396 * have to look any further.
398 static int tree_difference
= REV_TREE_SAME
;
400 static void file_add_remove(struct diff_options
*options
,
401 int addremove
, unsigned mode
,
402 const struct object_id
*oid
,
404 const char *fullpath
, unsigned dirty_submodule
)
406 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
408 tree_difference
|= diff
;
409 if (tree_difference
== REV_TREE_DIFFERENT
)
410 DIFF_OPT_SET(options
, HAS_CHANGES
);
413 static void file_change(struct diff_options
*options
,
414 unsigned old_mode
, unsigned new_mode
,
415 const struct object_id
*old_oid
,
416 const struct object_id
*new_oid
,
417 int old_oid_valid
, int new_oid_valid
,
418 const char *fullpath
,
419 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
421 tree_difference
= REV_TREE_DIFFERENT
;
422 DIFF_OPT_SET(options
, HAS_CHANGES
);
425 static int rev_compare_tree(struct rev_info
*revs
,
426 struct commit
*parent
, struct commit
*commit
)
428 struct tree
*t1
= parent
->tree
;
429 struct tree
*t2
= commit
->tree
;
436 if (revs
->simplify_by_decoration
) {
438 * If we are simplifying by decoration, then the commit
439 * is worth showing if it has a tag pointing at it.
441 if (get_name_decoration(&commit
->object
))
442 return REV_TREE_DIFFERENT
;
444 * A commit that is not pointed by a tag is uninteresting
445 * if we are not limited by path. This means that you will
446 * see the usual "commits that touch the paths" plus any
447 * tagged commit by specifying both --simplify-by-decoration
450 if (!revs
->prune_data
.nr
)
451 return REV_TREE_SAME
;
454 tree_difference
= REV_TREE_SAME
;
455 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
456 if (diff_tree_oid(&t1
->object
.oid
, &t2
->object
.oid
, "",
458 return REV_TREE_DIFFERENT
;
459 return tree_difference
;
462 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
465 struct tree
*t1
= commit
->tree
;
470 tree_difference
= REV_TREE_SAME
;
471 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
472 retval
= diff_tree_oid(NULL
, &t1
->object
.oid
, "", &revs
->pruning
);
474 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
477 struct treesame_state
{
478 unsigned int nparents
;
479 unsigned char treesame
[FLEX_ARRAY
];
482 static struct treesame_state
*initialise_treesame(struct rev_info
*revs
, struct commit
*commit
)
484 unsigned n
= commit_list_count(commit
->parents
);
485 struct treesame_state
*st
= xcalloc(1, st_add(sizeof(*st
), n
));
487 add_decoration(&revs
->treesame
, &commit
->object
, st
);
492 * Must be called immediately after removing the nth_parent from a commit's
493 * parent list, if we are maintaining the per-parent treesame[] decoration.
494 * This does not recalculate the master TREESAME flag - update_treesame()
495 * should be called to update it after a sequence of treesame[] modifications
496 * that may have affected it.
498 static int compact_treesame(struct rev_info
*revs
, struct commit
*commit
, unsigned nth_parent
)
500 struct treesame_state
*st
;
503 if (!commit
->parents
) {
505 * Have just removed the only parent from a non-merge.
506 * Different handling, as we lack decoration.
509 die("compact_treesame %u", nth_parent
);
510 old_same
= !!(commit
->object
.flags
& TREESAME
);
511 if (rev_same_tree_as_empty(revs
, commit
))
512 commit
->object
.flags
|= TREESAME
;
514 commit
->object
.flags
&= ~TREESAME
;
518 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
519 if (!st
|| nth_parent
>= st
->nparents
)
520 die("compact_treesame %u", nth_parent
);
522 old_same
= st
->treesame
[nth_parent
];
523 memmove(st
->treesame
+ nth_parent
,
524 st
->treesame
+ nth_parent
+ 1,
525 st
->nparents
- nth_parent
- 1);
528 * If we've just become a non-merge commit, update TREESAME
529 * immediately, and remove the no-longer-needed decoration.
530 * If still a merge, defer update until update_treesame().
532 if (--st
->nparents
== 1) {
533 if (commit
->parents
->next
)
534 die("compact_treesame parents mismatch");
535 if (st
->treesame
[0] && revs
->dense
)
536 commit
->object
.flags
|= TREESAME
;
538 commit
->object
.flags
&= ~TREESAME
;
539 free(add_decoration(&revs
->treesame
, &commit
->object
, NULL
));
545 static unsigned update_treesame(struct rev_info
*revs
, struct commit
*commit
)
547 if (commit
->parents
&& commit
->parents
->next
) {
549 struct treesame_state
*st
;
550 struct commit_list
*p
;
551 unsigned relevant_parents
;
552 unsigned relevant_change
, irrelevant_change
;
554 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
556 die("update_treesame %s", oid_to_hex(&commit
->object
.oid
));
557 relevant_parents
= 0;
558 relevant_change
= irrelevant_change
= 0;
559 for (p
= commit
->parents
, n
= 0; p
; n
++, p
= p
->next
) {
560 if (relevant_commit(p
->item
)) {
561 relevant_change
|= !st
->treesame
[n
];
564 irrelevant_change
|= !st
->treesame
[n
];
566 if (relevant_parents
? relevant_change
: irrelevant_change
)
567 commit
->object
.flags
&= ~TREESAME
;
569 commit
->object
.flags
|= TREESAME
;
572 return commit
->object
.flags
& TREESAME
;
575 static inline int limiting_can_increase_treesame(const struct rev_info
*revs
)
578 * TREESAME is irrelevant unless prune && dense;
579 * if simplify_history is set, we can't have a mixture of TREESAME and
580 * !TREESAME INTERESTING parents (and we don't have treesame[]
581 * decoration anyway);
582 * if first_parent_only is set, then the TREESAME flag is locked
583 * against the first parent (and again we lack treesame[] decoration).
585 return revs
->prune
&& revs
->dense
&&
586 !revs
->simplify_history
&&
587 !revs
->first_parent_only
;
590 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
592 struct commit_list
**pp
, *parent
;
593 struct treesame_state
*ts
= NULL
;
594 int relevant_change
= 0, irrelevant_change
= 0;
595 int relevant_parents
, nth_parent
;
598 * If we don't do pruning, everything is interesting
606 if (!commit
->parents
) {
607 if (rev_same_tree_as_empty(revs
, commit
))
608 commit
->object
.flags
|= TREESAME
;
613 * Normal non-merge commit? If we don't want to make the
614 * history dense, we consider it always to be a change..
616 if (!revs
->dense
&& !commit
->parents
->next
)
619 for (pp
= &commit
->parents
, nth_parent
= 0, relevant_parents
= 0;
620 (parent
= *pp
) != NULL
;
621 pp
= &parent
->next
, nth_parent
++) {
622 struct commit
*p
= parent
->item
;
623 if (relevant_commit(p
))
626 if (nth_parent
== 1) {
628 * This our second loop iteration - so we now know
629 * we're dealing with a merge.
631 * Do not compare with later parents when we care only about
632 * the first parent chain, in order to avoid derailing the
633 * traversal to follow a side branch that brought everything
634 * in the path we are limited to by the pathspec.
636 if (revs
->first_parent_only
)
639 * If this will remain a potentially-simplifiable
640 * merge, remember per-parent treesame if needed.
641 * Initialise the array with the comparison from our
644 if (revs
->treesame
.name
&&
645 !revs
->simplify_history
&&
646 !(commit
->object
.flags
& UNINTERESTING
)) {
647 ts
= initialise_treesame(revs
, commit
);
648 if (!(irrelevant_change
|| relevant_change
))
652 if (parse_commit(p
) < 0)
653 die("cannot simplify commit %s (because of %s)",
654 oid_to_hex(&commit
->object
.oid
),
655 oid_to_hex(&p
->object
.oid
));
656 switch (rev_compare_tree(revs
, p
, commit
)) {
658 if (!revs
->simplify_history
|| !relevant_commit(p
)) {
659 /* Even if a merge with an uninteresting
660 * side branch brought the entire change
661 * we are interested in, we do not want
662 * to lose the other branches of this
663 * merge, so we just keep going.
666 ts
->treesame
[nth_parent
] = 1;
670 commit
->parents
= parent
;
671 commit
->object
.flags
|= TREESAME
;
675 if (revs
->remove_empty_trees
&&
676 rev_same_tree_as_empty(revs
, p
)) {
677 /* We are adding all the specified
678 * paths from this parent, so the
679 * history beyond this parent is not
680 * interesting. Remove its parents
681 * (they are grandparents for us).
682 * IOW, we pretend this parent is a
685 if (parse_commit(p
) < 0)
686 die("cannot simplify commit %s (invalid %s)",
687 oid_to_hex(&commit
->object
.oid
),
688 oid_to_hex(&p
->object
.oid
));
693 case REV_TREE_DIFFERENT
:
694 if (relevant_commit(p
))
697 irrelevant_change
= 1;
700 die("bad tree compare for commit %s", oid_to_hex(&commit
->object
.oid
));
704 * TREESAME is straightforward for single-parent commits. For merge
705 * commits, it is most useful to define it so that "irrelevant"
706 * parents cannot make us !TREESAME - if we have any relevant
707 * parents, then we only consider TREESAMEness with respect to them,
708 * allowing irrelevant merges from uninteresting branches to be
709 * simplified away. Only if we have only irrelevant parents do we
710 * base TREESAME on them. Note that this logic is replicated in
711 * update_treesame, which should be kept in sync.
713 if (relevant_parents
? !relevant_change
: !irrelevant_change
)
714 commit
->object
.flags
|= TREESAME
;
717 static void commit_list_insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
718 struct commit_list
*cached_base
, struct commit_list
**cache
)
720 struct commit_list
*new_entry
;
722 if (cached_base
&& p
->date
< cached_base
->item
->date
)
723 new_entry
= commit_list_insert_by_date(p
, &cached_base
->next
);
725 new_entry
= commit_list_insert_by_date(p
, head
);
727 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
731 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
732 struct commit_list
**list
, struct commit_list
**cache_ptr
)
734 struct commit_list
*parent
= commit
->parents
;
736 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
738 if (commit
->object
.flags
& ADDED
)
740 commit
->object
.flags
|= ADDED
;
742 if (revs
->include_check
&&
743 !revs
->include_check(commit
, revs
->include_check_data
))
747 * If the commit is uninteresting, don't try to
748 * prune parents - we want the maximal uninteresting
751 * Normally we haven't parsed the parent
752 * yet, so we won't have a parent of a parent
753 * here. However, it may turn out that we've
754 * reached this commit some other way (where it
755 * wasn't uninteresting), in which case we need
756 * to mark its parents recursively too..
758 if (commit
->object
.flags
& UNINTERESTING
) {
760 struct commit
*p
= parent
->item
;
761 parent
= parent
->next
;
763 p
->object
.flags
|= UNINTERESTING
;
764 if (parse_commit_gently(p
, 1) < 0)
767 mark_parents_uninteresting(p
);
768 if (p
->object
.flags
& SEEN
)
770 p
->object
.flags
|= SEEN
;
771 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
777 * Ok, the commit wasn't uninteresting. Try to
778 * simplify the commit history and find the parent
779 * that has no differences in the path set if one exists.
781 try_to_simplify_commit(revs
, commit
);
786 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
788 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
789 struct commit
*p
= parent
->item
;
791 if (parse_commit_gently(p
, revs
->ignore_missing_links
) < 0)
793 if (revs
->show_source
&& !p
->util
)
794 p
->util
= commit
->util
;
795 p
->object
.flags
|= left_flag
;
796 if (!(p
->object
.flags
& SEEN
)) {
797 p
->object
.flags
|= SEEN
;
798 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
800 if (revs
->first_parent_only
)
806 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
808 struct commit_list
*p
;
809 int left_count
= 0, right_count
= 0;
811 struct patch_ids ids
;
812 unsigned cherry_flag
;
814 /* First count the commits on the left and on the right */
815 for (p
= list
; p
; p
= p
->next
) {
816 struct commit
*commit
= p
->item
;
817 unsigned flags
= commit
->object
.flags
;
818 if (flags
& BOUNDARY
)
820 else if (flags
& SYMMETRIC_LEFT
)
826 if (!left_count
|| !right_count
)
829 left_first
= left_count
< right_count
;
830 init_patch_ids(&ids
);
831 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
833 /* Compute patch-ids for one side */
834 for (p
= list
; p
; p
= p
->next
) {
835 struct commit
*commit
= p
->item
;
836 unsigned flags
= commit
->object
.flags
;
838 if (flags
& BOUNDARY
)
841 * If we have fewer left, left_first is set and we omit
842 * commits on the right branch in this loop. If we have
843 * fewer right, we skip the left ones.
845 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
847 add_commit_patch_id(commit
, &ids
);
850 /* either cherry_mark or cherry_pick are true */
851 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
853 /* Check the other side */
854 for (p
= list
; p
; p
= p
->next
) {
855 struct commit
*commit
= p
->item
;
857 unsigned flags
= commit
->object
.flags
;
859 if (flags
& BOUNDARY
)
862 * If we have fewer left, left_first is set and we omit
863 * commits on the left branch in this loop.
865 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
869 * Have we seen the same patch id?
871 id
= has_commit_patch_id(commit
, &ids
);
875 commit
->object
.flags
|= cherry_flag
;
876 id
->commit
->object
.flags
|= cherry_flag
;
879 free_patch_ids(&ids
);
882 /* How many extra uninteresting commits we want to see.. */
885 static int still_interesting(struct commit_list
*src
, timestamp_t date
, int slop
,
886 struct commit
**interesting_cache
)
889 * No source list at all? We're definitely done..
895 * Does the destination list contain entries with a date
896 * before the source list? Definitely _not_ done.
898 if (date
<= src
->item
->date
)
902 * Does the source list still have interesting commits in
903 * it? Definitely not done..
905 if (!everybody_uninteresting(src
, interesting_cache
))
908 /* Ok, we're closing in.. */
913 * "rev-list --ancestry-path A..B" computes commits that are ancestors
914 * of B but not ancestors of A but further limits the result to those
915 * that are descendants of A. This takes the list of bottom commits and
916 * the result of "A..B" without --ancestry-path, and limits the latter
917 * further to the ones that can reach one of the commits in "bottom".
919 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
921 struct commit_list
*p
;
922 struct commit_list
*rlist
= NULL
;
926 * Reverse the list so that it will be likely that we would
927 * process parents before children.
929 for (p
= list
; p
; p
= p
->next
)
930 commit_list_insert(p
->item
, &rlist
);
932 for (p
= bottom
; p
; p
= p
->next
)
933 p
->item
->object
.flags
|= TMP_MARK
;
936 * Mark the ones that can reach bottom commits in "list",
937 * in a bottom-up fashion.
941 for (p
= rlist
; p
; p
= p
->next
) {
942 struct commit
*c
= p
->item
;
943 struct commit_list
*parents
;
944 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
946 for (parents
= c
->parents
;
948 parents
= parents
->next
) {
949 if (!(parents
->item
->object
.flags
& TMP_MARK
))
951 c
->object
.flags
|= TMP_MARK
;
956 } while (made_progress
);
959 * NEEDSWORK: decide if we want to remove parents that are
960 * not marked with TMP_MARK from commit->parents for commits
961 * in the resulting list. We may not want to do that, though.
965 * The ones that are not marked with TMP_MARK are uninteresting
967 for (p
= list
; p
; p
= p
->next
) {
968 struct commit
*c
= p
->item
;
969 if (c
->object
.flags
& TMP_MARK
)
971 c
->object
.flags
|= UNINTERESTING
;
974 /* We are done with the TMP_MARK */
975 for (p
= list
; p
; p
= p
->next
)
976 p
->item
->object
.flags
&= ~TMP_MARK
;
977 for (p
= bottom
; p
; p
= p
->next
)
978 p
->item
->object
.flags
&= ~TMP_MARK
;
979 free_commit_list(rlist
);
983 * Before walking the history, keep the set of "negative" refs the
984 * caller has asked to exclude.
986 * This is used to compute "rev-list --ancestry-path A..B", as we need
987 * to filter the result of "A..B" further to the ones that can actually
990 static struct commit_list
*collect_bottom_commits(struct commit_list
*list
)
992 struct commit_list
*elem
, *bottom
= NULL
;
993 for (elem
= list
; elem
; elem
= elem
->next
)
994 if (elem
->item
->object
.flags
& BOTTOM
)
995 commit_list_insert(elem
->item
, &bottom
);
999 /* Assumes either left_only or right_only is set */
1000 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
1002 struct commit_list
*p
;
1004 for (p
= list
; p
; p
= p
->next
) {
1005 struct commit
*commit
= p
->item
;
1007 if (revs
->right_only
) {
1008 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
1009 commit
->object
.flags
|= SHOWN
;
1010 } else /* revs->left_only is set */
1011 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
1012 commit
->object
.flags
|= SHOWN
;
1016 static int limit_list(struct rev_info
*revs
)
1019 timestamp_t date
= TIME_MAX
;
1020 struct commit_list
*list
= revs
->commits
;
1021 struct commit_list
*newlist
= NULL
;
1022 struct commit_list
**p
= &newlist
;
1023 struct commit_list
*bottom
= NULL
;
1024 struct commit
*interesting_cache
= NULL
;
1026 if (revs
->ancestry_path
) {
1027 bottom
= collect_bottom_commits(list
);
1029 die("--ancestry-path given but there are no bottom commits");
1033 struct commit
*commit
= pop_commit(&list
);
1034 struct object
*obj
= &commit
->object
;
1035 show_early_output_fn_t show
;
1037 if (commit
== interesting_cache
)
1038 interesting_cache
= NULL
;
1040 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
1041 obj
->flags
|= UNINTERESTING
;
1042 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
1044 if (obj
->flags
& UNINTERESTING
) {
1045 mark_parents_uninteresting(commit
);
1047 p
= &commit_list_insert(commit
, p
)->next
;
1048 slop
= still_interesting(list
, date
, slop
, &interesting_cache
);
1051 /* If showing all, add the whole pending list to the end */
1056 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
1058 date
= commit
->date
;
1059 p
= &commit_list_insert(commit
, p
)->next
;
1061 show
= show_early_output
;
1065 show(revs
, newlist
);
1066 show_early_output
= NULL
;
1068 if (revs
->cherry_pick
|| revs
->cherry_mark
)
1069 cherry_pick_list(newlist
, revs
);
1071 if (revs
->left_only
|| revs
->right_only
)
1072 limit_left_right(newlist
, revs
);
1075 limit_to_ancestry(bottom
, newlist
);
1076 free_commit_list(bottom
);
1080 * Check if any commits have become TREESAME by some of their parents
1081 * becoming UNINTERESTING.
1083 if (limiting_can_increase_treesame(revs
))
1084 for (list
= newlist
; list
; list
= list
->next
) {
1085 struct commit
*c
= list
->item
;
1086 if (c
->object
.flags
& (UNINTERESTING
| TREESAME
))
1088 update_treesame(revs
, c
);
1091 revs
->commits
= newlist
;
1096 * Add an entry to refs->cmdline with the specified information.
1099 static void add_rev_cmdline(struct rev_info
*revs
,
1100 struct object
*item
,
1105 struct rev_cmdline_info
*info
= &revs
->cmdline
;
1108 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
1109 info
->rev
[nr
].item
= item
;
1110 info
->rev
[nr
].name
= xstrdup(name
);
1111 info
->rev
[nr
].whence
= whence
;
1112 info
->rev
[nr
].flags
= flags
;
1116 static void add_rev_cmdline_list(struct rev_info
*revs
,
1117 struct commit_list
*commit_list
,
1121 while (commit_list
) {
1122 struct object
*object
= &commit_list
->item
->object
;
1123 add_rev_cmdline(revs
, object
, oid_to_hex(&object
->oid
),
1125 commit_list
= commit_list
->next
;
1129 struct all_refs_cb
{
1131 int warned_bad_reflog
;
1132 struct rev_info
*all_revs
;
1133 const char *name_for_errormsg
;
1136 int ref_excluded(struct string_list
*ref_excludes
, const char *path
)
1138 struct string_list_item
*item
;
1142 for_each_string_list_item(item
, ref_excludes
) {
1143 if (!wildmatch(item
->string
, path
, 0))
1149 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
1150 int flag
, void *cb_data
)
1152 struct all_refs_cb
*cb
= cb_data
;
1153 struct object
*object
;
1155 if (ref_excluded(cb
->all_revs
->ref_excludes
, path
))
1158 object
= get_reference(cb
->all_revs
, path
, oid
, cb
->all_flags
);
1159 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
1160 add_pending_oid(cb
->all_revs
, path
, oid
, cb
->all_flags
);
1164 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
1167 cb
->all_revs
= revs
;
1168 cb
->all_flags
= flags
;
1169 revs
->rev_input_given
= 1;
1172 void clear_ref_exclusion(struct string_list
**ref_excludes_p
)
1174 if (*ref_excludes_p
) {
1175 string_list_clear(*ref_excludes_p
, 0);
1176 free(*ref_excludes_p
);
1178 *ref_excludes_p
= NULL
;
1181 void add_ref_exclusion(struct string_list
**ref_excludes_p
, const char *exclude
)
1183 if (!*ref_excludes_p
) {
1184 *ref_excludes_p
= xcalloc(1, sizeof(**ref_excludes_p
));
1185 (*ref_excludes_p
)->strdup_strings
= 1;
1187 string_list_append(*ref_excludes_p
, exclude
);
1190 static void handle_refs(const char *submodule
, struct rev_info
*revs
, unsigned flags
,
1191 int (*for_each
)(const char *, each_ref_fn
, void *))
1193 struct all_refs_cb cb
;
1194 init_all_refs_cb(&cb
, revs
, flags
);
1195 for_each(submodule
, handle_one_ref
, &cb
);
1198 static void handle_one_reflog_commit(struct object_id
*oid
, void *cb_data
)
1200 struct all_refs_cb
*cb
= cb_data
;
1201 if (!is_null_oid(oid
)) {
1202 struct object
*o
= parse_object(oid
);
1204 o
->flags
|= cb
->all_flags
;
1205 /* ??? CMDLINEFLAGS ??? */
1206 add_pending_object(cb
->all_revs
, o
, "");
1208 else if (!cb
->warned_bad_reflog
) {
1209 warning("reflog of '%s' references pruned commits",
1210 cb
->name_for_errormsg
);
1211 cb
->warned_bad_reflog
= 1;
1216 static int handle_one_reflog_ent(struct object_id
*ooid
, struct object_id
*noid
,
1217 const char *email
, timestamp_t timestamp
, int tz
,
1218 const char *message
, void *cb_data
)
1220 handle_one_reflog_commit(ooid
, cb_data
);
1221 handle_one_reflog_commit(noid
, cb_data
);
1225 static int handle_one_reflog(const char *path
, const struct object_id
*oid
,
1226 int flag
, void *cb_data
)
1228 struct all_refs_cb
*cb
= cb_data
;
1229 cb
->warned_bad_reflog
= 0;
1230 cb
->name_for_errormsg
= path
;
1231 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
1235 void add_reflogs_to_pending(struct rev_info
*revs
, unsigned flags
)
1237 struct all_refs_cb cb
;
1240 cb
.all_flags
= flags
;
1241 for_each_reflog(handle_one_reflog
, &cb
);
1244 static void add_cache_tree(struct cache_tree
*it
, struct rev_info
*revs
,
1245 struct strbuf
*path
)
1247 size_t baselen
= path
->len
;
1250 if (it
->entry_count
>= 0) {
1251 struct tree
*tree
= lookup_tree(&it
->oid
);
1252 add_pending_object_with_path(revs
, &tree
->object
, "",
1256 for (i
= 0; i
< it
->subtree_nr
; i
++) {
1257 struct cache_tree_sub
*sub
= it
->down
[i
];
1258 strbuf_addf(path
, "%s%s", baselen
? "/" : "", sub
->name
);
1259 add_cache_tree(sub
->cache_tree
, revs
, path
);
1260 strbuf_setlen(path
, baselen
);
1265 static void do_add_index_objects_to_pending(struct rev_info
*revs
,
1266 struct index_state
*istate
)
1270 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1271 struct cache_entry
*ce
= istate
->cache
[i
];
1274 if (S_ISGITLINK(ce
->ce_mode
))
1277 blob
= lookup_blob(&ce
->oid
);
1279 die("unable to add index blob to traversal");
1280 add_pending_object_with_path(revs
, &blob
->object
, "",
1281 ce
->ce_mode
, ce
->name
);
1284 if (istate
->cache_tree
) {
1285 struct strbuf path
= STRBUF_INIT
;
1286 add_cache_tree(istate
->cache_tree
, revs
, &path
);
1287 strbuf_release(&path
);
1291 void add_index_objects_to_pending(struct rev_info
*revs
, unsigned int flags
)
1294 do_add_index_objects_to_pending(revs
, &the_index
);
1297 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
,
1300 struct object_id oid
;
1302 struct commit
*commit
;
1303 struct commit_list
*parents
;
1305 const char *arg
= arg_
;
1308 flags
^= UNINTERESTING
| BOTTOM
;
1311 if (get_oid_committish(arg
, &oid
))
1314 it
= get_reference(revs
, arg
, &oid
, 0);
1315 if (!it
&& revs
->ignore_missing
)
1317 if (it
->type
!= OBJ_TAG
)
1319 if (!((struct tag
*)it
)->tagged
)
1321 oidcpy(&oid
, &((struct tag
*)it
)->tagged
->oid
);
1323 if (it
->type
!= OBJ_COMMIT
)
1325 commit
= (struct commit
*)it
;
1326 if (exclude_parent
&&
1327 exclude_parent
> commit_list_count(commit
->parents
))
1329 for (parents
= commit
->parents
, parent_number
= 1;
1331 parents
= parents
->next
, parent_number
++) {
1332 if (exclude_parent
&& parent_number
!= exclude_parent
)
1335 it
= &parents
->item
->object
;
1337 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1338 add_pending_object(revs
, it
, arg
);
1343 void init_revisions(struct rev_info
*revs
, const char *prefix
)
1345 memset(revs
, 0, sizeof(*revs
));
1347 revs
->abbrev
= DEFAULT_ABBREV
;
1348 revs
->ignore_merges
= 1;
1349 revs
->simplify_history
= 1;
1350 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
1351 DIFF_OPT_SET(&revs
->pruning
, QUICK
);
1352 revs
->pruning
.add_remove
= file_add_remove
;
1353 revs
->pruning
.change
= file_change
;
1354 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1356 revs
->prefix
= prefix
;
1359 revs
->skip_count
= -1;
1360 revs
->max_count
= -1;
1361 revs
->max_parents
= -1;
1362 revs
->expand_tabs_in_log
= -1;
1364 revs
->commit_format
= CMIT_FMT_DEFAULT
;
1365 revs
->expand_tabs_in_log_default
= 8;
1367 init_grep_defaults();
1368 grep_init(&revs
->grep_filter
, prefix
);
1369 revs
->grep_filter
.status_only
= 1;
1371 diff_setup(&revs
->diffopt
);
1372 if (prefix
&& !revs
->diffopt
.prefix
) {
1373 revs
->diffopt
.prefix
= prefix
;
1374 revs
->diffopt
.prefix_length
= strlen(prefix
);
1377 revs
->notes_opt
.use_default_notes
= -1;
1380 static void add_pending_commit_list(struct rev_info
*revs
,
1381 struct commit_list
*commit_list
,
1384 while (commit_list
) {
1385 struct object
*object
= &commit_list
->item
->object
;
1386 object
->flags
|= flags
;
1387 add_pending_object(revs
, object
, oid_to_hex(&object
->oid
));
1388 commit_list
= commit_list
->next
;
1392 static void prepare_show_merge(struct rev_info
*revs
)
1394 struct commit_list
*bases
;
1395 struct commit
*head
, *other
;
1396 struct object_id oid
;
1397 const char **prune
= NULL
;
1398 int i
, prune_num
= 1; /* counting terminating NULL */
1400 if (get_oid("HEAD", &oid
))
1401 die("--merge without HEAD?");
1402 head
= lookup_commit_or_die(&oid
, "HEAD");
1403 if (get_oid("MERGE_HEAD", &oid
))
1404 die("--merge without MERGE_HEAD?");
1405 other
= lookup_commit_or_die(&oid
, "MERGE_HEAD");
1406 add_pending_object(revs
, &head
->object
, "HEAD");
1407 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1408 bases
= get_merge_bases(head
, other
);
1409 add_rev_cmdline_list(revs
, bases
, REV_CMD_MERGE_BASE
, UNINTERESTING
| BOTTOM
);
1410 add_pending_commit_list(revs
, bases
, UNINTERESTING
| BOTTOM
);
1411 free_commit_list(bases
);
1412 head
->object
.flags
|= SYMMETRIC_LEFT
;
1416 for (i
= 0; i
< active_nr
; i
++) {
1417 const struct cache_entry
*ce
= active_cache
[i
];
1420 if (ce_path_match(ce
, &revs
->prune_data
, NULL
)) {
1422 REALLOC_ARRAY(prune
, prune_num
);
1423 prune
[prune_num
-2] = ce
->name
;
1424 prune
[prune_num
-1] = NULL
;
1426 while ((i
+1 < active_nr
) &&
1427 ce_same_name(ce
, active_cache
[i
+1]))
1430 clear_pathspec(&revs
->prune_data
);
1431 parse_pathspec(&revs
->prune_data
, PATHSPEC_ALL_MAGIC
& ~PATHSPEC_LITERAL
,
1432 PATHSPEC_PREFER_FULL
| PATHSPEC_LITERAL_PATH
, "", prune
);
1436 static int dotdot_missing(const char *arg
, char *dotdot
,
1437 struct rev_info
*revs
, int symmetric
)
1439 if (revs
->ignore_missing
)
1441 /* de-munge so we report the full argument */
1444 ? "Invalid symmetric difference expression %s"
1445 : "Invalid revision range %s", arg
);
1448 static int handle_dotdot_1(const char *arg
, char *dotdot
,
1449 struct rev_info
*revs
, int flags
,
1450 int cant_be_filename
,
1451 struct object_context
*a_oc
,
1452 struct object_context
*b_oc
)
1454 const char *a_name
, *b_name
;
1455 struct object_id a_oid
, b_oid
;
1456 struct object
*a_obj
, *b_obj
;
1457 unsigned int a_flags
, b_flags
;
1459 unsigned int flags_exclude
= flags
^ (UNINTERESTING
| BOTTOM
);
1460 unsigned int oc_flags
= GET_OID_COMMITTISH
| GET_OID_RECORD_PATH
;
1466 b_name
= dotdot
+ 2;
1467 if (*b_name
== '.') {
1474 if (get_oid_with_context(a_name
, oc_flags
, &a_oid
, a_oc
) ||
1475 get_oid_with_context(b_name
, oc_flags
, &b_oid
, b_oc
))
1478 if (!cant_be_filename
) {
1480 verify_non_filename(revs
->prefix
, arg
);
1484 a_obj
= parse_object(&a_oid
);
1485 b_obj
= parse_object(&b_oid
);
1486 if (!a_obj
|| !b_obj
)
1487 return dotdot_missing(arg
, dotdot
, revs
, symmetric
);
1492 a_flags
= flags_exclude
;
1494 /* A...B -- find merge bases between the two */
1495 struct commit
*a
, *b
;
1496 struct commit_list
*exclude
;
1498 a
= lookup_commit_reference(&a_obj
->oid
);
1499 b
= lookup_commit_reference(&b_obj
->oid
);
1501 return dotdot_missing(arg
, dotdot
, revs
, symmetric
);
1503 exclude
= get_merge_bases(a
, b
);
1504 add_rev_cmdline_list(revs
, exclude
, REV_CMD_MERGE_BASE
,
1506 add_pending_commit_list(revs
, exclude
, flags_exclude
);
1507 free_commit_list(exclude
);
1510 a_flags
= flags
| SYMMETRIC_LEFT
;
1513 a_obj
->flags
|= a_flags
;
1514 b_obj
->flags
|= b_flags
;
1515 add_rev_cmdline(revs
, a_obj
, a_name
, REV_CMD_LEFT
, a_flags
);
1516 add_rev_cmdline(revs
, b_obj
, b_name
, REV_CMD_RIGHT
, b_flags
);
1517 add_pending_object_with_path(revs
, a_obj
, a_name
, a_oc
->mode
, a_oc
->path
);
1518 add_pending_object_with_path(revs
, b_obj
, b_name
, b_oc
->mode
, b_oc
->path
);
1522 static int handle_dotdot(const char *arg
,
1523 struct rev_info
*revs
, int flags
,
1524 int cant_be_filename
)
1526 struct object_context a_oc
, b_oc
;
1527 char *dotdot
= strstr(arg
, "..");
1533 memset(&a_oc
, 0, sizeof(a_oc
));
1534 memset(&b_oc
, 0, sizeof(b_oc
));
1537 ret
= handle_dotdot_1(arg
, dotdot
, revs
, flags
, cant_be_filename
,
1547 int handle_revision_arg(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
1549 struct object_context oc
;
1551 struct object
*object
;
1552 struct object_id oid
;
1554 const char *arg
= arg_
;
1555 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
1556 unsigned get_sha1_flags
= GET_OID_RECORD_PATH
;
1558 flags
= flags
& UNINTERESTING
? flags
| BOTTOM
: flags
& ~BOTTOM
;
1560 if (!cant_be_filename
&& !strcmp(arg
, "..")) {
1562 * Just ".."? That is not a range but the
1563 * pathspec for the parent directory.
1568 if (!handle_dotdot(arg
, revs
, flags
, revarg_opt
))
1571 mark
= strstr(arg
, "^@");
1572 if (mark
&& !mark
[2]) {
1574 if (add_parents_only(revs
, arg
, flags
, 0))
1578 mark
= strstr(arg
, "^!");
1579 if (mark
&& !mark
[2]) {
1581 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
), 0))
1584 mark
= strstr(arg
, "^-");
1586 int exclude_parent
= 1;
1590 exclude_parent
= strtoul(mark
+ 2, &end
, 10);
1591 if (*end
!= '\0' || !exclude_parent
)
1596 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
), exclude_parent
))
1602 local_flags
= UNINTERESTING
| BOTTOM
;
1606 if (revarg_opt
& REVARG_COMMITTISH
)
1607 get_sha1_flags
|= GET_OID_COMMITTISH
;
1609 if (get_oid_with_context(arg
, get_sha1_flags
, &oid
, &oc
))
1610 return revs
->ignore_missing
? 0 : -1;
1611 if (!cant_be_filename
)
1612 verify_non_filename(revs
->prefix
, arg
);
1613 object
= get_reference(revs
, arg
, &oid
, flags
^ local_flags
);
1614 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
1615 add_pending_object_with_path(revs
, object
, arg
, oc
.mode
, oc
.path
);
1620 struct cmdline_pathspec
{
1626 static void append_prune_data(struct cmdline_pathspec
*prune
, const char **av
)
1629 ALLOC_GROW(prune
->path
, prune
->nr
+ 1, prune
->alloc
);
1630 prune
->path
[prune
->nr
++] = *(av
++);
1634 static void read_pathspec_from_stdin(struct rev_info
*revs
, struct strbuf
*sb
,
1635 struct cmdline_pathspec
*prune
)
1637 while (strbuf_getline(sb
, stdin
) != EOF
) {
1638 ALLOC_GROW(prune
->path
, prune
->nr
+ 1, prune
->alloc
);
1639 prune
->path
[prune
->nr
++] = xstrdup(sb
->buf
);
1643 static void read_revisions_from_stdin(struct rev_info
*revs
,
1644 struct cmdline_pathspec
*prune
)
1647 int seen_dashdash
= 0;
1650 save_warning
= warn_on_object_refname_ambiguity
;
1651 warn_on_object_refname_ambiguity
= 0;
1653 strbuf_init(&sb
, 1000);
1654 while (strbuf_getline(&sb
, stdin
) != EOF
) {
1658 if (sb
.buf
[0] == '-') {
1659 if (len
== 2 && sb
.buf
[1] == '-') {
1663 die("options not supported in --stdin mode");
1665 if (handle_revision_arg(sb
.buf
, revs
, 0,
1666 REVARG_CANNOT_BE_FILENAME
))
1667 die("bad revision '%s'", sb
.buf
);
1670 read_pathspec_from_stdin(revs
, &sb
, prune
);
1672 strbuf_release(&sb
);
1673 warn_on_object_refname_ambiguity
= save_warning
;
1676 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
1678 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
1681 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
1683 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
1686 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
1688 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
1691 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
1692 int *unkc
, const char **unkv
)
1694 const char *arg
= argv
[0];
1698 /* pseudo revision arguments */
1699 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1700 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1701 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1702 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
1703 !strcmp(arg
, "--bisect") || starts_with(arg
, "--glob=") ||
1704 !strcmp(arg
, "--indexed-objects") ||
1705 starts_with(arg
, "--exclude=") ||
1706 starts_with(arg
, "--branches=") || starts_with(arg
, "--tags=") ||
1707 starts_with(arg
, "--remotes=") || starts_with(arg
, "--no-walk="))
1709 unkv
[(*unkc
)++] = arg
;
1713 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
1714 revs
->max_count
= atoi(optarg
);
1717 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
1718 revs
->skip_count
= atoi(optarg
);
1720 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1721 /* accept -<digit>, like traditional "head" */
1722 if (strtol_i(arg
+ 1, 10, &revs
->max_count
) < 0 ||
1723 revs
->max_count
< 0)
1724 die("'%s': not a non-negative integer", arg
+ 1);
1726 } else if (!strcmp(arg
, "-n")) {
1728 return error("-n requires an argument");
1729 revs
->max_count
= atoi(argv
[1]);
1732 } else if (skip_prefix(arg
, "-n", &optarg
)) {
1733 revs
->max_count
= atoi(optarg
);
1735 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
1736 revs
->max_age
= atoi(optarg
);
1738 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
1739 revs
->max_age
= approxidate(optarg
);
1741 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
1742 revs
->max_age
= approxidate(optarg
);
1744 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
1745 revs
->min_age
= atoi(optarg
);
1747 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
1748 revs
->min_age
= approxidate(optarg
);
1750 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
1751 revs
->min_age
= approxidate(optarg
);
1753 } else if (!strcmp(arg
, "--first-parent")) {
1754 revs
->first_parent_only
= 1;
1755 } else if (!strcmp(arg
, "--ancestry-path")) {
1756 revs
->ancestry_path
= 1;
1757 revs
->simplify_history
= 0;
1759 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1760 init_reflog_walk(&revs
->reflog_info
);
1761 } else if (!strcmp(arg
, "--default")) {
1763 return error("bad --default argument");
1764 revs
->def
= argv
[1];
1766 } else if (!strcmp(arg
, "--merge")) {
1767 revs
->show_merge
= 1;
1768 } else if (!strcmp(arg
, "--topo-order")) {
1769 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1770 revs
->topo_order
= 1;
1771 } else if (!strcmp(arg
, "--simplify-merges")) {
1772 revs
->simplify_merges
= 1;
1773 revs
->topo_order
= 1;
1774 revs
->rewrite_parents
= 1;
1775 revs
->simplify_history
= 0;
1777 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
1778 revs
->simplify_merges
= 1;
1779 revs
->topo_order
= 1;
1780 revs
->rewrite_parents
= 1;
1781 revs
->simplify_history
= 0;
1782 revs
->simplify_by_decoration
= 1;
1785 load_ref_decorations(DECORATE_SHORT_REFS
);
1786 } else if (!strcmp(arg
, "--date-order")) {
1787 revs
->sort_order
= REV_SORT_BY_COMMIT_DATE
;
1788 revs
->topo_order
= 1;
1789 } else if (!strcmp(arg
, "--author-date-order")) {
1790 revs
->sort_order
= REV_SORT_BY_AUTHOR_DATE
;
1791 revs
->topo_order
= 1;
1792 } else if (!strcmp(arg
, "--early-output")) {
1793 revs
->early_output
= 100;
1794 revs
->topo_order
= 1;
1795 } else if (skip_prefix(arg
, "--early-output=", &optarg
)) {
1796 if (strtoul_ui(optarg
, 10, &revs
->early_output
) < 0)
1797 die("'%s': not a non-negative integer", optarg
);
1798 revs
->topo_order
= 1;
1799 } else if (!strcmp(arg
, "--parents")) {
1800 revs
->rewrite_parents
= 1;
1801 revs
->print_parents
= 1;
1802 } else if (!strcmp(arg
, "--dense")) {
1804 } else if (!strcmp(arg
, "--sparse")) {
1806 } else if (!strcmp(arg
, "--show-all")) {
1808 } else if (!strcmp(arg
, "--remove-empty")) {
1809 revs
->remove_empty_trees
= 1;
1810 } else if (!strcmp(arg
, "--merges")) {
1811 revs
->min_parents
= 2;
1812 } else if (!strcmp(arg
, "--no-merges")) {
1813 revs
->max_parents
= 1;
1814 } else if (skip_prefix(arg
, "--min-parents=", &optarg
)) {
1815 revs
->min_parents
= atoi(optarg
);
1816 } else if (!strcmp(arg
, "--no-min-parents")) {
1817 revs
->min_parents
= 0;
1818 } else if (skip_prefix(arg
, "--max-parents=", &optarg
)) {
1819 revs
->max_parents
= atoi(optarg
);
1820 } else if (!strcmp(arg
, "--no-max-parents")) {
1821 revs
->max_parents
= -1;
1822 } else if (!strcmp(arg
, "--boundary")) {
1824 } else if (!strcmp(arg
, "--left-right")) {
1825 revs
->left_right
= 1;
1826 } else if (!strcmp(arg
, "--left-only")) {
1827 if (revs
->right_only
)
1828 die("--left-only is incompatible with --right-only"
1830 revs
->left_only
= 1;
1831 } else if (!strcmp(arg
, "--right-only")) {
1832 if (revs
->left_only
)
1833 die("--right-only is incompatible with --left-only");
1834 revs
->right_only
= 1;
1835 } else if (!strcmp(arg
, "--cherry")) {
1836 if (revs
->left_only
)
1837 die("--cherry is incompatible with --left-only");
1838 revs
->cherry_mark
= 1;
1839 revs
->right_only
= 1;
1840 revs
->max_parents
= 1;
1842 } else if (!strcmp(arg
, "--count")) {
1844 } else if (!strcmp(arg
, "--cherry-mark")) {
1845 if (revs
->cherry_pick
)
1846 die("--cherry-mark is incompatible with --cherry-pick");
1847 revs
->cherry_mark
= 1;
1848 revs
->limited
= 1; /* needs limit_list() */
1849 } else if (!strcmp(arg
, "--cherry-pick")) {
1850 if (revs
->cherry_mark
)
1851 die("--cherry-pick is incompatible with --cherry-mark");
1852 revs
->cherry_pick
= 1;
1854 } else if (!strcmp(arg
, "--objects")) {
1855 revs
->tag_objects
= 1;
1856 revs
->tree_objects
= 1;
1857 revs
->blob_objects
= 1;
1858 } else if (!strcmp(arg
, "--objects-edge")) {
1859 revs
->tag_objects
= 1;
1860 revs
->tree_objects
= 1;
1861 revs
->blob_objects
= 1;
1862 revs
->edge_hint
= 1;
1863 } else if (!strcmp(arg
, "--objects-edge-aggressive")) {
1864 revs
->tag_objects
= 1;
1865 revs
->tree_objects
= 1;
1866 revs
->blob_objects
= 1;
1867 revs
->edge_hint
= 1;
1868 revs
->edge_hint_aggressive
= 1;
1869 } else if (!strcmp(arg
, "--verify-objects")) {
1870 revs
->tag_objects
= 1;
1871 revs
->tree_objects
= 1;
1872 revs
->blob_objects
= 1;
1873 revs
->verify_objects
= 1;
1874 } else if (!strcmp(arg
, "--unpacked")) {
1876 } else if (starts_with(arg
, "--unpacked=")) {
1877 die("--unpacked=<packfile> no longer supported.");
1878 } else if (!strcmp(arg
, "-r")) {
1880 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1881 } else if (!strcmp(arg
, "-t")) {
1883 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1884 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1885 } else if (!strcmp(arg
, "-m")) {
1886 revs
->ignore_merges
= 0;
1887 } else if (!strcmp(arg
, "-c")) {
1889 revs
->dense_combined_merges
= 0;
1890 revs
->combine_merges
= 1;
1891 } else if (!strcmp(arg
, "--cc")) {
1893 revs
->dense_combined_merges
= 1;
1894 revs
->combine_merges
= 1;
1895 } else if (!strcmp(arg
, "-v")) {
1896 revs
->verbose_header
= 1;
1897 } else if (!strcmp(arg
, "--pretty")) {
1898 revs
->verbose_header
= 1;
1899 revs
->pretty_given
= 1;
1900 get_commit_format(NULL
, revs
);
1901 } else if (skip_prefix(arg
, "--pretty=", &optarg
) ||
1902 skip_prefix(arg
, "--format=", &optarg
)) {
1904 * Detached form ("--pretty X" as opposed to "--pretty=X")
1905 * not allowed, since the argument is optional.
1907 revs
->verbose_header
= 1;
1908 revs
->pretty_given
= 1;
1909 get_commit_format(optarg
, revs
);
1910 } else if (!strcmp(arg
, "--expand-tabs")) {
1911 revs
->expand_tabs_in_log
= 8;
1912 } else if (!strcmp(arg
, "--no-expand-tabs")) {
1913 revs
->expand_tabs_in_log
= 0;
1914 } else if (skip_prefix(arg
, "--expand-tabs=", &arg
)) {
1916 if (strtol_i(arg
, 10, &val
) < 0 || val
< 0)
1917 die("'%s': not a non-negative integer", arg
);
1918 revs
->expand_tabs_in_log
= val
;
1919 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
1920 revs
->show_notes
= 1;
1921 revs
->show_notes_given
= 1;
1922 revs
->notes_opt
.use_default_notes
= 1;
1923 } else if (!strcmp(arg
, "--show-signature")) {
1924 revs
->show_signature
= 1;
1925 } else if (!strcmp(arg
, "--no-show-signature")) {
1926 revs
->show_signature
= 0;
1927 } else if (!strcmp(arg
, "--show-linear-break")) {
1928 revs
->break_bar
= " ..........";
1929 revs
->track_linear
= 1;
1930 revs
->track_first_time
= 1;
1931 } else if (skip_prefix(arg
, "--show-linear-break=", &optarg
)) {
1932 revs
->break_bar
= xstrdup(optarg
);
1933 revs
->track_linear
= 1;
1934 revs
->track_first_time
= 1;
1935 } else if (skip_prefix(arg
, "--show-notes=", &optarg
) ||
1936 skip_prefix(arg
, "--notes=", &optarg
)) {
1937 struct strbuf buf
= STRBUF_INIT
;
1938 revs
->show_notes
= 1;
1939 revs
->show_notes_given
= 1;
1940 if (starts_with(arg
, "--show-notes=") &&
1941 revs
->notes_opt
.use_default_notes
< 0)
1942 revs
->notes_opt
.use_default_notes
= 1;
1943 strbuf_addstr(&buf
, optarg
);
1944 expand_notes_ref(&buf
);
1945 string_list_append(&revs
->notes_opt
.extra_notes_refs
,
1946 strbuf_detach(&buf
, NULL
));
1947 } else if (!strcmp(arg
, "--no-notes")) {
1948 revs
->show_notes
= 0;
1949 revs
->show_notes_given
= 1;
1950 revs
->notes_opt
.use_default_notes
= -1;
1951 /* we have been strdup'ing ourselves, so trick
1952 * string_list into free()ing strings */
1953 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 1;
1954 string_list_clear(&revs
->notes_opt
.extra_notes_refs
, 0);
1955 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 0;
1956 } else if (!strcmp(arg
, "--standard-notes")) {
1957 revs
->show_notes_given
= 1;
1958 revs
->notes_opt
.use_default_notes
= 1;
1959 } else if (!strcmp(arg
, "--no-standard-notes")) {
1960 revs
->notes_opt
.use_default_notes
= 0;
1961 } else if (!strcmp(arg
, "--oneline")) {
1962 revs
->verbose_header
= 1;
1963 get_commit_format("oneline", revs
);
1964 revs
->pretty_given
= 1;
1965 revs
->abbrev_commit
= 1;
1966 } else if (!strcmp(arg
, "--graph")) {
1967 revs
->topo_order
= 1;
1968 revs
->rewrite_parents
= 1;
1969 revs
->graph
= graph_init(revs
);
1970 } else if (!strcmp(arg
, "--root")) {
1971 revs
->show_root_diff
= 1;
1972 } else if (!strcmp(arg
, "--no-commit-id")) {
1973 revs
->no_commit_id
= 1;
1974 } else if (!strcmp(arg
, "--always")) {
1975 revs
->always_show_header
= 1;
1976 } else if (!strcmp(arg
, "--no-abbrev")) {
1978 } else if (!strcmp(arg
, "--abbrev")) {
1979 revs
->abbrev
= DEFAULT_ABBREV
;
1980 } else if (skip_prefix(arg
, "--abbrev=", &optarg
)) {
1981 revs
->abbrev
= strtoul(optarg
, NULL
, 10);
1982 if (revs
->abbrev
< MINIMUM_ABBREV
)
1983 revs
->abbrev
= MINIMUM_ABBREV
;
1984 else if (revs
->abbrev
> 40)
1986 } else if (!strcmp(arg
, "--abbrev-commit")) {
1987 revs
->abbrev_commit
= 1;
1988 revs
->abbrev_commit_given
= 1;
1989 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
1990 revs
->abbrev_commit
= 0;
1991 } else if (!strcmp(arg
, "--full-diff")) {
1993 revs
->full_diff
= 1;
1994 } else if (!strcmp(arg
, "--full-history")) {
1995 revs
->simplify_history
= 0;
1996 } else if (!strcmp(arg
, "--relative-date")) {
1997 revs
->date_mode
.type
= DATE_RELATIVE
;
1998 revs
->date_mode_explicit
= 1;
1999 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
2000 parse_date_format(optarg
, &revs
->date_mode
);
2001 revs
->date_mode_explicit
= 1;
2003 } else if (!strcmp(arg
, "--log-size")) {
2004 revs
->show_log_size
= 1;
2007 * Grepping the commit log
2009 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
2010 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
2012 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
2013 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
2015 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
2016 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
2018 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
2019 add_message_grep(revs
, optarg
);
2021 } else if (!strcmp(arg
, "--grep-debug")) {
2022 revs
->grep_filter
.debug
= 1;
2023 } else if (!strcmp(arg
, "--basic-regexp")) {
2024 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_BRE
;
2025 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
2026 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_ERE
;
2027 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
2028 revs
->grep_filter
.ignore_case
= 1;
2029 DIFF_OPT_SET(&revs
->diffopt
, PICKAXE_IGNORE_CASE
);
2030 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
2031 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_FIXED
;
2032 } else if (!strcmp(arg
, "--perl-regexp") || !strcmp(arg
, "-P")) {
2033 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_PCRE
;
2034 } else if (!strcmp(arg
, "--all-match")) {
2035 revs
->grep_filter
.all_match
= 1;
2036 } else if (!strcmp(arg
, "--invert-grep")) {
2037 revs
->invert_grep
= 1;
2038 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
2039 if (strcmp(optarg
, "none"))
2040 git_log_output_encoding
= xstrdup(optarg
);
2042 git_log_output_encoding
= "";
2044 } else if (!strcmp(arg
, "--reverse")) {
2046 } else if (!strcmp(arg
, "--children")) {
2047 revs
->children
.name
= "children";
2049 } else if (!strcmp(arg
, "--ignore-missing")) {
2050 revs
->ignore_missing
= 1;
2052 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
, revs
->prefix
);
2054 unkv
[(*unkc
)++] = arg
;
2057 if (revs
->graph
&& revs
->track_linear
)
2058 die("--show-linear-break and --graph are incompatible");
2063 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
2064 const struct option
*options
,
2065 const char * const usagestr
[])
2067 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
2068 &ctx
->cpidx
, ctx
->out
);
2070 error("unknown option `%s'", ctx
->argv
[0]);
2071 usage_with_options(usagestr
, options
);
2077 static int for_each_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
, const char *term
) {
2078 struct strbuf bisect_refs
= STRBUF_INIT
;
2080 strbuf_addf(&bisect_refs
, "refs/bisect/%s", term
);
2081 status
= for_each_fullref_in_submodule(submodule
, bisect_refs
.buf
, fn
, cb_data
, 0);
2082 strbuf_release(&bisect_refs
);
2086 static int for_each_bad_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
2088 return for_each_bisect_ref(submodule
, fn
, cb_data
, term_bad
);
2091 static int for_each_good_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
2093 return for_each_bisect_ref(submodule
, fn
, cb_data
, term_good
);
2096 static int handle_revision_pseudo_opt(const char *submodule
,
2097 struct rev_info
*revs
,
2098 int argc
, const char **argv
, int *flags
)
2100 const char *arg
= argv
[0];
2107 * Commands like "git shortlog" will not accept the options below
2108 * unless parse_revision_opt queues them (as opposed to erroring
2111 * When implementing your new pseudo-option, remember to
2112 * register it in the list at the top of handle_revision_opt.
2114 if (!strcmp(arg
, "--all")) {
2115 handle_refs(submodule
, revs
, *flags
, for_each_ref_submodule
);
2116 handle_refs(submodule
, revs
, *flags
, head_ref_submodule
);
2117 clear_ref_exclusion(&revs
->ref_excludes
);
2118 } else if (!strcmp(arg
, "--branches")) {
2119 handle_refs(submodule
, revs
, *flags
, for_each_branch_ref_submodule
);
2120 clear_ref_exclusion(&revs
->ref_excludes
);
2121 } else if (!strcmp(arg
, "--bisect")) {
2122 read_bisect_terms(&term_bad
, &term_good
);
2123 handle_refs(submodule
, revs
, *flags
, for_each_bad_bisect_ref
);
2124 handle_refs(submodule
, revs
, *flags
^ (UNINTERESTING
| BOTTOM
), for_each_good_bisect_ref
);
2126 } else if (!strcmp(arg
, "--tags")) {
2127 handle_refs(submodule
, revs
, *flags
, for_each_tag_ref_submodule
);
2128 clear_ref_exclusion(&revs
->ref_excludes
);
2129 } else if (!strcmp(arg
, "--remotes")) {
2130 handle_refs(submodule
, revs
, *flags
, for_each_remote_ref_submodule
);
2131 clear_ref_exclusion(&revs
->ref_excludes
);
2132 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
2133 struct all_refs_cb cb
;
2134 init_all_refs_cb(&cb
, revs
, *flags
);
2135 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
2136 clear_ref_exclusion(&revs
->ref_excludes
);
2138 } else if ((argcount
= parse_long_opt("exclude", argv
, &optarg
))) {
2139 add_ref_exclusion(&revs
->ref_excludes
, optarg
);
2141 } else if (skip_prefix(arg
, "--branches=", &optarg
)) {
2142 struct all_refs_cb cb
;
2143 init_all_refs_cb(&cb
, revs
, *flags
);
2144 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/heads/", &cb
);
2145 clear_ref_exclusion(&revs
->ref_excludes
);
2146 } else if (skip_prefix(arg
, "--tags=", &optarg
)) {
2147 struct all_refs_cb cb
;
2148 init_all_refs_cb(&cb
, revs
, *flags
);
2149 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/tags/", &cb
);
2150 clear_ref_exclusion(&revs
->ref_excludes
);
2151 } else if (skip_prefix(arg
, "--remotes=", &optarg
)) {
2152 struct all_refs_cb cb
;
2153 init_all_refs_cb(&cb
, revs
, *flags
);
2154 for_each_glob_ref_in(handle_one_ref
, optarg
, "refs/remotes/", &cb
);
2155 clear_ref_exclusion(&revs
->ref_excludes
);
2156 } else if (!strcmp(arg
, "--reflog")) {
2157 add_reflogs_to_pending(revs
, *flags
);
2158 } else if (!strcmp(arg
, "--indexed-objects")) {
2159 add_index_objects_to_pending(revs
, *flags
);
2160 } else if (!strcmp(arg
, "--not")) {
2161 *flags
^= UNINTERESTING
| BOTTOM
;
2162 } else if (!strcmp(arg
, "--no-walk")) {
2163 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2164 } else if (skip_prefix(arg
, "--no-walk=", &optarg
)) {
2166 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2167 * not allowed, since the argument is optional.
2169 if (!strcmp(optarg
, "sorted"))
2170 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2171 else if (!strcmp(optarg
, "unsorted"))
2172 revs
->no_walk
= REVISION_WALK_NO_WALK_UNSORTED
;
2174 return error("invalid argument to --no-walk");
2175 } else if (!strcmp(arg
, "--do-walk")) {
2184 static void NORETURN
diagnose_missing_default(const char *def
)
2186 unsigned char sha1
[20];
2188 const char *refname
;
2190 refname
= resolve_ref_unsafe(def
, 0, sha1
, &flags
);
2191 if (!refname
|| !(flags
& REF_ISSYMREF
) || (flags
& REF_ISBROKEN
))
2192 die(_("your current branch appears to be broken"));
2194 skip_prefix(refname
, "refs/heads/", &refname
);
2195 die(_("your current branch '%s' does not have any commits yet"),
2200 * Parse revision information, filling in the "rev_info" structure,
2201 * and removing the used arguments from the argument list.
2203 * Returns the number of arguments left that weren't recognized
2204 * (which are also moved to the head of the argument list)
2206 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
2208 int i
, flags
, left
, seen_dashdash
, read_from_stdin
, got_rev_arg
= 0, revarg_opt
;
2209 struct cmdline_pathspec prune_data
;
2210 const char *submodule
= NULL
;
2212 memset(&prune_data
, 0, sizeof(prune_data
));
2214 submodule
= opt
->submodule
;
2216 /* First, search for "--" */
2217 if (opt
&& opt
->assume_dashdash
) {
2221 for (i
= 1; i
< argc
; i
++) {
2222 const char *arg
= argv
[i
];
2223 if (strcmp(arg
, "--"))
2228 append_prune_data(&prune_data
, argv
+ i
+ 1);
2234 /* Second, deal with arguments and options */
2236 revarg_opt
= opt
? opt
->revarg_opt
: 0;
2238 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
2239 read_from_stdin
= 0;
2240 for (left
= i
= 1; i
< argc
; i
++) {
2241 const char *arg
= argv
[i
];
2245 opts
= handle_revision_pseudo_opt(submodule
,
2246 revs
, argc
- i
, argv
+ i
,
2253 if (!strcmp(arg
, "--stdin")) {
2254 if (revs
->disable_stdin
) {
2258 if (read_from_stdin
++)
2259 die("--stdin given twice?");
2260 read_revisions_from_stdin(revs
, &prune_data
);
2264 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
2275 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
2277 if (seen_dashdash
|| *arg
== '^')
2278 die("bad revision '%s'", arg
);
2280 /* If we didn't have a "--":
2281 * (1) all filenames must exist;
2282 * (2) all rev-args must not be interpretable
2283 * as a valid filename.
2284 * but the latter we have checked in the main loop.
2286 for (j
= i
; j
< argc
; j
++)
2287 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
2289 append_prune_data(&prune_data
, argv
+ i
);
2296 if (prune_data
.nr
) {
2298 * If we need to introduce the magic "a lone ':' means no
2299 * pathspec whatsoever", here is the place to do so.
2301 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2302 * prune_data.nr = 0;
2303 * prune_data.alloc = 0;
2304 * free(prune_data.path);
2305 * prune_data.path = NULL;
2307 * terminate prune_data.alloc with NULL and
2308 * call init_pathspec() to set revs->prune_data here.
2311 ALLOC_GROW(prune_data
.path
, prune_data
.nr
+ 1, prune_data
.alloc
);
2312 prune_data
.path
[prune_data
.nr
++] = NULL
;
2313 parse_pathspec(&revs
->prune_data
, 0, 0,
2314 revs
->prefix
, prune_data
.path
);
2317 if (revs
->def
== NULL
)
2318 revs
->def
= opt
? opt
->def
: NULL
;
2319 if (opt
&& opt
->tweak
)
2320 opt
->tweak(revs
, opt
);
2321 if (revs
->show_merge
)
2322 prepare_show_merge(revs
);
2323 if (revs
->def
&& !revs
->pending
.nr
&& !revs
->rev_input_given
&& !got_rev_arg
) {
2324 struct object_id oid
;
2325 struct object
*object
;
2326 struct object_context oc
;
2327 if (get_oid_with_context(revs
->def
, 0, &oid
, &oc
))
2328 diagnose_missing_default(revs
->def
);
2329 object
= get_reference(revs
, revs
->def
, &oid
, 0);
2330 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
);
2333 /* Did the user ask for any diff output? Run the diff! */
2334 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
2337 /* Pickaxe, diff-filter and rename following need diffs */
2338 if (revs
->diffopt
.pickaxe
||
2339 revs
->diffopt
.filter
||
2340 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
2343 if (revs
->topo_order
)
2346 if (revs
->prune_data
.nr
) {
2347 copy_pathspec(&revs
->pruning
.pathspec
, &revs
->prune_data
);
2348 /* Can't prune commits with rename following: the paths change.. */
2349 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
2351 if (!revs
->full_diff
)
2352 copy_pathspec(&revs
->diffopt
.pathspec
,
2355 if (revs
->combine_merges
)
2356 revs
->ignore_merges
= 0;
2357 revs
->diffopt
.abbrev
= revs
->abbrev
;
2359 if (revs
->line_level_traverse
) {
2361 revs
->topo_order
= 1;
2364 diff_setup_done(&revs
->diffopt
);
2366 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED
,
2367 &revs
->grep_filter
);
2368 compile_grep_patterns(&revs
->grep_filter
);
2370 if (revs
->reverse
&& revs
->reflog_info
)
2371 die("cannot combine --reverse with --walk-reflogs");
2372 if (revs
->reflog_info
&& revs
->limited
)
2373 die("cannot combine --walk-reflogs with history-limiting options");
2374 if (revs
->rewrite_parents
&& revs
->children
.name
)
2375 die("cannot combine --parents and --children");
2378 * Limitations on the graph functionality
2380 if (revs
->reverse
&& revs
->graph
)
2381 die("cannot combine --reverse with --graph");
2383 if (revs
->reflog_info
&& revs
->graph
)
2384 die("cannot combine --walk-reflogs with --graph");
2385 if (revs
->no_walk
&& revs
->graph
)
2386 die("cannot combine --no-walk with --graph");
2387 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
2388 die("cannot use --grep-reflog without --walk-reflogs");
2390 if (revs
->first_parent_only
&& revs
->bisect
)
2391 die(_("--first-parent is incompatible with --bisect"));
2393 if (revs
->expand_tabs_in_log
< 0)
2394 revs
->expand_tabs_in_log
= revs
->expand_tabs_in_log_default
;
2399 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
2401 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
2404 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
2407 static int remove_duplicate_parents(struct rev_info
*revs
, struct commit
*commit
)
2409 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2410 struct commit_list
**pp
, *p
;
2411 int surviving_parents
;
2413 /* Examine existing parents while marking ones we have seen... */
2414 pp
= &commit
->parents
;
2415 surviving_parents
= 0;
2416 while ((p
= *pp
) != NULL
) {
2417 struct commit
*parent
= p
->item
;
2418 if (parent
->object
.flags
& TMP_MARK
) {
2421 compact_treesame(revs
, commit
, surviving_parents
);
2424 parent
->object
.flags
|= TMP_MARK
;
2425 surviving_parents
++;
2428 /* clear the temporary mark */
2429 for (p
= commit
->parents
; p
; p
= p
->next
) {
2430 p
->item
->object
.flags
&= ~TMP_MARK
;
2432 /* no update_treesame() - removing duplicates can't affect TREESAME */
2433 return surviving_parents
;
2436 struct merge_simplify_state
{
2437 struct commit
*simplified
;
2440 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
2442 struct merge_simplify_state
*st
;
2444 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
2446 st
= xcalloc(1, sizeof(*st
));
2447 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
2452 static int mark_redundant_parents(struct rev_info
*revs
, struct commit
*commit
)
2454 struct commit_list
*h
= reduce_heads(commit
->parents
);
2455 int i
= 0, marked
= 0;
2456 struct commit_list
*po
, *pn
;
2458 /* Want these for sanity-checking only */
2459 int orig_cnt
= commit_list_count(commit
->parents
);
2460 int cnt
= commit_list_count(h
);
2463 * Not ready to remove items yet, just mark them for now, based
2464 * on the output of reduce_heads(). reduce_heads outputs the reduced
2465 * set in its original order, so this isn't too hard.
2467 po
= commit
->parents
;
2470 if (pn
&& po
->item
== pn
->item
) {
2474 po
->item
->object
.flags
|= TMP_MARK
;
2480 if (i
!= cnt
|| cnt
+marked
!= orig_cnt
)
2481 die("mark_redundant_parents %d %d %d %d", orig_cnt
, cnt
, i
, marked
);
2483 free_commit_list(h
);
2488 static int mark_treesame_root_parents(struct rev_info
*revs
, struct commit
*commit
)
2490 struct commit_list
*p
;
2493 for (p
= commit
->parents
; p
; p
= p
->next
) {
2494 struct commit
*parent
= p
->item
;
2495 if (!parent
->parents
&& (parent
->object
.flags
& TREESAME
)) {
2496 parent
->object
.flags
|= TMP_MARK
;
2505 * Awkward naming - this means one parent we are TREESAME to.
2506 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2507 * empty tree). Better name suggestions?
2509 static int leave_one_treesame_to_parent(struct rev_info
*revs
, struct commit
*commit
)
2511 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2512 struct commit
*unmarked
= NULL
, *marked
= NULL
;
2513 struct commit_list
*p
;
2516 for (p
= commit
->parents
, n
= 0; p
; p
= p
->next
, n
++) {
2517 if (ts
->treesame
[n
]) {
2518 if (p
->item
->object
.flags
& TMP_MARK
) {
2531 * If we are TREESAME to a marked-for-deletion parent, but not to any
2532 * unmarked parents, unmark the first TREESAME parent. This is the
2533 * parent that the default simplify_history==1 scan would have followed,
2534 * and it doesn't make sense to omit that path when asking for a
2535 * simplified full history. Retaining it improves the chances of
2536 * understanding odd missed merges that took an old version of a file.
2540 * I--------*X A modified the file, but mainline merge X used
2541 * \ / "-s ours", so took the version from I. X is
2542 * `-*A--' TREESAME to I and !TREESAME to A.
2544 * Default log from X would produce "I". Without this check,
2545 * --full-history --simplify-merges would produce "I-A-X", showing
2546 * the merge commit X and that it changed A, but not making clear that
2547 * it had just taken the I version. With this check, the topology above
2550 * Note that it is possible that the simplification chooses a different
2551 * TREESAME parent from the default, in which case this test doesn't
2552 * activate, and we _do_ drop the default parent. Example:
2554 * I------X A modified the file, but it was reverted in B,
2555 * \ / meaning mainline merge X is TREESAME to both
2558 * Default log would produce "I" by following the first parent;
2559 * --full-history --simplify-merges will produce "I-A-B". But this is a
2560 * reasonable result - it presents a logical full history leading from
2561 * I to X, and X is not an important merge.
2563 if (!unmarked
&& marked
) {
2564 marked
->object
.flags
&= ~TMP_MARK
;
2571 static int remove_marked_parents(struct rev_info
*revs
, struct commit
*commit
)
2573 struct commit_list
**pp
, *p
;
2574 int nth_parent
, removed
= 0;
2576 pp
= &commit
->parents
;
2578 while ((p
= *pp
) != NULL
) {
2579 struct commit
*parent
= p
->item
;
2580 if (parent
->object
.flags
& TMP_MARK
) {
2581 parent
->object
.flags
&= ~TMP_MARK
;
2585 compact_treesame(revs
, commit
, nth_parent
);
2592 /* Removing parents can only increase TREESAMEness */
2593 if (removed
&& !(commit
->object
.flags
& TREESAME
))
2594 update_treesame(revs
, commit
);
2599 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
2601 struct commit_list
*p
;
2602 struct commit
*parent
;
2603 struct merge_simplify_state
*st
, *pst
;
2606 st
= locate_simplify_state(revs
, commit
);
2609 * Have we handled this one?
2615 * An UNINTERESTING commit simplifies to itself, so does a
2616 * root commit. We do not rewrite parents of such commit
2619 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
2620 st
->simplified
= commit
;
2625 * Do we know what commit all of our parents that matter
2626 * should be rewritten to? Otherwise we are not ready to
2627 * rewrite this one yet.
2629 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
2630 pst
= locate_simplify_state(revs
, p
->item
);
2631 if (!pst
->simplified
) {
2632 tail
= &commit_list_insert(p
->item
, tail
)->next
;
2635 if (revs
->first_parent_only
)
2639 tail
= &commit_list_insert(commit
, tail
)->next
;
2644 * Rewrite our list of parents. Note that this cannot
2645 * affect our TREESAME flags in any way - a commit is
2646 * always TREESAME to its simplification.
2648 for (p
= commit
->parents
; p
; p
= p
->next
) {
2649 pst
= locate_simplify_state(revs
, p
->item
);
2650 p
->item
= pst
->simplified
;
2651 if (revs
->first_parent_only
)
2655 if (revs
->first_parent_only
)
2658 cnt
= remove_duplicate_parents(revs
, commit
);
2661 * It is possible that we are a merge and one side branch
2662 * does not have any commit that touches the given paths;
2663 * in such a case, the immediate parent from that branch
2664 * will be rewritten to be the merge base.
2666 * o----X X: the commit we are looking at;
2667 * / / o: a commit that touches the paths;
2670 * Further, a merge of an independent branch that doesn't
2671 * touch the path will reduce to a treesame root parent:
2673 * ----o----X X: the commit we are looking at;
2674 * / o: a commit that touches the paths;
2675 * r r: a root commit not touching the paths
2677 * Detect and simplify both cases.
2680 int marked
= mark_redundant_parents(revs
, commit
);
2681 marked
+= mark_treesame_root_parents(revs
, commit
);
2683 marked
-= leave_one_treesame_to_parent(revs
, commit
);
2685 cnt
= remove_marked_parents(revs
, commit
);
2689 * A commit simplifies to itself if it is a root, if it is
2690 * UNINTERESTING, if it touches the given paths, or if it is a
2691 * merge and its parents don't simplify to one relevant commit
2692 * (the first two cases are already handled at the beginning of
2695 * Otherwise, it simplifies to what its sole relevant parent
2699 (commit
->object
.flags
& UNINTERESTING
) ||
2700 !(commit
->object
.flags
& TREESAME
) ||
2701 (parent
= one_relevant_parent(revs
, commit
->parents
)) == NULL
)
2702 st
->simplified
= commit
;
2704 pst
= locate_simplify_state(revs
, parent
);
2705 st
->simplified
= pst
->simplified
;
2710 static void simplify_merges(struct rev_info
*revs
)
2712 struct commit_list
*list
, *next
;
2713 struct commit_list
*yet_to_do
, **tail
;
2714 struct commit
*commit
;
2719 /* feed the list reversed */
2721 for (list
= revs
->commits
; list
; list
= next
) {
2722 commit
= list
->item
;
2725 * Do not free(list) here yet; the original list
2726 * is used later in this function.
2728 commit_list_insert(commit
, &yet_to_do
);
2735 commit
= pop_commit(&list
);
2736 tail
= simplify_one(revs
, commit
, tail
);
2740 /* clean up the result, removing the simplified ones */
2741 list
= revs
->commits
;
2742 revs
->commits
= NULL
;
2743 tail
= &revs
->commits
;
2745 struct merge_simplify_state
*st
;
2747 commit
= pop_commit(&list
);
2748 st
= locate_simplify_state(revs
, commit
);
2749 if (st
->simplified
== commit
)
2750 tail
= &commit_list_insert(commit
, tail
)->next
;
2754 static void set_children(struct rev_info
*revs
)
2756 struct commit_list
*l
;
2757 for (l
= revs
->commits
; l
; l
= l
->next
) {
2758 struct commit
*commit
= l
->item
;
2759 struct commit_list
*p
;
2761 for (p
= commit
->parents
; p
; p
= p
->next
)
2762 add_child(revs
, p
->item
, commit
);
2766 void reset_revision_walk(void)
2768 clear_object_flags(SEEN
| ADDED
| SHOWN
);
2771 int prepare_revision_walk(struct rev_info
*revs
)
2774 struct object_array old_pending
;
2775 struct commit_list
**next
= &revs
->commits
;
2777 memcpy(&old_pending
, &revs
->pending
, sizeof(old_pending
));
2778 revs
->pending
.nr
= 0;
2779 revs
->pending
.alloc
= 0;
2780 revs
->pending
.objects
= NULL
;
2781 for (i
= 0; i
< old_pending
.nr
; i
++) {
2782 struct object_array_entry
*e
= old_pending
.objects
+ i
;
2783 struct commit
*commit
= handle_commit(revs
, e
);
2785 if (!(commit
->object
.flags
& SEEN
)) {
2786 commit
->object
.flags
|= SEEN
;
2787 next
= commit_list_append(commit
, next
);
2791 if (!revs
->leak_pending
)
2792 object_array_clear(&old_pending
);
2794 /* Signal whether we need per-parent treesame decoration */
2795 if (revs
->simplify_merges
||
2796 (revs
->limited
&& limiting_can_increase_treesame(revs
)))
2797 revs
->treesame
.name
= "treesame";
2799 if (revs
->no_walk
!= REVISION_WALK_NO_WALK_UNSORTED
)
2800 commit_list_sort_by_date(&revs
->commits
);
2804 if (limit_list(revs
) < 0)
2806 if (revs
->topo_order
)
2807 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
2808 if (revs
->line_level_traverse
)
2809 line_log_filter(revs
);
2810 if (revs
->simplify_merges
)
2811 simplify_merges(revs
);
2812 if (revs
->children
.name
)
2817 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
2819 struct commit_list
*cache
= NULL
;
2822 struct commit
*p
= *pp
;
2824 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
2825 return rewrite_one_error
;
2826 if (p
->object
.flags
& UNINTERESTING
)
2827 return rewrite_one_ok
;
2828 if (!(p
->object
.flags
& TREESAME
))
2829 return rewrite_one_ok
;
2831 return rewrite_one_noparents
;
2832 if ((p
= one_relevant_parent(revs
, p
->parents
)) == NULL
)
2833 return rewrite_one_ok
;
2838 int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
,
2839 rewrite_parent_fn_t rewrite_parent
)
2841 struct commit_list
**pp
= &commit
->parents
;
2843 struct commit_list
*parent
= *pp
;
2844 switch (rewrite_parent(revs
, &parent
->item
)) {
2845 case rewrite_one_ok
:
2847 case rewrite_one_noparents
:
2850 case rewrite_one_error
:
2855 remove_duplicate_parents(revs
, commit
);
2859 static int commit_rewrite_person(struct strbuf
*buf
, const char *what
, struct string_list
*mailmap
)
2861 char *person
, *endp
;
2862 size_t len
, namelen
, maillen
;
2865 struct ident_split ident
;
2867 person
= strstr(buf
->buf
, what
);
2871 person
+= strlen(what
);
2872 endp
= strchr(person
, '\n');
2876 len
= endp
- person
;
2878 if (split_ident_line(&ident
, person
, len
))
2881 mail
= ident
.mail_begin
;
2882 maillen
= ident
.mail_end
- ident
.mail_begin
;
2883 name
= ident
.name_begin
;
2884 namelen
= ident
.name_end
- ident
.name_begin
;
2886 if (map_user(mailmap
, &mail
, &maillen
, &name
, &namelen
)) {
2887 struct strbuf namemail
= STRBUF_INIT
;
2889 strbuf_addf(&namemail
, "%.*s <%.*s>",
2890 (int)namelen
, name
, (int)maillen
, mail
);
2892 strbuf_splice(buf
, ident
.name_begin
- buf
->buf
,
2893 ident
.mail_end
- ident
.name_begin
+ 1,
2894 namemail
.buf
, namemail
.len
);
2896 strbuf_release(&namemail
);
2904 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
2907 const char *encoding
;
2908 const char *message
;
2909 struct strbuf buf
= STRBUF_INIT
;
2911 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
2914 /* Prepend "fake" headers as needed */
2915 if (opt
->grep_filter
.use_reflog_filter
) {
2916 strbuf_addstr(&buf
, "reflog ");
2917 get_reflog_message(&buf
, opt
->reflog_info
);
2918 strbuf_addch(&buf
, '\n');
2922 * We grep in the user's output encoding, under the assumption that it
2923 * is the encoding they are most likely to write their grep pattern
2924 * for. In addition, it means we will match the "notes" encoding below,
2925 * so we will not end up with a buffer that has two different encodings
2928 encoding
= get_log_output_encoding();
2929 message
= logmsg_reencode(commit
, NULL
, encoding
);
2931 /* Copy the commit to temporary if we are using "fake" headers */
2933 strbuf_addstr(&buf
, message
);
2935 if (opt
->grep_filter
.header_list
&& opt
->mailmap
) {
2937 strbuf_addstr(&buf
, message
);
2939 commit_rewrite_person(&buf
, "\nauthor ", opt
->mailmap
);
2940 commit_rewrite_person(&buf
, "\ncommitter ", opt
->mailmap
);
2943 /* Append "fake" message parts as needed */
2944 if (opt
->show_notes
) {
2946 strbuf_addstr(&buf
, message
);
2947 format_display_notes(&commit
->object
.oid
, &buf
, encoding
, 1);
2951 * Find either in the original commit message, or in the temporary.
2952 * Note that we cast away the constness of "message" here. It is
2953 * const because it may come from the cached commit buffer. That's OK,
2954 * because we know that it is modifiable heap memory, and that while
2955 * grep_buffer may modify it for speed, it will restore any
2956 * changes before returning.
2959 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
2961 retval
= grep_buffer(&opt
->grep_filter
,
2962 (char *)message
, strlen(message
));
2963 strbuf_release(&buf
);
2964 unuse_commit_buffer(commit
, message
);
2965 return opt
->invert_grep
? !retval
: retval
;
2968 static inline int want_ancestry(const struct rev_info
*revs
)
2970 return (revs
->rewrite_parents
|| revs
->children
.name
);
2974 * Return a timestamp to be used for --since/--until comparisons for this
2975 * commit, based on the revision options.
2977 static timestamp_t
comparison_date(const struct rev_info
*revs
,
2978 struct commit
*commit
)
2980 return revs
->reflog_info
?
2981 get_reflog_timestamp(revs
->reflog_info
) :
2985 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
2987 if (commit
->object
.flags
& SHOWN
)
2988 return commit_ignore
;
2989 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.oid
.hash
))
2990 return commit_ignore
;
2993 if (commit
->object
.flags
& UNINTERESTING
)
2994 return commit_ignore
;
2995 if (revs
->min_age
!= -1 &&
2996 comparison_date(revs
, commit
) > revs
->min_age
)
2997 return commit_ignore
;
2998 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
2999 int n
= commit_list_count(commit
->parents
);
3000 if ((n
< revs
->min_parents
) ||
3001 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
3002 return commit_ignore
;
3004 if (!commit_match(commit
, revs
))
3005 return commit_ignore
;
3006 if (revs
->prune
&& revs
->dense
) {
3007 /* Commit without changes? */
3008 if (commit
->object
.flags
& TREESAME
) {
3010 struct commit_list
*p
;
3011 /* drop merges unless we want parenthood */
3012 if (!want_ancestry(revs
))
3013 return commit_ignore
;
3015 * If we want ancestry, then need to keep any merges
3016 * between relevant commits to tie together topology.
3017 * For consistency with TREESAME and simplification
3018 * use "relevant" here rather than just INTERESTING,
3019 * to treat bottom commit(s) as part of the topology.
3021 for (n
= 0, p
= commit
->parents
; p
; p
= p
->next
)
3022 if (relevant_commit(p
->item
))
3025 return commit_ignore
;
3031 define_commit_slab(saved_parents
, struct commit_list
*);
3033 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3036 * You may only call save_parents() once per commit (this is checked
3037 * for non-root commits).
3039 static void save_parents(struct rev_info
*revs
, struct commit
*commit
)
3041 struct commit_list
**pp
;
3043 if (!revs
->saved_parents_slab
) {
3044 revs
->saved_parents_slab
= xmalloc(sizeof(struct saved_parents
));
3045 init_saved_parents(revs
->saved_parents_slab
);
3048 pp
= saved_parents_at(revs
->saved_parents_slab
, commit
);
3051 * When walking with reflogs, we may visit the same commit
3052 * several times: once for each appearance in the reflog.
3054 * In this case, save_parents() will be called multiple times.
3055 * We want to keep only the first set of parents. We need to
3056 * store a sentinel value for an empty (i.e., NULL) parent
3057 * list to distinguish it from a not-yet-saved list, however.
3061 if (commit
->parents
)
3062 *pp
= copy_commit_list(commit
->parents
);
3064 *pp
= EMPTY_PARENT_LIST
;
3067 static void free_saved_parents(struct rev_info
*revs
)
3069 if (revs
->saved_parents_slab
)
3070 clear_saved_parents(revs
->saved_parents_slab
);
3073 struct commit_list
*get_saved_parents(struct rev_info
*revs
, const struct commit
*commit
)
3075 struct commit_list
*parents
;
3077 if (!revs
->saved_parents_slab
)
3078 return commit
->parents
;
3080 parents
= *saved_parents_at(revs
->saved_parents_slab
, commit
);
3081 if (parents
== EMPTY_PARENT_LIST
)
3086 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
3088 enum commit_action action
= get_commit_action(revs
, commit
);
3090 if (action
== commit_show
&&
3092 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
3094 * --full-diff on simplified parents is no good: it
3095 * will show spurious changes from the commits that
3096 * were elided. So we save the parents on the side
3097 * when --full-diff is in effect.
3099 if (revs
->full_diff
)
3100 save_parents(revs
, commit
);
3101 if (rewrite_parents(revs
, commit
, rewrite_one
) < 0)
3102 return commit_error
;
3107 static void track_linear(struct rev_info
*revs
, struct commit
*commit
)
3109 if (revs
->track_first_time
) {
3111 revs
->track_first_time
= 0;
3113 struct commit_list
*p
;
3114 for (p
= revs
->previous_parents
; p
; p
= p
->next
)
3115 if (p
->item
== NULL
|| /* first commit */
3116 !oidcmp(&p
->item
->object
.oid
, &commit
->object
.oid
))
3118 revs
->linear
= p
!= NULL
;
3120 if (revs
->reverse
) {
3122 commit
->object
.flags
|= TRACK_LINEAR
;
3124 free_commit_list(revs
->previous_parents
);
3125 revs
->previous_parents
= copy_commit_list(commit
->parents
);
3128 static struct commit
*get_revision_1(struct rev_info
*revs
)
3131 struct commit
*commit
;
3133 if (revs
->reflog_info
)
3134 commit
= next_reflog_entry(revs
->reflog_info
);
3136 commit
= pop_commit(&revs
->commits
);
3141 if (revs
->reflog_info
)
3142 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
3145 * If we haven't done the list limiting, we need to look at
3146 * the parents here. We also need to do the date-based limiting
3147 * that we'd otherwise have done in limit_list().
3149 if (!revs
->limited
) {
3150 if (revs
->max_age
!= -1 &&
3151 comparison_date(revs
, commit
) < revs
->max_age
)
3154 if (revs
->reflog_info
)
3155 try_to_simplify_commit(revs
, commit
);
3156 else if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0) {
3157 if (!revs
->ignore_missing_links
)
3158 die("Failed to traverse parents of commit %s",
3159 oid_to_hex(&commit
->object
.oid
));
3163 switch (simplify_commit(revs
, commit
)) {
3167 die("Failed to simplify parents of commit %s",
3168 oid_to_hex(&commit
->object
.oid
));
3170 if (revs
->track_linear
)
3171 track_linear(revs
, commit
);
3178 * Return true for entries that have not yet been shown. (This is an
3179 * object_array_each_func_t.)
3181 static int entry_unshown(struct object_array_entry
*entry
, void *cb_data_unused
)
3183 return !(entry
->item
->flags
& SHOWN
);
3187 * If array is on the verge of a realloc, garbage-collect any entries
3188 * that have already been shown to try to free up some space.
3190 static void gc_boundary(struct object_array
*array
)
3192 if (array
->nr
== array
->alloc
)
3193 object_array_filter(array
, entry_unshown
, NULL
);
3196 static void create_boundary_commit_list(struct rev_info
*revs
)
3200 struct object_array
*array
= &revs
->boundary_commits
;
3201 struct object_array_entry
*objects
= array
->objects
;
3204 * If revs->commits is non-NULL at this point, an error occurred in
3205 * get_revision_1(). Ignore the error and continue printing the
3206 * boundary commits anyway. (This is what the code has always
3209 if (revs
->commits
) {
3210 free_commit_list(revs
->commits
);
3211 revs
->commits
= NULL
;
3215 * Put all of the actual boundary commits from revs->boundary_commits
3216 * into revs->commits
3218 for (i
= 0; i
< array
->nr
; i
++) {
3219 c
= (struct commit
*)(objects
[i
].item
);
3222 if (!(c
->object
.flags
& CHILD_SHOWN
))
3224 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
3226 c
->object
.flags
|= BOUNDARY
;
3227 commit_list_insert(c
, &revs
->commits
);
3231 * If revs->topo_order is set, sort the boundary commits
3232 * in topological order
3234 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
3237 static struct commit
*get_revision_internal(struct rev_info
*revs
)
3239 struct commit
*c
= NULL
;
3240 struct commit_list
*l
;
3242 if (revs
->boundary
== 2) {
3244 * All of the normal commits have already been returned,
3245 * and we are now returning boundary commits.
3246 * create_boundary_commit_list() has populated
3247 * revs->commits with the remaining commits to return.
3249 c
= pop_commit(&revs
->commits
);
3251 c
->object
.flags
|= SHOWN
;
3256 * If our max_count counter has reached zero, then we are done. We
3257 * don't simply return NULL because we still might need to show
3258 * boundary commits. But we want to avoid calling get_revision_1, which
3259 * might do a considerable amount of work finding the next commit only
3260 * for us to throw it away.
3262 * If it is non-zero, then either we don't have a max_count at all
3263 * (-1), or it is still counting, in which case we decrement.
3265 if (revs
->max_count
) {
3266 c
= get_revision_1(revs
);
3268 while (revs
->skip_count
> 0) {
3270 c
= get_revision_1(revs
);
3276 if (revs
->max_count
> 0)
3281 c
->object
.flags
|= SHOWN
;
3283 if (!revs
->boundary
)
3288 * get_revision_1() runs out the commits, and
3289 * we are done computing the boundaries.
3290 * switch to boundary commits output mode.
3295 * Update revs->commits to contain the list of
3298 create_boundary_commit_list(revs
);
3300 return get_revision_internal(revs
);
3304 * boundary commits are the commits that are parents of the
3305 * ones we got from get_revision_1() but they themselves are
3306 * not returned from get_revision_1(). Before returning
3307 * 'c', we need to mark its parents that they could be boundaries.
3310 for (l
= c
->parents
; l
; l
= l
->next
) {
3312 p
= &(l
->item
->object
);
3313 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
3315 p
->flags
|= CHILD_SHOWN
;
3316 gc_boundary(&revs
->boundary_commits
);
3317 add_object_array(p
, NULL
, &revs
->boundary_commits
);
3323 struct commit
*get_revision(struct rev_info
*revs
)
3326 struct commit_list
*reversed
;
3328 if (revs
->reverse
) {
3330 while ((c
= get_revision_internal(revs
)))
3331 commit_list_insert(c
, &reversed
);
3332 revs
->commits
= reversed
;
3334 revs
->reverse_output_stage
= 1;
3337 if (revs
->reverse_output_stage
) {
3338 c
= pop_commit(&revs
->commits
);
3339 if (revs
->track_linear
)
3340 revs
->linear
= !!(c
&& c
->object
.flags
& TRACK_LINEAR
);
3344 c
= get_revision_internal(revs
);
3345 if (c
&& revs
->graph
)
3346 graph_update(revs
->graph
, c
);
3348 free_saved_parents(revs
);
3349 if (revs
->previous_parents
) {
3350 free_commit_list(revs
->previous_parents
);
3351 revs
->previous_parents
= NULL
;
3357 char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
3359 if (commit
->object
.flags
& BOUNDARY
)
3361 else if (commit
->object
.flags
& UNINTERESTING
)
3363 else if (commit
->object
.flags
& PATCHSAME
)
3365 else if (!revs
|| revs
->left_right
) {
3366 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
3370 } else if (revs
->graph
)
3372 else if (revs
->cherry_mark
)
3377 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
3379 char *mark
= get_revision_mark(revs
, commit
);
3382 fputs(mark
, stdout
);