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"
22 volatile show_early_output_fn_t show_early_output
;
24 char *path_name(const struct name_path
*path
, const char *name
)
26 struct strbuf ret
= STRBUF_INIT
;
28 strbuf_addbuf(&ret
, path
->base
);
29 strbuf_addstr(&ret
, name
);
30 return strbuf_detach(&ret
, NULL
);
33 void show_object_with_name(FILE *out
, struct object
*obj
,
34 const struct name_path
*path
, const char *component
)
36 char *name
= path_name(path
, component
);
39 fprintf(out
, "%s ", sha1_to_hex(obj
->sha1
));
40 for (p
= name
; *p
&& *p
!= '\n'; p
++)
47 static void mark_blob_uninteresting(struct blob
*blob
)
51 if (blob
->object
.flags
& UNINTERESTING
)
53 blob
->object
.flags
|= UNINTERESTING
;
56 static void mark_tree_contents_uninteresting(struct tree
*tree
)
58 struct tree_desc desc
;
59 struct name_entry entry
;
60 struct object
*obj
= &tree
->object
;
62 if (!has_sha1_file(obj
->sha1
))
64 if (parse_tree(tree
) < 0)
65 die("bad tree %s", sha1_to_hex(obj
->sha1
));
67 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
68 while (tree_entry(&desc
, &entry
)) {
69 switch (object_type(entry
.mode
)) {
71 mark_tree_uninteresting(lookup_tree(entry
.sha1
));
74 mark_blob_uninteresting(lookup_blob(entry
.sha1
));
77 /* Subproject commit - not in this repository */
83 * We don't care about the tree any more
84 * after it has been marked uninteresting.
86 free_tree_buffer(tree
);
89 void mark_tree_uninteresting(struct tree
*tree
)
91 struct object
*obj
= &tree
->object
;
95 if (obj
->flags
& UNINTERESTING
)
97 obj
->flags
|= UNINTERESTING
;
98 mark_tree_contents_uninteresting(tree
);
101 void mark_parents_uninteresting(struct commit
*commit
)
103 struct commit_list
*parents
= NULL
, *l
;
105 for (l
= commit
->parents
; l
; l
= l
->next
)
106 commit_list_insert(l
->item
, &parents
);
109 struct commit
*commit
= parents
->item
;
111 parents
= parents
->next
;
116 * A missing commit is ok iff its parent is marked
119 * We just mark such a thing parsed, so that when
120 * it is popped next time around, we won't be trying
121 * to parse it and get an error.
123 if (!has_sha1_file(commit
->object
.sha1
))
124 commit
->object
.parsed
= 1;
126 if (commit
->object
.flags
& UNINTERESTING
)
129 commit
->object
.flags
|= UNINTERESTING
;
132 * Normally we haven't parsed the parent
133 * yet, so we won't have a parent of a parent
134 * here. However, it may turn out that we've
135 * reached this commit some other way (where it
136 * wasn't uninteresting), in which case we need
137 * to mark its parents recursively too..
139 if (!commit
->parents
)
142 for (l
= commit
->parents
->next
; l
; l
= l
->next
)
143 commit_list_insert(l
->item
, &parents
);
144 commit
= commit
->parents
->item
;
149 static void add_pending_object_with_path(struct rev_info
*revs
,
151 const char *name
, unsigned mode
,
156 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
158 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
159 struct strbuf buf
= STRBUF_INIT
;
160 int len
= interpret_branch_name(name
, 0, &buf
);
163 if (0 < len
&& name
[len
] && buf
.len
)
164 strbuf_addstr(&buf
, name
+ len
);
165 st
= add_reflog_for_walk(revs
->reflog_info
,
166 (struct commit
*)obj
,
167 buf
.buf
[0] ? buf
.buf
: name
);
168 strbuf_release(&buf
);
172 add_object_array_with_path(obj
, name
, &revs
->pending
, mode
, path
);
175 static void add_pending_object_with_mode(struct rev_info
*revs
,
177 const char *name
, unsigned mode
)
179 add_pending_object_with_path(revs
, obj
, name
, mode
, NULL
);
182 void add_pending_object(struct rev_info
*revs
,
183 struct object
*obj
, const char *name
)
185 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
188 void add_head_to_pending(struct rev_info
*revs
)
190 unsigned char sha1
[20];
192 if (get_sha1("HEAD", sha1
))
194 obj
= parse_object(sha1
);
197 add_pending_object(revs
, obj
, "HEAD");
200 static struct object
*get_reference(struct rev_info
*revs
, const char *name
,
201 const unsigned char *sha1
,
204 struct object
*object
;
206 object
= parse_object(sha1
);
208 if (revs
->ignore_missing
)
210 die("bad object %s", name
);
212 object
->flags
|= flags
;
216 void add_pending_sha1(struct rev_info
*revs
, const char *name
,
217 const unsigned char *sha1
, unsigned int flags
)
219 struct object
*object
= get_reference(revs
, name
, sha1
, flags
);
220 add_pending_object(revs
, object
, name
);
223 static struct commit
*handle_commit(struct rev_info
*revs
,
224 struct object_array_entry
*entry
)
226 struct object
*object
= entry
->item
;
227 const char *name
= entry
->name
;
228 const char *path
= entry
->path
;
229 unsigned int mode
= entry
->mode
;
230 unsigned long flags
= object
->flags
;
233 * Tag object? Look what it points to..
235 while (object
->type
== OBJ_TAG
) {
236 struct tag
*tag
= (struct tag
*) object
;
237 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
238 add_pending_object(revs
, object
, tag
->tag
);
241 object
= parse_object(tag
->tagged
->sha1
);
243 if (flags
& UNINTERESTING
)
245 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
247 object
->flags
|= flags
;
249 * We'll handle the tagged object by looping or dropping
250 * through to the non-tag handlers below. Do not
251 * propagate data from the tag's pending entry.
259 * Commit object? Just return it, we'll do all the complex
262 if (object
->type
== OBJ_COMMIT
) {
263 struct commit
*commit
= (struct commit
*)object
;
264 if (parse_commit(commit
) < 0)
265 die("unable to parse commit %s", name
);
266 if (flags
& UNINTERESTING
) {
267 mark_parents_uninteresting(commit
);
270 if (revs
->show_source
&& !commit
->util
)
271 commit
->util
= xstrdup(name
);
276 * Tree object? Either mark it uninteresting, or add it
277 * to the list of objects to look at later..
279 if (object
->type
== OBJ_TREE
) {
280 struct tree
*tree
= (struct tree
*)object
;
281 if (!revs
->tree_objects
)
283 if (flags
& UNINTERESTING
) {
284 mark_tree_contents_uninteresting(tree
);
287 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
292 * Blob object? You know the drill by now..
294 if (object
->type
== OBJ_BLOB
) {
295 if (!revs
->blob_objects
)
297 if (flags
& UNINTERESTING
)
299 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
302 die("%s is unknown object", name
);
305 static int everybody_uninteresting(struct commit_list
*orig
,
306 struct commit
**interesting_cache
)
308 struct commit_list
*list
= orig
;
310 if (*interesting_cache
) {
311 struct commit
*commit
= *interesting_cache
;
312 if (!(commit
->object
.flags
& UNINTERESTING
))
317 struct commit
*commit
= list
->item
;
319 if (commit
->object
.flags
& UNINTERESTING
)
321 if (interesting_cache
)
322 *interesting_cache
= commit
;
329 * A definition of "relevant" commit that we can use to simplify limited graphs
330 * by eliminating side branches.
332 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
333 * in our list), or that is a specified BOTTOM commit. Then after computing
334 * a limited list, during processing we can generally ignore boundary merges
335 * coming from outside the graph, (ie from irrelevant parents), and treat
336 * those merges as if they were single-parent. TREESAME is defined to consider
337 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
338 * we don't care if we were !TREESAME to non-graph parents.
340 * Treating bottom commits as relevant ensures that a limited graph's
341 * connection to the actual bottom commit is not viewed as a side branch, but
342 * treated as part of the graph. For example:
344 * ....Z...A---X---o---o---B
348 * When computing "A..B", the A-X connection is at least as important as
349 * Y-X, despite A being flagged UNINTERESTING.
351 * And when computing --ancestry-path "A..B", the A-X connection is more
352 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
354 static inline int relevant_commit(struct commit
*commit
)
356 return (commit
->object
.flags
& (UNINTERESTING
| BOTTOM
)) != UNINTERESTING
;
360 * Return a single relevant commit from a parent list. If we are a TREESAME
361 * commit, and this selects one of our parents, then we can safely simplify to
364 static struct commit
*one_relevant_parent(const struct rev_info
*revs
,
365 struct commit_list
*orig
)
367 struct commit_list
*list
= orig
;
368 struct commit
*relevant
= NULL
;
374 * For 1-parent commits, or if first-parent-only, then return that
375 * first parent (even if not "relevant" by the above definition).
376 * TREESAME will have been set purely on that parent.
378 if (revs
->first_parent_only
|| !orig
->next
)
382 * For multi-parent commits, identify a sole relevant parent, if any.
383 * If we have only one relevant parent, then TREESAME will be set purely
384 * with regard to that parent, and we can simplify accordingly.
386 * If we have more than one relevant parent, or no relevant parents
387 * (and multiple irrelevant ones), then we can't select a parent here
391 struct commit
*commit
= list
->item
;
393 if (relevant_commit(commit
)) {
403 * The goal is to get REV_TREE_NEW as the result only if the
404 * diff consists of all '+' (and no other changes), REV_TREE_OLD
405 * if the whole diff is removal of old data, and otherwise
406 * REV_TREE_DIFFERENT (of course if the trees are the same we
407 * want REV_TREE_SAME).
408 * That means that once we get to REV_TREE_DIFFERENT, we do not
409 * have to look any further.
411 static int tree_difference
= REV_TREE_SAME
;
413 static void file_add_remove(struct diff_options
*options
,
414 int addremove
, unsigned mode
,
415 const unsigned char *sha1
,
417 const char *fullpath
, unsigned dirty_submodule
)
419 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
421 tree_difference
|= diff
;
422 if (tree_difference
== REV_TREE_DIFFERENT
)
423 DIFF_OPT_SET(options
, HAS_CHANGES
);
426 static void file_change(struct diff_options
*options
,
427 unsigned old_mode
, unsigned new_mode
,
428 const unsigned char *old_sha1
,
429 const unsigned char *new_sha1
,
430 int old_sha1_valid
, int new_sha1_valid
,
431 const char *fullpath
,
432 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
434 tree_difference
= REV_TREE_DIFFERENT
;
435 DIFF_OPT_SET(options
, HAS_CHANGES
);
438 static int rev_compare_tree(struct rev_info
*revs
,
439 struct commit
*parent
, struct commit
*commit
)
441 struct tree
*t1
= parent
->tree
;
442 struct tree
*t2
= commit
->tree
;
449 if (revs
->simplify_by_decoration
) {
451 * If we are simplifying by decoration, then the commit
452 * is worth showing if it has a tag pointing at it.
454 if (get_name_decoration(&commit
->object
))
455 return REV_TREE_DIFFERENT
;
457 * A commit that is not pointed by a tag is uninteresting
458 * if we are not limited by path. This means that you will
459 * see the usual "commits that touch the paths" plus any
460 * tagged commit by specifying both --simplify-by-decoration
463 if (!revs
->prune_data
.nr
)
464 return REV_TREE_SAME
;
467 tree_difference
= REV_TREE_SAME
;
468 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
469 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
471 return REV_TREE_DIFFERENT
;
472 return tree_difference
;
475 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
478 struct tree
*t1
= commit
->tree
;
483 tree_difference
= REV_TREE_SAME
;
484 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
485 retval
= diff_tree_sha1(NULL
, t1
->object
.sha1
, "", &revs
->pruning
);
487 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
490 struct treesame_state
{
491 unsigned int nparents
;
492 unsigned char treesame
[FLEX_ARRAY
];
495 static struct treesame_state
*initialise_treesame(struct rev_info
*revs
, struct commit
*commit
)
497 unsigned n
= commit_list_count(commit
->parents
);
498 struct treesame_state
*st
= xcalloc(1, sizeof(*st
) + n
);
500 add_decoration(&revs
->treesame
, &commit
->object
, st
);
505 * Must be called immediately after removing the nth_parent from a commit's
506 * parent list, if we are maintaining the per-parent treesame[] decoration.
507 * This does not recalculate the master TREESAME flag - update_treesame()
508 * should be called to update it after a sequence of treesame[] modifications
509 * that may have affected it.
511 static int compact_treesame(struct rev_info
*revs
, struct commit
*commit
, unsigned nth_parent
)
513 struct treesame_state
*st
;
516 if (!commit
->parents
) {
518 * Have just removed the only parent from a non-merge.
519 * Different handling, as we lack decoration.
522 die("compact_treesame %u", nth_parent
);
523 old_same
= !!(commit
->object
.flags
& TREESAME
);
524 if (rev_same_tree_as_empty(revs
, commit
))
525 commit
->object
.flags
|= TREESAME
;
527 commit
->object
.flags
&= ~TREESAME
;
531 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
532 if (!st
|| nth_parent
>= st
->nparents
)
533 die("compact_treesame %u", nth_parent
);
535 old_same
= st
->treesame
[nth_parent
];
536 memmove(st
->treesame
+ nth_parent
,
537 st
->treesame
+ nth_parent
+ 1,
538 st
->nparents
- nth_parent
- 1);
541 * If we've just become a non-merge commit, update TREESAME
542 * immediately, and remove the no-longer-needed decoration.
543 * If still a merge, defer update until update_treesame().
545 if (--st
->nparents
== 1) {
546 if (commit
->parents
->next
)
547 die("compact_treesame parents mismatch");
548 if (st
->treesame
[0] && revs
->dense
)
549 commit
->object
.flags
|= TREESAME
;
551 commit
->object
.flags
&= ~TREESAME
;
552 free(add_decoration(&revs
->treesame
, &commit
->object
, NULL
));
558 static unsigned update_treesame(struct rev_info
*revs
, struct commit
*commit
)
560 if (commit
->parents
&& commit
->parents
->next
) {
562 struct treesame_state
*st
;
563 struct commit_list
*p
;
564 unsigned relevant_parents
;
565 unsigned relevant_change
, irrelevant_change
;
567 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
569 die("update_treesame %s", sha1_to_hex(commit
->object
.sha1
));
570 relevant_parents
= 0;
571 relevant_change
= irrelevant_change
= 0;
572 for (p
= commit
->parents
, n
= 0; p
; n
++, p
= p
->next
) {
573 if (relevant_commit(p
->item
)) {
574 relevant_change
|= !st
->treesame
[n
];
577 irrelevant_change
|= !st
->treesame
[n
];
579 if (relevant_parents
? relevant_change
: irrelevant_change
)
580 commit
->object
.flags
&= ~TREESAME
;
582 commit
->object
.flags
|= TREESAME
;
585 return commit
->object
.flags
& TREESAME
;
588 static inline int limiting_can_increase_treesame(const struct rev_info
*revs
)
591 * TREESAME is irrelevant unless prune && dense;
592 * if simplify_history is set, we can't have a mixture of TREESAME and
593 * !TREESAME INTERESTING parents (and we don't have treesame[]
594 * decoration anyway);
595 * if first_parent_only is set, then the TREESAME flag is locked
596 * against the first parent (and again we lack treesame[] decoration).
598 return revs
->prune
&& revs
->dense
&&
599 !revs
->simplify_history
&&
600 !revs
->first_parent_only
;
603 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
605 struct commit_list
**pp
, *parent
;
606 struct treesame_state
*ts
= NULL
;
607 int relevant_change
= 0, irrelevant_change
= 0;
608 int relevant_parents
, nth_parent
;
611 * If we don't do pruning, everything is interesting
619 if (!commit
->parents
) {
620 if (rev_same_tree_as_empty(revs
, commit
))
621 commit
->object
.flags
|= TREESAME
;
626 * Normal non-merge commit? If we don't want to make the
627 * history dense, we consider it always to be a change..
629 if (!revs
->dense
&& !commit
->parents
->next
)
632 for (pp
= &commit
->parents
, nth_parent
= 0, relevant_parents
= 0;
633 (parent
= *pp
) != NULL
;
634 pp
= &parent
->next
, nth_parent
++) {
635 struct commit
*p
= parent
->item
;
636 if (relevant_commit(p
))
639 if (nth_parent
== 1) {
641 * This our second loop iteration - so we now know
642 * we're dealing with a merge.
644 * Do not compare with later parents when we care only about
645 * the first parent chain, in order to avoid derailing the
646 * traversal to follow a side branch that brought everything
647 * in the path we are limited to by the pathspec.
649 if (revs
->first_parent_only
)
652 * If this will remain a potentially-simplifiable
653 * merge, remember per-parent treesame if needed.
654 * Initialise the array with the comparison from our
657 if (revs
->treesame
.name
&&
658 !revs
->simplify_history
&&
659 !(commit
->object
.flags
& UNINTERESTING
)) {
660 ts
= initialise_treesame(revs
, commit
);
661 if (!(irrelevant_change
|| relevant_change
))
665 if (parse_commit(p
) < 0)
666 die("cannot simplify commit %s (because of %s)",
667 sha1_to_hex(commit
->object
.sha1
),
668 sha1_to_hex(p
->object
.sha1
));
669 switch (rev_compare_tree(revs
, p
, commit
)) {
671 if (!revs
->simplify_history
|| !relevant_commit(p
)) {
672 /* Even if a merge with an uninteresting
673 * side branch brought the entire change
674 * we are interested in, we do not want
675 * to lose the other branches of this
676 * merge, so we just keep going.
679 ts
->treesame
[nth_parent
] = 1;
683 commit
->parents
= parent
;
684 commit
->object
.flags
|= TREESAME
;
688 if (revs
->remove_empty_trees
&&
689 rev_same_tree_as_empty(revs
, p
)) {
690 /* We are adding all the specified
691 * paths from this parent, so the
692 * history beyond this parent is not
693 * interesting. Remove its parents
694 * (they are grandparents for us).
695 * IOW, we pretend this parent is a
698 if (parse_commit(p
) < 0)
699 die("cannot simplify commit %s (invalid %s)",
700 sha1_to_hex(commit
->object
.sha1
),
701 sha1_to_hex(p
->object
.sha1
));
706 case REV_TREE_DIFFERENT
:
707 if (relevant_commit(p
))
710 irrelevant_change
= 1;
713 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
717 * TREESAME is straightforward for single-parent commits. For merge
718 * commits, it is most useful to define it so that "irrelevant"
719 * parents cannot make us !TREESAME - if we have any relevant
720 * parents, then we only consider TREESAMEness with respect to them,
721 * allowing irrelevant merges from uninteresting branches to be
722 * simplified away. Only if we have only irrelevant parents do we
723 * base TREESAME on them. Note that this logic is replicated in
724 * update_treesame, which should be kept in sync.
726 if (relevant_parents
? !relevant_change
: !irrelevant_change
)
727 commit
->object
.flags
|= TREESAME
;
730 static void commit_list_insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
731 struct commit_list
*cached_base
, struct commit_list
**cache
)
733 struct commit_list
*new_entry
;
735 if (cached_base
&& p
->date
< cached_base
->item
->date
)
736 new_entry
= commit_list_insert_by_date(p
, &cached_base
->next
);
738 new_entry
= commit_list_insert_by_date(p
, head
);
740 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
744 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
745 struct commit_list
**list
, struct commit_list
**cache_ptr
)
747 struct commit_list
*parent
= commit
->parents
;
749 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
751 if (commit
->object
.flags
& ADDED
)
753 commit
->object
.flags
|= ADDED
;
755 if (revs
->include_check
&&
756 !revs
->include_check(commit
, revs
->include_check_data
))
760 * If the commit is uninteresting, don't try to
761 * prune parents - we want the maximal uninteresting
764 * Normally we haven't parsed the parent
765 * yet, so we won't have a parent of a parent
766 * here. However, it may turn out that we've
767 * reached this commit some other way (where it
768 * wasn't uninteresting), in which case we need
769 * to mark its parents recursively too..
771 if (commit
->object
.flags
& UNINTERESTING
) {
773 struct commit
*p
= parent
->item
;
774 parent
= parent
->next
;
776 p
->object
.flags
|= UNINTERESTING
;
777 if (parse_commit_gently(p
, 1) < 0)
780 mark_parents_uninteresting(p
);
781 if (p
->object
.flags
& SEEN
)
783 p
->object
.flags
|= SEEN
;
784 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
790 * Ok, the commit wasn't uninteresting. Try to
791 * simplify the commit history and find the parent
792 * that has no differences in the path set if one exists.
794 try_to_simplify_commit(revs
, commit
);
799 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
801 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
802 struct commit
*p
= parent
->item
;
804 if (parse_commit_gently(p
, revs
->ignore_missing_links
) < 0)
806 if (revs
->show_source
&& !p
->util
)
807 p
->util
= commit
->util
;
808 p
->object
.flags
|= left_flag
;
809 if (!(p
->object
.flags
& SEEN
)) {
810 p
->object
.flags
|= SEEN
;
811 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
813 if (revs
->first_parent_only
)
819 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
821 struct commit_list
*p
;
822 int left_count
= 0, right_count
= 0;
824 struct patch_ids ids
;
825 unsigned cherry_flag
;
827 /* First count the commits on the left and on the right */
828 for (p
= list
; p
; p
= p
->next
) {
829 struct commit
*commit
= p
->item
;
830 unsigned flags
= commit
->object
.flags
;
831 if (flags
& BOUNDARY
)
833 else if (flags
& SYMMETRIC_LEFT
)
839 if (!left_count
|| !right_count
)
842 left_first
= left_count
< right_count
;
843 init_patch_ids(&ids
);
844 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
846 /* Compute patch-ids for one side */
847 for (p
= list
; p
; p
= p
->next
) {
848 struct commit
*commit
= p
->item
;
849 unsigned flags
= commit
->object
.flags
;
851 if (flags
& BOUNDARY
)
854 * If we have fewer left, left_first is set and we omit
855 * commits on the right branch in this loop. If we have
856 * fewer right, we skip the left ones.
858 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
860 commit
->util
= add_commit_patch_id(commit
, &ids
);
863 /* either cherry_mark or cherry_pick are true */
864 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
866 /* Check the other side */
867 for (p
= list
; p
; p
= p
->next
) {
868 struct commit
*commit
= p
->item
;
870 unsigned flags
= commit
->object
.flags
;
872 if (flags
& BOUNDARY
)
875 * If we have fewer left, left_first is set and we omit
876 * commits on the left branch in this loop.
878 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
882 * Have we seen the same patch id?
884 id
= has_commit_patch_id(commit
, &ids
);
888 commit
->object
.flags
|= cherry_flag
;
891 /* Now check the original side for seen ones */
892 for (p
= list
; p
; p
= p
->next
) {
893 struct commit
*commit
= p
->item
;
894 struct patch_id
*ent
;
900 commit
->object
.flags
|= cherry_flag
;
904 free_patch_ids(&ids
);
907 /* How many extra uninteresting commits we want to see.. */
910 static int still_interesting(struct commit_list
*src
, unsigned long date
, int slop
,
911 struct commit
**interesting_cache
)
914 * No source list at all? We're definitely done..
920 * Does the destination list contain entries with a date
921 * before the source list? Definitely _not_ done.
923 if (date
<= src
->item
->date
)
927 * Does the source list still have interesting commits in
928 * it? Definitely not done..
930 if (!everybody_uninteresting(src
, interesting_cache
))
933 /* Ok, we're closing in.. */
938 * "rev-list --ancestry-path A..B" computes commits that are ancestors
939 * of B but not ancestors of A but further limits the result to those
940 * that are descendants of A. This takes the list of bottom commits and
941 * the result of "A..B" without --ancestry-path, and limits the latter
942 * further to the ones that can reach one of the commits in "bottom".
944 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
946 struct commit_list
*p
;
947 struct commit_list
*rlist
= NULL
;
951 * Reverse the list so that it will be likely that we would
952 * process parents before children.
954 for (p
= list
; p
; p
= p
->next
)
955 commit_list_insert(p
->item
, &rlist
);
957 for (p
= bottom
; p
; p
= p
->next
)
958 p
->item
->object
.flags
|= TMP_MARK
;
961 * Mark the ones that can reach bottom commits in "list",
962 * in a bottom-up fashion.
966 for (p
= rlist
; p
; p
= p
->next
) {
967 struct commit
*c
= p
->item
;
968 struct commit_list
*parents
;
969 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
971 for (parents
= c
->parents
;
973 parents
= parents
->next
) {
974 if (!(parents
->item
->object
.flags
& TMP_MARK
))
976 c
->object
.flags
|= TMP_MARK
;
981 } while (made_progress
);
984 * NEEDSWORK: decide if we want to remove parents that are
985 * not marked with TMP_MARK from commit->parents for commits
986 * in the resulting list. We may not want to do that, though.
990 * The ones that are not marked with TMP_MARK are uninteresting
992 for (p
= list
; p
; p
= p
->next
) {
993 struct commit
*c
= p
->item
;
994 if (c
->object
.flags
& TMP_MARK
)
996 c
->object
.flags
|= UNINTERESTING
;
999 /* We are done with the TMP_MARK */
1000 for (p
= list
; p
; p
= p
->next
)
1001 p
->item
->object
.flags
&= ~TMP_MARK
;
1002 for (p
= bottom
; p
; p
= p
->next
)
1003 p
->item
->object
.flags
&= ~TMP_MARK
;
1004 free_commit_list(rlist
);
1008 * Before walking the history, keep the set of "negative" refs the
1009 * caller has asked to exclude.
1011 * This is used to compute "rev-list --ancestry-path A..B", as we need
1012 * to filter the result of "A..B" further to the ones that can actually
1015 static struct commit_list
*collect_bottom_commits(struct commit_list
*list
)
1017 struct commit_list
*elem
, *bottom
= NULL
;
1018 for (elem
= list
; elem
; elem
= elem
->next
)
1019 if (elem
->item
->object
.flags
& BOTTOM
)
1020 commit_list_insert(elem
->item
, &bottom
);
1024 /* Assumes either left_only or right_only is set */
1025 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
1027 struct commit_list
*p
;
1029 for (p
= list
; p
; p
= p
->next
) {
1030 struct commit
*commit
= p
->item
;
1032 if (revs
->right_only
) {
1033 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
1034 commit
->object
.flags
|= SHOWN
;
1035 } else /* revs->left_only is set */
1036 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
1037 commit
->object
.flags
|= SHOWN
;
1041 static int limit_list(struct rev_info
*revs
)
1044 unsigned long date
= ~0ul;
1045 struct commit_list
*list
= revs
->commits
;
1046 struct commit_list
*newlist
= NULL
;
1047 struct commit_list
**p
= &newlist
;
1048 struct commit_list
*bottom
= NULL
;
1049 struct commit
*interesting_cache
= NULL
;
1051 if (revs
->ancestry_path
) {
1052 bottom
= collect_bottom_commits(list
);
1054 die("--ancestry-path given but there are no bottom commits");
1058 struct commit_list
*entry
= list
;
1059 struct commit
*commit
= list
->item
;
1060 struct object
*obj
= &commit
->object
;
1061 show_early_output_fn_t show
;
1066 if (commit
== interesting_cache
)
1067 interesting_cache
= NULL
;
1069 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
1070 obj
->flags
|= UNINTERESTING
;
1071 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
1073 if (obj
->flags
& UNINTERESTING
) {
1074 mark_parents_uninteresting(commit
);
1076 p
= &commit_list_insert(commit
, p
)->next
;
1077 slop
= still_interesting(list
, date
, slop
, &interesting_cache
);
1080 /* If showing all, add the whole pending list to the end */
1085 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
1087 date
= commit
->date
;
1088 p
= &commit_list_insert(commit
, p
)->next
;
1090 show
= show_early_output
;
1094 show(revs
, newlist
);
1095 show_early_output
= NULL
;
1097 if (revs
->cherry_pick
|| revs
->cherry_mark
)
1098 cherry_pick_list(newlist
, revs
);
1100 if (revs
->left_only
|| revs
->right_only
)
1101 limit_left_right(newlist
, revs
);
1104 limit_to_ancestry(bottom
, newlist
);
1105 free_commit_list(bottom
);
1109 * Check if any commits have become TREESAME by some of their parents
1110 * becoming UNINTERESTING.
1112 if (limiting_can_increase_treesame(revs
))
1113 for (list
= newlist
; list
; list
= list
->next
) {
1114 struct commit
*c
= list
->item
;
1115 if (c
->object
.flags
& (UNINTERESTING
| TREESAME
))
1117 update_treesame(revs
, c
);
1120 revs
->commits
= newlist
;
1125 * Add an entry to refs->cmdline with the specified information.
1128 static void add_rev_cmdline(struct rev_info
*revs
,
1129 struct object
*item
,
1134 struct rev_cmdline_info
*info
= &revs
->cmdline
;
1137 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
1138 info
->rev
[nr
].item
= item
;
1139 info
->rev
[nr
].name
= xstrdup(name
);
1140 info
->rev
[nr
].whence
= whence
;
1141 info
->rev
[nr
].flags
= flags
;
1145 static void add_rev_cmdline_list(struct rev_info
*revs
,
1146 struct commit_list
*commit_list
,
1150 while (commit_list
) {
1151 struct object
*object
= &commit_list
->item
->object
;
1152 add_rev_cmdline(revs
, object
, sha1_to_hex(object
->sha1
),
1154 commit_list
= commit_list
->next
;
1158 struct all_refs_cb
{
1160 int warned_bad_reflog
;
1161 struct rev_info
*all_revs
;
1162 const char *name_for_errormsg
;
1165 int ref_excluded(struct string_list
*ref_excludes
, const char *path
)
1167 struct string_list_item
*item
;
1171 for_each_string_list_item(item
, ref_excludes
) {
1172 if (!wildmatch(item
->string
, path
, 0, NULL
))
1178 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
1180 struct all_refs_cb
*cb
= cb_data
;
1181 struct object
*object
;
1183 if (ref_excluded(cb
->all_revs
->ref_excludes
, path
))
1186 object
= get_reference(cb
->all_revs
, path
, sha1
, cb
->all_flags
);
1187 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
1188 add_pending_sha1(cb
->all_revs
, path
, sha1
, cb
->all_flags
);
1192 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
1195 cb
->all_revs
= revs
;
1196 cb
->all_flags
= flags
;
1199 void clear_ref_exclusion(struct string_list
**ref_excludes_p
)
1201 if (*ref_excludes_p
) {
1202 string_list_clear(*ref_excludes_p
, 0);
1203 free(*ref_excludes_p
);
1205 *ref_excludes_p
= NULL
;
1208 void add_ref_exclusion(struct string_list
**ref_excludes_p
, const char *exclude
)
1210 if (!*ref_excludes_p
) {
1211 *ref_excludes_p
= xcalloc(1, sizeof(**ref_excludes_p
));
1212 (*ref_excludes_p
)->strdup_strings
= 1;
1214 string_list_append(*ref_excludes_p
, exclude
);
1217 static void handle_refs(const char *submodule
, struct rev_info
*revs
, unsigned flags
,
1218 int (*for_each
)(const char *, each_ref_fn
, void *))
1220 struct all_refs_cb cb
;
1221 init_all_refs_cb(&cb
, revs
, flags
);
1222 for_each(submodule
, handle_one_ref
, &cb
);
1225 static void handle_one_reflog_commit(unsigned char *sha1
, void *cb_data
)
1227 struct all_refs_cb
*cb
= cb_data
;
1228 if (!is_null_sha1(sha1
)) {
1229 struct object
*o
= parse_object(sha1
);
1231 o
->flags
|= cb
->all_flags
;
1232 /* ??? CMDLINEFLAGS ??? */
1233 add_pending_object(cb
->all_revs
, o
, "");
1235 else if (!cb
->warned_bad_reflog
) {
1236 warning("reflog of '%s' references pruned commits",
1237 cb
->name_for_errormsg
);
1238 cb
->warned_bad_reflog
= 1;
1243 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
1244 const char *email
, unsigned long timestamp
, int tz
,
1245 const char *message
, void *cb_data
)
1247 handle_one_reflog_commit(osha1
, cb_data
);
1248 handle_one_reflog_commit(nsha1
, cb_data
);
1252 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
1254 struct all_refs_cb
*cb
= cb_data
;
1255 cb
->warned_bad_reflog
= 0;
1256 cb
->name_for_errormsg
= path
;
1257 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
1261 void add_reflogs_to_pending(struct rev_info
*revs
, unsigned flags
)
1263 struct all_refs_cb cb
;
1265 cb
.all_flags
= flags
;
1266 for_each_reflog(handle_one_reflog
, &cb
);
1269 static void add_cache_tree(struct cache_tree
*it
, struct rev_info
*revs
,
1270 struct strbuf
*path
)
1272 size_t baselen
= path
->len
;
1275 if (it
->entry_count
>= 0) {
1276 struct tree
*tree
= lookup_tree(it
->sha1
);
1277 add_pending_object_with_path(revs
, &tree
->object
, "",
1281 for (i
= 0; i
< it
->subtree_nr
; i
++) {
1282 struct cache_tree_sub
*sub
= it
->down
[i
];
1283 strbuf_addf(path
, "%s%s", baselen
? "/" : "", sub
->name
);
1284 add_cache_tree(sub
->cache_tree
, revs
, path
);
1285 strbuf_setlen(path
, baselen
);
1290 void add_index_objects_to_pending(struct rev_info
*revs
, unsigned flags
)
1295 for (i
= 0; i
< active_nr
; i
++) {
1296 struct cache_entry
*ce
= active_cache
[i
];
1299 if (S_ISGITLINK(ce
->ce_mode
))
1302 blob
= lookup_blob(ce
->sha1
);
1304 die("unable to add index blob to traversal");
1305 add_pending_object_with_path(revs
, &blob
->object
, "",
1306 ce
->ce_mode
, ce
->name
);
1309 if (active_cache_tree
) {
1310 struct strbuf path
= STRBUF_INIT
;
1311 add_cache_tree(active_cache_tree
, revs
, &path
);
1312 strbuf_release(&path
);
1316 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
)
1318 unsigned char sha1
[20];
1320 struct commit
*commit
;
1321 struct commit_list
*parents
;
1322 const char *arg
= arg_
;
1325 flags
^= UNINTERESTING
| BOTTOM
;
1328 if (get_sha1_committish(arg
, sha1
))
1331 it
= get_reference(revs
, arg
, sha1
, 0);
1332 if (!it
&& revs
->ignore_missing
)
1334 if (it
->type
!= OBJ_TAG
)
1336 if (!((struct tag
*)it
)->tagged
)
1338 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
1340 if (it
->type
!= OBJ_COMMIT
)
1342 commit
= (struct commit
*)it
;
1343 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
1344 it
= &parents
->item
->object
;
1346 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1347 add_pending_object(revs
, it
, arg
);
1352 void init_revisions(struct rev_info
*revs
, const char *prefix
)
1354 memset(revs
, 0, sizeof(*revs
));
1356 revs
->abbrev
= DEFAULT_ABBREV
;
1357 revs
->ignore_merges
= 1;
1358 revs
->simplify_history
= 1;
1359 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
1360 DIFF_OPT_SET(&revs
->pruning
, QUICK
);
1361 revs
->pruning
.add_remove
= file_add_remove
;
1362 revs
->pruning
.change
= file_change
;
1363 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1365 revs
->prefix
= prefix
;
1368 revs
->skip_count
= -1;
1369 revs
->max_count
= -1;
1370 revs
->max_parents
= -1;
1372 revs
->commit_format
= CMIT_FMT_DEFAULT
;
1374 init_grep_defaults();
1375 grep_init(&revs
->grep_filter
, prefix
);
1376 revs
->grep_filter
.status_only
= 1;
1377 revs
->grep_filter
.regflags
= REG_NEWLINE
;
1379 diff_setup(&revs
->diffopt
);
1380 if (prefix
&& !revs
->diffopt
.prefix
) {
1381 revs
->diffopt
.prefix
= prefix
;
1382 revs
->diffopt
.prefix_length
= strlen(prefix
);
1385 revs
->notes_opt
.use_default_notes
= -1;
1388 static void add_pending_commit_list(struct rev_info
*revs
,
1389 struct commit_list
*commit_list
,
1392 while (commit_list
) {
1393 struct object
*object
= &commit_list
->item
->object
;
1394 object
->flags
|= flags
;
1395 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
1396 commit_list
= commit_list
->next
;
1400 static void prepare_show_merge(struct rev_info
*revs
)
1402 struct commit_list
*bases
;
1403 struct commit
*head
, *other
;
1404 unsigned char sha1
[20];
1405 const char **prune
= NULL
;
1406 int i
, prune_num
= 1; /* counting terminating NULL */
1408 if (get_sha1("HEAD", sha1
))
1409 die("--merge without HEAD?");
1410 head
= lookup_commit_or_die(sha1
, "HEAD");
1411 if (get_sha1("MERGE_HEAD", sha1
))
1412 die("--merge without MERGE_HEAD?");
1413 other
= lookup_commit_or_die(sha1
, "MERGE_HEAD");
1414 add_pending_object(revs
, &head
->object
, "HEAD");
1415 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1416 bases
= get_merge_bases(head
, other
);
1417 add_rev_cmdline_list(revs
, bases
, REV_CMD_MERGE_BASE
, UNINTERESTING
| BOTTOM
);
1418 add_pending_commit_list(revs
, bases
, UNINTERESTING
| BOTTOM
);
1419 free_commit_list(bases
);
1420 head
->object
.flags
|= SYMMETRIC_LEFT
;
1424 for (i
= 0; i
< active_nr
; i
++) {
1425 const struct cache_entry
*ce
= active_cache
[i
];
1428 if (ce_path_match(ce
, &revs
->prune_data
, NULL
)) {
1430 REALLOC_ARRAY(prune
, prune_num
);
1431 prune
[prune_num
-2] = ce
->name
;
1432 prune
[prune_num
-1] = NULL
;
1434 while ((i
+1 < active_nr
) &&
1435 ce_same_name(ce
, active_cache
[i
+1]))
1438 free_pathspec(&revs
->prune_data
);
1439 parse_pathspec(&revs
->prune_data
, PATHSPEC_ALL_MAGIC
& ~PATHSPEC_LITERAL
,
1440 PATHSPEC_PREFER_FULL
| PATHSPEC_LITERAL_PATH
, "", prune
);
1444 int handle_revision_arg(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
1446 struct object_context oc
;
1448 struct object
*object
;
1449 unsigned char sha1
[20];
1451 const char *arg
= arg_
;
1452 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
1453 unsigned get_sha1_flags
= 0;
1455 flags
= flags
& UNINTERESTING
? flags
| BOTTOM
: flags
& ~BOTTOM
;
1457 dotdot
= strstr(arg
, "..");
1459 unsigned char from_sha1
[20];
1460 const char *next
= dotdot
+ 2;
1461 const char *this = arg
;
1462 int symmetric
= *next
== '.';
1463 unsigned int flags_exclude
= flags
^ (UNINTERESTING
| BOTTOM
);
1464 static const char head_by_default
[] = "HEAD";
1465 unsigned int a_flags
;
1471 next
= head_by_default
;
1473 this = head_by_default
;
1474 if (this == head_by_default
&& next
== head_by_default
&&
1477 * Just ".."? That is not a range but the
1478 * pathspec for the parent directory.
1480 if (!cant_be_filename
) {
1485 if (!get_sha1_committish(this, from_sha1
) &&
1486 !get_sha1_committish(next
, sha1
)) {
1487 struct object
*a_obj
, *b_obj
;
1489 if (!cant_be_filename
) {
1491 verify_non_filename(revs
->prefix
, arg
);
1494 a_obj
= parse_object(from_sha1
);
1495 b_obj
= parse_object(sha1
);
1496 if (!a_obj
|| !b_obj
) {
1498 if (revs
->ignore_missing
)
1501 ? "Invalid symmetric difference expression %s"
1502 : "Invalid revision range %s", arg
);
1507 a_flags
= flags_exclude
;
1509 /* A...B -- find merge bases between the two */
1510 struct commit
*a
, *b
;
1511 struct commit_list
*exclude
;
1513 a
= (a_obj
->type
== OBJ_COMMIT
1514 ? (struct commit
*)a_obj
1515 : lookup_commit_reference(a_obj
->sha1
));
1516 b
= (b_obj
->type
== OBJ_COMMIT
1517 ? (struct commit
*)b_obj
1518 : lookup_commit_reference(b_obj
->sha1
));
1521 exclude
= get_merge_bases(a
, b
);
1522 add_rev_cmdline_list(revs
, exclude
,
1525 add_pending_commit_list(revs
, exclude
,
1527 free_commit_list(exclude
);
1529 a_flags
= flags
| SYMMETRIC_LEFT
;
1532 a_obj
->flags
|= a_flags
;
1533 b_obj
->flags
|= flags
;
1534 add_rev_cmdline(revs
, a_obj
, this,
1535 REV_CMD_LEFT
, a_flags
);
1536 add_rev_cmdline(revs
, b_obj
, next
,
1537 REV_CMD_RIGHT
, flags
);
1538 add_pending_object(revs
, a_obj
, this);
1539 add_pending_object(revs
, b_obj
, next
);
1544 dotdot
= strstr(arg
, "^@");
1545 if (dotdot
&& !dotdot
[2]) {
1547 if (add_parents_only(revs
, arg
, flags
))
1551 dotdot
= strstr(arg
, "^!");
1552 if (dotdot
&& !dotdot
[2]) {
1554 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
)))
1560 local_flags
= UNINTERESTING
| BOTTOM
;
1564 if (revarg_opt
& REVARG_COMMITTISH
)
1565 get_sha1_flags
= GET_SHA1_COMMITTISH
;
1567 if (get_sha1_with_context(arg
, get_sha1_flags
, sha1
, &oc
))
1568 return revs
->ignore_missing
? 0 : -1;
1569 if (!cant_be_filename
)
1570 verify_non_filename(revs
->prefix
, arg
);
1571 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
1572 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
1573 add_pending_object_with_mode(revs
, object
, arg
, oc
.mode
);
1577 struct cmdline_pathspec
{
1583 static void append_prune_data(struct cmdline_pathspec
*prune
, const char **av
)
1586 ALLOC_GROW(prune
->path
, prune
->nr
+ 1, prune
->alloc
);
1587 prune
->path
[prune
->nr
++] = *(av
++);
1591 static void read_pathspec_from_stdin(struct rev_info
*revs
, struct strbuf
*sb
,
1592 struct cmdline_pathspec
*prune
)
1594 while (strbuf_getwholeline(sb
, stdin
, '\n') != EOF
) {
1596 if (len
&& sb
->buf
[len
- 1] == '\n')
1597 sb
->buf
[--len
] = '\0';
1598 ALLOC_GROW(prune
->path
, prune
->nr
+ 1, prune
->alloc
);
1599 prune
->path
[prune
->nr
++] = xstrdup(sb
->buf
);
1603 static void read_revisions_from_stdin(struct rev_info
*revs
,
1604 struct cmdline_pathspec
*prune
)
1607 int seen_dashdash
= 0;
1610 save_warning
= warn_on_object_refname_ambiguity
;
1611 warn_on_object_refname_ambiguity
= 0;
1613 strbuf_init(&sb
, 1000);
1614 while (strbuf_getwholeline(&sb
, stdin
, '\n') != EOF
) {
1616 if (len
&& sb
.buf
[len
- 1] == '\n')
1617 sb
.buf
[--len
] = '\0';
1620 if (sb
.buf
[0] == '-') {
1621 if (len
== 2 && sb
.buf
[1] == '-') {
1625 die("options not supported in --stdin mode");
1627 if (handle_revision_arg(sb
.buf
, revs
, 0,
1628 REVARG_CANNOT_BE_FILENAME
))
1629 die("bad revision '%s'", sb
.buf
);
1632 read_pathspec_from_stdin(revs
, &sb
, prune
);
1634 strbuf_release(&sb
);
1635 warn_on_object_refname_ambiguity
= save_warning
;
1638 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
1640 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
1643 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
1645 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
1648 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
1650 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
1653 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
1654 int *unkc
, const char **unkv
)
1656 const char *arg
= argv
[0];
1660 /* pseudo revision arguments */
1661 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1662 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1663 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1664 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
1665 !strcmp(arg
, "--bisect") || starts_with(arg
, "--glob=") ||
1666 !strcmp(arg
, "--indexed-objects") ||
1667 starts_with(arg
, "--exclude=") ||
1668 starts_with(arg
, "--branches=") || starts_with(arg
, "--tags=") ||
1669 starts_with(arg
, "--remotes=") || starts_with(arg
, "--no-walk="))
1671 unkv
[(*unkc
)++] = arg
;
1675 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
1676 revs
->max_count
= atoi(optarg
);
1679 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
1680 revs
->skip_count
= atoi(optarg
);
1682 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1683 /* accept -<digit>, like traditional "head" */
1684 if (strtol_i(arg
+ 1, 10, &revs
->max_count
) < 0 ||
1685 revs
->max_count
< 0)
1686 die("'%s': not a non-negative integer", arg
+ 1);
1688 } else if (!strcmp(arg
, "-n")) {
1690 return error("-n requires an argument");
1691 revs
->max_count
= atoi(argv
[1]);
1694 } else if (starts_with(arg
, "-n")) {
1695 revs
->max_count
= atoi(arg
+ 2);
1697 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
1698 revs
->max_age
= atoi(optarg
);
1700 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
1701 revs
->max_age
= approxidate(optarg
);
1703 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
1704 revs
->max_age
= approxidate(optarg
);
1706 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
1707 revs
->min_age
= atoi(optarg
);
1709 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
1710 revs
->min_age
= approxidate(optarg
);
1712 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
1713 revs
->min_age
= approxidate(optarg
);
1715 } else if (!strcmp(arg
, "--first-parent")) {
1716 revs
->first_parent_only
= 1;
1717 } else if (!strcmp(arg
, "--ancestry-path")) {
1718 revs
->ancestry_path
= 1;
1719 revs
->simplify_history
= 0;
1721 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1722 init_reflog_walk(&revs
->reflog_info
);
1723 } else if (!strcmp(arg
, "--default")) {
1725 return error("bad --default argument");
1726 revs
->def
= argv
[1];
1728 } else if (!strcmp(arg
, "--merge")) {
1729 revs
->show_merge
= 1;
1730 } else if (!strcmp(arg
, "--topo-order")) {
1731 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1732 revs
->topo_order
= 1;
1733 } else if (!strcmp(arg
, "--simplify-merges")) {
1734 revs
->simplify_merges
= 1;
1735 revs
->topo_order
= 1;
1736 revs
->rewrite_parents
= 1;
1737 revs
->simplify_history
= 0;
1739 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
1740 revs
->simplify_merges
= 1;
1741 revs
->topo_order
= 1;
1742 revs
->rewrite_parents
= 1;
1743 revs
->simplify_history
= 0;
1744 revs
->simplify_by_decoration
= 1;
1747 load_ref_decorations(DECORATE_SHORT_REFS
);
1748 } else if (!strcmp(arg
, "--date-order")) {
1749 revs
->sort_order
= REV_SORT_BY_COMMIT_DATE
;
1750 revs
->topo_order
= 1;
1751 } else if (!strcmp(arg
, "--author-date-order")) {
1752 revs
->sort_order
= REV_SORT_BY_AUTHOR_DATE
;
1753 revs
->topo_order
= 1;
1754 } else if (starts_with(arg
, "--early-output")) {
1758 count
= atoi(arg
+15);
1761 revs
->topo_order
= 1;
1762 revs
->early_output
= count
;
1764 } else if (!strcmp(arg
, "--parents")) {
1765 revs
->rewrite_parents
= 1;
1766 revs
->print_parents
= 1;
1767 } else if (!strcmp(arg
, "--dense")) {
1769 } else if (!strcmp(arg
, "--sparse")) {
1771 } else if (!strcmp(arg
, "--show-all")) {
1773 } else if (!strcmp(arg
, "--remove-empty")) {
1774 revs
->remove_empty_trees
= 1;
1775 } else if (!strcmp(arg
, "--merges")) {
1776 revs
->min_parents
= 2;
1777 } else if (!strcmp(arg
, "--no-merges")) {
1778 revs
->max_parents
= 1;
1779 } else if (starts_with(arg
, "--min-parents=")) {
1780 revs
->min_parents
= atoi(arg
+14);
1781 } else if (starts_with(arg
, "--no-min-parents")) {
1782 revs
->min_parents
= 0;
1783 } else if (starts_with(arg
, "--max-parents=")) {
1784 revs
->max_parents
= atoi(arg
+14);
1785 } else if (starts_with(arg
, "--no-max-parents")) {
1786 revs
->max_parents
= -1;
1787 } else if (!strcmp(arg
, "--boundary")) {
1789 } else if (!strcmp(arg
, "--left-right")) {
1790 revs
->left_right
= 1;
1791 } else if (!strcmp(arg
, "--left-only")) {
1792 if (revs
->right_only
)
1793 die("--left-only is incompatible with --right-only"
1795 revs
->left_only
= 1;
1796 } else if (!strcmp(arg
, "--right-only")) {
1797 if (revs
->left_only
)
1798 die("--right-only is incompatible with --left-only");
1799 revs
->right_only
= 1;
1800 } else if (!strcmp(arg
, "--cherry")) {
1801 if (revs
->left_only
)
1802 die("--cherry is incompatible with --left-only");
1803 revs
->cherry_mark
= 1;
1804 revs
->right_only
= 1;
1805 revs
->max_parents
= 1;
1807 } else if (!strcmp(arg
, "--count")) {
1809 } else if (!strcmp(arg
, "--cherry-mark")) {
1810 if (revs
->cherry_pick
)
1811 die("--cherry-mark is incompatible with --cherry-pick");
1812 revs
->cherry_mark
= 1;
1813 revs
->limited
= 1; /* needs limit_list() */
1814 } else if (!strcmp(arg
, "--cherry-pick")) {
1815 if (revs
->cherry_mark
)
1816 die("--cherry-pick is incompatible with --cherry-mark");
1817 revs
->cherry_pick
= 1;
1819 } else if (!strcmp(arg
, "--objects")) {
1820 revs
->tag_objects
= 1;
1821 revs
->tree_objects
= 1;
1822 revs
->blob_objects
= 1;
1823 } else if (!strcmp(arg
, "--objects-edge")) {
1824 revs
->tag_objects
= 1;
1825 revs
->tree_objects
= 1;
1826 revs
->blob_objects
= 1;
1827 revs
->edge_hint
= 1;
1828 } else if (!strcmp(arg
, "--objects-edge-aggressive")) {
1829 revs
->tag_objects
= 1;
1830 revs
->tree_objects
= 1;
1831 revs
->blob_objects
= 1;
1832 revs
->edge_hint
= 1;
1833 revs
->edge_hint_aggressive
= 1;
1834 } else if (!strcmp(arg
, "--verify-objects")) {
1835 revs
->tag_objects
= 1;
1836 revs
->tree_objects
= 1;
1837 revs
->blob_objects
= 1;
1838 revs
->verify_objects
= 1;
1839 } else if (!strcmp(arg
, "--unpacked")) {
1841 } else if (starts_with(arg
, "--unpacked=")) {
1842 die("--unpacked=<packfile> no longer supported.");
1843 } else if (!strcmp(arg
, "-r")) {
1845 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1846 } else if (!strcmp(arg
, "-t")) {
1848 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1849 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1850 } else if (!strcmp(arg
, "-m")) {
1851 revs
->ignore_merges
= 0;
1852 } else if (!strcmp(arg
, "-c")) {
1854 revs
->dense_combined_merges
= 0;
1855 revs
->combine_merges
= 1;
1856 } else if (!strcmp(arg
, "--cc")) {
1858 revs
->dense_combined_merges
= 1;
1859 revs
->combine_merges
= 1;
1860 } else if (!strcmp(arg
, "-v")) {
1861 revs
->verbose_header
= 1;
1862 } else if (!strcmp(arg
, "--pretty")) {
1863 revs
->verbose_header
= 1;
1864 revs
->pretty_given
= 1;
1865 get_commit_format(NULL
, revs
);
1866 } else if (starts_with(arg
, "--pretty=") || starts_with(arg
, "--format=")) {
1868 * Detached form ("--pretty X" as opposed to "--pretty=X")
1869 * not allowed, since the argument is optional.
1871 revs
->verbose_header
= 1;
1872 revs
->pretty_given
= 1;
1873 get_commit_format(arg
+9, revs
);
1874 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
1875 revs
->show_notes
= 1;
1876 revs
->show_notes_given
= 1;
1877 revs
->notes_opt
.use_default_notes
= 1;
1878 } else if (!strcmp(arg
, "--show-signature")) {
1879 revs
->show_signature
= 1;
1880 } else if (!strcmp(arg
, "--show-linear-break") ||
1881 starts_with(arg
, "--show-linear-break=")) {
1882 if (starts_with(arg
, "--show-linear-break="))
1883 revs
->break_bar
= xstrdup(arg
+ 20);
1885 revs
->break_bar
= " ..........";
1886 revs
->track_linear
= 1;
1887 revs
->track_first_time
= 1;
1888 } else if (starts_with(arg
, "--show-notes=") ||
1889 starts_with(arg
, "--notes=")) {
1890 struct strbuf buf
= STRBUF_INIT
;
1891 revs
->show_notes
= 1;
1892 revs
->show_notes_given
= 1;
1893 if (starts_with(arg
, "--show-notes")) {
1894 if (revs
->notes_opt
.use_default_notes
< 0)
1895 revs
->notes_opt
.use_default_notes
= 1;
1896 strbuf_addstr(&buf
, arg
+13);
1899 strbuf_addstr(&buf
, arg
+8);
1900 expand_notes_ref(&buf
);
1901 string_list_append(&revs
->notes_opt
.extra_notes_refs
,
1902 strbuf_detach(&buf
, NULL
));
1903 } else if (!strcmp(arg
, "--no-notes")) {
1904 revs
->show_notes
= 0;
1905 revs
->show_notes_given
= 1;
1906 revs
->notes_opt
.use_default_notes
= -1;
1907 /* we have been strdup'ing ourselves, so trick
1908 * string_list into free()ing strings */
1909 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 1;
1910 string_list_clear(&revs
->notes_opt
.extra_notes_refs
, 0);
1911 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 0;
1912 } else if (!strcmp(arg
, "--standard-notes")) {
1913 revs
->show_notes_given
= 1;
1914 revs
->notes_opt
.use_default_notes
= 1;
1915 } else if (!strcmp(arg
, "--no-standard-notes")) {
1916 revs
->notes_opt
.use_default_notes
= 0;
1917 } else if (!strcmp(arg
, "--oneline")) {
1918 revs
->verbose_header
= 1;
1919 get_commit_format("oneline", revs
);
1920 revs
->pretty_given
= 1;
1921 revs
->abbrev_commit
= 1;
1922 } else if (!strcmp(arg
, "--graph")) {
1923 revs
->topo_order
= 1;
1924 revs
->rewrite_parents
= 1;
1925 revs
->graph
= graph_init(revs
);
1926 } else if (!strcmp(arg
, "--root")) {
1927 revs
->show_root_diff
= 1;
1928 } else if (!strcmp(arg
, "--no-commit-id")) {
1929 revs
->no_commit_id
= 1;
1930 } else if (!strcmp(arg
, "--always")) {
1931 revs
->always_show_header
= 1;
1932 } else if (!strcmp(arg
, "--no-abbrev")) {
1934 } else if (!strcmp(arg
, "--abbrev")) {
1935 revs
->abbrev
= DEFAULT_ABBREV
;
1936 } else if (starts_with(arg
, "--abbrev=")) {
1937 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1938 if (revs
->abbrev
< MINIMUM_ABBREV
)
1939 revs
->abbrev
= MINIMUM_ABBREV
;
1940 else if (revs
->abbrev
> 40)
1942 } else if (!strcmp(arg
, "--abbrev-commit")) {
1943 revs
->abbrev_commit
= 1;
1944 revs
->abbrev_commit_given
= 1;
1945 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
1946 revs
->abbrev_commit
= 0;
1947 } else if (!strcmp(arg
, "--full-diff")) {
1949 revs
->full_diff
= 1;
1950 } else if (!strcmp(arg
, "--full-history")) {
1951 revs
->simplify_history
= 0;
1952 } else if (!strcmp(arg
, "--relative-date")) {
1953 revs
->date_mode
= DATE_RELATIVE
;
1954 revs
->date_mode_explicit
= 1;
1955 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
1956 revs
->date_mode
= parse_date_format(optarg
);
1957 revs
->date_mode_explicit
= 1;
1959 } else if (!strcmp(arg
, "--log-size")) {
1960 revs
->show_log_size
= 1;
1963 * Grepping the commit log
1965 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
1966 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
1968 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
1969 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
1971 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
1972 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
1974 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
1975 add_message_grep(revs
, optarg
);
1977 } else if (!strcmp(arg
, "--grep-debug")) {
1978 revs
->grep_filter
.debug
= 1;
1979 } else if (!strcmp(arg
, "--basic-regexp")) {
1980 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE
, &revs
->grep_filter
);
1981 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
1982 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE
, &revs
->grep_filter
);
1983 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
1984 revs
->grep_filter
.regflags
|= REG_ICASE
;
1985 DIFF_OPT_SET(&revs
->diffopt
, PICKAXE_IGNORE_CASE
);
1986 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
1987 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED
, &revs
->grep_filter
);
1988 } else if (!strcmp(arg
, "--perl-regexp")) {
1989 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE
, &revs
->grep_filter
);
1990 } else if (!strcmp(arg
, "--all-match")) {
1991 revs
->grep_filter
.all_match
= 1;
1992 } else if (!strcmp(arg
, "--invert-grep")) {
1993 revs
->invert_grep
= 1;
1994 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
1995 if (strcmp(optarg
, "none"))
1996 git_log_output_encoding
= xstrdup(optarg
);
1998 git_log_output_encoding
= "";
2000 } else if (!strcmp(arg
, "--reverse")) {
2002 } else if (!strcmp(arg
, "--children")) {
2003 revs
->children
.name
= "children";
2005 } else if (!strcmp(arg
, "--ignore-missing")) {
2006 revs
->ignore_missing
= 1;
2008 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
);
2010 unkv
[(*unkc
)++] = arg
;
2013 if (revs
->graph
&& revs
->track_linear
)
2014 die("--show-linear-break and --graph are incompatible");
2019 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
2020 const struct option
*options
,
2021 const char * const usagestr
[])
2023 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
2024 &ctx
->cpidx
, ctx
->out
);
2026 error("unknown option `%s'", ctx
->argv
[0]);
2027 usage_with_options(usagestr
, options
);
2033 static int for_each_bad_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
2035 return for_each_ref_in_submodule(submodule
, "refs/bisect/bad", fn
, cb_data
);
2038 static int for_each_good_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
2040 return for_each_ref_in_submodule(submodule
, "refs/bisect/good", fn
, cb_data
);
2043 static int handle_revision_pseudo_opt(const char *submodule
,
2044 struct rev_info
*revs
,
2045 int argc
, const char **argv
, int *flags
)
2047 const char *arg
= argv
[0];
2054 * Commands like "git shortlog" will not accept the options below
2055 * unless parse_revision_opt queues them (as opposed to erroring
2058 * When implementing your new pseudo-option, remember to
2059 * register it in the list at the top of handle_revision_opt.
2061 if (!strcmp(arg
, "--all")) {
2062 handle_refs(submodule
, revs
, *flags
, for_each_ref_submodule
);
2063 handle_refs(submodule
, revs
, *flags
, head_ref_submodule
);
2064 clear_ref_exclusion(&revs
->ref_excludes
);
2065 } else if (!strcmp(arg
, "--branches")) {
2066 handle_refs(submodule
, revs
, *flags
, for_each_branch_ref_submodule
);
2067 clear_ref_exclusion(&revs
->ref_excludes
);
2068 } else if (!strcmp(arg
, "--bisect")) {
2069 handle_refs(submodule
, revs
, *flags
, for_each_bad_bisect_ref
);
2070 handle_refs(submodule
, revs
, *flags
^ (UNINTERESTING
| BOTTOM
), for_each_good_bisect_ref
);
2072 } else if (!strcmp(arg
, "--tags")) {
2073 handle_refs(submodule
, revs
, *flags
, for_each_tag_ref_submodule
);
2074 clear_ref_exclusion(&revs
->ref_excludes
);
2075 } else if (!strcmp(arg
, "--remotes")) {
2076 handle_refs(submodule
, revs
, *flags
, for_each_remote_ref_submodule
);
2077 clear_ref_exclusion(&revs
->ref_excludes
);
2078 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
2079 struct all_refs_cb cb
;
2080 init_all_refs_cb(&cb
, revs
, *flags
);
2081 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
2082 clear_ref_exclusion(&revs
->ref_excludes
);
2084 } else if ((argcount
= parse_long_opt("exclude", argv
, &optarg
))) {
2085 add_ref_exclusion(&revs
->ref_excludes
, optarg
);
2087 } else if (starts_with(arg
, "--branches=")) {
2088 struct all_refs_cb cb
;
2089 init_all_refs_cb(&cb
, revs
, *flags
);
2090 for_each_glob_ref_in(handle_one_ref
, arg
+ 11, "refs/heads/", &cb
);
2091 clear_ref_exclusion(&revs
->ref_excludes
);
2092 } else if (starts_with(arg
, "--tags=")) {
2093 struct all_refs_cb cb
;
2094 init_all_refs_cb(&cb
, revs
, *flags
);
2095 for_each_glob_ref_in(handle_one_ref
, arg
+ 7, "refs/tags/", &cb
);
2096 clear_ref_exclusion(&revs
->ref_excludes
);
2097 } else if (starts_with(arg
, "--remotes=")) {
2098 struct all_refs_cb cb
;
2099 init_all_refs_cb(&cb
, revs
, *flags
);
2100 for_each_glob_ref_in(handle_one_ref
, arg
+ 10, "refs/remotes/", &cb
);
2101 clear_ref_exclusion(&revs
->ref_excludes
);
2102 } else if (!strcmp(arg
, "--reflog")) {
2103 add_reflogs_to_pending(revs
, *flags
);
2104 } else if (!strcmp(arg
, "--indexed-objects")) {
2105 add_index_objects_to_pending(revs
, *flags
);
2106 } else if (!strcmp(arg
, "--not")) {
2107 *flags
^= UNINTERESTING
| BOTTOM
;
2108 } else if (!strcmp(arg
, "--no-walk")) {
2109 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2110 } else if (starts_with(arg
, "--no-walk=")) {
2112 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2113 * not allowed, since the argument is optional.
2115 if (!strcmp(arg
+ 10, "sorted"))
2116 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2117 else if (!strcmp(arg
+ 10, "unsorted"))
2118 revs
->no_walk
= REVISION_WALK_NO_WALK_UNSORTED
;
2120 return error("invalid argument to --no-walk");
2121 } else if (!strcmp(arg
, "--do-walk")) {
2131 * Parse revision information, filling in the "rev_info" structure,
2132 * and removing the used arguments from the argument list.
2134 * Returns the number of arguments left that weren't recognized
2135 * (which are also moved to the head of the argument list)
2137 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
2139 int i
, flags
, left
, seen_dashdash
, read_from_stdin
, got_rev_arg
= 0, revarg_opt
;
2140 struct cmdline_pathspec prune_data
;
2141 const char *submodule
= NULL
;
2143 memset(&prune_data
, 0, sizeof(prune_data
));
2145 submodule
= opt
->submodule
;
2147 /* First, search for "--" */
2148 if (opt
&& opt
->assume_dashdash
) {
2152 for (i
= 1; i
< argc
; i
++) {
2153 const char *arg
= argv
[i
];
2154 if (strcmp(arg
, "--"))
2159 append_prune_data(&prune_data
, argv
+ i
+ 1);
2165 /* Second, deal with arguments and options */
2167 revarg_opt
= opt
? opt
->revarg_opt
: 0;
2169 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
2170 read_from_stdin
= 0;
2171 for (left
= i
= 1; i
< argc
; i
++) {
2172 const char *arg
= argv
[i
];
2176 opts
= handle_revision_pseudo_opt(submodule
,
2177 revs
, argc
- i
, argv
+ i
,
2184 if (!strcmp(arg
, "--stdin")) {
2185 if (revs
->disable_stdin
) {
2189 if (read_from_stdin
++)
2190 die("--stdin given twice?");
2191 read_revisions_from_stdin(revs
, &prune_data
);
2195 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
2206 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
2208 if (seen_dashdash
|| *arg
== '^')
2209 die("bad revision '%s'", arg
);
2211 /* If we didn't have a "--":
2212 * (1) all filenames must exist;
2213 * (2) all rev-args must not be interpretable
2214 * as a valid filename.
2215 * but the latter we have checked in the main loop.
2217 for (j
= i
; j
< argc
; j
++)
2218 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
2220 append_prune_data(&prune_data
, argv
+ i
);
2227 if (prune_data
.nr
) {
2229 * If we need to introduce the magic "a lone ':' means no
2230 * pathspec whatsoever", here is the place to do so.
2232 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2233 * prune_data.nr = 0;
2234 * prune_data.alloc = 0;
2235 * free(prune_data.path);
2236 * prune_data.path = NULL;
2238 * terminate prune_data.alloc with NULL and
2239 * call init_pathspec() to set revs->prune_data here.
2242 ALLOC_GROW(prune_data
.path
, prune_data
.nr
+ 1, prune_data
.alloc
);
2243 prune_data
.path
[prune_data
.nr
++] = NULL
;
2244 parse_pathspec(&revs
->prune_data
, 0, 0,
2245 revs
->prefix
, prune_data
.path
);
2248 if (revs
->def
== NULL
)
2249 revs
->def
= opt
? opt
->def
: NULL
;
2250 if (opt
&& opt
->tweak
)
2251 opt
->tweak(revs
, opt
);
2252 if (revs
->show_merge
)
2253 prepare_show_merge(revs
);
2254 if (revs
->def
&& !revs
->pending
.nr
&& !got_rev_arg
) {
2255 unsigned char sha1
[20];
2256 struct object
*object
;
2257 struct object_context oc
;
2258 if (get_sha1_with_context(revs
->def
, 0, sha1
, &oc
))
2259 die("bad default revision '%s'", revs
->def
);
2260 object
= get_reference(revs
, revs
->def
, sha1
, 0);
2261 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
);
2264 /* Did the user ask for any diff output? Run the diff! */
2265 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
2268 /* Pickaxe, diff-filter and rename following need diffs */
2269 if (revs
->diffopt
.pickaxe
||
2270 revs
->diffopt
.filter
||
2271 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
2274 if (revs
->topo_order
)
2277 if (revs
->prune_data
.nr
) {
2278 copy_pathspec(&revs
->pruning
.pathspec
, &revs
->prune_data
);
2279 /* Can't prune commits with rename following: the paths change.. */
2280 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
2282 if (!revs
->full_diff
)
2283 copy_pathspec(&revs
->diffopt
.pathspec
,
2286 if (revs
->combine_merges
)
2287 revs
->ignore_merges
= 0;
2288 revs
->diffopt
.abbrev
= revs
->abbrev
;
2290 if (revs
->line_level_traverse
) {
2292 revs
->topo_order
= 1;
2295 diff_setup_done(&revs
->diffopt
);
2297 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED
,
2298 &revs
->grep_filter
);
2299 compile_grep_patterns(&revs
->grep_filter
);
2301 if (revs
->reverse
&& revs
->reflog_info
)
2302 die("cannot combine --reverse with --walk-reflogs");
2303 if (revs
->rewrite_parents
&& revs
->children
.name
)
2304 die("cannot combine --parents and --children");
2307 * Limitations on the graph functionality
2309 if (revs
->reverse
&& revs
->graph
)
2310 die("cannot combine --reverse with --graph");
2312 if (revs
->reflog_info
&& revs
->graph
)
2313 die("cannot combine --walk-reflogs with --graph");
2314 if (revs
->no_walk
&& revs
->graph
)
2315 die("cannot combine --no-walk with --graph");
2316 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
2317 die("cannot use --grep-reflog without --walk-reflogs");
2319 if (revs
->first_parent_only
&& revs
->bisect
)
2320 die(_("--first-parent is incompatible with --bisect"));
2325 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
2327 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
2330 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
2333 static int remove_duplicate_parents(struct rev_info
*revs
, struct commit
*commit
)
2335 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2336 struct commit_list
**pp
, *p
;
2337 int surviving_parents
;
2339 /* Examine existing parents while marking ones we have seen... */
2340 pp
= &commit
->parents
;
2341 surviving_parents
= 0;
2342 while ((p
= *pp
) != NULL
) {
2343 struct commit
*parent
= p
->item
;
2344 if (parent
->object
.flags
& TMP_MARK
) {
2347 compact_treesame(revs
, commit
, surviving_parents
);
2350 parent
->object
.flags
|= TMP_MARK
;
2351 surviving_parents
++;
2354 /* clear the temporary mark */
2355 for (p
= commit
->parents
; p
; p
= p
->next
) {
2356 p
->item
->object
.flags
&= ~TMP_MARK
;
2358 /* no update_treesame() - removing duplicates can't affect TREESAME */
2359 return surviving_parents
;
2362 struct merge_simplify_state
{
2363 struct commit
*simplified
;
2366 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
2368 struct merge_simplify_state
*st
;
2370 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
2372 st
= xcalloc(1, sizeof(*st
));
2373 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
2378 static int mark_redundant_parents(struct rev_info
*revs
, struct commit
*commit
)
2380 struct commit_list
*h
= reduce_heads(commit
->parents
);
2381 int i
= 0, marked
= 0;
2382 struct commit_list
*po
, *pn
;
2384 /* Want these for sanity-checking only */
2385 int orig_cnt
= commit_list_count(commit
->parents
);
2386 int cnt
= commit_list_count(h
);
2389 * Not ready to remove items yet, just mark them for now, based
2390 * on the output of reduce_heads(). reduce_heads outputs the reduced
2391 * set in its original order, so this isn't too hard.
2393 po
= commit
->parents
;
2396 if (pn
&& po
->item
== pn
->item
) {
2400 po
->item
->object
.flags
|= TMP_MARK
;
2406 if (i
!= cnt
|| cnt
+marked
!= orig_cnt
)
2407 die("mark_redundant_parents %d %d %d %d", orig_cnt
, cnt
, i
, marked
);
2409 free_commit_list(h
);
2414 static int mark_treesame_root_parents(struct rev_info
*revs
, struct commit
*commit
)
2416 struct commit_list
*p
;
2419 for (p
= commit
->parents
; p
; p
= p
->next
) {
2420 struct commit
*parent
= p
->item
;
2421 if (!parent
->parents
&& (parent
->object
.flags
& TREESAME
)) {
2422 parent
->object
.flags
|= TMP_MARK
;
2431 * Awkward naming - this means one parent we are TREESAME to.
2432 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2433 * empty tree). Better name suggestions?
2435 static int leave_one_treesame_to_parent(struct rev_info
*revs
, struct commit
*commit
)
2437 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2438 struct commit
*unmarked
= NULL
, *marked
= NULL
;
2439 struct commit_list
*p
;
2442 for (p
= commit
->parents
, n
= 0; p
; p
= p
->next
, n
++) {
2443 if (ts
->treesame
[n
]) {
2444 if (p
->item
->object
.flags
& TMP_MARK
) {
2457 * If we are TREESAME to a marked-for-deletion parent, but not to any
2458 * unmarked parents, unmark the first TREESAME parent. This is the
2459 * parent that the default simplify_history==1 scan would have followed,
2460 * and it doesn't make sense to omit that path when asking for a
2461 * simplified full history. Retaining it improves the chances of
2462 * understanding odd missed merges that took an old version of a file.
2466 * I--------*X A modified the file, but mainline merge X used
2467 * \ / "-s ours", so took the version from I. X is
2468 * `-*A--' TREESAME to I and !TREESAME to A.
2470 * Default log from X would produce "I". Without this check,
2471 * --full-history --simplify-merges would produce "I-A-X", showing
2472 * the merge commit X and that it changed A, but not making clear that
2473 * it had just taken the I version. With this check, the topology above
2476 * Note that it is possible that the simplification chooses a different
2477 * TREESAME parent from the default, in which case this test doesn't
2478 * activate, and we _do_ drop the default parent. Example:
2480 * I------X A modified the file, but it was reverted in B,
2481 * \ / meaning mainline merge X is TREESAME to both
2484 * Default log would produce "I" by following the first parent;
2485 * --full-history --simplify-merges will produce "I-A-B". But this is a
2486 * reasonable result - it presents a logical full history leading from
2487 * I to X, and X is not an important merge.
2489 if (!unmarked
&& marked
) {
2490 marked
->object
.flags
&= ~TMP_MARK
;
2497 static int remove_marked_parents(struct rev_info
*revs
, struct commit
*commit
)
2499 struct commit_list
**pp
, *p
;
2500 int nth_parent
, removed
= 0;
2502 pp
= &commit
->parents
;
2504 while ((p
= *pp
) != NULL
) {
2505 struct commit
*parent
= p
->item
;
2506 if (parent
->object
.flags
& TMP_MARK
) {
2507 parent
->object
.flags
&= ~TMP_MARK
;
2511 compact_treesame(revs
, commit
, nth_parent
);
2518 /* Removing parents can only increase TREESAMEness */
2519 if (removed
&& !(commit
->object
.flags
& TREESAME
))
2520 update_treesame(revs
, commit
);
2525 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
2527 struct commit_list
*p
;
2528 struct commit
*parent
;
2529 struct merge_simplify_state
*st
, *pst
;
2532 st
= locate_simplify_state(revs
, commit
);
2535 * Have we handled this one?
2541 * An UNINTERESTING commit simplifies to itself, so does a
2542 * root commit. We do not rewrite parents of such commit
2545 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
2546 st
->simplified
= commit
;
2551 * Do we know what commit all of our parents that matter
2552 * should be rewritten to? Otherwise we are not ready to
2553 * rewrite this one yet.
2555 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
2556 pst
= locate_simplify_state(revs
, p
->item
);
2557 if (!pst
->simplified
) {
2558 tail
= &commit_list_insert(p
->item
, tail
)->next
;
2561 if (revs
->first_parent_only
)
2565 tail
= &commit_list_insert(commit
, tail
)->next
;
2570 * Rewrite our list of parents. Note that this cannot
2571 * affect our TREESAME flags in any way - a commit is
2572 * always TREESAME to its simplification.
2574 for (p
= commit
->parents
; p
; p
= p
->next
) {
2575 pst
= locate_simplify_state(revs
, p
->item
);
2576 p
->item
= pst
->simplified
;
2577 if (revs
->first_parent_only
)
2581 if (revs
->first_parent_only
)
2584 cnt
= remove_duplicate_parents(revs
, commit
);
2587 * It is possible that we are a merge and one side branch
2588 * does not have any commit that touches the given paths;
2589 * in such a case, the immediate parent from that branch
2590 * will be rewritten to be the merge base.
2592 * o----X X: the commit we are looking at;
2593 * / / o: a commit that touches the paths;
2596 * Further, a merge of an independent branch that doesn't
2597 * touch the path will reduce to a treesame root parent:
2599 * ----o----X X: the commit we are looking at;
2600 * / o: a commit that touches the paths;
2601 * r r: a root commit not touching the paths
2603 * Detect and simplify both cases.
2606 int marked
= mark_redundant_parents(revs
, commit
);
2607 marked
+= mark_treesame_root_parents(revs
, commit
);
2609 marked
-= leave_one_treesame_to_parent(revs
, commit
);
2611 cnt
= remove_marked_parents(revs
, commit
);
2615 * A commit simplifies to itself if it is a root, if it is
2616 * UNINTERESTING, if it touches the given paths, or if it is a
2617 * merge and its parents don't simplify to one relevant commit
2618 * (the first two cases are already handled at the beginning of
2621 * Otherwise, it simplifies to what its sole relevant parent
2625 (commit
->object
.flags
& UNINTERESTING
) ||
2626 !(commit
->object
.flags
& TREESAME
) ||
2627 (parent
= one_relevant_parent(revs
, commit
->parents
)) == NULL
)
2628 st
->simplified
= commit
;
2630 pst
= locate_simplify_state(revs
, parent
);
2631 st
->simplified
= pst
->simplified
;
2636 static void simplify_merges(struct rev_info
*revs
)
2638 struct commit_list
*list
, *next
;
2639 struct commit_list
*yet_to_do
, **tail
;
2640 struct commit
*commit
;
2645 /* feed the list reversed */
2647 for (list
= revs
->commits
; list
; list
= next
) {
2648 commit
= list
->item
;
2651 * Do not free(list) here yet; the original list
2652 * is used later in this function.
2654 commit_list_insert(commit
, &yet_to_do
);
2661 commit
= list
->item
;
2665 tail
= simplify_one(revs
, commit
, tail
);
2669 /* clean up the result, removing the simplified ones */
2670 list
= revs
->commits
;
2671 revs
->commits
= NULL
;
2672 tail
= &revs
->commits
;
2674 struct merge_simplify_state
*st
;
2676 commit
= list
->item
;
2680 st
= locate_simplify_state(revs
, commit
);
2681 if (st
->simplified
== commit
)
2682 tail
= &commit_list_insert(commit
, tail
)->next
;
2686 static void set_children(struct rev_info
*revs
)
2688 struct commit_list
*l
;
2689 for (l
= revs
->commits
; l
; l
= l
->next
) {
2690 struct commit
*commit
= l
->item
;
2691 struct commit_list
*p
;
2693 for (p
= commit
->parents
; p
; p
= p
->next
)
2694 add_child(revs
, p
->item
, commit
);
2698 void reset_revision_walk(void)
2700 clear_object_flags(SEEN
| ADDED
| SHOWN
);
2703 int prepare_revision_walk(struct rev_info
*revs
)
2706 struct object_array old_pending
;
2707 struct commit_list
**next
= &revs
->commits
;
2709 memcpy(&old_pending
, &revs
->pending
, sizeof(old_pending
));
2710 revs
->pending
.nr
= 0;
2711 revs
->pending
.alloc
= 0;
2712 revs
->pending
.objects
= NULL
;
2713 for (i
= 0; i
< old_pending
.nr
; i
++) {
2714 struct object_array_entry
*e
= old_pending
.objects
+ i
;
2715 struct commit
*commit
= handle_commit(revs
, e
);
2717 if (!(commit
->object
.flags
& SEEN
)) {
2718 commit
->object
.flags
|= SEEN
;
2719 next
= commit_list_append(commit
, next
);
2723 if (!revs
->leak_pending
)
2724 object_array_clear(&old_pending
);
2726 /* Signal whether we need per-parent treesame decoration */
2727 if (revs
->simplify_merges
||
2728 (revs
->limited
&& limiting_can_increase_treesame(revs
)))
2729 revs
->treesame
.name
= "treesame";
2731 if (revs
->no_walk
!= REVISION_WALK_NO_WALK_UNSORTED
)
2732 commit_list_sort_by_date(&revs
->commits
);
2736 if (limit_list(revs
) < 0)
2738 if (revs
->topo_order
)
2739 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
2740 if (revs
->line_level_traverse
)
2741 line_log_filter(revs
);
2742 if (revs
->simplify_merges
)
2743 simplify_merges(revs
);
2744 if (revs
->children
.name
)
2749 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
2751 struct commit_list
*cache
= NULL
;
2754 struct commit
*p
= *pp
;
2756 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
2757 return rewrite_one_error
;
2758 if (p
->object
.flags
& UNINTERESTING
)
2759 return rewrite_one_ok
;
2760 if (!(p
->object
.flags
& TREESAME
))
2761 return rewrite_one_ok
;
2763 return rewrite_one_noparents
;
2764 if ((p
= one_relevant_parent(revs
, p
->parents
)) == NULL
)
2765 return rewrite_one_ok
;
2770 int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
,
2771 rewrite_parent_fn_t rewrite_parent
)
2773 struct commit_list
**pp
= &commit
->parents
;
2775 struct commit_list
*parent
= *pp
;
2776 switch (rewrite_parent(revs
, &parent
->item
)) {
2777 case rewrite_one_ok
:
2779 case rewrite_one_noparents
:
2782 case rewrite_one_error
:
2787 remove_duplicate_parents(revs
, commit
);
2791 static int commit_rewrite_person(struct strbuf
*buf
, const char *what
, struct string_list
*mailmap
)
2793 char *person
, *endp
;
2794 size_t len
, namelen
, maillen
;
2797 struct ident_split ident
;
2799 person
= strstr(buf
->buf
, what
);
2803 person
+= strlen(what
);
2804 endp
= strchr(person
, '\n');
2808 len
= endp
- person
;
2810 if (split_ident_line(&ident
, person
, len
))
2813 mail
= ident
.mail_begin
;
2814 maillen
= ident
.mail_end
- ident
.mail_begin
;
2815 name
= ident
.name_begin
;
2816 namelen
= ident
.name_end
- ident
.name_begin
;
2818 if (map_user(mailmap
, &mail
, &maillen
, &name
, &namelen
)) {
2819 struct strbuf namemail
= STRBUF_INIT
;
2821 strbuf_addf(&namemail
, "%.*s <%.*s>",
2822 (int)namelen
, name
, (int)maillen
, mail
);
2824 strbuf_splice(buf
, ident
.name_begin
- buf
->buf
,
2825 ident
.mail_end
- ident
.name_begin
+ 1,
2826 namemail
.buf
, namemail
.len
);
2828 strbuf_release(&namemail
);
2836 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
2839 const char *encoding
;
2840 const char *message
;
2841 struct strbuf buf
= STRBUF_INIT
;
2843 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
2846 /* Prepend "fake" headers as needed */
2847 if (opt
->grep_filter
.use_reflog_filter
) {
2848 strbuf_addstr(&buf
, "reflog ");
2849 get_reflog_message(&buf
, opt
->reflog_info
);
2850 strbuf_addch(&buf
, '\n');
2854 * We grep in the user's output encoding, under the assumption that it
2855 * is the encoding they are most likely to write their grep pattern
2856 * for. In addition, it means we will match the "notes" encoding below,
2857 * so we will not end up with a buffer that has two different encodings
2860 encoding
= get_log_output_encoding();
2861 message
= logmsg_reencode(commit
, NULL
, encoding
);
2863 /* Copy the commit to temporary if we are using "fake" headers */
2865 strbuf_addstr(&buf
, message
);
2867 if (opt
->grep_filter
.header_list
&& opt
->mailmap
) {
2869 strbuf_addstr(&buf
, message
);
2871 commit_rewrite_person(&buf
, "\nauthor ", opt
->mailmap
);
2872 commit_rewrite_person(&buf
, "\ncommitter ", opt
->mailmap
);
2875 /* Append "fake" message parts as needed */
2876 if (opt
->show_notes
) {
2878 strbuf_addstr(&buf
, message
);
2879 format_display_notes(commit
->object
.sha1
, &buf
, encoding
, 1);
2883 * Find either in the original commit message, or in the temporary.
2884 * Note that we cast away the constness of "message" here. It is
2885 * const because it may come from the cached commit buffer. That's OK,
2886 * because we know that it is modifiable heap memory, and that while
2887 * grep_buffer may modify it for speed, it will restore any
2888 * changes before returning.
2891 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
2893 retval
= grep_buffer(&opt
->grep_filter
,
2894 (char *)message
, strlen(message
));
2895 strbuf_release(&buf
);
2896 unuse_commit_buffer(commit
, message
);
2897 return opt
->invert_grep
? !retval
: retval
;
2900 static inline int want_ancestry(const struct rev_info
*revs
)
2902 return (revs
->rewrite_parents
|| revs
->children
.name
);
2905 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
2907 if (commit
->object
.flags
& SHOWN
)
2908 return commit_ignore
;
2909 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
))
2910 return commit_ignore
;
2913 if (commit
->object
.flags
& UNINTERESTING
)
2914 return commit_ignore
;
2915 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
2916 return commit_ignore
;
2917 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
2918 int n
= commit_list_count(commit
->parents
);
2919 if ((n
< revs
->min_parents
) ||
2920 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
2921 return commit_ignore
;
2923 if (!commit_match(commit
, revs
))
2924 return commit_ignore
;
2925 if (revs
->prune
&& revs
->dense
) {
2926 /* Commit without changes? */
2927 if (commit
->object
.flags
& TREESAME
) {
2929 struct commit_list
*p
;
2930 /* drop merges unless we want parenthood */
2931 if (!want_ancestry(revs
))
2932 return commit_ignore
;
2934 * If we want ancestry, then need to keep any merges
2935 * between relevant commits to tie together topology.
2936 * For consistency with TREESAME and simplification
2937 * use "relevant" here rather than just INTERESTING,
2938 * to treat bottom commit(s) as part of the topology.
2940 for (n
= 0, p
= commit
->parents
; p
; p
= p
->next
)
2941 if (relevant_commit(p
->item
))
2944 return commit_ignore
;
2950 define_commit_slab(saved_parents
, struct commit_list
*);
2952 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
2955 * You may only call save_parents() once per commit (this is checked
2956 * for non-root commits).
2958 static void save_parents(struct rev_info
*revs
, struct commit
*commit
)
2960 struct commit_list
**pp
;
2962 if (!revs
->saved_parents_slab
) {
2963 revs
->saved_parents_slab
= xmalloc(sizeof(struct saved_parents
));
2964 init_saved_parents(revs
->saved_parents_slab
);
2967 pp
= saved_parents_at(revs
->saved_parents_slab
, commit
);
2970 * When walking with reflogs, we may visit the same commit
2971 * several times: once for each appearance in the reflog.
2973 * In this case, save_parents() will be called multiple times.
2974 * We want to keep only the first set of parents. We need to
2975 * store a sentinel value for an empty (i.e., NULL) parent
2976 * list to distinguish it from a not-yet-saved list, however.
2980 if (commit
->parents
)
2981 *pp
= copy_commit_list(commit
->parents
);
2983 *pp
= EMPTY_PARENT_LIST
;
2986 static void free_saved_parents(struct rev_info
*revs
)
2988 if (revs
->saved_parents_slab
)
2989 clear_saved_parents(revs
->saved_parents_slab
);
2992 struct commit_list
*get_saved_parents(struct rev_info
*revs
, const struct commit
*commit
)
2994 struct commit_list
*parents
;
2996 if (!revs
->saved_parents_slab
)
2997 return commit
->parents
;
2999 parents
= *saved_parents_at(revs
->saved_parents_slab
, commit
);
3000 if (parents
== EMPTY_PARENT_LIST
)
3005 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
3007 enum commit_action action
= get_commit_action(revs
, commit
);
3009 if (action
== commit_show
&&
3011 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
3013 * --full-diff on simplified parents is no good: it
3014 * will show spurious changes from the commits that
3015 * were elided. So we save the parents on the side
3016 * when --full-diff is in effect.
3018 if (revs
->full_diff
)
3019 save_parents(revs
, commit
);
3020 if (rewrite_parents(revs
, commit
, rewrite_one
) < 0)
3021 return commit_error
;
3026 static void track_linear(struct rev_info
*revs
, struct commit
*commit
)
3028 if (revs
->track_first_time
) {
3030 revs
->track_first_time
= 0;
3032 struct commit_list
*p
;
3033 for (p
= revs
->previous_parents
; p
; p
= p
->next
)
3034 if (p
->item
== NULL
|| /* first commit */
3035 !hashcmp(p
->item
->object
.sha1
, commit
->object
.sha1
))
3037 revs
->linear
= p
!= NULL
;
3039 if (revs
->reverse
) {
3041 commit
->object
.flags
|= TRACK_LINEAR
;
3043 free_commit_list(revs
->previous_parents
);
3044 revs
->previous_parents
= copy_commit_list(commit
->parents
);
3047 static struct commit
*get_revision_1(struct rev_info
*revs
)
3053 struct commit_list
*entry
= revs
->commits
;
3054 struct commit
*commit
= entry
->item
;
3056 revs
->commits
= entry
->next
;
3059 if (revs
->reflog_info
) {
3060 save_parents(revs
, commit
);
3061 fake_reflog_parent(revs
->reflog_info
, commit
);
3062 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
3066 * If we haven't done the list limiting, we need to look at
3067 * the parents here. We also need to do the date-based limiting
3068 * that we'd otherwise have done in limit_list().
3070 if (!revs
->limited
) {
3071 if (revs
->max_age
!= -1 &&
3072 (commit
->date
< revs
->max_age
))
3074 if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0) {
3075 if (!revs
->ignore_missing_links
)
3076 die("Failed to traverse parents of commit %s",
3077 sha1_to_hex(commit
->object
.sha1
));
3081 switch (simplify_commit(revs
, commit
)) {
3085 die("Failed to simplify parents of commit %s",
3086 sha1_to_hex(commit
->object
.sha1
));
3088 if (revs
->track_linear
)
3089 track_linear(revs
, commit
);
3092 } while (revs
->commits
);
3097 * Return true for entries that have not yet been shown. (This is an
3098 * object_array_each_func_t.)
3100 static int entry_unshown(struct object_array_entry
*entry
, void *cb_data_unused
)
3102 return !(entry
->item
->flags
& SHOWN
);
3106 * If array is on the verge of a realloc, garbage-collect any entries
3107 * that have already been shown to try to free up some space.
3109 static void gc_boundary(struct object_array
*array
)
3111 if (array
->nr
== array
->alloc
)
3112 object_array_filter(array
, entry_unshown
, NULL
);
3115 static void create_boundary_commit_list(struct rev_info
*revs
)
3119 struct object_array
*array
= &revs
->boundary_commits
;
3120 struct object_array_entry
*objects
= array
->objects
;
3123 * If revs->commits is non-NULL at this point, an error occurred in
3124 * get_revision_1(). Ignore the error and continue printing the
3125 * boundary commits anyway. (This is what the code has always
3128 if (revs
->commits
) {
3129 free_commit_list(revs
->commits
);
3130 revs
->commits
= NULL
;
3134 * Put all of the actual boundary commits from revs->boundary_commits
3135 * into revs->commits
3137 for (i
= 0; i
< array
->nr
; i
++) {
3138 c
= (struct commit
*)(objects
[i
].item
);
3141 if (!(c
->object
.flags
& CHILD_SHOWN
))
3143 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
3145 c
->object
.flags
|= BOUNDARY
;
3146 commit_list_insert(c
, &revs
->commits
);
3150 * If revs->topo_order is set, sort the boundary commits
3151 * in topological order
3153 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
3156 static struct commit
*get_revision_internal(struct rev_info
*revs
)
3158 struct commit
*c
= NULL
;
3159 struct commit_list
*l
;
3161 if (revs
->boundary
== 2) {
3163 * All of the normal commits have already been returned,
3164 * and we are now returning boundary commits.
3165 * create_boundary_commit_list() has populated
3166 * revs->commits with the remaining commits to return.
3168 c
= pop_commit(&revs
->commits
);
3170 c
->object
.flags
|= SHOWN
;
3175 * If our max_count counter has reached zero, then we are done. We
3176 * don't simply return NULL because we still might need to show
3177 * boundary commits. But we want to avoid calling get_revision_1, which
3178 * might do a considerable amount of work finding the next commit only
3179 * for us to throw it away.
3181 * If it is non-zero, then either we don't have a max_count at all
3182 * (-1), or it is still counting, in which case we decrement.
3184 if (revs
->max_count
) {
3185 c
= get_revision_1(revs
);
3187 while (revs
->skip_count
> 0) {
3189 c
= get_revision_1(revs
);
3195 if (revs
->max_count
> 0)
3200 c
->object
.flags
|= SHOWN
;
3202 if (!revs
->boundary
)
3207 * get_revision_1() runs out the commits, and
3208 * we are done computing the boundaries.
3209 * switch to boundary commits output mode.
3214 * Update revs->commits to contain the list of
3217 create_boundary_commit_list(revs
);
3219 return get_revision_internal(revs
);
3223 * boundary commits are the commits that are parents of the
3224 * ones we got from get_revision_1() but they themselves are
3225 * not returned from get_revision_1(). Before returning
3226 * 'c', we need to mark its parents that they could be boundaries.
3229 for (l
= c
->parents
; l
; l
= l
->next
) {
3231 p
= &(l
->item
->object
);
3232 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
3234 p
->flags
|= CHILD_SHOWN
;
3235 gc_boundary(&revs
->boundary_commits
);
3236 add_object_array(p
, NULL
, &revs
->boundary_commits
);
3242 struct commit
*get_revision(struct rev_info
*revs
)
3245 struct commit_list
*reversed
;
3247 if (revs
->reverse
) {
3249 while ((c
= get_revision_internal(revs
)))
3250 commit_list_insert(c
, &reversed
);
3251 revs
->commits
= reversed
;
3253 revs
->reverse_output_stage
= 1;
3256 if (revs
->reverse_output_stage
) {
3257 c
= pop_commit(&revs
->commits
);
3258 if (revs
->track_linear
)
3259 revs
->linear
= !!(c
&& c
->object
.flags
& TRACK_LINEAR
);
3263 c
= get_revision_internal(revs
);
3264 if (c
&& revs
->graph
)
3265 graph_update(revs
->graph
, c
);
3267 free_saved_parents(revs
);
3268 if (revs
->previous_parents
) {
3269 free_commit_list(revs
->previous_parents
);
3270 revs
->previous_parents
= NULL
;
3276 char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
3278 if (commit
->object
.flags
& BOUNDARY
)
3280 else if (commit
->object
.flags
& UNINTERESTING
)
3282 else if (commit
->object
.flags
& PATCHSAME
)
3284 else if (!revs
|| revs
->left_right
) {
3285 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
3289 } else if (revs
->graph
)
3291 else if (revs
->cherry_mark
)
3296 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
3298 char *mark
= get_revision_mark(revs
, commit
);
3301 fputs(mark
, stdout
);