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 const struct name_path
*p
;
28 int nlen
= strlen(name
);
31 for (p
= path
; p
; p
= p
->up
) {
33 len
+= p
->elem_len
+ 1;
36 m
= n
+ len
- (nlen
+ 1);
38 for (p
= path
; p
; p
= p
->up
) {
41 memcpy(m
, p
->elem
, p
->elem_len
);
48 static int show_path_component_truncated(FILE *out
, const char *name
, int len
)
51 for (cnt
= 0; cnt
< len
; cnt
++) {
53 if (!ch
|| ch
== '\n')
60 static int show_path_truncated(FILE *out
, const struct name_path
*path
)
66 emitted
= show_path_truncated(out
, path
->up
);
71 ours
= show_path_component_truncated(out
, path
->elem
, path
->elem_len
);
74 return ours
|| emitted
;
77 void show_object_with_name(FILE *out
, struct object
*obj
,
78 const struct name_path
*path
, const char *component
)
80 struct name_path leaf
;
81 leaf
.up
= (struct name_path
*)path
;
82 leaf
.elem
= component
;
83 leaf
.elem_len
= strlen(component
);
85 fprintf(out
, "%s ", sha1_to_hex(obj
->sha1
));
86 show_path_truncated(out
, &leaf
);
90 static void mark_blob_uninteresting(struct blob
*blob
)
94 if (blob
->object
.flags
& UNINTERESTING
)
96 blob
->object
.flags
|= UNINTERESTING
;
99 static void mark_tree_contents_uninteresting(struct tree
*tree
)
101 struct tree_desc desc
;
102 struct name_entry entry
;
103 struct object
*obj
= &tree
->object
;
105 if (!has_sha1_file(obj
->sha1
))
107 if (parse_tree(tree
) < 0)
108 die("bad tree %s", sha1_to_hex(obj
->sha1
));
110 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
111 while (tree_entry(&desc
, &entry
)) {
112 switch (object_type(entry
.mode
)) {
114 mark_tree_uninteresting(lookup_tree(entry
.sha1
));
117 mark_blob_uninteresting(lookup_blob(entry
.sha1
));
120 /* Subproject commit - not in this repository */
126 * We don't care about the tree any more
127 * after it has been marked uninteresting.
129 free_tree_buffer(tree
);
132 void mark_tree_uninteresting(struct tree
*tree
)
134 struct object
*obj
= &tree
->object
;
138 if (obj
->flags
& UNINTERESTING
)
140 obj
->flags
|= UNINTERESTING
;
141 mark_tree_contents_uninteresting(tree
);
144 void mark_parents_uninteresting(struct commit
*commit
)
146 struct commit_list
*parents
= NULL
, *l
;
148 for (l
= commit
->parents
; l
; l
= l
->next
)
149 commit_list_insert(l
->item
, &parents
);
152 struct commit
*commit
= parents
->item
;
154 parents
= parents
->next
;
159 * A missing commit is ok iff its parent is marked
162 * We just mark such a thing parsed, so that when
163 * it is popped next time around, we won't be trying
164 * to parse it and get an error.
166 if (!has_sha1_file(commit
->object
.sha1
))
167 commit
->object
.parsed
= 1;
169 if (commit
->object
.flags
& UNINTERESTING
)
172 commit
->object
.flags
|= UNINTERESTING
;
175 * Normally we haven't parsed the parent
176 * yet, so we won't have a parent of a parent
177 * here. However, it may turn out that we've
178 * reached this commit some other way (where it
179 * wasn't uninteresting), in which case we need
180 * to mark its parents recursively too..
182 if (!commit
->parents
)
185 for (l
= commit
->parents
->next
; l
; l
= l
->next
)
186 commit_list_insert(l
->item
, &parents
);
187 commit
= commit
->parents
->item
;
192 static void add_pending_object_with_path(struct rev_info
*revs
,
194 const char *name
, unsigned mode
,
199 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
201 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
202 struct strbuf buf
= STRBUF_INIT
;
203 int len
= interpret_branch_name(name
, 0, &buf
);
206 if (0 < len
&& name
[len
] && buf
.len
)
207 strbuf_addstr(&buf
, name
+ len
);
208 st
= add_reflog_for_walk(revs
->reflog_info
,
209 (struct commit
*)obj
,
210 buf
.buf
[0] ? buf
.buf
: name
);
211 strbuf_release(&buf
);
215 add_object_array_with_path(obj
, name
, &revs
->pending
, mode
, path
);
218 static void add_pending_object_with_mode(struct rev_info
*revs
,
220 const char *name
, unsigned mode
)
222 add_pending_object_with_path(revs
, obj
, name
, mode
, NULL
);
225 void add_pending_object(struct rev_info
*revs
,
226 struct object
*obj
, const char *name
)
228 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
231 void add_head_to_pending(struct rev_info
*revs
)
233 unsigned char sha1
[20];
235 if (get_sha1("HEAD", sha1
))
237 obj
= parse_object(sha1
);
240 add_pending_object(revs
, obj
, "HEAD");
243 static struct object
*get_reference(struct rev_info
*revs
, const char *name
,
244 const unsigned char *sha1
,
247 struct object
*object
;
249 object
= parse_object(sha1
);
251 if (revs
->ignore_missing
)
253 die("bad object %s", name
);
255 object
->flags
|= flags
;
259 void add_pending_sha1(struct rev_info
*revs
, const char *name
,
260 const unsigned char *sha1
, unsigned int flags
)
262 struct object
*object
= get_reference(revs
, name
, sha1
, flags
);
263 add_pending_object(revs
, object
, name
);
266 static struct commit
*handle_commit(struct rev_info
*revs
,
267 struct object_array_entry
*entry
)
269 struct object
*object
= entry
->item
;
270 const char *name
= entry
->name
;
271 const char *path
= entry
->path
;
272 unsigned int mode
= entry
->mode
;
273 unsigned long flags
= object
->flags
;
276 * Tag object? Look what it points to..
278 while (object
->type
== OBJ_TAG
) {
279 struct tag
*tag
= (struct tag
*) object
;
280 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
281 add_pending_object(revs
, object
, tag
->tag
);
284 object
= parse_object(tag
->tagged
->sha1
);
286 if (flags
& UNINTERESTING
)
288 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
290 object
->flags
|= flags
;
292 * We'll handle the tagged object by looping or dropping
293 * through to the non-tag handlers below. Do not
294 * propagate data from the tag's pending entry.
302 * Commit object? Just return it, we'll do all the complex
305 if (object
->type
== OBJ_COMMIT
) {
306 struct commit
*commit
= (struct commit
*)object
;
307 if (parse_commit(commit
) < 0)
308 die("unable to parse commit %s", name
);
309 if (flags
& UNINTERESTING
) {
310 mark_parents_uninteresting(commit
);
313 if (revs
->show_source
&& !commit
->util
)
314 commit
->util
= xstrdup(name
);
319 * Tree object? Either mark it uninteresting, or add it
320 * to the list of objects to look at later..
322 if (object
->type
== OBJ_TREE
) {
323 struct tree
*tree
= (struct tree
*)object
;
324 if (!revs
->tree_objects
)
326 if (flags
& UNINTERESTING
) {
327 mark_tree_contents_uninteresting(tree
);
330 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
335 * Blob object? You know the drill by now..
337 if (object
->type
== OBJ_BLOB
) {
338 if (!revs
->blob_objects
)
340 if (flags
& UNINTERESTING
)
342 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
345 die("%s is unknown object", name
);
348 static int everybody_uninteresting(struct commit_list
*orig
,
349 struct commit
**interesting_cache
)
351 struct commit_list
*list
= orig
;
353 if (*interesting_cache
) {
354 struct commit
*commit
= *interesting_cache
;
355 if (!(commit
->object
.flags
& UNINTERESTING
))
360 struct commit
*commit
= list
->item
;
362 if (commit
->object
.flags
& UNINTERESTING
)
364 if (interesting_cache
)
365 *interesting_cache
= commit
;
372 * A definition of "relevant" commit that we can use to simplify limited graphs
373 * by eliminating side branches.
375 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
376 * in our list), or that is a specified BOTTOM commit. Then after computing
377 * a limited list, during processing we can generally ignore boundary merges
378 * coming from outside the graph, (ie from irrelevant parents), and treat
379 * those merges as if they were single-parent. TREESAME is defined to consider
380 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
381 * we don't care if we were !TREESAME to non-graph parents.
383 * Treating bottom commits as relevant ensures that a limited graph's
384 * connection to the actual bottom commit is not viewed as a side branch, but
385 * treated as part of the graph. For example:
387 * ....Z...A---X---o---o---B
391 * When computing "A..B", the A-X connection is at least as important as
392 * Y-X, despite A being flagged UNINTERESTING.
394 * And when computing --ancestry-path "A..B", the A-X connection is more
395 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
397 static inline int relevant_commit(struct commit
*commit
)
399 return (commit
->object
.flags
& (UNINTERESTING
| BOTTOM
)) != UNINTERESTING
;
403 * Return a single relevant commit from a parent list. If we are a TREESAME
404 * commit, and this selects one of our parents, then we can safely simplify to
407 static struct commit
*one_relevant_parent(const struct rev_info
*revs
,
408 struct commit_list
*orig
)
410 struct commit_list
*list
= orig
;
411 struct commit
*relevant
= NULL
;
417 * For 1-parent commits, or if first-parent-only, then return that
418 * first parent (even if not "relevant" by the above definition).
419 * TREESAME will have been set purely on that parent.
421 if (revs
->first_parent_only
|| !orig
->next
)
425 * For multi-parent commits, identify a sole relevant parent, if any.
426 * If we have only one relevant parent, then TREESAME will be set purely
427 * with regard to that parent, and we can simplify accordingly.
429 * If we have more than one relevant parent, or no relevant parents
430 * (and multiple irrelevant ones), then we can't select a parent here
434 struct commit
*commit
= list
->item
;
436 if (relevant_commit(commit
)) {
446 * The goal is to get REV_TREE_NEW as the result only if the
447 * diff consists of all '+' (and no other changes), REV_TREE_OLD
448 * if the whole diff is removal of old data, and otherwise
449 * REV_TREE_DIFFERENT (of course if the trees are the same we
450 * want REV_TREE_SAME).
451 * That means that once we get to REV_TREE_DIFFERENT, we do not
452 * have to look any further.
454 static int tree_difference
= REV_TREE_SAME
;
456 static void file_add_remove(struct diff_options
*options
,
457 int addremove
, unsigned mode
,
458 const unsigned char *sha1
,
460 const char *fullpath
, unsigned dirty_submodule
)
462 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
464 tree_difference
|= diff
;
465 if (tree_difference
== REV_TREE_DIFFERENT
)
466 DIFF_OPT_SET(options
, HAS_CHANGES
);
469 static void file_change(struct diff_options
*options
,
470 unsigned old_mode
, unsigned new_mode
,
471 const unsigned char *old_sha1
,
472 const unsigned char *new_sha1
,
473 int old_sha1_valid
, int new_sha1_valid
,
474 const char *fullpath
,
475 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
477 tree_difference
= REV_TREE_DIFFERENT
;
478 DIFF_OPT_SET(options
, HAS_CHANGES
);
481 static int rev_compare_tree(struct rev_info
*revs
,
482 struct commit
*parent
, struct commit
*commit
)
484 struct tree
*t1
= parent
->tree
;
485 struct tree
*t2
= commit
->tree
;
492 if (revs
->simplify_by_decoration
) {
494 * If we are simplifying by decoration, then the commit
495 * is worth showing if it has a tag pointing at it.
497 if (get_name_decoration(&commit
->object
))
498 return REV_TREE_DIFFERENT
;
500 * A commit that is not pointed by a tag is uninteresting
501 * if we are not limited by path. This means that you will
502 * see the usual "commits that touch the paths" plus any
503 * tagged commit by specifying both --simplify-by-decoration
506 if (!revs
->prune_data
.nr
)
507 return REV_TREE_SAME
;
510 tree_difference
= REV_TREE_SAME
;
511 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
512 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
514 return REV_TREE_DIFFERENT
;
515 return tree_difference
;
518 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
521 struct tree
*t1
= commit
->tree
;
526 tree_difference
= REV_TREE_SAME
;
527 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
528 retval
= diff_tree_sha1(NULL
, t1
->object
.sha1
, "", &revs
->pruning
);
530 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
533 struct treesame_state
{
534 unsigned int nparents
;
535 unsigned char treesame
[FLEX_ARRAY
];
538 static struct treesame_state
*initialise_treesame(struct rev_info
*revs
, struct commit
*commit
)
540 unsigned n
= commit_list_count(commit
->parents
);
541 struct treesame_state
*st
= xcalloc(1, sizeof(*st
) + n
);
543 add_decoration(&revs
->treesame
, &commit
->object
, st
);
548 * Must be called immediately after removing the nth_parent from a commit's
549 * parent list, if we are maintaining the per-parent treesame[] decoration.
550 * This does not recalculate the master TREESAME flag - update_treesame()
551 * should be called to update it after a sequence of treesame[] modifications
552 * that may have affected it.
554 static int compact_treesame(struct rev_info
*revs
, struct commit
*commit
, unsigned nth_parent
)
556 struct treesame_state
*st
;
559 if (!commit
->parents
) {
561 * Have just removed the only parent from a non-merge.
562 * Different handling, as we lack decoration.
565 die("compact_treesame %u", nth_parent
);
566 old_same
= !!(commit
->object
.flags
& TREESAME
);
567 if (rev_same_tree_as_empty(revs
, commit
))
568 commit
->object
.flags
|= TREESAME
;
570 commit
->object
.flags
&= ~TREESAME
;
574 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
575 if (!st
|| nth_parent
>= st
->nparents
)
576 die("compact_treesame %u", nth_parent
);
578 old_same
= st
->treesame
[nth_parent
];
579 memmove(st
->treesame
+ nth_parent
,
580 st
->treesame
+ nth_parent
+ 1,
581 st
->nparents
- nth_parent
- 1);
584 * If we've just become a non-merge commit, update TREESAME
585 * immediately, and remove the no-longer-needed decoration.
586 * If still a merge, defer update until update_treesame().
588 if (--st
->nparents
== 1) {
589 if (commit
->parents
->next
)
590 die("compact_treesame parents mismatch");
591 if (st
->treesame
[0] && revs
->dense
)
592 commit
->object
.flags
|= TREESAME
;
594 commit
->object
.flags
&= ~TREESAME
;
595 free(add_decoration(&revs
->treesame
, &commit
->object
, NULL
));
601 static unsigned update_treesame(struct rev_info
*revs
, struct commit
*commit
)
603 if (commit
->parents
&& commit
->parents
->next
) {
605 struct treesame_state
*st
;
606 struct commit_list
*p
;
607 unsigned relevant_parents
;
608 unsigned relevant_change
, irrelevant_change
;
610 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
612 die("update_treesame %s", sha1_to_hex(commit
->object
.sha1
));
613 relevant_parents
= 0;
614 relevant_change
= irrelevant_change
= 0;
615 for (p
= commit
->parents
, n
= 0; p
; n
++, p
= p
->next
) {
616 if (relevant_commit(p
->item
)) {
617 relevant_change
|= !st
->treesame
[n
];
620 irrelevant_change
|= !st
->treesame
[n
];
622 if (relevant_parents
? relevant_change
: irrelevant_change
)
623 commit
->object
.flags
&= ~TREESAME
;
625 commit
->object
.flags
|= TREESAME
;
628 return commit
->object
.flags
& TREESAME
;
631 static inline int limiting_can_increase_treesame(const struct rev_info
*revs
)
634 * TREESAME is irrelevant unless prune && dense;
635 * if simplify_history is set, we can't have a mixture of TREESAME and
636 * !TREESAME INTERESTING parents (and we don't have treesame[]
637 * decoration anyway);
638 * if first_parent_only is set, then the TREESAME flag is locked
639 * against the first parent (and again we lack treesame[] decoration).
641 return revs
->prune
&& revs
->dense
&&
642 !revs
->simplify_history
&&
643 !revs
->first_parent_only
;
646 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
648 struct commit_list
**pp
, *parent
;
649 struct treesame_state
*ts
= NULL
;
650 int relevant_change
= 0, irrelevant_change
= 0;
651 int relevant_parents
, nth_parent
;
654 * If we don't do pruning, everything is interesting
662 if (!commit
->parents
) {
663 if (rev_same_tree_as_empty(revs
, commit
))
664 commit
->object
.flags
|= TREESAME
;
669 * Normal non-merge commit? If we don't want to make the
670 * history dense, we consider it always to be a change..
672 if (!revs
->dense
&& !commit
->parents
->next
)
675 for (pp
= &commit
->parents
, nth_parent
= 0, relevant_parents
= 0;
676 (parent
= *pp
) != NULL
;
677 pp
= &parent
->next
, nth_parent
++) {
678 struct commit
*p
= parent
->item
;
679 if (relevant_commit(p
))
682 if (nth_parent
== 1) {
684 * This our second loop iteration - so we now know
685 * we're dealing with a merge.
687 * Do not compare with later parents when we care only about
688 * the first parent chain, in order to avoid derailing the
689 * traversal to follow a side branch that brought everything
690 * in the path we are limited to by the pathspec.
692 if (revs
->first_parent_only
)
695 * If this will remain a potentially-simplifiable
696 * merge, remember per-parent treesame if needed.
697 * Initialise the array with the comparison from our
700 if (revs
->treesame
.name
&&
701 !revs
->simplify_history
&&
702 !(commit
->object
.flags
& UNINTERESTING
)) {
703 ts
= initialise_treesame(revs
, commit
);
704 if (!(irrelevant_change
|| relevant_change
))
708 if (parse_commit(p
) < 0)
709 die("cannot simplify commit %s (because of %s)",
710 sha1_to_hex(commit
->object
.sha1
),
711 sha1_to_hex(p
->object
.sha1
));
712 switch (rev_compare_tree(revs
, p
, commit
)) {
714 if (!revs
->simplify_history
|| !relevant_commit(p
)) {
715 /* Even if a merge with an uninteresting
716 * side branch brought the entire change
717 * we are interested in, we do not want
718 * to lose the other branches of this
719 * merge, so we just keep going.
722 ts
->treesame
[nth_parent
] = 1;
726 commit
->parents
= parent
;
727 commit
->object
.flags
|= TREESAME
;
731 if (revs
->remove_empty_trees
&&
732 rev_same_tree_as_empty(revs
, p
)) {
733 /* We are adding all the specified
734 * paths from this parent, so the
735 * history beyond this parent is not
736 * interesting. Remove its parents
737 * (they are grandparents for us).
738 * IOW, we pretend this parent is a
741 if (parse_commit(p
) < 0)
742 die("cannot simplify commit %s (invalid %s)",
743 sha1_to_hex(commit
->object
.sha1
),
744 sha1_to_hex(p
->object
.sha1
));
749 case REV_TREE_DIFFERENT
:
750 if (relevant_commit(p
))
753 irrelevant_change
= 1;
756 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
760 * TREESAME is straightforward for single-parent commits. For merge
761 * commits, it is most useful to define it so that "irrelevant"
762 * parents cannot make us !TREESAME - if we have any relevant
763 * parents, then we only consider TREESAMEness with respect to them,
764 * allowing irrelevant merges from uninteresting branches to be
765 * simplified away. Only if we have only irrelevant parents do we
766 * base TREESAME on them. Note that this logic is replicated in
767 * update_treesame, which should be kept in sync.
769 if (relevant_parents
? !relevant_change
: !irrelevant_change
)
770 commit
->object
.flags
|= TREESAME
;
773 static void commit_list_insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
774 struct commit_list
*cached_base
, struct commit_list
**cache
)
776 struct commit_list
*new_entry
;
778 if (cached_base
&& p
->date
< cached_base
->item
->date
)
779 new_entry
= commit_list_insert_by_date(p
, &cached_base
->next
);
781 new_entry
= commit_list_insert_by_date(p
, head
);
783 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
787 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
788 struct commit_list
**list
, struct commit_list
**cache_ptr
)
790 struct commit_list
*parent
= commit
->parents
;
792 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
794 if (commit
->object
.flags
& ADDED
)
796 commit
->object
.flags
|= ADDED
;
798 if (revs
->include_check
&&
799 !revs
->include_check(commit
, revs
->include_check_data
))
803 * If the commit is uninteresting, don't try to
804 * prune parents - we want the maximal uninteresting
807 * Normally we haven't parsed the parent
808 * yet, so we won't have a parent of a parent
809 * here. However, it may turn out that we've
810 * reached this commit some other way (where it
811 * wasn't uninteresting), in which case we need
812 * to mark its parents recursively too..
814 if (commit
->object
.flags
& UNINTERESTING
) {
816 struct commit
*p
= parent
->item
;
817 parent
= parent
->next
;
819 p
->object
.flags
|= UNINTERESTING
;
820 if (parse_commit(p
) < 0)
823 mark_parents_uninteresting(p
);
824 if (p
->object
.flags
& SEEN
)
826 p
->object
.flags
|= SEEN
;
827 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
833 * Ok, the commit wasn't uninteresting. Try to
834 * simplify the commit history and find the parent
835 * that has no differences in the path set if one exists.
837 try_to_simplify_commit(revs
, commit
);
842 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
844 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
845 struct commit
*p
= parent
->item
;
847 if (parse_commit(p
) < 0)
849 if (revs
->show_source
&& !p
->util
)
850 p
->util
= commit
->util
;
851 p
->object
.flags
|= left_flag
;
852 if (!(p
->object
.flags
& SEEN
)) {
853 p
->object
.flags
|= SEEN
;
854 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
856 if (revs
->first_parent_only
)
862 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
864 struct commit_list
*p
;
865 int left_count
= 0, right_count
= 0;
867 struct patch_ids ids
;
868 unsigned cherry_flag
;
870 /* First count the commits on the left and on the right */
871 for (p
= list
; p
; p
= p
->next
) {
872 struct commit
*commit
= p
->item
;
873 unsigned flags
= commit
->object
.flags
;
874 if (flags
& BOUNDARY
)
876 else if (flags
& SYMMETRIC_LEFT
)
882 if (!left_count
|| !right_count
)
885 left_first
= left_count
< right_count
;
886 init_patch_ids(&ids
);
887 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
889 /* Compute patch-ids for one side */
890 for (p
= list
; p
; p
= p
->next
) {
891 struct commit
*commit
= p
->item
;
892 unsigned flags
= commit
->object
.flags
;
894 if (flags
& BOUNDARY
)
897 * If we have fewer left, left_first is set and we omit
898 * commits on the right branch in this loop. If we have
899 * fewer right, we skip the left ones.
901 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
903 commit
->util
= add_commit_patch_id(commit
, &ids
);
906 /* either cherry_mark or cherry_pick are true */
907 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
909 /* Check the other side */
910 for (p
= list
; p
; p
= p
->next
) {
911 struct commit
*commit
= p
->item
;
913 unsigned flags
= commit
->object
.flags
;
915 if (flags
& BOUNDARY
)
918 * If we have fewer left, left_first is set and we omit
919 * commits on the left branch in this loop.
921 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
925 * Have we seen the same patch id?
927 id
= has_commit_patch_id(commit
, &ids
);
931 commit
->object
.flags
|= cherry_flag
;
934 /* Now check the original side for seen ones */
935 for (p
= list
; p
; p
= p
->next
) {
936 struct commit
*commit
= p
->item
;
937 struct patch_id
*ent
;
943 commit
->object
.flags
|= cherry_flag
;
947 free_patch_ids(&ids
);
950 /* How many extra uninteresting commits we want to see.. */
953 static int still_interesting(struct commit_list
*src
, unsigned long date
, int slop
,
954 struct commit
**interesting_cache
)
957 * No source list at all? We're definitely done..
963 * Does the destination list contain entries with a date
964 * before the source list? Definitely _not_ done.
966 if (date
<= src
->item
->date
)
970 * Does the source list still have interesting commits in
971 * it? Definitely not done..
973 if (!everybody_uninteresting(src
, interesting_cache
))
976 /* Ok, we're closing in.. */
981 * "rev-list --ancestry-path A..B" computes commits that are ancestors
982 * of B but not ancestors of A but further limits the result to those
983 * that are descendants of A. This takes the list of bottom commits and
984 * the result of "A..B" without --ancestry-path, and limits the latter
985 * further to the ones that can reach one of the commits in "bottom".
987 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
989 struct commit_list
*p
;
990 struct commit_list
*rlist
= NULL
;
994 * Reverse the list so that it will be likely that we would
995 * process parents before children.
997 for (p
= list
; p
; p
= p
->next
)
998 commit_list_insert(p
->item
, &rlist
);
1000 for (p
= bottom
; p
; p
= p
->next
)
1001 p
->item
->object
.flags
|= TMP_MARK
;
1004 * Mark the ones that can reach bottom commits in "list",
1005 * in a bottom-up fashion.
1009 for (p
= rlist
; p
; p
= p
->next
) {
1010 struct commit
*c
= p
->item
;
1011 struct commit_list
*parents
;
1012 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
1014 for (parents
= c
->parents
;
1016 parents
= parents
->next
) {
1017 if (!(parents
->item
->object
.flags
& TMP_MARK
))
1019 c
->object
.flags
|= TMP_MARK
;
1024 } while (made_progress
);
1027 * NEEDSWORK: decide if we want to remove parents that are
1028 * not marked with TMP_MARK from commit->parents for commits
1029 * in the resulting list. We may not want to do that, though.
1033 * The ones that are not marked with TMP_MARK are uninteresting
1035 for (p
= list
; p
; p
= p
->next
) {
1036 struct commit
*c
= p
->item
;
1037 if (c
->object
.flags
& TMP_MARK
)
1039 c
->object
.flags
|= UNINTERESTING
;
1042 /* We are done with the TMP_MARK */
1043 for (p
= list
; p
; p
= p
->next
)
1044 p
->item
->object
.flags
&= ~TMP_MARK
;
1045 for (p
= bottom
; p
; p
= p
->next
)
1046 p
->item
->object
.flags
&= ~TMP_MARK
;
1047 free_commit_list(rlist
);
1051 * Before walking the history, keep the set of "negative" refs the
1052 * caller has asked to exclude.
1054 * This is used to compute "rev-list --ancestry-path A..B", as we need
1055 * to filter the result of "A..B" further to the ones that can actually
1058 static struct commit_list
*collect_bottom_commits(struct commit_list
*list
)
1060 struct commit_list
*elem
, *bottom
= NULL
;
1061 for (elem
= list
; elem
; elem
= elem
->next
)
1062 if (elem
->item
->object
.flags
& BOTTOM
)
1063 commit_list_insert(elem
->item
, &bottom
);
1067 /* Assumes either left_only or right_only is set */
1068 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
1070 struct commit_list
*p
;
1072 for (p
= list
; p
; p
= p
->next
) {
1073 struct commit
*commit
= p
->item
;
1075 if (revs
->right_only
) {
1076 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
1077 commit
->object
.flags
|= SHOWN
;
1078 } else /* revs->left_only is set */
1079 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
1080 commit
->object
.flags
|= SHOWN
;
1084 static int limit_list(struct rev_info
*revs
)
1087 unsigned long date
= ~0ul;
1088 struct commit_list
*list
= revs
->commits
;
1089 struct commit_list
*newlist
= NULL
;
1090 struct commit_list
**p
= &newlist
;
1091 struct commit_list
*bottom
= NULL
;
1092 struct commit
*interesting_cache
= NULL
;
1094 if (revs
->ancestry_path
) {
1095 bottom
= collect_bottom_commits(list
);
1097 die("--ancestry-path given but there are no bottom commits");
1101 struct commit_list
*entry
= list
;
1102 struct commit
*commit
= list
->item
;
1103 struct object
*obj
= &commit
->object
;
1104 show_early_output_fn_t show
;
1109 if (commit
== interesting_cache
)
1110 interesting_cache
= NULL
;
1112 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
1113 obj
->flags
|= UNINTERESTING
;
1114 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
1116 if (obj
->flags
& UNINTERESTING
) {
1117 mark_parents_uninteresting(commit
);
1119 p
= &commit_list_insert(commit
, p
)->next
;
1120 slop
= still_interesting(list
, date
, slop
, &interesting_cache
);
1123 /* If showing all, add the whole pending list to the end */
1128 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
1130 date
= commit
->date
;
1131 p
= &commit_list_insert(commit
, p
)->next
;
1133 show
= show_early_output
;
1137 show(revs
, newlist
);
1138 show_early_output
= NULL
;
1140 if (revs
->cherry_pick
|| revs
->cherry_mark
)
1141 cherry_pick_list(newlist
, revs
);
1143 if (revs
->left_only
|| revs
->right_only
)
1144 limit_left_right(newlist
, revs
);
1147 limit_to_ancestry(bottom
, newlist
);
1148 free_commit_list(bottom
);
1152 * Check if any commits have become TREESAME by some of their parents
1153 * becoming UNINTERESTING.
1155 if (limiting_can_increase_treesame(revs
))
1156 for (list
= newlist
; list
; list
= list
->next
) {
1157 struct commit
*c
= list
->item
;
1158 if (c
->object
.flags
& (UNINTERESTING
| TREESAME
))
1160 update_treesame(revs
, c
);
1163 revs
->commits
= newlist
;
1168 * Add an entry to refs->cmdline with the specified information.
1171 static void add_rev_cmdline(struct rev_info
*revs
,
1172 struct object
*item
,
1177 struct rev_cmdline_info
*info
= &revs
->cmdline
;
1180 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
1181 info
->rev
[nr
].item
= item
;
1182 info
->rev
[nr
].name
= xstrdup(name
);
1183 info
->rev
[nr
].whence
= whence
;
1184 info
->rev
[nr
].flags
= flags
;
1188 static void add_rev_cmdline_list(struct rev_info
*revs
,
1189 struct commit_list
*commit_list
,
1193 while (commit_list
) {
1194 struct object
*object
= &commit_list
->item
->object
;
1195 add_rev_cmdline(revs
, object
, sha1_to_hex(object
->sha1
),
1197 commit_list
= commit_list
->next
;
1201 struct all_refs_cb
{
1203 int warned_bad_reflog
;
1204 struct rev_info
*all_revs
;
1205 const char *name_for_errormsg
;
1208 int ref_excluded(struct string_list
*ref_excludes
, const char *path
)
1210 struct string_list_item
*item
;
1214 for_each_string_list_item(item
, ref_excludes
) {
1215 if (!wildmatch(item
->string
, path
, 0, NULL
))
1221 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
1223 struct all_refs_cb
*cb
= cb_data
;
1224 struct object
*object
;
1226 if (ref_excluded(cb
->all_revs
->ref_excludes
, path
))
1229 object
= get_reference(cb
->all_revs
, path
, sha1
, cb
->all_flags
);
1230 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
1231 add_pending_sha1(cb
->all_revs
, path
, sha1
, cb
->all_flags
);
1235 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
1238 cb
->all_revs
= revs
;
1239 cb
->all_flags
= flags
;
1242 void clear_ref_exclusion(struct string_list
**ref_excludes_p
)
1244 if (*ref_excludes_p
) {
1245 string_list_clear(*ref_excludes_p
, 0);
1246 free(*ref_excludes_p
);
1248 *ref_excludes_p
= NULL
;
1251 void add_ref_exclusion(struct string_list
**ref_excludes_p
, const char *exclude
)
1253 if (!*ref_excludes_p
) {
1254 *ref_excludes_p
= xcalloc(1, sizeof(**ref_excludes_p
));
1255 (*ref_excludes_p
)->strdup_strings
= 1;
1257 string_list_append(*ref_excludes_p
, exclude
);
1260 static void handle_refs(const char *submodule
, struct rev_info
*revs
, unsigned flags
,
1261 int (*for_each
)(const char *, each_ref_fn
, void *))
1263 struct all_refs_cb cb
;
1264 struct each_ref_fn_sha1_adapter wrapped_handle_one_ref
=
1265 {handle_one_ref
, &cb
};
1267 init_all_refs_cb(&cb
, revs
, flags
);
1268 for_each(submodule
, each_ref_fn_adapter
, &wrapped_handle_one_ref
);
1271 static void handle_one_reflog_commit(unsigned char *sha1
, void *cb_data
)
1273 struct all_refs_cb
*cb
= cb_data
;
1274 if (!is_null_sha1(sha1
)) {
1275 struct object
*o
= parse_object(sha1
);
1277 o
->flags
|= cb
->all_flags
;
1278 /* ??? CMDLINEFLAGS ??? */
1279 add_pending_object(cb
->all_revs
, o
, "");
1281 else if (!cb
->warned_bad_reflog
) {
1282 warning("reflog of '%s' references pruned commits",
1283 cb
->name_for_errormsg
);
1284 cb
->warned_bad_reflog
= 1;
1289 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
1290 const char *email
, unsigned long timestamp
, int tz
,
1291 const char *message
, void *cb_data
)
1293 handle_one_reflog_commit(osha1
, cb_data
);
1294 handle_one_reflog_commit(nsha1
, cb_data
);
1298 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
1300 struct all_refs_cb
*cb
= cb_data
;
1301 cb
->warned_bad_reflog
= 0;
1302 cb
->name_for_errormsg
= path
;
1303 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
1307 void add_reflogs_to_pending(struct rev_info
*revs
, unsigned flags
)
1309 struct all_refs_cb cb
;
1310 struct each_ref_fn_sha1_adapter wrapped_handle_one_reflog
=
1311 {handle_one_reflog
, &cb
};
1314 cb
.all_flags
= flags
;
1315 for_each_reflog(each_ref_fn_adapter
, &wrapped_handle_one_reflog
);
1318 static void add_cache_tree(struct cache_tree
*it
, struct rev_info
*revs
,
1319 struct strbuf
*path
)
1321 size_t baselen
= path
->len
;
1324 if (it
->entry_count
>= 0) {
1325 struct tree
*tree
= lookup_tree(it
->sha1
);
1326 add_pending_object_with_path(revs
, &tree
->object
, "",
1330 for (i
= 0; i
< it
->subtree_nr
; i
++) {
1331 struct cache_tree_sub
*sub
= it
->down
[i
];
1332 strbuf_addf(path
, "%s%s", baselen
? "/" : "", sub
->name
);
1333 add_cache_tree(sub
->cache_tree
, revs
, path
);
1334 strbuf_setlen(path
, baselen
);
1339 void add_index_objects_to_pending(struct rev_info
*revs
, unsigned flags
)
1344 for (i
= 0; i
< active_nr
; i
++) {
1345 struct cache_entry
*ce
= active_cache
[i
];
1348 if (S_ISGITLINK(ce
->ce_mode
))
1351 blob
= lookup_blob(ce
->sha1
);
1353 die("unable to add index blob to traversal");
1354 add_pending_object_with_path(revs
, &blob
->object
, "",
1355 ce
->ce_mode
, ce
->name
);
1358 if (active_cache_tree
) {
1359 struct strbuf path
= STRBUF_INIT
;
1360 add_cache_tree(active_cache_tree
, revs
, &path
);
1361 strbuf_release(&path
);
1365 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
)
1367 unsigned char sha1
[20];
1369 struct commit
*commit
;
1370 struct commit_list
*parents
;
1371 const char *arg
= arg_
;
1374 flags
^= UNINTERESTING
| BOTTOM
;
1377 if (get_sha1_committish(arg
, sha1
))
1380 it
= get_reference(revs
, arg
, sha1
, 0);
1381 if (!it
&& revs
->ignore_missing
)
1383 if (it
->type
!= OBJ_TAG
)
1385 if (!((struct tag
*)it
)->tagged
)
1387 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
1389 if (it
->type
!= OBJ_COMMIT
)
1391 commit
= (struct commit
*)it
;
1392 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
1393 it
= &parents
->item
->object
;
1395 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1396 add_pending_object(revs
, it
, arg
);
1401 void init_revisions(struct rev_info
*revs
, const char *prefix
)
1403 memset(revs
, 0, sizeof(*revs
));
1405 revs
->abbrev
= DEFAULT_ABBREV
;
1406 revs
->ignore_merges
= 1;
1407 revs
->simplify_history
= 1;
1408 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
1409 DIFF_OPT_SET(&revs
->pruning
, QUICK
);
1410 revs
->pruning
.add_remove
= file_add_remove
;
1411 revs
->pruning
.change
= file_change
;
1412 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1414 revs
->prefix
= prefix
;
1417 revs
->skip_count
= -1;
1418 revs
->max_count
= -1;
1419 revs
->max_parents
= -1;
1421 revs
->commit_format
= CMIT_FMT_DEFAULT
;
1423 init_grep_defaults();
1424 grep_init(&revs
->grep_filter
, prefix
);
1425 revs
->grep_filter
.status_only
= 1;
1426 revs
->grep_filter
.regflags
= REG_NEWLINE
;
1428 diff_setup(&revs
->diffopt
);
1429 if (prefix
&& !revs
->diffopt
.prefix
) {
1430 revs
->diffopt
.prefix
= prefix
;
1431 revs
->diffopt
.prefix_length
= strlen(prefix
);
1434 revs
->notes_opt
.use_default_notes
= -1;
1437 static void add_pending_commit_list(struct rev_info
*revs
,
1438 struct commit_list
*commit_list
,
1441 while (commit_list
) {
1442 struct object
*object
= &commit_list
->item
->object
;
1443 object
->flags
|= flags
;
1444 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
1445 commit_list
= commit_list
->next
;
1449 static void prepare_show_merge(struct rev_info
*revs
)
1451 struct commit_list
*bases
;
1452 struct commit
*head
, *other
;
1453 unsigned char sha1
[20];
1454 const char **prune
= NULL
;
1455 int i
, prune_num
= 1; /* counting terminating NULL */
1457 if (get_sha1("HEAD", sha1
))
1458 die("--merge without HEAD?");
1459 head
= lookup_commit_or_die(sha1
, "HEAD");
1460 if (get_sha1("MERGE_HEAD", sha1
))
1461 die("--merge without MERGE_HEAD?");
1462 other
= lookup_commit_or_die(sha1
, "MERGE_HEAD");
1463 add_pending_object(revs
, &head
->object
, "HEAD");
1464 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1465 bases
= get_merge_bases(head
, other
);
1466 add_rev_cmdline_list(revs
, bases
, REV_CMD_MERGE_BASE
, UNINTERESTING
| BOTTOM
);
1467 add_pending_commit_list(revs
, bases
, UNINTERESTING
| BOTTOM
);
1468 free_commit_list(bases
);
1469 head
->object
.flags
|= SYMMETRIC_LEFT
;
1473 for (i
= 0; i
< active_nr
; i
++) {
1474 const struct cache_entry
*ce
= active_cache
[i
];
1477 if (ce_path_match(ce
, &revs
->prune_data
, NULL
)) {
1479 REALLOC_ARRAY(prune
, prune_num
);
1480 prune
[prune_num
-2] = ce
->name
;
1481 prune
[prune_num
-1] = NULL
;
1483 while ((i
+1 < active_nr
) &&
1484 ce_same_name(ce
, active_cache
[i
+1]))
1487 free_pathspec(&revs
->prune_data
);
1488 parse_pathspec(&revs
->prune_data
, PATHSPEC_ALL_MAGIC
& ~PATHSPEC_LITERAL
,
1489 PATHSPEC_PREFER_FULL
| PATHSPEC_LITERAL_PATH
, "", prune
);
1493 int handle_revision_arg(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
1495 struct object_context oc
;
1497 struct object
*object
;
1498 unsigned char sha1
[20];
1500 const char *arg
= arg_
;
1501 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
1502 unsigned get_sha1_flags
= 0;
1504 flags
= flags
& UNINTERESTING
? flags
| BOTTOM
: flags
& ~BOTTOM
;
1506 dotdot
= strstr(arg
, "..");
1508 unsigned char from_sha1
[20];
1509 const char *next
= dotdot
+ 2;
1510 const char *this = arg
;
1511 int symmetric
= *next
== '.';
1512 unsigned int flags_exclude
= flags
^ (UNINTERESTING
| BOTTOM
);
1513 static const char head_by_default
[] = "HEAD";
1514 unsigned int a_flags
;
1520 next
= head_by_default
;
1522 this = head_by_default
;
1523 if (this == head_by_default
&& next
== head_by_default
&&
1526 * Just ".."? That is not a range but the
1527 * pathspec for the parent directory.
1529 if (!cant_be_filename
) {
1534 if (!get_sha1_committish(this, from_sha1
) &&
1535 !get_sha1_committish(next
, sha1
)) {
1536 struct object
*a_obj
, *b_obj
;
1538 if (!cant_be_filename
) {
1540 verify_non_filename(revs
->prefix
, arg
);
1543 a_obj
= parse_object(from_sha1
);
1544 b_obj
= parse_object(sha1
);
1545 if (!a_obj
|| !b_obj
) {
1547 if (revs
->ignore_missing
)
1550 ? "Invalid symmetric difference expression %s"
1551 : "Invalid revision range %s", arg
);
1556 a_flags
= flags_exclude
;
1558 /* A...B -- find merge bases between the two */
1559 struct commit
*a
, *b
;
1560 struct commit_list
*exclude
;
1562 a
= (a_obj
->type
== OBJ_COMMIT
1563 ? (struct commit
*)a_obj
1564 : lookup_commit_reference(a_obj
->sha1
));
1565 b
= (b_obj
->type
== OBJ_COMMIT
1566 ? (struct commit
*)b_obj
1567 : lookup_commit_reference(b_obj
->sha1
));
1570 exclude
= get_merge_bases(a
, b
);
1571 add_rev_cmdline_list(revs
, exclude
,
1574 add_pending_commit_list(revs
, exclude
,
1576 free_commit_list(exclude
);
1578 a_flags
= flags
| SYMMETRIC_LEFT
;
1581 a_obj
->flags
|= a_flags
;
1582 b_obj
->flags
|= flags
;
1583 add_rev_cmdline(revs
, a_obj
, this,
1584 REV_CMD_LEFT
, a_flags
);
1585 add_rev_cmdline(revs
, b_obj
, next
,
1586 REV_CMD_RIGHT
, flags
);
1587 add_pending_object(revs
, a_obj
, this);
1588 add_pending_object(revs
, b_obj
, next
);
1593 dotdot
= strstr(arg
, "^@");
1594 if (dotdot
&& !dotdot
[2]) {
1596 if (add_parents_only(revs
, arg
, flags
))
1600 dotdot
= strstr(arg
, "^!");
1601 if (dotdot
&& !dotdot
[2]) {
1603 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
)))
1609 local_flags
= UNINTERESTING
| BOTTOM
;
1613 if (revarg_opt
& REVARG_COMMITTISH
)
1614 get_sha1_flags
= GET_SHA1_COMMITTISH
;
1616 if (get_sha1_with_context(arg
, get_sha1_flags
, sha1
, &oc
))
1617 return revs
->ignore_missing
? 0 : -1;
1618 if (!cant_be_filename
)
1619 verify_non_filename(revs
->prefix
, arg
);
1620 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
1621 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
1622 add_pending_object_with_mode(revs
, object
, arg
, oc
.mode
);
1626 struct cmdline_pathspec
{
1632 static void append_prune_data(struct cmdline_pathspec
*prune
, const char **av
)
1635 ALLOC_GROW(prune
->path
, prune
->nr
+ 1, prune
->alloc
);
1636 prune
->path
[prune
->nr
++] = *(av
++);
1640 static void read_pathspec_from_stdin(struct rev_info
*revs
, struct strbuf
*sb
,
1641 struct cmdline_pathspec
*prune
)
1643 while (strbuf_getwholeline(sb
, stdin
, '\n') != EOF
) {
1645 if (len
&& sb
->buf
[len
- 1] == '\n')
1646 sb
->buf
[--len
] = '\0';
1647 ALLOC_GROW(prune
->path
, prune
->nr
+ 1, prune
->alloc
);
1648 prune
->path
[prune
->nr
++] = xstrdup(sb
->buf
);
1652 static void read_revisions_from_stdin(struct rev_info
*revs
,
1653 struct cmdline_pathspec
*prune
)
1656 int seen_dashdash
= 0;
1659 save_warning
= warn_on_object_refname_ambiguity
;
1660 warn_on_object_refname_ambiguity
= 0;
1662 strbuf_init(&sb
, 1000);
1663 while (strbuf_getwholeline(&sb
, stdin
, '\n') != EOF
) {
1665 if (len
&& sb
.buf
[len
- 1] == '\n')
1666 sb
.buf
[--len
] = '\0';
1669 if (sb
.buf
[0] == '-') {
1670 if (len
== 2 && sb
.buf
[1] == '-') {
1674 die("options not supported in --stdin mode");
1676 if (handle_revision_arg(sb
.buf
, revs
, 0,
1677 REVARG_CANNOT_BE_FILENAME
))
1678 die("bad revision '%s'", sb
.buf
);
1681 read_pathspec_from_stdin(revs
, &sb
, prune
);
1683 strbuf_release(&sb
);
1684 warn_on_object_refname_ambiguity
= save_warning
;
1687 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
1689 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
1692 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
1694 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
1697 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
1699 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
1702 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
1703 int *unkc
, const char **unkv
)
1705 const char *arg
= argv
[0];
1709 /* pseudo revision arguments */
1710 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1711 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1712 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1713 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
1714 !strcmp(arg
, "--bisect") || starts_with(arg
, "--glob=") ||
1715 !strcmp(arg
, "--indexed-objects") ||
1716 starts_with(arg
, "--exclude=") ||
1717 starts_with(arg
, "--branches=") || starts_with(arg
, "--tags=") ||
1718 starts_with(arg
, "--remotes=") || starts_with(arg
, "--no-walk="))
1720 unkv
[(*unkc
)++] = arg
;
1724 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
1725 revs
->max_count
= atoi(optarg
);
1728 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
1729 revs
->skip_count
= atoi(optarg
);
1731 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1732 /* accept -<digit>, like traditional "head" */
1733 if (strtol_i(arg
+ 1, 10, &revs
->max_count
) < 0 ||
1734 revs
->max_count
< 0)
1735 die("'%s': not a non-negative integer", arg
+ 1);
1737 } else if (!strcmp(arg
, "-n")) {
1739 return error("-n requires an argument");
1740 revs
->max_count
= atoi(argv
[1]);
1743 } else if (starts_with(arg
, "-n")) {
1744 revs
->max_count
= atoi(arg
+ 2);
1746 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
1747 revs
->max_age
= atoi(optarg
);
1749 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
1750 revs
->max_age
= approxidate(optarg
);
1752 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
1753 revs
->max_age
= approxidate(optarg
);
1755 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
1756 revs
->min_age
= atoi(optarg
);
1758 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
1759 revs
->min_age
= approxidate(optarg
);
1761 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
1762 revs
->min_age
= approxidate(optarg
);
1764 } else if (!strcmp(arg
, "--first-parent")) {
1765 revs
->first_parent_only
= 1;
1766 } else if (!strcmp(arg
, "--ancestry-path")) {
1767 revs
->ancestry_path
= 1;
1768 revs
->simplify_history
= 0;
1770 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1771 init_reflog_walk(&revs
->reflog_info
);
1772 } else if (!strcmp(arg
, "--default")) {
1774 return error("bad --default argument");
1775 revs
->def
= argv
[1];
1777 } else if (!strcmp(arg
, "--merge")) {
1778 revs
->show_merge
= 1;
1779 } else if (!strcmp(arg
, "--topo-order")) {
1780 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1781 revs
->topo_order
= 1;
1782 } else if (!strcmp(arg
, "--simplify-merges")) {
1783 revs
->simplify_merges
= 1;
1784 revs
->topo_order
= 1;
1785 revs
->rewrite_parents
= 1;
1786 revs
->simplify_history
= 0;
1788 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
1789 revs
->simplify_merges
= 1;
1790 revs
->topo_order
= 1;
1791 revs
->rewrite_parents
= 1;
1792 revs
->simplify_history
= 0;
1793 revs
->simplify_by_decoration
= 1;
1796 load_ref_decorations(DECORATE_SHORT_REFS
);
1797 } else if (!strcmp(arg
, "--date-order")) {
1798 revs
->sort_order
= REV_SORT_BY_COMMIT_DATE
;
1799 revs
->topo_order
= 1;
1800 } else if (!strcmp(arg
, "--author-date-order")) {
1801 revs
->sort_order
= REV_SORT_BY_AUTHOR_DATE
;
1802 revs
->topo_order
= 1;
1803 } else if (starts_with(arg
, "--early-output")) {
1807 count
= atoi(arg
+15);
1810 revs
->topo_order
= 1;
1811 revs
->early_output
= count
;
1813 } else if (!strcmp(arg
, "--parents")) {
1814 revs
->rewrite_parents
= 1;
1815 revs
->print_parents
= 1;
1816 } else if (!strcmp(arg
, "--dense")) {
1818 } else if (!strcmp(arg
, "--sparse")) {
1820 } else if (!strcmp(arg
, "--show-all")) {
1822 } else if (!strcmp(arg
, "--remove-empty")) {
1823 revs
->remove_empty_trees
= 1;
1824 } else if (!strcmp(arg
, "--merges")) {
1825 revs
->min_parents
= 2;
1826 } else if (!strcmp(arg
, "--no-merges")) {
1827 revs
->max_parents
= 1;
1828 } else if (starts_with(arg
, "--min-parents=")) {
1829 revs
->min_parents
= atoi(arg
+14);
1830 } else if (starts_with(arg
, "--no-min-parents")) {
1831 revs
->min_parents
= 0;
1832 } else if (starts_with(arg
, "--max-parents=")) {
1833 revs
->max_parents
= atoi(arg
+14);
1834 } else if (starts_with(arg
, "--no-max-parents")) {
1835 revs
->max_parents
= -1;
1836 } else if (!strcmp(arg
, "--boundary")) {
1838 } else if (!strcmp(arg
, "--left-right")) {
1839 revs
->left_right
= 1;
1840 } else if (!strcmp(arg
, "--left-only")) {
1841 if (revs
->right_only
)
1842 die("--left-only is incompatible with --right-only"
1844 revs
->left_only
= 1;
1845 } else if (!strcmp(arg
, "--right-only")) {
1846 if (revs
->left_only
)
1847 die("--right-only is incompatible with --left-only");
1848 revs
->right_only
= 1;
1849 } else if (!strcmp(arg
, "--cherry")) {
1850 if (revs
->left_only
)
1851 die("--cherry is incompatible with --left-only");
1852 revs
->cherry_mark
= 1;
1853 revs
->right_only
= 1;
1854 revs
->max_parents
= 1;
1856 } else if (!strcmp(arg
, "--count")) {
1858 } else if (!strcmp(arg
, "--cherry-mark")) {
1859 if (revs
->cherry_pick
)
1860 die("--cherry-mark is incompatible with --cherry-pick");
1861 revs
->cherry_mark
= 1;
1862 revs
->limited
= 1; /* needs limit_list() */
1863 } else if (!strcmp(arg
, "--cherry-pick")) {
1864 if (revs
->cherry_mark
)
1865 die("--cherry-pick is incompatible with --cherry-mark");
1866 revs
->cherry_pick
= 1;
1868 } else if (!strcmp(arg
, "--objects")) {
1869 revs
->tag_objects
= 1;
1870 revs
->tree_objects
= 1;
1871 revs
->blob_objects
= 1;
1872 } else if (!strcmp(arg
, "--objects-edge")) {
1873 revs
->tag_objects
= 1;
1874 revs
->tree_objects
= 1;
1875 revs
->blob_objects
= 1;
1876 revs
->edge_hint
= 1;
1877 } else if (!strcmp(arg
, "--objects-edge-aggressive")) {
1878 revs
->tag_objects
= 1;
1879 revs
->tree_objects
= 1;
1880 revs
->blob_objects
= 1;
1881 revs
->edge_hint
= 1;
1882 revs
->edge_hint_aggressive
= 1;
1883 } else if (!strcmp(arg
, "--verify-objects")) {
1884 revs
->tag_objects
= 1;
1885 revs
->tree_objects
= 1;
1886 revs
->blob_objects
= 1;
1887 revs
->verify_objects
= 1;
1888 } else if (!strcmp(arg
, "--unpacked")) {
1890 } else if (starts_with(arg
, "--unpacked=")) {
1891 die("--unpacked=<packfile> no longer supported.");
1892 } else if (!strcmp(arg
, "-r")) {
1894 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1895 } else if (!strcmp(arg
, "-t")) {
1897 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1898 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1899 } else if (!strcmp(arg
, "-m")) {
1900 revs
->ignore_merges
= 0;
1901 } else if (!strcmp(arg
, "-c")) {
1903 revs
->dense_combined_merges
= 0;
1904 revs
->combine_merges
= 1;
1905 } else if (!strcmp(arg
, "--cc")) {
1907 revs
->dense_combined_merges
= 1;
1908 revs
->combine_merges
= 1;
1909 } else if (!strcmp(arg
, "-v")) {
1910 revs
->verbose_header
= 1;
1911 } else if (!strcmp(arg
, "--pretty")) {
1912 revs
->verbose_header
= 1;
1913 revs
->pretty_given
= 1;
1914 get_commit_format(NULL
, revs
);
1915 } else if (starts_with(arg
, "--pretty=") || starts_with(arg
, "--format=")) {
1917 * Detached form ("--pretty X" as opposed to "--pretty=X")
1918 * not allowed, since the argument is optional.
1920 revs
->verbose_header
= 1;
1921 revs
->pretty_given
= 1;
1922 get_commit_format(arg
+9, revs
);
1923 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
1924 revs
->show_notes
= 1;
1925 revs
->show_notes_given
= 1;
1926 revs
->notes_opt
.use_default_notes
= 1;
1927 } else if (!strcmp(arg
, "--show-signature")) {
1928 revs
->show_signature
= 1;
1929 } else if (!strcmp(arg
, "--show-linear-break") ||
1930 starts_with(arg
, "--show-linear-break=")) {
1931 if (starts_with(arg
, "--show-linear-break="))
1932 revs
->break_bar
= xstrdup(arg
+ 20);
1934 revs
->break_bar
= " ..........";
1935 revs
->track_linear
= 1;
1936 revs
->track_first_time
= 1;
1937 } else if (starts_with(arg
, "--show-notes=") ||
1938 starts_with(arg
, "--notes=")) {
1939 struct strbuf buf
= STRBUF_INIT
;
1940 revs
->show_notes
= 1;
1941 revs
->show_notes_given
= 1;
1942 if (starts_with(arg
, "--show-notes")) {
1943 if (revs
->notes_opt
.use_default_notes
< 0)
1944 revs
->notes_opt
.use_default_notes
= 1;
1945 strbuf_addstr(&buf
, arg
+13);
1948 strbuf_addstr(&buf
, arg
+8);
1949 expand_notes_ref(&buf
);
1950 string_list_append(&revs
->notes_opt
.extra_notes_refs
,
1951 strbuf_detach(&buf
, NULL
));
1952 } else if (!strcmp(arg
, "--no-notes")) {
1953 revs
->show_notes
= 0;
1954 revs
->show_notes_given
= 1;
1955 revs
->notes_opt
.use_default_notes
= -1;
1956 /* we have been strdup'ing ourselves, so trick
1957 * string_list into free()ing strings */
1958 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 1;
1959 string_list_clear(&revs
->notes_opt
.extra_notes_refs
, 0);
1960 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 0;
1961 } else if (!strcmp(arg
, "--standard-notes")) {
1962 revs
->show_notes_given
= 1;
1963 revs
->notes_opt
.use_default_notes
= 1;
1964 } else if (!strcmp(arg
, "--no-standard-notes")) {
1965 revs
->notes_opt
.use_default_notes
= 0;
1966 } else if (!strcmp(arg
, "--oneline")) {
1967 revs
->verbose_header
= 1;
1968 get_commit_format("oneline", revs
);
1969 revs
->pretty_given
= 1;
1970 revs
->abbrev_commit
= 1;
1971 } else if (!strcmp(arg
, "--graph")) {
1972 revs
->topo_order
= 1;
1973 revs
->rewrite_parents
= 1;
1974 revs
->graph
= graph_init(revs
);
1975 } else if (!strcmp(arg
, "--root")) {
1976 revs
->show_root_diff
= 1;
1977 } else if (!strcmp(arg
, "--no-commit-id")) {
1978 revs
->no_commit_id
= 1;
1979 } else if (!strcmp(arg
, "--always")) {
1980 revs
->always_show_header
= 1;
1981 } else if (!strcmp(arg
, "--no-abbrev")) {
1983 } else if (!strcmp(arg
, "--abbrev")) {
1984 revs
->abbrev
= DEFAULT_ABBREV
;
1985 } else if (starts_with(arg
, "--abbrev=")) {
1986 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1987 if (revs
->abbrev
< MINIMUM_ABBREV
)
1988 revs
->abbrev
= MINIMUM_ABBREV
;
1989 else if (revs
->abbrev
> 40)
1991 } else if (!strcmp(arg
, "--abbrev-commit")) {
1992 revs
->abbrev_commit
= 1;
1993 revs
->abbrev_commit_given
= 1;
1994 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
1995 revs
->abbrev_commit
= 0;
1996 } else if (!strcmp(arg
, "--full-diff")) {
1998 revs
->full_diff
= 1;
1999 } else if (!strcmp(arg
, "--full-history")) {
2000 revs
->simplify_history
= 0;
2001 } else if (!strcmp(arg
, "--relative-date")) {
2002 revs
->date_mode
= DATE_RELATIVE
;
2003 revs
->date_mode_explicit
= 1;
2004 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
2005 revs
->date_mode
= parse_date_format(optarg
);
2006 revs
->date_mode_explicit
= 1;
2008 } else if (!strcmp(arg
, "--log-size")) {
2009 revs
->show_log_size
= 1;
2012 * Grepping the commit log
2014 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
2015 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
2017 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
2018 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
2020 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
2021 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
2023 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
2024 add_message_grep(revs
, optarg
);
2026 } else if (!strcmp(arg
, "--grep-debug")) {
2027 revs
->grep_filter
.debug
= 1;
2028 } else if (!strcmp(arg
, "--basic-regexp")) {
2029 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE
, &revs
->grep_filter
);
2030 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
2031 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE
, &revs
->grep_filter
);
2032 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
2033 revs
->grep_filter
.regflags
|= REG_ICASE
;
2034 DIFF_OPT_SET(&revs
->diffopt
, PICKAXE_IGNORE_CASE
);
2035 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
2036 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED
, &revs
->grep_filter
);
2037 } else if (!strcmp(arg
, "--perl-regexp")) {
2038 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE
, &revs
->grep_filter
);
2039 } else if (!strcmp(arg
, "--all-match")) {
2040 revs
->grep_filter
.all_match
= 1;
2041 } else if (!strcmp(arg
, "--invert-grep")) {
2042 revs
->invert_grep
= 1;
2043 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
2044 if (strcmp(optarg
, "none"))
2045 git_log_output_encoding
= xstrdup(optarg
);
2047 git_log_output_encoding
= "";
2049 } else if (!strcmp(arg
, "--reverse")) {
2051 } else if (!strcmp(arg
, "--children")) {
2052 revs
->children
.name
= "children";
2054 } else if (!strcmp(arg
, "--ignore-missing")) {
2055 revs
->ignore_missing
= 1;
2057 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
);
2059 unkv
[(*unkc
)++] = arg
;
2062 if (revs
->graph
&& revs
->track_linear
)
2063 die("--show-linear-break and --graph are incompatible");
2068 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
2069 const struct option
*options
,
2070 const char * const usagestr
[])
2072 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
2073 &ctx
->cpidx
, ctx
->out
);
2075 error("unknown option `%s'", ctx
->argv
[0]);
2076 usage_with_options(usagestr
, options
);
2082 static int for_each_bad_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
2084 return for_each_ref_in_submodule(submodule
, "refs/bisect/bad", fn
, cb_data
);
2087 static int for_each_good_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
2089 return for_each_ref_in_submodule(submodule
, "refs/bisect/good", fn
, cb_data
);
2092 static int handle_revision_pseudo_opt(const char *submodule
,
2093 struct rev_info
*revs
,
2094 int argc
, const char **argv
, int *flags
)
2096 const char *arg
= argv
[0];
2103 * Commands like "git shortlog" will not accept the options below
2104 * unless parse_revision_opt queues them (as opposed to erroring
2107 * When implementing your new pseudo-option, remember to
2108 * register it in the list at the top of handle_revision_opt.
2110 if (!strcmp(arg
, "--all")) {
2111 handle_refs(submodule
, revs
, *flags
, for_each_ref_submodule
);
2112 handle_refs(submodule
, revs
, *flags
, head_ref_submodule
);
2113 clear_ref_exclusion(&revs
->ref_excludes
);
2114 } else if (!strcmp(arg
, "--branches")) {
2115 handle_refs(submodule
, revs
, *flags
, for_each_branch_ref_submodule
);
2116 clear_ref_exclusion(&revs
->ref_excludes
);
2117 } else if (!strcmp(arg
, "--bisect")) {
2118 handle_refs(submodule
, revs
, *flags
, for_each_bad_bisect_ref
);
2119 handle_refs(submodule
, revs
, *flags
^ (UNINTERESTING
| BOTTOM
), for_each_good_bisect_ref
);
2121 } else if (!strcmp(arg
, "--tags")) {
2122 handle_refs(submodule
, revs
, *flags
, for_each_tag_ref_submodule
);
2123 clear_ref_exclusion(&revs
->ref_excludes
);
2124 } else if (!strcmp(arg
, "--remotes")) {
2125 handle_refs(submodule
, revs
, *flags
, for_each_remote_ref_submodule
);
2126 clear_ref_exclusion(&revs
->ref_excludes
);
2127 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
2128 struct all_refs_cb cb
;
2129 struct each_ref_fn_sha1_adapter wrapped_handle_one_ref
=
2130 {handle_one_ref
, &cb
};
2132 init_all_refs_cb(&cb
, revs
, *flags
);
2133 for_each_glob_ref(each_ref_fn_adapter
, optarg
, &wrapped_handle_one_ref
);
2134 clear_ref_exclusion(&revs
->ref_excludes
);
2136 } else if ((argcount
= parse_long_opt("exclude", argv
, &optarg
))) {
2137 add_ref_exclusion(&revs
->ref_excludes
, optarg
);
2139 } else if (starts_with(arg
, "--branches=")) {
2140 struct all_refs_cb cb
;
2141 struct each_ref_fn_sha1_adapter wrapped_handle_one_ref
=
2142 {handle_one_ref
, &cb
};
2144 init_all_refs_cb(&cb
, revs
, *flags
);
2145 for_each_glob_ref_in(each_ref_fn_adapter
, arg
+ 11, "refs/heads/",
2146 &wrapped_handle_one_ref
);
2147 clear_ref_exclusion(&revs
->ref_excludes
);
2148 } else if (starts_with(arg
, "--tags=")) {
2149 struct all_refs_cb cb
;
2150 struct each_ref_fn_sha1_adapter wrapped_handle_one_ref
=
2151 {handle_one_ref
, &cb
};
2153 init_all_refs_cb(&cb
, revs
, *flags
);
2154 for_each_glob_ref_in(each_ref_fn_adapter
, arg
+ 7, "refs/tags/",
2155 &wrapped_handle_one_ref
);
2156 clear_ref_exclusion(&revs
->ref_excludes
);
2157 } else if (starts_with(arg
, "--remotes=")) {
2158 struct all_refs_cb cb
;
2159 struct each_ref_fn_sha1_adapter wrapped_handle_one_ref
=
2160 {handle_one_ref
, &cb
};
2162 init_all_refs_cb(&cb
, revs
, *flags
);
2163 for_each_glob_ref_in(each_ref_fn_adapter
, arg
+ 10, "refs/remotes/",
2164 &wrapped_handle_one_ref
);
2165 clear_ref_exclusion(&revs
->ref_excludes
);
2166 } else if (!strcmp(arg
, "--reflog")) {
2167 add_reflogs_to_pending(revs
, *flags
);
2168 } else if (!strcmp(arg
, "--indexed-objects")) {
2169 add_index_objects_to_pending(revs
, *flags
);
2170 } else if (!strcmp(arg
, "--not")) {
2171 *flags
^= UNINTERESTING
| BOTTOM
;
2172 } else if (!strcmp(arg
, "--no-walk")) {
2173 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2174 } else if (starts_with(arg
, "--no-walk=")) {
2176 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2177 * not allowed, since the argument is optional.
2179 if (!strcmp(arg
+ 10, "sorted"))
2180 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2181 else if (!strcmp(arg
+ 10, "unsorted"))
2182 revs
->no_walk
= REVISION_WALK_NO_WALK_UNSORTED
;
2184 return error("invalid argument to --no-walk");
2185 } else if (!strcmp(arg
, "--do-walk")) {
2195 * Parse revision information, filling in the "rev_info" structure,
2196 * and removing the used arguments from the argument list.
2198 * Returns the number of arguments left that weren't recognized
2199 * (which are also moved to the head of the argument list)
2201 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
2203 int i
, flags
, left
, seen_dashdash
, read_from_stdin
, got_rev_arg
= 0, revarg_opt
;
2204 struct cmdline_pathspec prune_data
;
2205 const char *submodule
= NULL
;
2207 memset(&prune_data
, 0, sizeof(prune_data
));
2209 submodule
= opt
->submodule
;
2211 /* First, search for "--" */
2212 if (opt
&& opt
->assume_dashdash
) {
2216 for (i
= 1; i
< argc
; i
++) {
2217 const char *arg
= argv
[i
];
2218 if (strcmp(arg
, "--"))
2223 append_prune_data(&prune_data
, argv
+ i
+ 1);
2229 /* Second, deal with arguments and options */
2231 revarg_opt
= opt
? opt
->revarg_opt
: 0;
2233 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
2234 read_from_stdin
= 0;
2235 for (left
= i
= 1; i
< argc
; i
++) {
2236 const char *arg
= argv
[i
];
2240 opts
= handle_revision_pseudo_opt(submodule
,
2241 revs
, argc
- i
, argv
+ i
,
2248 if (!strcmp(arg
, "--stdin")) {
2249 if (revs
->disable_stdin
) {
2253 if (read_from_stdin
++)
2254 die("--stdin given twice?");
2255 read_revisions_from_stdin(revs
, &prune_data
);
2259 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
2270 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
2272 if (seen_dashdash
|| *arg
== '^')
2273 die("bad revision '%s'", arg
);
2275 /* If we didn't have a "--":
2276 * (1) all filenames must exist;
2277 * (2) all rev-args must not be interpretable
2278 * as a valid filename.
2279 * but the latter we have checked in the main loop.
2281 for (j
= i
; j
< argc
; j
++)
2282 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
2284 append_prune_data(&prune_data
, argv
+ i
);
2291 if (prune_data
.nr
) {
2293 * If we need to introduce the magic "a lone ':' means no
2294 * pathspec whatsoever", here is the place to do so.
2296 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2297 * prune_data.nr = 0;
2298 * prune_data.alloc = 0;
2299 * free(prune_data.path);
2300 * prune_data.path = NULL;
2302 * terminate prune_data.alloc with NULL and
2303 * call init_pathspec() to set revs->prune_data here.
2306 ALLOC_GROW(prune_data
.path
, prune_data
.nr
+ 1, prune_data
.alloc
);
2307 prune_data
.path
[prune_data
.nr
++] = NULL
;
2308 parse_pathspec(&revs
->prune_data
, 0, 0,
2309 revs
->prefix
, prune_data
.path
);
2312 if (revs
->def
== NULL
)
2313 revs
->def
= opt
? opt
->def
: NULL
;
2314 if (opt
&& opt
->tweak
)
2315 opt
->tweak(revs
, opt
);
2316 if (revs
->show_merge
)
2317 prepare_show_merge(revs
);
2318 if (revs
->def
&& !revs
->pending
.nr
&& !got_rev_arg
) {
2319 unsigned char sha1
[20];
2320 struct object
*object
;
2321 struct object_context oc
;
2322 if (get_sha1_with_context(revs
->def
, 0, sha1
, &oc
))
2323 die("bad default revision '%s'", revs
->def
);
2324 object
= get_reference(revs
, revs
->def
, sha1
, 0);
2325 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
);
2328 /* Did the user ask for any diff output? Run the diff! */
2329 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
2332 /* Pickaxe, diff-filter and rename following need diffs */
2333 if (revs
->diffopt
.pickaxe
||
2334 revs
->diffopt
.filter
||
2335 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
2338 if (revs
->topo_order
)
2341 if (revs
->prune_data
.nr
) {
2342 copy_pathspec(&revs
->pruning
.pathspec
, &revs
->prune_data
);
2343 /* Can't prune commits with rename following: the paths change.. */
2344 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
2346 if (!revs
->full_diff
)
2347 copy_pathspec(&revs
->diffopt
.pathspec
,
2350 if (revs
->combine_merges
)
2351 revs
->ignore_merges
= 0;
2352 revs
->diffopt
.abbrev
= revs
->abbrev
;
2354 if (revs
->line_level_traverse
) {
2356 revs
->topo_order
= 1;
2359 diff_setup_done(&revs
->diffopt
);
2361 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED
,
2362 &revs
->grep_filter
);
2363 compile_grep_patterns(&revs
->grep_filter
);
2365 if (revs
->reverse
&& revs
->reflog_info
)
2366 die("cannot combine --reverse with --walk-reflogs");
2367 if (revs
->rewrite_parents
&& revs
->children
.name
)
2368 die("cannot combine --parents and --children");
2371 * Limitations on the graph functionality
2373 if (revs
->reverse
&& revs
->graph
)
2374 die("cannot combine --reverse with --graph");
2376 if (revs
->reflog_info
&& revs
->graph
)
2377 die("cannot combine --walk-reflogs with --graph");
2378 if (revs
->no_walk
&& revs
->graph
)
2379 die("cannot combine --no-walk with --graph");
2380 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
2381 die("cannot use --grep-reflog without --walk-reflogs");
2383 if (revs
->first_parent_only
&& revs
->bisect
)
2384 die(_("--first-parent is incompatible with --bisect"));
2389 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
2391 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
2394 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
2397 static int remove_duplicate_parents(struct rev_info
*revs
, struct commit
*commit
)
2399 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2400 struct commit_list
**pp
, *p
;
2401 int surviving_parents
;
2403 /* Examine existing parents while marking ones we have seen... */
2404 pp
= &commit
->parents
;
2405 surviving_parents
= 0;
2406 while ((p
= *pp
) != NULL
) {
2407 struct commit
*parent
= p
->item
;
2408 if (parent
->object
.flags
& TMP_MARK
) {
2411 compact_treesame(revs
, commit
, surviving_parents
);
2414 parent
->object
.flags
|= TMP_MARK
;
2415 surviving_parents
++;
2418 /* clear the temporary mark */
2419 for (p
= commit
->parents
; p
; p
= p
->next
) {
2420 p
->item
->object
.flags
&= ~TMP_MARK
;
2422 /* no update_treesame() - removing duplicates can't affect TREESAME */
2423 return surviving_parents
;
2426 struct merge_simplify_state
{
2427 struct commit
*simplified
;
2430 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
2432 struct merge_simplify_state
*st
;
2434 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
2436 st
= xcalloc(1, sizeof(*st
));
2437 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
2442 static int mark_redundant_parents(struct rev_info
*revs
, struct commit
*commit
)
2444 struct commit_list
*h
= reduce_heads(commit
->parents
);
2445 int i
= 0, marked
= 0;
2446 struct commit_list
*po
, *pn
;
2448 /* Want these for sanity-checking only */
2449 int orig_cnt
= commit_list_count(commit
->parents
);
2450 int cnt
= commit_list_count(h
);
2453 * Not ready to remove items yet, just mark them for now, based
2454 * on the output of reduce_heads(). reduce_heads outputs the reduced
2455 * set in its original order, so this isn't too hard.
2457 po
= commit
->parents
;
2460 if (pn
&& po
->item
== pn
->item
) {
2464 po
->item
->object
.flags
|= TMP_MARK
;
2470 if (i
!= cnt
|| cnt
+marked
!= orig_cnt
)
2471 die("mark_redundant_parents %d %d %d %d", orig_cnt
, cnt
, i
, marked
);
2473 free_commit_list(h
);
2478 static int mark_treesame_root_parents(struct rev_info
*revs
, struct commit
*commit
)
2480 struct commit_list
*p
;
2483 for (p
= commit
->parents
; p
; p
= p
->next
) {
2484 struct commit
*parent
= p
->item
;
2485 if (!parent
->parents
&& (parent
->object
.flags
& TREESAME
)) {
2486 parent
->object
.flags
|= TMP_MARK
;
2495 * Awkward naming - this means one parent we are TREESAME to.
2496 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2497 * empty tree). Better name suggestions?
2499 static int leave_one_treesame_to_parent(struct rev_info
*revs
, struct commit
*commit
)
2501 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2502 struct commit
*unmarked
= NULL
, *marked
= NULL
;
2503 struct commit_list
*p
;
2506 for (p
= commit
->parents
, n
= 0; p
; p
= p
->next
, n
++) {
2507 if (ts
->treesame
[n
]) {
2508 if (p
->item
->object
.flags
& TMP_MARK
) {
2521 * If we are TREESAME to a marked-for-deletion parent, but not to any
2522 * unmarked parents, unmark the first TREESAME parent. This is the
2523 * parent that the default simplify_history==1 scan would have followed,
2524 * and it doesn't make sense to omit that path when asking for a
2525 * simplified full history. Retaining it improves the chances of
2526 * understanding odd missed merges that took an old version of a file.
2530 * I--------*X A modified the file, but mainline merge X used
2531 * \ / "-s ours", so took the version from I. X is
2532 * `-*A--' TREESAME to I and !TREESAME to A.
2534 * Default log from X would produce "I". Without this check,
2535 * --full-history --simplify-merges would produce "I-A-X", showing
2536 * the merge commit X and that it changed A, but not making clear that
2537 * it had just taken the I version. With this check, the topology above
2540 * Note that it is possible that the simplification chooses a different
2541 * TREESAME parent from the default, in which case this test doesn't
2542 * activate, and we _do_ drop the default parent. Example:
2544 * I------X A modified the file, but it was reverted in B,
2545 * \ / meaning mainline merge X is TREESAME to both
2548 * Default log would produce "I" by following the first parent;
2549 * --full-history --simplify-merges will produce "I-A-B". But this is a
2550 * reasonable result - it presents a logical full history leading from
2551 * I to X, and X is not an important merge.
2553 if (!unmarked
&& marked
) {
2554 marked
->object
.flags
&= ~TMP_MARK
;
2561 static int remove_marked_parents(struct rev_info
*revs
, struct commit
*commit
)
2563 struct commit_list
**pp
, *p
;
2564 int nth_parent
, removed
= 0;
2566 pp
= &commit
->parents
;
2568 while ((p
= *pp
) != NULL
) {
2569 struct commit
*parent
= p
->item
;
2570 if (parent
->object
.flags
& TMP_MARK
) {
2571 parent
->object
.flags
&= ~TMP_MARK
;
2575 compact_treesame(revs
, commit
, nth_parent
);
2582 /* Removing parents can only increase TREESAMEness */
2583 if (removed
&& !(commit
->object
.flags
& TREESAME
))
2584 update_treesame(revs
, commit
);
2589 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
2591 struct commit_list
*p
;
2592 struct commit
*parent
;
2593 struct merge_simplify_state
*st
, *pst
;
2596 st
= locate_simplify_state(revs
, commit
);
2599 * Have we handled this one?
2605 * An UNINTERESTING commit simplifies to itself, so does a
2606 * root commit. We do not rewrite parents of such commit
2609 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
2610 st
->simplified
= commit
;
2615 * Do we know what commit all of our parents that matter
2616 * should be rewritten to? Otherwise we are not ready to
2617 * rewrite this one yet.
2619 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
2620 pst
= locate_simplify_state(revs
, p
->item
);
2621 if (!pst
->simplified
) {
2622 tail
= &commit_list_insert(p
->item
, tail
)->next
;
2625 if (revs
->first_parent_only
)
2629 tail
= &commit_list_insert(commit
, tail
)->next
;
2634 * Rewrite our list of parents. Note that this cannot
2635 * affect our TREESAME flags in any way - a commit is
2636 * always TREESAME to its simplification.
2638 for (p
= commit
->parents
; p
; p
= p
->next
) {
2639 pst
= locate_simplify_state(revs
, p
->item
);
2640 p
->item
= pst
->simplified
;
2641 if (revs
->first_parent_only
)
2645 if (revs
->first_parent_only
)
2648 cnt
= remove_duplicate_parents(revs
, commit
);
2651 * It is possible that we are a merge and one side branch
2652 * does not have any commit that touches the given paths;
2653 * in such a case, the immediate parent from that branch
2654 * will be rewritten to be the merge base.
2656 * o----X X: the commit we are looking at;
2657 * / / o: a commit that touches the paths;
2660 * Further, a merge of an independent branch that doesn't
2661 * touch the path will reduce to a treesame root parent:
2663 * ----o----X X: the commit we are looking at;
2664 * / o: a commit that touches the paths;
2665 * r r: a root commit not touching the paths
2667 * Detect and simplify both cases.
2670 int marked
= mark_redundant_parents(revs
, commit
);
2671 marked
+= mark_treesame_root_parents(revs
, commit
);
2673 marked
-= leave_one_treesame_to_parent(revs
, commit
);
2675 cnt
= remove_marked_parents(revs
, commit
);
2679 * A commit simplifies to itself if it is a root, if it is
2680 * UNINTERESTING, if it touches the given paths, or if it is a
2681 * merge and its parents don't simplify to one relevant commit
2682 * (the first two cases are already handled at the beginning of
2685 * Otherwise, it simplifies to what its sole relevant parent
2689 (commit
->object
.flags
& UNINTERESTING
) ||
2690 !(commit
->object
.flags
& TREESAME
) ||
2691 (parent
= one_relevant_parent(revs
, commit
->parents
)) == NULL
)
2692 st
->simplified
= commit
;
2694 pst
= locate_simplify_state(revs
, parent
);
2695 st
->simplified
= pst
->simplified
;
2700 static void simplify_merges(struct rev_info
*revs
)
2702 struct commit_list
*list
, *next
;
2703 struct commit_list
*yet_to_do
, **tail
;
2704 struct commit
*commit
;
2709 /* feed the list reversed */
2711 for (list
= revs
->commits
; list
; list
= next
) {
2712 commit
= list
->item
;
2715 * Do not free(list) here yet; the original list
2716 * is used later in this function.
2718 commit_list_insert(commit
, &yet_to_do
);
2725 commit
= list
->item
;
2729 tail
= simplify_one(revs
, commit
, tail
);
2733 /* clean up the result, removing the simplified ones */
2734 list
= revs
->commits
;
2735 revs
->commits
= NULL
;
2736 tail
= &revs
->commits
;
2738 struct merge_simplify_state
*st
;
2740 commit
= list
->item
;
2744 st
= locate_simplify_state(revs
, commit
);
2745 if (st
->simplified
== commit
)
2746 tail
= &commit_list_insert(commit
, tail
)->next
;
2750 static void set_children(struct rev_info
*revs
)
2752 struct commit_list
*l
;
2753 for (l
= revs
->commits
; l
; l
= l
->next
) {
2754 struct commit
*commit
= l
->item
;
2755 struct commit_list
*p
;
2757 for (p
= commit
->parents
; p
; p
= p
->next
)
2758 add_child(revs
, p
->item
, commit
);
2762 void reset_revision_walk(void)
2764 clear_object_flags(SEEN
| ADDED
| SHOWN
);
2767 int prepare_revision_walk(struct rev_info
*revs
)
2770 struct object_array old_pending
;
2771 struct commit_list
**next
= &revs
->commits
;
2773 memcpy(&old_pending
, &revs
->pending
, sizeof(old_pending
));
2774 revs
->pending
.nr
= 0;
2775 revs
->pending
.alloc
= 0;
2776 revs
->pending
.objects
= NULL
;
2777 for (i
= 0; i
< old_pending
.nr
; i
++) {
2778 struct object_array_entry
*e
= old_pending
.objects
+ i
;
2779 struct commit
*commit
= handle_commit(revs
, e
);
2781 if (!(commit
->object
.flags
& SEEN
)) {
2782 commit
->object
.flags
|= SEEN
;
2783 next
= commit_list_append(commit
, next
);
2787 if (!revs
->leak_pending
)
2788 object_array_clear(&old_pending
);
2790 /* Signal whether we need per-parent treesame decoration */
2791 if (revs
->simplify_merges
||
2792 (revs
->limited
&& limiting_can_increase_treesame(revs
)))
2793 revs
->treesame
.name
= "treesame";
2795 if (revs
->no_walk
!= REVISION_WALK_NO_WALK_UNSORTED
)
2796 commit_list_sort_by_date(&revs
->commits
);
2800 if (limit_list(revs
) < 0)
2802 if (revs
->topo_order
)
2803 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
2804 if (revs
->line_level_traverse
)
2805 line_log_filter(revs
);
2806 if (revs
->simplify_merges
)
2807 simplify_merges(revs
);
2808 if (revs
->children
.name
)
2813 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
2815 struct commit_list
*cache
= NULL
;
2818 struct commit
*p
= *pp
;
2820 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
2821 return rewrite_one_error
;
2822 if (p
->object
.flags
& UNINTERESTING
)
2823 return rewrite_one_ok
;
2824 if (!(p
->object
.flags
& TREESAME
))
2825 return rewrite_one_ok
;
2827 return rewrite_one_noparents
;
2828 if ((p
= one_relevant_parent(revs
, p
->parents
)) == NULL
)
2829 return rewrite_one_ok
;
2834 int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
,
2835 rewrite_parent_fn_t rewrite_parent
)
2837 struct commit_list
**pp
= &commit
->parents
;
2839 struct commit_list
*parent
= *pp
;
2840 switch (rewrite_parent(revs
, &parent
->item
)) {
2841 case rewrite_one_ok
:
2843 case rewrite_one_noparents
:
2846 case rewrite_one_error
:
2851 remove_duplicate_parents(revs
, commit
);
2855 static int commit_rewrite_person(struct strbuf
*buf
, const char *what
, struct string_list
*mailmap
)
2857 char *person
, *endp
;
2858 size_t len
, namelen
, maillen
;
2861 struct ident_split ident
;
2863 person
= strstr(buf
->buf
, what
);
2867 person
+= strlen(what
);
2868 endp
= strchr(person
, '\n');
2872 len
= endp
- person
;
2874 if (split_ident_line(&ident
, person
, len
))
2877 mail
= ident
.mail_begin
;
2878 maillen
= ident
.mail_end
- ident
.mail_begin
;
2879 name
= ident
.name_begin
;
2880 namelen
= ident
.name_end
- ident
.name_begin
;
2882 if (map_user(mailmap
, &mail
, &maillen
, &name
, &namelen
)) {
2883 struct strbuf namemail
= STRBUF_INIT
;
2885 strbuf_addf(&namemail
, "%.*s <%.*s>",
2886 (int)namelen
, name
, (int)maillen
, mail
);
2888 strbuf_splice(buf
, ident
.name_begin
- buf
->buf
,
2889 ident
.mail_end
- ident
.name_begin
+ 1,
2890 namemail
.buf
, namemail
.len
);
2892 strbuf_release(&namemail
);
2900 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
2903 const char *encoding
;
2904 const char *message
;
2905 struct strbuf buf
= STRBUF_INIT
;
2907 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
2910 /* Prepend "fake" headers as needed */
2911 if (opt
->grep_filter
.use_reflog_filter
) {
2912 strbuf_addstr(&buf
, "reflog ");
2913 get_reflog_message(&buf
, opt
->reflog_info
);
2914 strbuf_addch(&buf
, '\n');
2918 * We grep in the user's output encoding, under the assumption that it
2919 * is the encoding they are most likely to write their grep pattern
2920 * for. In addition, it means we will match the "notes" encoding below,
2921 * so we will not end up with a buffer that has two different encodings
2924 encoding
= get_log_output_encoding();
2925 message
= logmsg_reencode(commit
, NULL
, encoding
);
2927 /* Copy the commit to temporary if we are using "fake" headers */
2929 strbuf_addstr(&buf
, message
);
2931 if (opt
->grep_filter
.header_list
&& opt
->mailmap
) {
2933 strbuf_addstr(&buf
, message
);
2935 commit_rewrite_person(&buf
, "\nauthor ", opt
->mailmap
);
2936 commit_rewrite_person(&buf
, "\ncommitter ", opt
->mailmap
);
2939 /* Append "fake" message parts as needed */
2940 if (opt
->show_notes
) {
2942 strbuf_addstr(&buf
, message
);
2943 format_display_notes(commit
->object
.sha1
, &buf
, encoding
, 1);
2947 * Find either in the original commit message, or in the temporary.
2948 * Note that we cast away the constness of "message" here. It is
2949 * const because it may come from the cached commit buffer. That's OK,
2950 * because we know that it is modifiable heap memory, and that while
2951 * grep_buffer may modify it for speed, it will restore any
2952 * changes before returning.
2955 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
2957 retval
= grep_buffer(&opt
->grep_filter
,
2958 (char *)message
, strlen(message
));
2959 strbuf_release(&buf
);
2960 unuse_commit_buffer(commit
, message
);
2961 return opt
->invert_grep
? !retval
: retval
;
2964 static inline int want_ancestry(const struct rev_info
*revs
)
2966 return (revs
->rewrite_parents
|| revs
->children
.name
);
2969 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
2971 if (commit
->object
.flags
& SHOWN
)
2972 return commit_ignore
;
2973 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
))
2974 return commit_ignore
;
2977 if (commit
->object
.flags
& UNINTERESTING
)
2978 return commit_ignore
;
2979 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
2980 return commit_ignore
;
2981 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
2982 int n
= commit_list_count(commit
->parents
);
2983 if ((n
< revs
->min_parents
) ||
2984 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
2985 return commit_ignore
;
2987 if (!commit_match(commit
, revs
))
2988 return commit_ignore
;
2989 if (revs
->prune
&& revs
->dense
) {
2990 /* Commit without changes? */
2991 if (commit
->object
.flags
& TREESAME
) {
2993 struct commit_list
*p
;
2994 /* drop merges unless we want parenthood */
2995 if (!want_ancestry(revs
))
2996 return commit_ignore
;
2998 * If we want ancestry, then need to keep any merges
2999 * between relevant commits to tie together topology.
3000 * For consistency with TREESAME and simplification
3001 * use "relevant" here rather than just INTERESTING,
3002 * to treat bottom commit(s) as part of the topology.
3004 for (n
= 0, p
= commit
->parents
; p
; p
= p
->next
)
3005 if (relevant_commit(p
->item
))
3008 return commit_ignore
;
3014 define_commit_slab(saved_parents
, struct commit_list
*);
3016 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3019 * You may only call save_parents() once per commit (this is checked
3020 * for non-root commits).
3022 static void save_parents(struct rev_info
*revs
, struct commit
*commit
)
3024 struct commit_list
**pp
;
3026 if (!revs
->saved_parents_slab
) {
3027 revs
->saved_parents_slab
= xmalloc(sizeof(struct saved_parents
));
3028 init_saved_parents(revs
->saved_parents_slab
);
3031 pp
= saved_parents_at(revs
->saved_parents_slab
, commit
);
3034 * When walking with reflogs, we may visit the same commit
3035 * several times: once for each appearance in the reflog.
3037 * In this case, save_parents() will be called multiple times.
3038 * We want to keep only the first set of parents. We need to
3039 * store a sentinel value for an empty (i.e., NULL) parent
3040 * list to distinguish it from a not-yet-saved list, however.
3044 if (commit
->parents
)
3045 *pp
= copy_commit_list(commit
->parents
);
3047 *pp
= EMPTY_PARENT_LIST
;
3050 static void free_saved_parents(struct rev_info
*revs
)
3052 if (revs
->saved_parents_slab
)
3053 clear_saved_parents(revs
->saved_parents_slab
);
3056 struct commit_list
*get_saved_parents(struct rev_info
*revs
, const struct commit
*commit
)
3058 struct commit_list
*parents
;
3060 if (!revs
->saved_parents_slab
)
3061 return commit
->parents
;
3063 parents
= *saved_parents_at(revs
->saved_parents_slab
, commit
);
3064 if (parents
== EMPTY_PARENT_LIST
)
3069 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
3071 enum commit_action action
= get_commit_action(revs
, commit
);
3073 if (action
== commit_show
&&
3075 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
3077 * --full-diff on simplified parents is no good: it
3078 * will show spurious changes from the commits that
3079 * were elided. So we save the parents on the side
3080 * when --full-diff is in effect.
3082 if (revs
->full_diff
)
3083 save_parents(revs
, commit
);
3084 if (rewrite_parents(revs
, commit
, rewrite_one
) < 0)
3085 return commit_error
;
3090 static void track_linear(struct rev_info
*revs
, struct commit
*commit
)
3092 if (revs
->track_first_time
) {
3094 revs
->track_first_time
= 0;
3096 struct commit_list
*p
;
3097 for (p
= revs
->previous_parents
; p
; p
= p
->next
)
3098 if (p
->item
== NULL
|| /* first commit */
3099 !hashcmp(p
->item
->object
.sha1
, commit
->object
.sha1
))
3101 revs
->linear
= p
!= NULL
;
3103 if (revs
->reverse
) {
3105 commit
->object
.flags
|= TRACK_LINEAR
;
3107 free_commit_list(revs
->previous_parents
);
3108 revs
->previous_parents
= copy_commit_list(commit
->parents
);
3111 static struct commit
*get_revision_1(struct rev_info
*revs
)
3117 struct commit_list
*entry
= revs
->commits
;
3118 struct commit
*commit
= entry
->item
;
3120 revs
->commits
= entry
->next
;
3123 if (revs
->reflog_info
) {
3124 save_parents(revs
, commit
);
3125 fake_reflog_parent(revs
->reflog_info
, commit
);
3126 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
3130 * If we haven't done the list limiting, we need to look at
3131 * the parents here. We also need to do the date-based limiting
3132 * that we'd otherwise have done in limit_list().
3134 if (!revs
->limited
) {
3135 if (revs
->max_age
!= -1 &&
3136 (commit
->date
< revs
->max_age
))
3138 if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0) {
3139 if (!revs
->ignore_missing_links
)
3140 die("Failed to traverse parents of commit %s",
3141 sha1_to_hex(commit
->object
.sha1
));
3145 switch (simplify_commit(revs
, commit
)) {
3149 die("Failed to simplify parents of commit %s",
3150 sha1_to_hex(commit
->object
.sha1
));
3152 if (revs
->track_linear
)
3153 track_linear(revs
, commit
);
3156 } while (revs
->commits
);
3161 * Return true for entries that have not yet been shown. (This is an
3162 * object_array_each_func_t.)
3164 static int entry_unshown(struct object_array_entry
*entry
, void *cb_data_unused
)
3166 return !(entry
->item
->flags
& SHOWN
);
3170 * If array is on the verge of a realloc, garbage-collect any entries
3171 * that have already been shown to try to free up some space.
3173 static void gc_boundary(struct object_array
*array
)
3175 if (array
->nr
== array
->alloc
)
3176 object_array_filter(array
, entry_unshown
, NULL
);
3179 static void create_boundary_commit_list(struct rev_info
*revs
)
3183 struct object_array
*array
= &revs
->boundary_commits
;
3184 struct object_array_entry
*objects
= array
->objects
;
3187 * If revs->commits is non-NULL at this point, an error occurred in
3188 * get_revision_1(). Ignore the error and continue printing the
3189 * boundary commits anyway. (This is what the code has always
3192 if (revs
->commits
) {
3193 free_commit_list(revs
->commits
);
3194 revs
->commits
= NULL
;
3198 * Put all of the actual boundary commits from revs->boundary_commits
3199 * into revs->commits
3201 for (i
= 0; i
< array
->nr
; i
++) {
3202 c
= (struct commit
*)(objects
[i
].item
);
3205 if (!(c
->object
.flags
& CHILD_SHOWN
))
3207 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
3209 c
->object
.flags
|= BOUNDARY
;
3210 commit_list_insert(c
, &revs
->commits
);
3214 * If revs->topo_order is set, sort the boundary commits
3215 * in topological order
3217 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
3220 static struct commit
*get_revision_internal(struct rev_info
*revs
)
3222 struct commit
*c
= NULL
;
3223 struct commit_list
*l
;
3225 if (revs
->boundary
== 2) {
3227 * All of the normal commits have already been returned,
3228 * and we are now returning boundary commits.
3229 * create_boundary_commit_list() has populated
3230 * revs->commits with the remaining commits to return.
3232 c
= pop_commit(&revs
->commits
);
3234 c
->object
.flags
|= SHOWN
;
3239 * If our max_count counter has reached zero, then we are done. We
3240 * don't simply return NULL because we still might need to show
3241 * boundary commits. But we want to avoid calling get_revision_1, which
3242 * might do a considerable amount of work finding the next commit only
3243 * for us to throw it away.
3245 * If it is non-zero, then either we don't have a max_count at all
3246 * (-1), or it is still counting, in which case we decrement.
3248 if (revs
->max_count
) {
3249 c
= get_revision_1(revs
);
3251 while (revs
->skip_count
> 0) {
3253 c
= get_revision_1(revs
);
3259 if (revs
->max_count
> 0)
3264 c
->object
.flags
|= SHOWN
;
3266 if (!revs
->boundary
)
3271 * get_revision_1() runs out the commits, and
3272 * we are done computing the boundaries.
3273 * switch to boundary commits output mode.
3278 * Update revs->commits to contain the list of
3281 create_boundary_commit_list(revs
);
3283 return get_revision_internal(revs
);
3287 * boundary commits are the commits that are parents of the
3288 * ones we got from get_revision_1() but they themselves are
3289 * not returned from get_revision_1(). Before returning
3290 * 'c', we need to mark its parents that they could be boundaries.
3293 for (l
= c
->parents
; l
; l
= l
->next
) {
3295 p
= &(l
->item
->object
);
3296 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
3298 p
->flags
|= CHILD_SHOWN
;
3299 gc_boundary(&revs
->boundary_commits
);
3300 add_object_array(p
, NULL
, &revs
->boundary_commits
);
3306 struct commit
*get_revision(struct rev_info
*revs
)
3309 struct commit_list
*reversed
;
3311 if (revs
->reverse
) {
3313 while ((c
= get_revision_internal(revs
)))
3314 commit_list_insert(c
, &reversed
);
3315 revs
->commits
= reversed
;
3317 revs
->reverse_output_stage
= 1;
3320 if (revs
->reverse_output_stage
) {
3321 c
= pop_commit(&revs
->commits
);
3322 if (revs
->track_linear
)
3323 revs
->linear
= !!(c
&& c
->object
.flags
& TRACK_LINEAR
);
3327 c
= get_revision_internal(revs
);
3328 if (c
&& revs
->graph
)
3329 graph_update(revs
->graph
, c
);
3331 free_saved_parents(revs
);
3332 if (revs
->previous_parents
) {
3333 free_commit_list(revs
->previous_parents
);
3334 revs
->previous_parents
= NULL
;
3340 char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
3342 if (commit
->object
.flags
& BOUNDARY
)
3344 else if (commit
->object
.flags
& UNINTERESTING
)
3346 else if (commit
->object
.flags
& PATCHSAME
)
3348 else if (!revs
|| revs
->left_right
) {
3349 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
3353 } else if (revs
->graph
)
3355 else if (revs
->cherry_mark
)
3360 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
3362 char *mark
= get_revision_mark(revs
, commit
);
3365 fputs(mark
, stdout
);