11 #include "reflog-walk.h"
12 #include "patch-ids.h"
15 #include "string-list.h"
18 #include "commit-slab.h"
20 #include "cache-tree.h"
23 volatile show_early_output_fn_t show_early_output
;
25 static const char *term_bad
;
26 static const char *term_good
;
28 void show_object_with_name(FILE *out
, struct object
*obj
, const char *name
)
32 fprintf(out
, "%s ", oid_to_hex(&obj
->oid
));
33 for (p
= name
; *p
&& *p
!= '\n'; p
++)
38 static void mark_blob_uninteresting(struct blob
*blob
)
42 if (blob
->object
.flags
& UNINTERESTING
)
44 blob
->object
.flags
|= UNINTERESTING
;
47 static void mark_tree_contents_uninteresting(struct tree
*tree
)
49 struct tree_desc desc
;
50 struct name_entry entry
;
51 struct object
*obj
= &tree
->object
;
53 if (!has_object_file(&obj
->oid
))
55 if (parse_tree(tree
) < 0)
56 die("bad tree %s", oid_to_hex(&obj
->oid
));
58 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
59 while (tree_entry(&desc
, &entry
)) {
60 switch (object_type(entry
.mode
)) {
62 mark_tree_uninteresting(lookup_tree(entry
.oid
->hash
));
65 mark_blob_uninteresting(lookup_blob(entry
.oid
->hash
));
68 /* Subproject commit - not in this repository */
74 * We don't care about the tree any more
75 * after it has been marked uninteresting.
77 free_tree_buffer(tree
);
80 void mark_tree_uninteresting(struct tree
*tree
)
88 if (obj
->flags
& UNINTERESTING
)
90 obj
->flags
|= UNINTERESTING
;
91 mark_tree_contents_uninteresting(tree
);
94 void mark_parents_uninteresting(struct commit
*commit
)
96 struct commit_list
*parents
= NULL
, *l
;
98 for (l
= commit
->parents
; l
; l
= l
->next
)
99 commit_list_insert(l
->item
, &parents
);
102 struct commit
*commit
= pop_commit(&parents
);
106 * A missing commit is ok iff its parent is marked
109 * We just mark such a thing parsed, so that when
110 * it is popped next time around, we won't be trying
111 * to parse it and get an error.
113 if (!has_object_file(&commit
->object
.oid
))
114 commit
->object
.parsed
= 1;
116 if (commit
->object
.flags
& UNINTERESTING
)
119 commit
->object
.flags
|= UNINTERESTING
;
122 * Normally we haven't parsed the parent
123 * yet, so we won't have a parent of a parent
124 * here. However, it may turn out that we've
125 * reached this commit some other way (where it
126 * wasn't uninteresting), in which case we need
127 * to mark its parents recursively too..
129 if (!commit
->parents
)
132 for (l
= commit
->parents
->next
; l
; l
= l
->next
)
133 commit_list_insert(l
->item
, &parents
);
134 commit
= commit
->parents
->item
;
139 static void add_pending_object_with_path(struct rev_info
*revs
,
141 const char *name
, unsigned mode
,
146 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
148 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
149 struct strbuf buf
= STRBUF_INIT
;
150 int len
= interpret_branch_name(name
, 0, &buf
, 0);
153 if (0 < len
&& name
[len
] && buf
.len
)
154 strbuf_addstr(&buf
, name
+ len
);
155 st
= add_reflog_for_walk(revs
->reflog_info
,
156 (struct commit
*)obj
,
157 buf
.buf
[0] ? buf
.buf
: name
);
158 strbuf_release(&buf
);
162 add_object_array_with_path(obj
, name
, &revs
->pending
, mode
, path
);
165 static void add_pending_object_with_mode(struct rev_info
*revs
,
167 const char *name
, unsigned mode
)
169 add_pending_object_with_path(revs
, obj
, name
, mode
, NULL
);
172 void add_pending_object(struct rev_info
*revs
,
173 struct object
*obj
, const char *name
)
175 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
178 void add_head_to_pending(struct rev_info
*revs
)
180 unsigned char sha1
[20];
182 if (get_sha1("HEAD", sha1
))
184 obj
= parse_object(sha1
);
187 add_pending_object(revs
, obj
, "HEAD");
190 static struct object
*get_reference(struct rev_info
*revs
, const char *name
,
191 const unsigned char *sha1
,
194 struct object
*object
;
196 object
= parse_object(sha1
);
198 if (revs
->ignore_missing
)
200 die("bad object %s", name
);
202 object
->flags
|= flags
;
206 void add_pending_sha1(struct rev_info
*revs
, const char *name
,
207 const unsigned char *sha1
, unsigned int flags
)
209 struct object
*object
= get_reference(revs
, name
, sha1
, flags
);
210 add_pending_object(revs
, object
, name
);
213 static struct commit
*handle_commit(struct rev_info
*revs
,
214 struct object_array_entry
*entry
)
216 struct object
*object
= entry
->item
;
217 const char *name
= entry
->name
;
218 const char *path
= entry
->path
;
219 unsigned int mode
= entry
->mode
;
220 unsigned long flags
= object
->flags
;
223 * Tag object? Look what it points to..
225 while (object
->type
== OBJ_TAG
) {
226 struct tag
*tag
= (struct tag
*) object
;
227 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
228 add_pending_object(revs
, object
, tag
->tag
);
231 object
= parse_object(tag
->tagged
->oid
.hash
);
233 if (flags
& UNINTERESTING
)
235 die("bad object %s", oid_to_hex(&tag
->tagged
->oid
));
237 object
->flags
|= flags
;
239 * We'll handle the tagged object by looping or dropping
240 * through to the non-tag handlers below. Do not
241 * propagate path data from the tag's pending entry.
248 * Commit object? Just return it, we'll do all the complex
251 if (object
->type
== OBJ_COMMIT
) {
252 struct commit
*commit
= (struct commit
*)object
;
253 if (parse_commit(commit
) < 0)
254 die("unable to parse commit %s", name
);
255 if (flags
& UNINTERESTING
) {
256 mark_parents_uninteresting(commit
);
259 if (revs
->show_source
&& !commit
->util
)
260 commit
->util
= xstrdup(name
);
265 * Tree object? Either mark it uninteresting, or add it
266 * to the list of objects to look at later..
268 if (object
->type
== OBJ_TREE
) {
269 struct tree
*tree
= (struct tree
*)object
;
270 if (!revs
->tree_objects
)
272 if (flags
& UNINTERESTING
) {
273 mark_tree_contents_uninteresting(tree
);
276 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
281 * Blob object? You know the drill by now..
283 if (object
->type
== OBJ_BLOB
) {
284 if (!revs
->blob_objects
)
286 if (flags
& UNINTERESTING
)
288 add_pending_object_with_path(revs
, object
, name
, mode
, path
);
291 die("%s is unknown object", name
);
294 static int everybody_uninteresting(struct commit_list
*orig
,
295 struct commit
**interesting_cache
)
297 struct commit_list
*list
= orig
;
299 if (*interesting_cache
) {
300 struct commit
*commit
= *interesting_cache
;
301 if (!(commit
->object
.flags
& UNINTERESTING
))
306 struct commit
*commit
= list
->item
;
308 if (commit
->object
.flags
& UNINTERESTING
)
311 *interesting_cache
= commit
;
318 * A definition of "relevant" commit that we can use to simplify limited graphs
319 * by eliminating side branches.
321 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
322 * in our list), or that is a specified BOTTOM commit. Then after computing
323 * a limited list, during processing we can generally ignore boundary merges
324 * coming from outside the graph, (ie from irrelevant parents), and treat
325 * those merges as if they were single-parent. TREESAME is defined to consider
326 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
327 * we don't care if we were !TREESAME to non-graph parents.
329 * Treating bottom commits as relevant ensures that a limited graph's
330 * connection to the actual bottom commit is not viewed as a side branch, but
331 * treated as part of the graph. For example:
333 * ....Z...A---X---o---o---B
337 * When computing "A..B", the A-X connection is at least as important as
338 * Y-X, despite A being flagged UNINTERESTING.
340 * And when computing --ancestry-path "A..B", the A-X connection is more
341 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
343 static inline int relevant_commit(struct commit
*commit
)
345 return (commit
->object
.flags
& (UNINTERESTING
| BOTTOM
)) != UNINTERESTING
;
349 * Return a single relevant commit from a parent list. If we are a TREESAME
350 * commit, and this selects one of our parents, then we can safely simplify to
353 static struct commit
*one_relevant_parent(const struct rev_info
*revs
,
354 struct commit_list
*orig
)
356 struct commit_list
*list
= orig
;
357 struct commit
*relevant
= NULL
;
363 * For 1-parent commits, or if first-parent-only, then return that
364 * first parent (even if not "relevant" by the above definition).
365 * TREESAME will have been set purely on that parent.
367 if (revs
->first_parent_only
|| !orig
->next
)
371 * For multi-parent commits, identify a sole relevant parent, if any.
372 * If we have only one relevant parent, then TREESAME will be set purely
373 * with regard to that parent, and we can simplify accordingly.
375 * If we have more than one relevant parent, or no relevant parents
376 * (and multiple irrelevant ones), then we can't select a parent here
380 struct commit
*commit
= list
->item
;
382 if (relevant_commit(commit
)) {
392 * The goal is to get REV_TREE_NEW as the result only if the
393 * diff consists of all '+' (and no other changes), REV_TREE_OLD
394 * if the whole diff is removal of old data, and otherwise
395 * REV_TREE_DIFFERENT (of course if the trees are the same we
396 * want REV_TREE_SAME).
397 * That means that once we get to REV_TREE_DIFFERENT, we do not
398 * have to look any further.
400 static int tree_difference
= REV_TREE_SAME
;
402 static void file_add_remove(struct diff_options
*options
,
403 int addremove
, unsigned mode
,
404 const unsigned char *sha1
,
406 const char *fullpath
, unsigned dirty_submodule
)
408 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
410 tree_difference
|= diff
;
411 if (tree_difference
== REV_TREE_DIFFERENT
)
412 DIFF_OPT_SET(options
, HAS_CHANGES
);
415 static void file_change(struct diff_options
*options
,
416 unsigned old_mode
, unsigned new_mode
,
417 const unsigned char *old_sha1
,
418 const unsigned char *new_sha1
,
419 int old_sha1_valid
, int new_sha1_valid
,
420 const char *fullpath
,
421 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
423 tree_difference
= REV_TREE_DIFFERENT
;
424 DIFF_OPT_SET(options
, HAS_CHANGES
);
427 static int rev_compare_tree(struct rev_info
*revs
,
428 struct commit
*parent
, struct commit
*commit
)
430 struct tree
*t1
= parent
->tree
;
431 struct tree
*t2
= commit
->tree
;
438 if (revs
->simplify_by_decoration
) {
440 * If we are simplifying by decoration, then the commit
441 * is worth showing if it has a tag pointing at it.
443 if (get_name_decoration(&commit
->object
))
444 return REV_TREE_DIFFERENT
;
446 * A commit that is not pointed by a tag is uninteresting
447 * if we are not limited by path. This means that you will
448 * see the usual "commits that touch the paths" plus any
449 * tagged commit by specifying both --simplify-by-decoration
452 if (!revs
->prune_data
.nr
)
453 return REV_TREE_SAME
;
456 tree_difference
= REV_TREE_SAME
;
457 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
458 if (diff_tree_sha1(t1
->object
.oid
.hash
, t2
->object
.oid
.hash
, "",
460 return REV_TREE_DIFFERENT
;
461 return tree_difference
;
464 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
467 struct tree
*t1
= commit
->tree
;
472 tree_difference
= REV_TREE_SAME
;
473 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
474 retval
= diff_tree_sha1(NULL
, t1
->object
.oid
.hash
, "", &revs
->pruning
);
476 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
479 struct treesame_state
{
480 unsigned int nparents
;
481 unsigned char treesame
[FLEX_ARRAY
];
484 static struct treesame_state
*initialise_treesame(struct rev_info
*revs
, struct commit
*commit
)
486 unsigned n
= commit_list_count(commit
->parents
);
487 struct treesame_state
*st
= xcalloc(1, st_add(sizeof(*st
), n
));
489 add_decoration(&revs
->treesame
, &commit
->object
, st
);
494 * Must be called immediately after removing the nth_parent from a commit's
495 * parent list, if we are maintaining the per-parent treesame[] decoration.
496 * This does not recalculate the master TREESAME flag - update_treesame()
497 * should be called to update it after a sequence of treesame[] modifications
498 * that may have affected it.
500 static int compact_treesame(struct rev_info
*revs
, struct commit
*commit
, unsigned nth_parent
)
502 struct treesame_state
*st
;
505 if (!commit
->parents
) {
507 * Have just removed the only parent from a non-merge.
508 * Different handling, as we lack decoration.
511 die("compact_treesame %u", nth_parent
);
512 old_same
= !!(commit
->object
.flags
& TREESAME
);
513 if (rev_same_tree_as_empty(revs
, commit
))
514 commit
->object
.flags
|= TREESAME
;
516 commit
->object
.flags
&= ~TREESAME
;
520 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
521 if (!st
|| nth_parent
>= st
->nparents
)
522 die("compact_treesame %u", nth_parent
);
524 old_same
= st
->treesame
[nth_parent
];
525 memmove(st
->treesame
+ nth_parent
,
526 st
->treesame
+ nth_parent
+ 1,
527 st
->nparents
- nth_parent
- 1);
530 * If we've just become a non-merge commit, update TREESAME
531 * immediately, and remove the no-longer-needed decoration.
532 * If still a merge, defer update until update_treesame().
534 if (--st
->nparents
== 1) {
535 if (commit
->parents
->next
)
536 die("compact_treesame parents mismatch");
537 if (st
->treesame
[0] && revs
->dense
)
538 commit
->object
.flags
|= TREESAME
;
540 commit
->object
.flags
&= ~TREESAME
;
541 free(add_decoration(&revs
->treesame
, &commit
->object
, NULL
));
547 static unsigned update_treesame(struct rev_info
*revs
, struct commit
*commit
)
549 if (commit
->parents
&& commit
->parents
->next
) {
551 struct treesame_state
*st
;
552 struct commit_list
*p
;
553 unsigned relevant_parents
;
554 unsigned relevant_change
, irrelevant_change
;
556 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
558 die("update_treesame %s", oid_to_hex(&commit
->object
.oid
));
559 relevant_parents
= 0;
560 relevant_change
= irrelevant_change
= 0;
561 for (p
= commit
->parents
, n
= 0; p
; n
++, p
= p
->next
) {
562 if (relevant_commit(p
->item
)) {
563 relevant_change
|= !st
->treesame
[n
];
566 irrelevant_change
|= !st
->treesame
[n
];
568 if (relevant_parents
? relevant_change
: irrelevant_change
)
569 commit
->object
.flags
&= ~TREESAME
;
571 commit
->object
.flags
|= TREESAME
;
574 return commit
->object
.flags
& TREESAME
;
577 static inline int limiting_can_increase_treesame(const struct rev_info
*revs
)
580 * TREESAME is irrelevant unless prune && dense;
581 * if simplify_history is set, we can't have a mixture of TREESAME and
582 * !TREESAME INTERESTING parents (and we don't have treesame[]
583 * decoration anyway);
584 * if first_parent_only is set, then the TREESAME flag is locked
585 * against the first parent (and again we lack treesame[] decoration).
587 return revs
->prune
&& revs
->dense
&&
588 !revs
->simplify_history
&&
589 !revs
->first_parent_only
;
592 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
594 struct commit_list
**pp
, *parent
;
595 struct treesame_state
*ts
= NULL
;
596 int relevant_change
= 0, irrelevant_change
= 0;
597 int relevant_parents
, nth_parent
;
600 * If we don't do pruning, everything is interesting
608 if (!commit
->parents
) {
609 if (rev_same_tree_as_empty(revs
, commit
))
610 commit
->object
.flags
|= TREESAME
;
615 * Normal non-merge commit? If we don't want to make the
616 * history dense, we consider it always to be a change..
618 if (!revs
->dense
&& !commit
->parents
->next
)
621 for (pp
= &commit
->parents
, nth_parent
= 0, relevant_parents
= 0;
622 (parent
= *pp
) != NULL
;
623 pp
= &parent
->next
, nth_parent
++) {
624 struct commit
*p
= parent
->item
;
625 if (relevant_commit(p
))
628 if (nth_parent
== 1) {
630 * This our second loop iteration - so we now know
631 * we're dealing with a merge.
633 * Do not compare with later parents when we care only about
634 * the first parent chain, in order to avoid derailing the
635 * traversal to follow a side branch that brought everything
636 * in the path we are limited to by the pathspec.
638 if (revs
->first_parent_only
)
641 * If this will remain a potentially-simplifiable
642 * merge, remember per-parent treesame if needed.
643 * Initialise the array with the comparison from our
646 if (revs
->treesame
.name
&&
647 !revs
->simplify_history
&&
648 !(commit
->object
.flags
& UNINTERESTING
)) {
649 ts
= initialise_treesame(revs
, commit
);
650 if (!(irrelevant_change
|| relevant_change
))
654 if (parse_commit(p
) < 0)
655 die("cannot simplify commit %s (because of %s)",
656 oid_to_hex(&commit
->object
.oid
),
657 oid_to_hex(&p
->object
.oid
));
658 switch (rev_compare_tree(revs
, p
, commit
)) {
660 if (!revs
->simplify_history
|| !relevant_commit(p
)) {
661 /* Even if a merge with an uninteresting
662 * side branch brought the entire change
663 * we are interested in, we do not want
664 * to lose the other branches of this
665 * merge, so we just keep going.
668 ts
->treesame
[nth_parent
] = 1;
672 commit
->parents
= parent
;
673 commit
->object
.flags
|= TREESAME
;
677 if (revs
->remove_empty_trees
&&
678 rev_same_tree_as_empty(revs
, p
)) {
679 /* We are adding all the specified
680 * paths from this parent, so the
681 * history beyond this parent is not
682 * interesting. Remove its parents
683 * (they are grandparents for us).
684 * IOW, we pretend this parent is a
687 if (parse_commit(p
) < 0)
688 die("cannot simplify commit %s (invalid %s)",
689 oid_to_hex(&commit
->object
.oid
),
690 oid_to_hex(&p
->object
.oid
));
695 case REV_TREE_DIFFERENT
:
696 if (relevant_commit(p
))
699 irrelevant_change
= 1;
702 die("bad tree compare for commit %s", oid_to_hex(&commit
->object
.oid
));
706 * TREESAME is straightforward for single-parent commits. For merge
707 * commits, it is most useful to define it so that "irrelevant"
708 * parents cannot make us !TREESAME - if we have any relevant
709 * parents, then we only consider TREESAMEness with respect to them,
710 * allowing irrelevant merges from uninteresting branches to be
711 * simplified away. Only if we have only irrelevant parents do we
712 * base TREESAME on them. Note that this logic is replicated in
713 * update_treesame, which should be kept in sync.
715 if (relevant_parents
? !relevant_change
: !irrelevant_change
)
716 commit
->object
.flags
|= TREESAME
;
719 static void commit_list_insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
720 struct commit_list
*cached_base
, struct commit_list
**cache
)
722 struct commit_list
*new_entry
;
724 if (cached_base
&& p
->date
< cached_base
->item
->date
)
725 new_entry
= commit_list_insert_by_date(p
, &cached_base
->next
);
727 new_entry
= commit_list_insert_by_date(p
, head
);
729 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
733 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
734 struct commit_list
**list
, struct commit_list
**cache_ptr
)
736 struct commit_list
*parent
= commit
->parents
;
738 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
740 if (commit
->object
.flags
& ADDED
)
742 commit
->object
.flags
|= ADDED
;
744 if (revs
->include_check
&&
745 !revs
->include_check(commit
, revs
->include_check_data
))
749 * If the commit is uninteresting, don't try to
750 * prune parents - we want the maximal uninteresting
753 * Normally we haven't parsed the parent
754 * yet, so we won't have a parent of a parent
755 * here. However, it may turn out that we've
756 * reached this commit some other way (where it
757 * wasn't uninteresting), in which case we need
758 * to mark its parents recursively too..
760 if (commit
->object
.flags
& UNINTERESTING
) {
762 struct commit
*p
= parent
->item
;
763 parent
= parent
->next
;
765 p
->object
.flags
|= UNINTERESTING
;
766 if (parse_commit_gently(p
, 1) < 0)
769 mark_parents_uninteresting(p
);
770 if (p
->object
.flags
& SEEN
)
772 p
->object
.flags
|= SEEN
;
773 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
779 * Ok, the commit wasn't uninteresting. Try to
780 * simplify the commit history and find the parent
781 * that has no differences in the path set if one exists.
783 try_to_simplify_commit(revs
, commit
);
788 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
790 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
791 struct commit
*p
= parent
->item
;
793 if (parse_commit_gently(p
, revs
->ignore_missing_links
) < 0)
795 if (revs
->show_source
&& !p
->util
)
796 p
->util
= commit
->util
;
797 p
->object
.flags
|= left_flag
;
798 if (!(p
->object
.flags
& SEEN
)) {
799 p
->object
.flags
|= SEEN
;
800 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
802 if (revs
->first_parent_only
)
808 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
810 struct commit_list
*p
;
811 int left_count
= 0, right_count
= 0;
813 struct patch_ids ids
;
814 unsigned cherry_flag
;
816 /* First count the commits on the left and on the right */
817 for (p
= list
; p
; p
= p
->next
) {
818 struct commit
*commit
= p
->item
;
819 unsigned flags
= commit
->object
.flags
;
820 if (flags
& BOUNDARY
)
822 else if (flags
& SYMMETRIC_LEFT
)
828 if (!left_count
|| !right_count
)
831 left_first
= left_count
< right_count
;
832 init_patch_ids(&ids
);
833 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
835 /* Compute patch-ids for one side */
836 for (p
= list
; p
; p
= p
->next
) {
837 struct commit
*commit
= p
->item
;
838 unsigned flags
= commit
->object
.flags
;
840 if (flags
& BOUNDARY
)
843 * If we have fewer left, left_first is set and we omit
844 * commits on the right branch in this loop. If we have
845 * fewer right, we skip the left ones.
847 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
849 add_commit_patch_id(commit
, &ids
);
852 /* either cherry_mark or cherry_pick are true */
853 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
855 /* Check the other side */
856 for (p
= list
; p
; p
= p
->next
) {
857 struct commit
*commit
= p
->item
;
859 unsigned flags
= commit
->object
.flags
;
861 if (flags
& BOUNDARY
)
864 * If we have fewer left, left_first is set and we omit
865 * commits on the left branch in this loop.
867 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
871 * Have we seen the same patch id?
873 id
= has_commit_patch_id(commit
, &ids
);
877 commit
->object
.flags
|= cherry_flag
;
878 id
->commit
->object
.flags
|= cherry_flag
;
881 free_patch_ids(&ids
);
884 /* How many extra uninteresting commits we want to see.. */
887 static int still_interesting(struct commit_list
*src
, unsigned long date
, int slop
,
888 struct commit
**interesting_cache
)
891 * No source list at all? We're definitely done..
897 * Does the destination list contain entries with a date
898 * before the source list? Definitely _not_ done.
900 if (date
<= src
->item
->date
)
904 * Does the source list still have interesting commits in
905 * it? Definitely not done..
907 if (!everybody_uninteresting(src
, interesting_cache
))
910 /* Ok, we're closing in.. */
915 * "rev-list --ancestry-path A..B" computes commits that are ancestors
916 * of B but not ancestors of A but further limits the result to those
917 * that are descendants of A. This takes the list of bottom commits and
918 * the result of "A..B" without --ancestry-path, and limits the latter
919 * further to the ones that can reach one of the commits in "bottom".
921 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
923 struct commit_list
*p
;
924 struct commit_list
*rlist
= NULL
;
928 * Reverse the list so that it will be likely that we would
929 * process parents before children.
931 for (p
= list
; p
; p
= p
->next
)
932 commit_list_insert(p
->item
, &rlist
);
934 for (p
= bottom
; p
; p
= p
->next
)
935 p
->item
->object
.flags
|= TMP_MARK
;
938 * Mark the ones that can reach bottom commits in "list",
939 * in a bottom-up fashion.
943 for (p
= rlist
; p
; p
= p
->next
) {
944 struct commit
*c
= p
->item
;
945 struct commit_list
*parents
;
946 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
948 for (parents
= c
->parents
;
950 parents
= parents
->next
) {
951 if (!(parents
->item
->object
.flags
& TMP_MARK
))
953 c
->object
.flags
|= TMP_MARK
;
958 } while (made_progress
);
961 * NEEDSWORK: decide if we want to remove parents that are
962 * not marked with TMP_MARK from commit->parents for commits
963 * in the resulting list. We may not want to do that, though.
967 * The ones that are not marked with TMP_MARK are uninteresting
969 for (p
= list
; p
; p
= p
->next
) {
970 struct commit
*c
= p
->item
;
971 if (c
->object
.flags
& TMP_MARK
)
973 c
->object
.flags
|= UNINTERESTING
;
976 /* We are done with the TMP_MARK */
977 for (p
= list
; p
; p
= p
->next
)
978 p
->item
->object
.flags
&= ~TMP_MARK
;
979 for (p
= bottom
; p
; p
= p
->next
)
980 p
->item
->object
.flags
&= ~TMP_MARK
;
981 free_commit_list(rlist
);
985 * Before walking the history, keep the set of "negative" refs the
986 * caller has asked to exclude.
988 * This is used to compute "rev-list --ancestry-path A..B", as we need
989 * to filter the result of "A..B" further to the ones that can actually
992 static struct commit_list
*collect_bottom_commits(struct commit_list
*list
)
994 struct commit_list
*elem
, *bottom
= NULL
;
995 for (elem
= list
; elem
; elem
= elem
->next
)
996 if (elem
->item
->object
.flags
& BOTTOM
)
997 commit_list_insert(elem
->item
, &bottom
);
1001 /* Assumes either left_only or right_only is set */
1002 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
1004 struct commit_list
*p
;
1006 for (p
= list
; p
; p
= p
->next
) {
1007 struct commit
*commit
= p
->item
;
1009 if (revs
->right_only
) {
1010 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
1011 commit
->object
.flags
|= SHOWN
;
1012 } else /* revs->left_only is set */
1013 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
1014 commit
->object
.flags
|= SHOWN
;
1018 static int limit_list(struct rev_info
*revs
)
1021 unsigned long date
= ~0ul;
1022 struct commit_list
*list
= revs
->commits
;
1023 struct commit_list
*newlist
= NULL
;
1024 struct commit_list
**p
= &newlist
;
1025 struct commit_list
*bottom
= NULL
;
1026 struct commit
*interesting_cache
= NULL
;
1028 if (revs
->ancestry_path
) {
1029 bottom
= collect_bottom_commits(list
);
1031 die("--ancestry-path given but there are no bottom commits");
1035 struct commit
*commit
= pop_commit(&list
);
1036 struct object
*obj
= &commit
->object
;
1037 show_early_output_fn_t show
;
1039 if (commit
== interesting_cache
)
1040 interesting_cache
= NULL
;
1042 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
1043 obj
->flags
|= UNINTERESTING
;
1044 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
1046 if (obj
->flags
& UNINTERESTING
) {
1047 mark_parents_uninteresting(commit
);
1049 p
= &commit_list_insert(commit
, p
)->next
;
1050 slop
= still_interesting(list
, date
, slop
, &interesting_cache
);
1053 /* If showing all, add the whole pending list to the end */
1058 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
1060 date
= commit
->date
;
1061 p
= &commit_list_insert(commit
, p
)->next
;
1063 show
= show_early_output
;
1067 show(revs
, newlist
);
1068 show_early_output
= NULL
;
1070 if (revs
->cherry_pick
|| revs
->cherry_mark
)
1071 cherry_pick_list(newlist
, revs
);
1073 if (revs
->left_only
|| revs
->right_only
)
1074 limit_left_right(newlist
, revs
);
1077 limit_to_ancestry(bottom
, newlist
);
1078 free_commit_list(bottom
);
1082 * Check if any commits have become TREESAME by some of their parents
1083 * becoming UNINTERESTING.
1085 if (limiting_can_increase_treesame(revs
))
1086 for (list
= newlist
; list
; list
= list
->next
) {
1087 struct commit
*c
= list
->item
;
1088 if (c
->object
.flags
& (UNINTERESTING
| TREESAME
))
1090 update_treesame(revs
, c
);
1093 revs
->commits
= newlist
;
1098 * Add an entry to refs->cmdline with the specified information.
1101 static void add_rev_cmdline(struct rev_info
*revs
,
1102 struct object
*item
,
1107 struct rev_cmdline_info
*info
= &revs
->cmdline
;
1110 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
1111 info
->rev
[nr
].item
= item
;
1112 info
->rev
[nr
].name
= xstrdup(name
);
1113 info
->rev
[nr
].whence
= whence
;
1114 info
->rev
[nr
].flags
= flags
;
1118 static void add_rev_cmdline_list(struct rev_info
*revs
,
1119 struct commit_list
*commit_list
,
1123 while (commit_list
) {
1124 struct object
*object
= &commit_list
->item
->object
;
1125 add_rev_cmdline(revs
, object
, oid_to_hex(&object
->oid
),
1127 commit_list
= commit_list
->next
;
1131 struct all_refs_cb
{
1133 int warned_bad_reflog
;
1134 struct rev_info
*all_revs
;
1135 const char *name_for_errormsg
;
1138 int ref_excluded(struct string_list
*ref_excludes
, const char *path
)
1140 struct string_list_item
*item
;
1144 for_each_string_list_item(item
, ref_excludes
) {
1145 if (!wildmatch(item
->string
, path
, 0, NULL
))
1151 static int handle_one_ref(const char *path
, const struct object_id
*oid
,
1152 int flag
, void *cb_data
)
1154 struct all_refs_cb
*cb
= cb_data
;
1155 struct object
*object
;
1157 if (ref_excluded(cb
->all_revs
->ref_excludes
, path
))
1160 object
= get_reference(cb
->all_revs
, path
, oid
->hash
, cb
->all_flags
);
1161 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
1162 add_pending_sha1(cb
->all_revs
, path
, oid
->hash
, cb
->all_flags
);
1166 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
1169 cb
->all_revs
= revs
;
1170 cb
->all_flags
= flags
;
1173 void clear_ref_exclusion(struct string_list
**ref_excludes_p
)
1175 if (*ref_excludes_p
) {
1176 string_list_clear(*ref_excludes_p
, 0);
1177 free(*ref_excludes_p
);
1179 *ref_excludes_p
= NULL
;
1182 void add_ref_exclusion(struct string_list
**ref_excludes_p
, const char *exclude
)
1184 if (!*ref_excludes_p
) {
1185 *ref_excludes_p
= xcalloc(1, sizeof(**ref_excludes_p
));
1186 (*ref_excludes_p
)->strdup_strings
= 1;
1188 string_list_append(*ref_excludes_p
, exclude
);
1191 static void handle_refs(const char *submodule
, struct rev_info
*revs
, unsigned flags
,
1192 int (*for_each
)(const char *, each_ref_fn
, void *))
1194 struct all_refs_cb cb
;
1195 init_all_refs_cb(&cb
, revs
, flags
);
1196 for_each(submodule
, handle_one_ref
, &cb
);
1199 static void handle_one_reflog_commit(struct object_id
*oid
, void *cb_data
)
1201 struct all_refs_cb
*cb
= cb_data
;
1202 if (!is_null_oid(oid
)) {
1203 struct object
*o
= parse_object(oid
->hash
);
1205 o
->flags
|= cb
->all_flags
;
1206 /* ??? CMDLINEFLAGS ??? */
1207 add_pending_object(cb
->all_revs
, o
, "");
1209 else if (!cb
->warned_bad_reflog
) {
1210 warning("reflog of '%s' references pruned commits",
1211 cb
->name_for_errormsg
);
1212 cb
->warned_bad_reflog
= 1;
1217 static int handle_one_reflog_ent(struct object_id
*ooid
, struct object_id
*noid
,
1218 const char *email
, unsigned long timestamp
, int tz
,
1219 const char *message
, void *cb_data
)
1221 handle_one_reflog_commit(ooid
, cb_data
);
1222 handle_one_reflog_commit(noid
, cb_data
);
1226 static int handle_one_reflog(const char *path
, const struct object_id
*oid
,
1227 int flag
, void *cb_data
)
1229 struct all_refs_cb
*cb
= cb_data
;
1230 cb
->warned_bad_reflog
= 0;
1231 cb
->name_for_errormsg
= path
;
1232 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
1236 void add_reflogs_to_pending(struct rev_info
*revs
, unsigned flags
)
1238 struct all_refs_cb cb
;
1241 cb
.all_flags
= flags
;
1242 for_each_reflog(handle_one_reflog
, &cb
);
1245 static void add_cache_tree(struct cache_tree
*it
, struct rev_info
*revs
,
1246 struct strbuf
*path
)
1248 size_t baselen
= path
->len
;
1251 if (it
->entry_count
>= 0) {
1252 struct tree
*tree
= lookup_tree(it
->sha1
);
1253 add_pending_object_with_path(revs
, &tree
->object
, "",
1257 for (i
= 0; i
< it
->subtree_nr
; i
++) {
1258 struct cache_tree_sub
*sub
= it
->down
[i
];
1259 strbuf_addf(path
, "%s%s", baselen
? "/" : "", sub
->name
);
1260 add_cache_tree(sub
->cache_tree
, revs
, path
);
1261 strbuf_setlen(path
, baselen
);
1266 void add_index_objects_to_pending(struct rev_info
*revs
, unsigned flags
)
1271 for (i
= 0; i
< active_nr
; i
++) {
1272 struct cache_entry
*ce
= active_cache
[i
];
1275 if (S_ISGITLINK(ce
->ce_mode
))
1278 blob
= lookup_blob(ce
->oid
.hash
);
1280 die("unable to add index blob to traversal");
1281 add_pending_object_with_path(revs
, &blob
->object
, "",
1282 ce
->ce_mode
, ce
->name
);
1285 if (active_cache_tree
) {
1286 struct strbuf path
= STRBUF_INIT
;
1287 add_cache_tree(active_cache_tree
, revs
, &path
);
1288 strbuf_release(&path
);
1292 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
,
1295 unsigned char sha1
[20];
1297 struct commit
*commit
;
1298 struct commit_list
*parents
;
1300 const char *arg
= arg_
;
1303 flags
^= UNINTERESTING
| BOTTOM
;
1306 if (get_sha1_committish(arg
, sha1
))
1309 it
= get_reference(revs
, arg
, sha1
, 0);
1310 if (!it
&& revs
->ignore_missing
)
1312 if (it
->type
!= OBJ_TAG
)
1314 if (!((struct tag
*)it
)->tagged
)
1316 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->oid
.hash
);
1318 if (it
->type
!= OBJ_COMMIT
)
1320 commit
= (struct commit
*)it
;
1321 if (exclude_parent
&&
1322 exclude_parent
> commit_list_count(commit
->parents
))
1324 for (parents
= commit
->parents
, parent_number
= 1;
1326 parents
= parents
->next
, parent_number
++) {
1327 if (exclude_parent
&& parent_number
!= exclude_parent
)
1330 it
= &parents
->item
->object
;
1332 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1333 add_pending_object(revs
, it
, arg
);
1338 void init_revisions(struct rev_info
*revs
, const char *prefix
)
1340 memset(revs
, 0, sizeof(*revs
));
1342 revs
->abbrev
= DEFAULT_ABBREV
;
1343 revs
->ignore_merges
= 1;
1344 revs
->simplify_history
= 1;
1345 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
1346 DIFF_OPT_SET(&revs
->pruning
, QUICK
);
1347 revs
->pruning
.add_remove
= file_add_remove
;
1348 revs
->pruning
.change
= file_change
;
1349 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1351 revs
->prefix
= prefix
;
1354 revs
->skip_count
= -1;
1355 revs
->max_count
= -1;
1356 revs
->max_parents
= -1;
1357 revs
->expand_tabs_in_log
= -1;
1359 revs
->commit_format
= CMIT_FMT_DEFAULT
;
1360 revs
->expand_tabs_in_log_default
= 8;
1362 init_grep_defaults();
1363 grep_init(&revs
->grep_filter
, prefix
);
1364 revs
->grep_filter
.status_only
= 1;
1365 revs
->grep_filter
.regflags
= REG_NEWLINE
;
1367 diff_setup(&revs
->diffopt
);
1368 if (prefix
&& !revs
->diffopt
.prefix
) {
1369 revs
->diffopt
.prefix
= prefix
;
1370 revs
->diffopt
.prefix_length
= strlen(prefix
);
1373 revs
->notes_opt
.use_default_notes
= -1;
1376 static void add_pending_commit_list(struct rev_info
*revs
,
1377 struct commit_list
*commit_list
,
1380 while (commit_list
) {
1381 struct object
*object
= &commit_list
->item
->object
;
1382 object
->flags
|= flags
;
1383 add_pending_object(revs
, object
, oid_to_hex(&object
->oid
));
1384 commit_list
= commit_list
->next
;
1388 static void prepare_show_merge(struct rev_info
*revs
)
1390 struct commit_list
*bases
;
1391 struct commit
*head
, *other
;
1392 unsigned char sha1
[20];
1393 const char **prune
= NULL
;
1394 int i
, prune_num
= 1; /* counting terminating NULL */
1396 if (get_sha1("HEAD", sha1
))
1397 die("--merge without HEAD?");
1398 head
= lookup_commit_or_die(sha1
, "HEAD");
1399 if (get_sha1("MERGE_HEAD", sha1
))
1400 die("--merge without MERGE_HEAD?");
1401 other
= lookup_commit_or_die(sha1
, "MERGE_HEAD");
1402 add_pending_object(revs
, &head
->object
, "HEAD");
1403 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1404 bases
= get_merge_bases(head
, other
);
1405 add_rev_cmdline_list(revs
, bases
, REV_CMD_MERGE_BASE
, UNINTERESTING
| BOTTOM
);
1406 add_pending_commit_list(revs
, bases
, UNINTERESTING
| BOTTOM
);
1407 free_commit_list(bases
);
1408 head
->object
.flags
|= SYMMETRIC_LEFT
;
1412 for (i
= 0; i
< active_nr
; i
++) {
1413 const struct cache_entry
*ce
= active_cache
[i
];
1416 if (ce_path_match(ce
, &revs
->prune_data
, NULL
)) {
1418 REALLOC_ARRAY(prune
, prune_num
);
1419 prune
[prune_num
-2] = ce
->name
;
1420 prune
[prune_num
-1] = NULL
;
1422 while ((i
+1 < active_nr
) &&
1423 ce_same_name(ce
, active_cache
[i
+1]))
1426 clear_pathspec(&revs
->prune_data
);
1427 parse_pathspec(&revs
->prune_data
, PATHSPEC_ALL_MAGIC
& ~PATHSPEC_LITERAL
,
1428 PATHSPEC_PREFER_FULL
| PATHSPEC_LITERAL_PATH
, "", prune
);
1432 int handle_revision_arg(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
1434 struct object_context oc
;
1436 struct object
*object
;
1437 unsigned char sha1
[20];
1439 const char *arg
= arg_
;
1440 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
1441 unsigned get_sha1_flags
= 0;
1443 flags
= flags
& UNINTERESTING
? flags
| BOTTOM
: flags
& ~BOTTOM
;
1445 dotdot
= strstr(arg
, "..");
1447 unsigned char from_sha1
[20];
1448 const char *next
= dotdot
+ 2;
1449 const char *this = arg
;
1450 int symmetric
= *next
== '.';
1451 unsigned int flags_exclude
= flags
^ (UNINTERESTING
| BOTTOM
);
1452 static const char head_by_default
[] = "HEAD";
1453 unsigned int a_flags
;
1459 next
= head_by_default
;
1461 this = head_by_default
;
1462 if (this == head_by_default
&& next
== head_by_default
&&
1465 * Just ".."? That is not a range but the
1466 * pathspec for the parent directory.
1468 if (!cant_be_filename
) {
1473 if (!get_sha1_committish(this, from_sha1
) &&
1474 !get_sha1_committish(next
, sha1
)) {
1475 struct object
*a_obj
, *b_obj
;
1477 if (!cant_be_filename
) {
1479 verify_non_filename(revs
->prefix
, arg
);
1482 a_obj
= parse_object(from_sha1
);
1483 b_obj
= parse_object(sha1
);
1484 if (!a_obj
|| !b_obj
) {
1486 if (revs
->ignore_missing
)
1489 ? "Invalid symmetric difference expression %s"
1490 : "Invalid revision range %s", arg
);
1495 a_flags
= flags_exclude
;
1497 /* A...B -- find merge bases between the two */
1498 struct commit
*a
, *b
;
1499 struct commit_list
*exclude
;
1501 a
= (a_obj
->type
== OBJ_COMMIT
1502 ? (struct commit
*)a_obj
1503 : lookup_commit_reference(a_obj
->oid
.hash
));
1504 b
= (b_obj
->type
== OBJ_COMMIT
1505 ? (struct commit
*)b_obj
1506 : lookup_commit_reference(b_obj
->oid
.hash
));
1509 exclude
= get_merge_bases(a
, b
);
1510 add_rev_cmdline_list(revs
, exclude
,
1513 add_pending_commit_list(revs
, exclude
,
1515 free_commit_list(exclude
);
1517 a_flags
= flags
| SYMMETRIC_LEFT
;
1520 a_obj
->flags
|= a_flags
;
1521 b_obj
->flags
|= flags
;
1522 add_rev_cmdline(revs
, a_obj
, this,
1523 REV_CMD_LEFT
, a_flags
);
1524 add_rev_cmdline(revs
, b_obj
, next
,
1525 REV_CMD_RIGHT
, flags
);
1526 add_pending_object(revs
, a_obj
, this);
1527 add_pending_object(revs
, b_obj
, next
);
1533 dotdot
= strstr(arg
, "^@");
1534 if (dotdot
&& !dotdot
[2]) {
1536 if (add_parents_only(revs
, arg
, flags
, 0))
1540 dotdot
= strstr(arg
, "^!");
1541 if (dotdot
&& !dotdot
[2]) {
1543 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
), 0))
1546 dotdot
= strstr(arg
, "^-");
1548 int exclude_parent
= 1;
1552 exclude_parent
= strtoul(dotdot
+ 2, &end
, 10);
1553 if (*end
!= '\0' || !exclude_parent
)
1558 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
), exclude_parent
))
1564 local_flags
= UNINTERESTING
| BOTTOM
;
1568 if (revarg_opt
& REVARG_COMMITTISH
)
1569 get_sha1_flags
= GET_SHA1_COMMITTISH
;
1571 if (get_sha1_with_context(arg
, get_sha1_flags
, sha1
, &oc
))
1572 return revs
->ignore_missing
? 0 : -1;
1573 if (!cant_be_filename
)
1574 verify_non_filename(revs
->prefix
, arg
);
1575 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
1576 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
1577 add_pending_object_with_mode(revs
, object
, arg
, oc
.mode
);
1581 struct cmdline_pathspec
{
1587 static void append_prune_data(struct cmdline_pathspec
*prune
, const char **av
)
1590 ALLOC_GROW(prune
->path
, prune
->nr
+ 1, prune
->alloc
);
1591 prune
->path
[prune
->nr
++] = *(av
++);
1595 static void read_pathspec_from_stdin(struct rev_info
*revs
, struct strbuf
*sb
,
1596 struct cmdline_pathspec
*prune
)
1598 while (strbuf_getline(sb
, stdin
) != EOF
) {
1599 ALLOC_GROW(prune
->path
, prune
->nr
+ 1, prune
->alloc
);
1600 prune
->path
[prune
->nr
++] = xstrdup(sb
->buf
);
1604 static void read_revisions_from_stdin(struct rev_info
*revs
,
1605 struct cmdline_pathspec
*prune
)
1608 int seen_dashdash
= 0;
1611 save_warning
= warn_on_object_refname_ambiguity
;
1612 warn_on_object_refname_ambiguity
= 0;
1614 strbuf_init(&sb
, 1000);
1615 while (strbuf_getline(&sb
, stdin
) != EOF
) {
1619 if (sb
.buf
[0] == '-') {
1620 if (len
== 2 && sb
.buf
[1] == '-') {
1624 die("options not supported in --stdin mode");
1626 if (handle_revision_arg(sb
.buf
, revs
, 0,
1627 REVARG_CANNOT_BE_FILENAME
))
1628 die("bad revision '%s'", sb
.buf
);
1631 read_pathspec_from_stdin(revs
, &sb
, prune
);
1633 strbuf_release(&sb
);
1634 warn_on_object_refname_ambiguity
= save_warning
;
1637 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
1639 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
1642 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
1644 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
1647 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
1649 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
1652 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
1653 int *unkc
, const char **unkv
)
1655 const char *arg
= argv
[0];
1659 /* pseudo revision arguments */
1660 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1661 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1662 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1663 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
1664 !strcmp(arg
, "--bisect") || starts_with(arg
, "--glob=") ||
1665 !strcmp(arg
, "--indexed-objects") ||
1666 starts_with(arg
, "--exclude=") ||
1667 starts_with(arg
, "--branches=") || starts_with(arg
, "--tags=") ||
1668 starts_with(arg
, "--remotes=") || starts_with(arg
, "--no-walk="))
1670 unkv
[(*unkc
)++] = arg
;
1674 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
1675 revs
->max_count
= atoi(optarg
);
1678 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
1679 revs
->skip_count
= atoi(optarg
);
1681 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1682 /* accept -<digit>, like traditional "head" */
1683 if (strtol_i(arg
+ 1, 10, &revs
->max_count
) < 0 ||
1684 revs
->max_count
< 0)
1685 die("'%s': not a non-negative integer", arg
+ 1);
1687 } else if (!strcmp(arg
, "-n")) {
1689 return error("-n requires an argument");
1690 revs
->max_count
= atoi(argv
[1]);
1693 } else if (starts_with(arg
, "-n")) {
1694 revs
->max_count
= atoi(arg
+ 2);
1696 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
1697 revs
->max_age
= atoi(optarg
);
1699 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
1700 revs
->max_age
= approxidate(optarg
);
1702 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
1703 revs
->max_age
= approxidate(optarg
);
1705 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
1706 revs
->min_age
= atoi(optarg
);
1708 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
1709 revs
->min_age
= approxidate(optarg
);
1711 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
1712 revs
->min_age
= approxidate(optarg
);
1714 } else if (!strcmp(arg
, "--first-parent")) {
1715 revs
->first_parent_only
= 1;
1716 } else if (!strcmp(arg
, "--ancestry-path")) {
1717 revs
->ancestry_path
= 1;
1718 revs
->simplify_history
= 0;
1720 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1721 init_reflog_walk(&revs
->reflog_info
);
1722 } else if (!strcmp(arg
, "--default")) {
1724 return error("bad --default argument");
1725 revs
->def
= argv
[1];
1727 } else if (!strcmp(arg
, "--merge")) {
1728 revs
->show_merge
= 1;
1729 } else if (!strcmp(arg
, "--topo-order")) {
1730 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1731 revs
->topo_order
= 1;
1732 } else if (!strcmp(arg
, "--simplify-merges")) {
1733 revs
->simplify_merges
= 1;
1734 revs
->topo_order
= 1;
1735 revs
->rewrite_parents
= 1;
1736 revs
->simplify_history
= 0;
1738 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
1739 revs
->simplify_merges
= 1;
1740 revs
->topo_order
= 1;
1741 revs
->rewrite_parents
= 1;
1742 revs
->simplify_history
= 0;
1743 revs
->simplify_by_decoration
= 1;
1746 load_ref_decorations(DECORATE_SHORT_REFS
);
1747 } else if (!strcmp(arg
, "--date-order")) {
1748 revs
->sort_order
= REV_SORT_BY_COMMIT_DATE
;
1749 revs
->topo_order
= 1;
1750 } else if (!strcmp(arg
, "--author-date-order")) {
1751 revs
->sort_order
= REV_SORT_BY_AUTHOR_DATE
;
1752 revs
->topo_order
= 1;
1753 } else if (starts_with(arg
, "--early-output")) {
1757 count
= atoi(arg
+15);
1760 revs
->topo_order
= 1;
1761 revs
->early_output
= count
;
1763 } else if (!strcmp(arg
, "--parents")) {
1764 revs
->rewrite_parents
= 1;
1765 revs
->print_parents
= 1;
1766 } else if (!strcmp(arg
, "--dense")) {
1768 } else if (!strcmp(arg
, "--sparse")) {
1770 } else if (!strcmp(arg
, "--show-all")) {
1772 } else if (!strcmp(arg
, "--remove-empty")) {
1773 revs
->remove_empty_trees
= 1;
1774 } else if (!strcmp(arg
, "--merges")) {
1775 revs
->min_parents
= 2;
1776 } else if (!strcmp(arg
, "--no-merges")) {
1777 revs
->max_parents
= 1;
1778 } else if (starts_with(arg
, "--min-parents=")) {
1779 revs
->min_parents
= atoi(arg
+14);
1780 } else if (starts_with(arg
, "--no-min-parents")) {
1781 revs
->min_parents
= 0;
1782 } else if (starts_with(arg
, "--max-parents=")) {
1783 revs
->max_parents
= atoi(arg
+14);
1784 } else if (starts_with(arg
, "--no-max-parents")) {
1785 revs
->max_parents
= -1;
1786 } else if (!strcmp(arg
, "--boundary")) {
1788 } else if (!strcmp(arg
, "--left-right")) {
1789 revs
->left_right
= 1;
1790 } else if (!strcmp(arg
, "--left-only")) {
1791 if (revs
->right_only
)
1792 die("--left-only is incompatible with --right-only"
1794 revs
->left_only
= 1;
1795 } else if (!strcmp(arg
, "--right-only")) {
1796 if (revs
->left_only
)
1797 die("--right-only is incompatible with --left-only");
1798 revs
->right_only
= 1;
1799 } else if (!strcmp(arg
, "--cherry")) {
1800 if (revs
->left_only
)
1801 die("--cherry is incompatible with --left-only");
1802 revs
->cherry_mark
= 1;
1803 revs
->right_only
= 1;
1804 revs
->max_parents
= 1;
1806 } else if (!strcmp(arg
, "--count")) {
1808 } else if (!strcmp(arg
, "--cherry-mark")) {
1809 if (revs
->cherry_pick
)
1810 die("--cherry-mark is incompatible with --cherry-pick");
1811 revs
->cherry_mark
= 1;
1812 revs
->limited
= 1; /* needs limit_list() */
1813 } else if (!strcmp(arg
, "--cherry-pick")) {
1814 if (revs
->cherry_mark
)
1815 die("--cherry-pick is incompatible with --cherry-mark");
1816 revs
->cherry_pick
= 1;
1818 } else if (!strcmp(arg
, "--objects")) {
1819 revs
->tag_objects
= 1;
1820 revs
->tree_objects
= 1;
1821 revs
->blob_objects
= 1;
1822 } else if (!strcmp(arg
, "--objects-edge")) {
1823 revs
->tag_objects
= 1;
1824 revs
->tree_objects
= 1;
1825 revs
->blob_objects
= 1;
1826 revs
->edge_hint
= 1;
1827 } else if (!strcmp(arg
, "--objects-edge-aggressive")) {
1828 revs
->tag_objects
= 1;
1829 revs
->tree_objects
= 1;
1830 revs
->blob_objects
= 1;
1831 revs
->edge_hint
= 1;
1832 revs
->edge_hint_aggressive
= 1;
1833 } else if (!strcmp(arg
, "--verify-objects")) {
1834 revs
->tag_objects
= 1;
1835 revs
->tree_objects
= 1;
1836 revs
->blob_objects
= 1;
1837 revs
->verify_objects
= 1;
1838 } else if (!strcmp(arg
, "--unpacked")) {
1840 } else if (starts_with(arg
, "--unpacked=")) {
1841 die("--unpacked=<packfile> no longer supported.");
1842 } else if (!strcmp(arg
, "-r")) {
1844 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1845 } else if (!strcmp(arg
, "-t")) {
1847 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1848 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1849 } else if (!strcmp(arg
, "-m")) {
1850 revs
->ignore_merges
= 0;
1851 } else if (!strcmp(arg
, "-c")) {
1853 revs
->dense_combined_merges
= 0;
1854 revs
->combine_merges
= 1;
1855 } else if (!strcmp(arg
, "--cc")) {
1857 revs
->dense_combined_merges
= 1;
1858 revs
->combine_merges
= 1;
1859 } else if (!strcmp(arg
, "-v")) {
1860 revs
->verbose_header
= 1;
1861 } else if (!strcmp(arg
, "--pretty")) {
1862 revs
->verbose_header
= 1;
1863 revs
->pretty_given
= 1;
1864 get_commit_format(NULL
, revs
);
1865 } else if (starts_with(arg
, "--pretty=") || starts_with(arg
, "--format=")) {
1867 * Detached form ("--pretty X" as opposed to "--pretty=X")
1868 * not allowed, since the argument is optional.
1870 revs
->verbose_header
= 1;
1871 revs
->pretty_given
= 1;
1872 get_commit_format(arg
+9, revs
);
1873 } else if (!strcmp(arg
, "--expand-tabs")) {
1874 revs
->expand_tabs_in_log
= 8;
1875 } else if (!strcmp(arg
, "--no-expand-tabs")) {
1876 revs
->expand_tabs_in_log
= 0;
1877 } else if (skip_prefix(arg
, "--expand-tabs=", &arg
)) {
1879 if (strtol_i(arg
, 10, &val
) < 0 || val
< 0)
1880 die("'%s': not a non-negative integer", arg
);
1881 revs
->expand_tabs_in_log
= val
;
1882 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
1883 revs
->show_notes
= 1;
1884 revs
->show_notes_given
= 1;
1885 revs
->notes_opt
.use_default_notes
= 1;
1886 } else if (!strcmp(arg
, "--show-signature")) {
1887 revs
->show_signature
= 1;
1888 } else if (!strcmp(arg
, "--no-show-signature")) {
1889 revs
->show_signature
= 0;
1890 } else if (!strcmp(arg
, "--show-linear-break") ||
1891 starts_with(arg
, "--show-linear-break=")) {
1892 if (starts_with(arg
, "--show-linear-break="))
1893 revs
->break_bar
= xstrdup(arg
+ 20);
1895 revs
->break_bar
= " ..........";
1896 revs
->track_linear
= 1;
1897 revs
->track_first_time
= 1;
1898 } else if (starts_with(arg
, "--show-notes=") ||
1899 starts_with(arg
, "--notes=")) {
1900 struct strbuf buf
= STRBUF_INIT
;
1901 revs
->show_notes
= 1;
1902 revs
->show_notes_given
= 1;
1903 if (starts_with(arg
, "--show-notes")) {
1904 if (revs
->notes_opt
.use_default_notes
< 0)
1905 revs
->notes_opt
.use_default_notes
= 1;
1906 strbuf_addstr(&buf
, arg
+13);
1909 strbuf_addstr(&buf
, arg
+8);
1910 expand_notes_ref(&buf
);
1911 string_list_append(&revs
->notes_opt
.extra_notes_refs
,
1912 strbuf_detach(&buf
, NULL
));
1913 } else if (!strcmp(arg
, "--no-notes")) {
1914 revs
->show_notes
= 0;
1915 revs
->show_notes_given
= 1;
1916 revs
->notes_opt
.use_default_notes
= -1;
1917 /* we have been strdup'ing ourselves, so trick
1918 * string_list into free()ing strings */
1919 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 1;
1920 string_list_clear(&revs
->notes_opt
.extra_notes_refs
, 0);
1921 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 0;
1922 } else if (!strcmp(arg
, "--standard-notes")) {
1923 revs
->show_notes_given
= 1;
1924 revs
->notes_opt
.use_default_notes
= 1;
1925 } else if (!strcmp(arg
, "--no-standard-notes")) {
1926 revs
->notes_opt
.use_default_notes
= 0;
1927 } else if (!strcmp(arg
, "--oneline")) {
1928 revs
->verbose_header
= 1;
1929 get_commit_format("oneline", revs
);
1930 revs
->pretty_given
= 1;
1931 revs
->abbrev_commit
= 1;
1932 } else if (!strcmp(arg
, "--graph")) {
1933 revs
->topo_order
= 1;
1934 revs
->rewrite_parents
= 1;
1935 revs
->graph
= graph_init(revs
);
1936 } else if (!strcmp(arg
, "--root")) {
1937 revs
->show_root_diff
= 1;
1938 } else if (!strcmp(arg
, "--no-commit-id")) {
1939 revs
->no_commit_id
= 1;
1940 } else if (!strcmp(arg
, "--always")) {
1941 revs
->always_show_header
= 1;
1942 } else if (!strcmp(arg
, "--no-abbrev")) {
1944 } else if (!strcmp(arg
, "--abbrev")) {
1945 revs
->abbrev
= DEFAULT_ABBREV
;
1946 } else if (starts_with(arg
, "--abbrev=")) {
1947 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1948 if (revs
->abbrev
< MINIMUM_ABBREV
)
1949 revs
->abbrev
= MINIMUM_ABBREV
;
1950 else if (revs
->abbrev
> 40)
1952 } else if (!strcmp(arg
, "--abbrev-commit")) {
1953 revs
->abbrev_commit
= 1;
1954 revs
->abbrev_commit_given
= 1;
1955 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
1956 revs
->abbrev_commit
= 0;
1957 } else if (!strcmp(arg
, "--full-diff")) {
1959 revs
->full_diff
= 1;
1960 } else if (!strcmp(arg
, "--full-history")) {
1961 revs
->simplify_history
= 0;
1962 } else if (!strcmp(arg
, "--relative-date")) {
1963 revs
->date_mode
.type
= DATE_RELATIVE
;
1964 revs
->date_mode_explicit
= 1;
1965 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
1966 parse_date_format(optarg
, &revs
->date_mode
);
1967 revs
->date_mode_explicit
= 1;
1969 } else if (!strcmp(arg
, "--log-size")) {
1970 revs
->show_log_size
= 1;
1973 * Grepping the commit log
1975 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
1976 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
1978 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
1979 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
1981 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
1982 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
1984 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
1985 add_message_grep(revs
, optarg
);
1987 } else if (!strcmp(arg
, "--grep-debug")) {
1988 revs
->grep_filter
.debug
= 1;
1989 } else if (!strcmp(arg
, "--basic-regexp")) {
1990 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_BRE
;
1991 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
1992 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_ERE
;
1993 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
1994 revs
->grep_filter
.ignore_case
= 1;
1995 revs
->grep_filter
.regflags
|= REG_ICASE
;
1996 DIFF_OPT_SET(&revs
->diffopt
, PICKAXE_IGNORE_CASE
);
1997 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
1998 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_FIXED
;
1999 } else if (!strcmp(arg
, "--perl-regexp") || !strcmp(arg
, "-P")) {
2000 revs
->grep_filter
.pattern_type_option
= GREP_PATTERN_TYPE_PCRE
;
2001 } else if (!strcmp(arg
, "--all-match")) {
2002 revs
->grep_filter
.all_match
= 1;
2003 } else if (!strcmp(arg
, "--invert-grep")) {
2004 revs
->invert_grep
= 1;
2005 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
2006 if (strcmp(optarg
, "none"))
2007 git_log_output_encoding
= xstrdup(optarg
);
2009 git_log_output_encoding
= "";
2011 } else if (!strcmp(arg
, "--reverse")) {
2013 } else if (!strcmp(arg
, "--children")) {
2014 revs
->children
.name
= "children";
2016 } else if (!strcmp(arg
, "--ignore-missing")) {
2017 revs
->ignore_missing
= 1;
2019 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
, revs
->prefix
);
2021 unkv
[(*unkc
)++] = arg
;
2024 if (revs
->graph
&& revs
->track_linear
)
2025 die("--show-linear-break and --graph are incompatible");
2030 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
2031 const struct option
*options
,
2032 const char * const usagestr
[])
2034 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
2035 &ctx
->cpidx
, ctx
->out
);
2037 error("unknown option `%s'", ctx
->argv
[0]);
2038 usage_with_options(usagestr
, options
);
2044 static int for_each_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
, const char *term
) {
2045 struct strbuf bisect_refs
= STRBUF_INIT
;
2047 strbuf_addf(&bisect_refs
, "refs/bisect/%s", term
);
2048 status
= for_each_ref_in_submodule(submodule
, bisect_refs
.buf
, fn
, cb_data
);
2049 strbuf_release(&bisect_refs
);
2053 static int for_each_bad_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
2055 return for_each_bisect_ref(submodule
, fn
, cb_data
, term_bad
);
2058 static int for_each_good_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
2060 return for_each_bisect_ref(submodule
, fn
, cb_data
, term_good
);
2063 static int handle_revision_pseudo_opt(const char *submodule
,
2064 struct rev_info
*revs
,
2065 int argc
, const char **argv
, int *flags
)
2067 const char *arg
= argv
[0];
2074 * Commands like "git shortlog" will not accept the options below
2075 * unless parse_revision_opt queues them (as opposed to erroring
2078 * When implementing your new pseudo-option, remember to
2079 * register it in the list at the top of handle_revision_opt.
2081 if (!strcmp(arg
, "--all")) {
2082 handle_refs(submodule
, revs
, *flags
, for_each_ref_submodule
);
2083 handle_refs(submodule
, revs
, *flags
, head_ref_submodule
);
2084 clear_ref_exclusion(&revs
->ref_excludes
);
2085 } else if (!strcmp(arg
, "--branches")) {
2086 handle_refs(submodule
, revs
, *flags
, for_each_branch_ref_submodule
);
2087 clear_ref_exclusion(&revs
->ref_excludes
);
2088 } else if (!strcmp(arg
, "--bisect")) {
2089 read_bisect_terms(&term_bad
, &term_good
);
2090 handle_refs(submodule
, revs
, *flags
, for_each_bad_bisect_ref
);
2091 handle_refs(submodule
, revs
, *flags
^ (UNINTERESTING
| BOTTOM
), for_each_good_bisect_ref
);
2093 } else if (!strcmp(arg
, "--tags")) {
2094 handle_refs(submodule
, revs
, *flags
, for_each_tag_ref_submodule
);
2095 clear_ref_exclusion(&revs
->ref_excludes
);
2096 } else if (!strcmp(arg
, "--remotes")) {
2097 handle_refs(submodule
, revs
, *flags
, for_each_remote_ref_submodule
);
2098 clear_ref_exclusion(&revs
->ref_excludes
);
2099 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
2100 struct all_refs_cb cb
;
2101 init_all_refs_cb(&cb
, revs
, *flags
);
2102 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
2103 clear_ref_exclusion(&revs
->ref_excludes
);
2105 } else if ((argcount
= parse_long_opt("exclude", argv
, &optarg
))) {
2106 add_ref_exclusion(&revs
->ref_excludes
, optarg
);
2108 } else if (starts_with(arg
, "--branches=")) {
2109 struct all_refs_cb cb
;
2110 init_all_refs_cb(&cb
, revs
, *flags
);
2111 for_each_glob_ref_in(handle_one_ref
, arg
+ 11, "refs/heads/", &cb
);
2112 clear_ref_exclusion(&revs
->ref_excludes
);
2113 } else if (starts_with(arg
, "--tags=")) {
2114 struct all_refs_cb cb
;
2115 init_all_refs_cb(&cb
, revs
, *flags
);
2116 for_each_glob_ref_in(handle_one_ref
, arg
+ 7, "refs/tags/", &cb
);
2117 clear_ref_exclusion(&revs
->ref_excludes
);
2118 } else if (starts_with(arg
, "--remotes=")) {
2119 struct all_refs_cb cb
;
2120 init_all_refs_cb(&cb
, revs
, *flags
);
2121 for_each_glob_ref_in(handle_one_ref
, arg
+ 10, "refs/remotes/", &cb
);
2122 clear_ref_exclusion(&revs
->ref_excludes
);
2123 } else if (!strcmp(arg
, "--reflog")) {
2124 add_reflogs_to_pending(revs
, *flags
);
2125 } else if (!strcmp(arg
, "--indexed-objects")) {
2126 add_index_objects_to_pending(revs
, *flags
);
2127 } else if (!strcmp(arg
, "--not")) {
2128 *flags
^= UNINTERESTING
| BOTTOM
;
2129 } else if (!strcmp(arg
, "--no-walk")) {
2130 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2131 } else if (starts_with(arg
, "--no-walk=")) {
2133 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2134 * not allowed, since the argument is optional.
2136 if (!strcmp(arg
+ 10, "sorted"))
2137 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2138 else if (!strcmp(arg
+ 10, "unsorted"))
2139 revs
->no_walk
= REVISION_WALK_NO_WALK_UNSORTED
;
2141 return error("invalid argument to --no-walk");
2142 } else if (!strcmp(arg
, "--do-walk")) {
2151 static void NORETURN
diagnose_missing_default(const char *def
)
2153 unsigned char sha1
[20];
2155 const char *refname
;
2157 refname
= resolve_ref_unsafe(def
, 0, sha1
, &flags
);
2158 if (!refname
|| !(flags
& REF_ISSYMREF
) || (flags
& REF_ISBROKEN
))
2159 die(_("your current branch appears to be broken"));
2161 skip_prefix(refname
, "refs/heads/", &refname
);
2162 die(_("your current branch '%s' does not have any commits yet"),
2167 * Parse revision information, filling in the "rev_info" structure,
2168 * and removing the used arguments from the argument list.
2170 * Returns the number of arguments left that weren't recognized
2171 * (which are also moved to the head of the argument list)
2173 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
2175 int i
, flags
, left
, seen_dashdash
, read_from_stdin
, got_rev_arg
= 0, revarg_opt
;
2176 struct cmdline_pathspec prune_data
;
2177 const char *submodule
= NULL
;
2179 memset(&prune_data
, 0, sizeof(prune_data
));
2181 submodule
= opt
->submodule
;
2183 /* First, search for "--" */
2184 if (opt
&& opt
->assume_dashdash
) {
2188 for (i
= 1; i
< argc
; i
++) {
2189 const char *arg
= argv
[i
];
2190 if (strcmp(arg
, "--"))
2195 append_prune_data(&prune_data
, argv
+ i
+ 1);
2201 /* Second, deal with arguments and options */
2203 revarg_opt
= opt
? opt
->revarg_opt
: 0;
2205 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
2206 read_from_stdin
= 0;
2207 for (left
= i
= 1; i
< argc
; i
++) {
2208 const char *arg
= argv
[i
];
2212 opts
= handle_revision_pseudo_opt(submodule
,
2213 revs
, argc
- i
, argv
+ i
,
2220 if (!strcmp(arg
, "--stdin")) {
2221 if (revs
->disable_stdin
) {
2225 if (read_from_stdin
++)
2226 die("--stdin given twice?");
2227 read_revisions_from_stdin(revs
, &prune_data
);
2231 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
2242 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
2244 if (seen_dashdash
|| *arg
== '^')
2245 die("bad revision '%s'", arg
);
2247 /* If we didn't have a "--":
2248 * (1) all filenames must exist;
2249 * (2) all rev-args must not be interpretable
2250 * as a valid filename.
2251 * but the latter we have checked in the main loop.
2253 for (j
= i
; j
< argc
; j
++)
2254 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
2256 append_prune_data(&prune_data
, argv
+ i
);
2263 if (prune_data
.nr
) {
2265 * If we need to introduce the magic "a lone ':' means no
2266 * pathspec whatsoever", here is the place to do so.
2268 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2269 * prune_data.nr = 0;
2270 * prune_data.alloc = 0;
2271 * free(prune_data.path);
2272 * prune_data.path = NULL;
2274 * terminate prune_data.alloc with NULL and
2275 * call init_pathspec() to set revs->prune_data here.
2278 ALLOC_GROW(prune_data
.path
, prune_data
.nr
+ 1, prune_data
.alloc
);
2279 prune_data
.path
[prune_data
.nr
++] = NULL
;
2280 parse_pathspec(&revs
->prune_data
, 0, 0,
2281 revs
->prefix
, prune_data
.path
);
2284 if (revs
->def
== NULL
)
2285 revs
->def
= opt
? opt
->def
: NULL
;
2286 if (opt
&& opt
->tweak
)
2287 opt
->tweak(revs
, opt
);
2288 if (revs
->show_merge
)
2289 prepare_show_merge(revs
);
2290 if (revs
->def
&& !revs
->pending
.nr
&& !got_rev_arg
) {
2291 unsigned char sha1
[20];
2292 struct object
*object
;
2293 struct object_context oc
;
2294 if (get_sha1_with_context(revs
->def
, 0, sha1
, &oc
))
2295 diagnose_missing_default(revs
->def
);
2296 object
= get_reference(revs
, revs
->def
, sha1
, 0);
2297 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
);
2300 /* Did the user ask for any diff output? Run the diff! */
2301 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
2304 /* Pickaxe, diff-filter and rename following need diffs */
2305 if (revs
->diffopt
.pickaxe
||
2306 revs
->diffopt
.filter
||
2307 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
2310 if (revs
->topo_order
)
2313 if (revs
->prune_data
.nr
) {
2314 copy_pathspec(&revs
->pruning
.pathspec
, &revs
->prune_data
);
2315 /* Can't prune commits with rename following: the paths change.. */
2316 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
2318 if (!revs
->full_diff
)
2319 copy_pathspec(&revs
->diffopt
.pathspec
,
2322 if (revs
->combine_merges
)
2323 revs
->ignore_merges
= 0;
2324 revs
->diffopt
.abbrev
= revs
->abbrev
;
2326 if (revs
->line_level_traverse
) {
2328 revs
->topo_order
= 1;
2331 diff_setup_done(&revs
->diffopt
);
2333 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED
,
2334 &revs
->grep_filter
);
2335 compile_grep_patterns(&revs
->grep_filter
);
2337 if (revs
->reverse
&& revs
->reflog_info
)
2338 die("cannot combine --reverse with --walk-reflogs");
2339 if (revs
->rewrite_parents
&& revs
->children
.name
)
2340 die("cannot combine --parents and --children");
2343 * Limitations on the graph functionality
2345 if (revs
->reverse
&& revs
->graph
)
2346 die("cannot combine --reverse with --graph");
2348 if (revs
->reflog_info
&& revs
->graph
)
2349 die("cannot combine --walk-reflogs with --graph");
2350 if (revs
->no_walk
&& revs
->graph
)
2351 die("cannot combine --no-walk with --graph");
2352 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
2353 die("cannot use --grep-reflog without --walk-reflogs");
2355 if (revs
->first_parent_only
&& revs
->bisect
)
2356 die(_("--first-parent is incompatible with --bisect"));
2358 if (revs
->expand_tabs_in_log
< 0)
2359 revs
->expand_tabs_in_log
= revs
->expand_tabs_in_log_default
;
2364 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
2366 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
2369 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
2372 static int remove_duplicate_parents(struct rev_info
*revs
, struct commit
*commit
)
2374 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2375 struct commit_list
**pp
, *p
;
2376 int surviving_parents
;
2378 /* Examine existing parents while marking ones we have seen... */
2379 pp
= &commit
->parents
;
2380 surviving_parents
= 0;
2381 while ((p
= *pp
) != NULL
) {
2382 struct commit
*parent
= p
->item
;
2383 if (parent
->object
.flags
& TMP_MARK
) {
2386 compact_treesame(revs
, commit
, surviving_parents
);
2389 parent
->object
.flags
|= TMP_MARK
;
2390 surviving_parents
++;
2393 /* clear the temporary mark */
2394 for (p
= commit
->parents
; p
; p
= p
->next
) {
2395 p
->item
->object
.flags
&= ~TMP_MARK
;
2397 /* no update_treesame() - removing duplicates can't affect TREESAME */
2398 return surviving_parents
;
2401 struct merge_simplify_state
{
2402 struct commit
*simplified
;
2405 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
2407 struct merge_simplify_state
*st
;
2409 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
2411 st
= xcalloc(1, sizeof(*st
));
2412 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
2417 static int mark_redundant_parents(struct rev_info
*revs
, struct commit
*commit
)
2419 struct commit_list
*h
= reduce_heads(commit
->parents
);
2420 int i
= 0, marked
= 0;
2421 struct commit_list
*po
, *pn
;
2423 /* Want these for sanity-checking only */
2424 int orig_cnt
= commit_list_count(commit
->parents
);
2425 int cnt
= commit_list_count(h
);
2428 * Not ready to remove items yet, just mark them for now, based
2429 * on the output of reduce_heads(). reduce_heads outputs the reduced
2430 * set in its original order, so this isn't too hard.
2432 po
= commit
->parents
;
2435 if (pn
&& po
->item
== pn
->item
) {
2439 po
->item
->object
.flags
|= TMP_MARK
;
2445 if (i
!= cnt
|| cnt
+marked
!= orig_cnt
)
2446 die("mark_redundant_parents %d %d %d %d", orig_cnt
, cnt
, i
, marked
);
2448 free_commit_list(h
);
2453 static int mark_treesame_root_parents(struct rev_info
*revs
, struct commit
*commit
)
2455 struct commit_list
*p
;
2458 for (p
= commit
->parents
; p
; p
= p
->next
) {
2459 struct commit
*parent
= p
->item
;
2460 if (!parent
->parents
&& (parent
->object
.flags
& TREESAME
)) {
2461 parent
->object
.flags
|= TMP_MARK
;
2470 * Awkward naming - this means one parent we are TREESAME to.
2471 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2472 * empty tree). Better name suggestions?
2474 static int leave_one_treesame_to_parent(struct rev_info
*revs
, struct commit
*commit
)
2476 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2477 struct commit
*unmarked
= NULL
, *marked
= NULL
;
2478 struct commit_list
*p
;
2481 for (p
= commit
->parents
, n
= 0; p
; p
= p
->next
, n
++) {
2482 if (ts
->treesame
[n
]) {
2483 if (p
->item
->object
.flags
& TMP_MARK
) {
2496 * If we are TREESAME to a marked-for-deletion parent, but not to any
2497 * unmarked parents, unmark the first TREESAME parent. This is the
2498 * parent that the default simplify_history==1 scan would have followed,
2499 * and it doesn't make sense to omit that path when asking for a
2500 * simplified full history. Retaining it improves the chances of
2501 * understanding odd missed merges that took an old version of a file.
2505 * I--------*X A modified the file, but mainline merge X used
2506 * \ / "-s ours", so took the version from I. X is
2507 * `-*A--' TREESAME to I and !TREESAME to A.
2509 * Default log from X would produce "I". Without this check,
2510 * --full-history --simplify-merges would produce "I-A-X", showing
2511 * the merge commit X and that it changed A, but not making clear that
2512 * it had just taken the I version. With this check, the topology above
2515 * Note that it is possible that the simplification chooses a different
2516 * TREESAME parent from the default, in which case this test doesn't
2517 * activate, and we _do_ drop the default parent. Example:
2519 * I------X A modified the file, but it was reverted in B,
2520 * \ / meaning mainline merge X is TREESAME to both
2523 * Default log would produce "I" by following the first parent;
2524 * --full-history --simplify-merges will produce "I-A-B". But this is a
2525 * reasonable result - it presents a logical full history leading from
2526 * I to X, and X is not an important merge.
2528 if (!unmarked
&& marked
) {
2529 marked
->object
.flags
&= ~TMP_MARK
;
2536 static int remove_marked_parents(struct rev_info
*revs
, struct commit
*commit
)
2538 struct commit_list
**pp
, *p
;
2539 int nth_parent
, removed
= 0;
2541 pp
= &commit
->parents
;
2543 while ((p
= *pp
) != NULL
) {
2544 struct commit
*parent
= p
->item
;
2545 if (parent
->object
.flags
& TMP_MARK
) {
2546 parent
->object
.flags
&= ~TMP_MARK
;
2550 compact_treesame(revs
, commit
, nth_parent
);
2557 /* Removing parents can only increase TREESAMEness */
2558 if (removed
&& !(commit
->object
.flags
& TREESAME
))
2559 update_treesame(revs
, commit
);
2564 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
2566 struct commit_list
*p
;
2567 struct commit
*parent
;
2568 struct merge_simplify_state
*st
, *pst
;
2571 st
= locate_simplify_state(revs
, commit
);
2574 * Have we handled this one?
2580 * An UNINTERESTING commit simplifies to itself, so does a
2581 * root commit. We do not rewrite parents of such commit
2584 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
2585 st
->simplified
= commit
;
2590 * Do we know what commit all of our parents that matter
2591 * should be rewritten to? Otherwise we are not ready to
2592 * rewrite this one yet.
2594 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
2595 pst
= locate_simplify_state(revs
, p
->item
);
2596 if (!pst
->simplified
) {
2597 tail
= &commit_list_insert(p
->item
, tail
)->next
;
2600 if (revs
->first_parent_only
)
2604 tail
= &commit_list_insert(commit
, tail
)->next
;
2609 * Rewrite our list of parents. Note that this cannot
2610 * affect our TREESAME flags in any way - a commit is
2611 * always TREESAME to its simplification.
2613 for (p
= commit
->parents
; p
; p
= p
->next
) {
2614 pst
= locate_simplify_state(revs
, p
->item
);
2615 p
->item
= pst
->simplified
;
2616 if (revs
->first_parent_only
)
2620 if (revs
->first_parent_only
)
2623 cnt
= remove_duplicate_parents(revs
, commit
);
2626 * It is possible that we are a merge and one side branch
2627 * does not have any commit that touches the given paths;
2628 * in such a case, the immediate parent from that branch
2629 * will be rewritten to be the merge base.
2631 * o----X X: the commit we are looking at;
2632 * / / o: a commit that touches the paths;
2635 * Further, a merge of an independent branch that doesn't
2636 * touch the path will reduce to a treesame root parent:
2638 * ----o----X X: the commit we are looking at;
2639 * / o: a commit that touches the paths;
2640 * r r: a root commit not touching the paths
2642 * Detect and simplify both cases.
2645 int marked
= mark_redundant_parents(revs
, commit
);
2646 marked
+= mark_treesame_root_parents(revs
, commit
);
2648 marked
-= leave_one_treesame_to_parent(revs
, commit
);
2650 cnt
= remove_marked_parents(revs
, commit
);
2654 * A commit simplifies to itself if it is a root, if it is
2655 * UNINTERESTING, if it touches the given paths, or if it is a
2656 * merge and its parents don't simplify to one relevant commit
2657 * (the first two cases are already handled at the beginning of
2660 * Otherwise, it simplifies to what its sole relevant parent
2664 (commit
->object
.flags
& UNINTERESTING
) ||
2665 !(commit
->object
.flags
& TREESAME
) ||
2666 (parent
= one_relevant_parent(revs
, commit
->parents
)) == NULL
)
2667 st
->simplified
= commit
;
2669 pst
= locate_simplify_state(revs
, parent
);
2670 st
->simplified
= pst
->simplified
;
2675 static void simplify_merges(struct rev_info
*revs
)
2677 struct commit_list
*list
, *next
;
2678 struct commit_list
*yet_to_do
, **tail
;
2679 struct commit
*commit
;
2684 /* feed the list reversed */
2686 for (list
= revs
->commits
; list
; list
= next
) {
2687 commit
= list
->item
;
2690 * Do not free(list) here yet; the original list
2691 * is used later in this function.
2693 commit_list_insert(commit
, &yet_to_do
);
2700 commit
= pop_commit(&list
);
2701 tail
= simplify_one(revs
, commit
, tail
);
2705 /* clean up the result, removing the simplified ones */
2706 list
= revs
->commits
;
2707 revs
->commits
= NULL
;
2708 tail
= &revs
->commits
;
2710 struct merge_simplify_state
*st
;
2712 commit
= pop_commit(&list
);
2713 st
= locate_simplify_state(revs
, commit
);
2714 if (st
->simplified
== commit
)
2715 tail
= &commit_list_insert(commit
, tail
)->next
;
2719 static void set_children(struct rev_info
*revs
)
2721 struct commit_list
*l
;
2722 for (l
= revs
->commits
; l
; l
= l
->next
) {
2723 struct commit
*commit
= l
->item
;
2724 struct commit_list
*p
;
2726 for (p
= commit
->parents
; p
; p
= p
->next
)
2727 add_child(revs
, p
->item
, commit
);
2731 void reset_revision_walk(void)
2733 clear_object_flags(SEEN
| ADDED
| SHOWN
);
2736 int prepare_revision_walk(struct rev_info
*revs
)
2739 struct object_array old_pending
;
2740 struct commit_list
**next
= &revs
->commits
;
2742 memcpy(&old_pending
, &revs
->pending
, sizeof(old_pending
));
2743 revs
->pending
.nr
= 0;
2744 revs
->pending
.alloc
= 0;
2745 revs
->pending
.objects
= NULL
;
2746 for (i
= 0; i
< old_pending
.nr
; i
++) {
2747 struct object_array_entry
*e
= old_pending
.objects
+ i
;
2748 struct commit
*commit
= handle_commit(revs
, e
);
2750 if (!(commit
->object
.flags
& SEEN
)) {
2751 commit
->object
.flags
|= SEEN
;
2752 next
= commit_list_append(commit
, next
);
2756 if (!revs
->leak_pending
)
2757 object_array_clear(&old_pending
);
2759 /* Signal whether we need per-parent treesame decoration */
2760 if (revs
->simplify_merges
||
2761 (revs
->limited
&& limiting_can_increase_treesame(revs
)))
2762 revs
->treesame
.name
= "treesame";
2764 if (revs
->no_walk
!= REVISION_WALK_NO_WALK_UNSORTED
)
2765 commit_list_sort_by_date(&revs
->commits
);
2769 if (limit_list(revs
) < 0)
2771 if (revs
->topo_order
)
2772 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
2773 if (revs
->line_level_traverse
)
2774 line_log_filter(revs
);
2775 if (revs
->simplify_merges
)
2776 simplify_merges(revs
);
2777 if (revs
->children
.name
)
2782 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
2784 struct commit_list
*cache
= NULL
;
2787 struct commit
*p
= *pp
;
2789 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
2790 return rewrite_one_error
;
2791 if (p
->object
.flags
& UNINTERESTING
)
2792 return rewrite_one_ok
;
2793 if (!(p
->object
.flags
& TREESAME
))
2794 return rewrite_one_ok
;
2796 return rewrite_one_noparents
;
2797 if ((p
= one_relevant_parent(revs
, p
->parents
)) == NULL
)
2798 return rewrite_one_ok
;
2803 int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
,
2804 rewrite_parent_fn_t rewrite_parent
)
2806 struct commit_list
**pp
= &commit
->parents
;
2808 struct commit_list
*parent
= *pp
;
2809 switch (rewrite_parent(revs
, &parent
->item
)) {
2810 case rewrite_one_ok
:
2812 case rewrite_one_noparents
:
2815 case rewrite_one_error
:
2820 remove_duplicate_parents(revs
, commit
);
2824 static int commit_rewrite_person(struct strbuf
*buf
, const char *what
, struct string_list
*mailmap
)
2826 char *person
, *endp
;
2827 size_t len
, namelen
, maillen
;
2830 struct ident_split ident
;
2832 person
= strstr(buf
->buf
, what
);
2836 person
+= strlen(what
);
2837 endp
= strchr(person
, '\n');
2841 len
= endp
- person
;
2843 if (split_ident_line(&ident
, person
, len
))
2846 mail
= ident
.mail_begin
;
2847 maillen
= ident
.mail_end
- ident
.mail_begin
;
2848 name
= ident
.name_begin
;
2849 namelen
= ident
.name_end
- ident
.name_begin
;
2851 if (map_user(mailmap
, &mail
, &maillen
, &name
, &namelen
)) {
2852 struct strbuf namemail
= STRBUF_INIT
;
2854 strbuf_addf(&namemail
, "%.*s <%.*s>",
2855 (int)namelen
, name
, (int)maillen
, mail
);
2857 strbuf_splice(buf
, ident
.name_begin
- buf
->buf
,
2858 ident
.mail_end
- ident
.name_begin
+ 1,
2859 namemail
.buf
, namemail
.len
);
2861 strbuf_release(&namemail
);
2869 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
2872 const char *encoding
;
2873 const char *message
;
2874 struct strbuf buf
= STRBUF_INIT
;
2876 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
2879 /* Prepend "fake" headers as needed */
2880 if (opt
->grep_filter
.use_reflog_filter
) {
2881 strbuf_addstr(&buf
, "reflog ");
2882 get_reflog_message(&buf
, opt
->reflog_info
);
2883 strbuf_addch(&buf
, '\n');
2887 * We grep in the user's output encoding, under the assumption that it
2888 * is the encoding they are most likely to write their grep pattern
2889 * for. In addition, it means we will match the "notes" encoding below,
2890 * so we will not end up with a buffer that has two different encodings
2893 encoding
= get_log_output_encoding();
2894 message
= logmsg_reencode(commit
, NULL
, encoding
);
2896 /* Copy the commit to temporary if we are using "fake" headers */
2898 strbuf_addstr(&buf
, message
);
2900 if (opt
->grep_filter
.header_list
&& opt
->mailmap
) {
2902 strbuf_addstr(&buf
, message
);
2904 commit_rewrite_person(&buf
, "\nauthor ", opt
->mailmap
);
2905 commit_rewrite_person(&buf
, "\ncommitter ", opt
->mailmap
);
2908 /* Append "fake" message parts as needed */
2909 if (opt
->show_notes
) {
2911 strbuf_addstr(&buf
, message
);
2912 format_display_notes(commit
->object
.oid
.hash
, &buf
, encoding
, 1);
2916 * Find either in the original commit message, or in the temporary.
2917 * Note that we cast away the constness of "message" here. It is
2918 * const because it may come from the cached commit buffer. That's OK,
2919 * because we know that it is modifiable heap memory, and that while
2920 * grep_buffer may modify it for speed, it will restore any
2921 * changes before returning.
2924 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
2926 retval
= grep_buffer(&opt
->grep_filter
,
2927 (char *)message
, strlen(message
));
2928 strbuf_release(&buf
);
2929 unuse_commit_buffer(commit
, message
);
2930 return opt
->invert_grep
? !retval
: retval
;
2933 static inline int want_ancestry(const struct rev_info
*revs
)
2935 return (revs
->rewrite_parents
|| revs
->children
.name
);
2938 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
2940 if (commit
->object
.flags
& SHOWN
)
2941 return commit_ignore
;
2942 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.oid
.hash
))
2943 return commit_ignore
;
2946 if (commit
->object
.flags
& UNINTERESTING
)
2947 return commit_ignore
;
2948 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
2949 return commit_ignore
;
2950 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
2951 int n
= commit_list_count(commit
->parents
);
2952 if ((n
< revs
->min_parents
) ||
2953 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
2954 return commit_ignore
;
2956 if (!commit_match(commit
, revs
))
2957 return commit_ignore
;
2958 if (revs
->prune
&& revs
->dense
) {
2959 /* Commit without changes? */
2960 if (commit
->object
.flags
& TREESAME
) {
2962 struct commit_list
*p
;
2963 /* drop merges unless we want parenthood */
2964 if (!want_ancestry(revs
))
2965 return commit_ignore
;
2967 * If we want ancestry, then need to keep any merges
2968 * between relevant commits to tie together topology.
2969 * For consistency with TREESAME and simplification
2970 * use "relevant" here rather than just INTERESTING,
2971 * to treat bottom commit(s) as part of the topology.
2973 for (n
= 0, p
= commit
->parents
; p
; p
= p
->next
)
2974 if (relevant_commit(p
->item
))
2977 return commit_ignore
;
2983 define_commit_slab(saved_parents
, struct commit_list
*);
2985 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
2988 * You may only call save_parents() once per commit (this is checked
2989 * for non-root commits).
2991 static void save_parents(struct rev_info
*revs
, struct commit
*commit
)
2993 struct commit_list
**pp
;
2995 if (!revs
->saved_parents_slab
) {
2996 revs
->saved_parents_slab
= xmalloc(sizeof(struct saved_parents
));
2997 init_saved_parents(revs
->saved_parents_slab
);
3000 pp
= saved_parents_at(revs
->saved_parents_slab
, commit
);
3003 * When walking with reflogs, we may visit the same commit
3004 * several times: once for each appearance in the reflog.
3006 * In this case, save_parents() will be called multiple times.
3007 * We want to keep only the first set of parents. We need to
3008 * store a sentinel value for an empty (i.e., NULL) parent
3009 * list to distinguish it from a not-yet-saved list, however.
3013 if (commit
->parents
)
3014 *pp
= copy_commit_list(commit
->parents
);
3016 *pp
= EMPTY_PARENT_LIST
;
3019 static void free_saved_parents(struct rev_info
*revs
)
3021 if (revs
->saved_parents_slab
)
3022 clear_saved_parents(revs
->saved_parents_slab
);
3025 struct commit_list
*get_saved_parents(struct rev_info
*revs
, const struct commit
*commit
)
3027 struct commit_list
*parents
;
3029 if (!revs
->saved_parents_slab
)
3030 return commit
->parents
;
3032 parents
= *saved_parents_at(revs
->saved_parents_slab
, commit
);
3033 if (parents
== EMPTY_PARENT_LIST
)
3038 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
3040 enum commit_action action
= get_commit_action(revs
, commit
);
3042 if (action
== commit_show
&&
3044 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
3046 * --full-diff on simplified parents is no good: it
3047 * will show spurious changes from the commits that
3048 * were elided. So we save the parents on the side
3049 * when --full-diff is in effect.
3051 if (revs
->full_diff
)
3052 save_parents(revs
, commit
);
3053 if (rewrite_parents(revs
, commit
, rewrite_one
) < 0)
3054 return commit_error
;
3059 static void track_linear(struct rev_info
*revs
, struct commit
*commit
)
3061 if (revs
->track_first_time
) {
3063 revs
->track_first_time
= 0;
3065 struct commit_list
*p
;
3066 for (p
= revs
->previous_parents
; p
; p
= p
->next
)
3067 if (p
->item
== NULL
|| /* first commit */
3068 !oidcmp(&p
->item
->object
.oid
, &commit
->object
.oid
))
3070 revs
->linear
= p
!= NULL
;
3072 if (revs
->reverse
) {
3074 commit
->object
.flags
|= TRACK_LINEAR
;
3076 free_commit_list(revs
->previous_parents
);
3077 revs
->previous_parents
= copy_commit_list(commit
->parents
);
3080 static struct commit
*get_revision_1(struct rev_info
*revs
)
3086 struct commit
*commit
= pop_commit(&revs
->commits
);
3088 if (revs
->reflog_info
) {
3089 save_parents(revs
, commit
);
3090 fake_reflog_parent(revs
->reflog_info
, commit
);
3091 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
3095 * If we haven't done the list limiting, we need to look at
3096 * the parents here. We also need to do the date-based limiting
3097 * that we'd otherwise have done in limit_list().
3099 if (!revs
->limited
) {
3100 if (revs
->max_age
!= -1 &&
3101 (commit
->date
< revs
->max_age
))
3103 if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0) {
3104 if (!revs
->ignore_missing_links
)
3105 die("Failed to traverse parents of commit %s",
3106 oid_to_hex(&commit
->object
.oid
));
3110 switch (simplify_commit(revs
, commit
)) {
3114 die("Failed to simplify parents of commit %s",
3115 oid_to_hex(&commit
->object
.oid
));
3117 if (revs
->track_linear
)
3118 track_linear(revs
, commit
);
3121 } while (revs
->commits
);
3126 * Return true for entries that have not yet been shown. (This is an
3127 * object_array_each_func_t.)
3129 static int entry_unshown(struct object_array_entry
*entry
, void *cb_data_unused
)
3131 return !(entry
->item
->flags
& SHOWN
);
3135 * If array is on the verge of a realloc, garbage-collect any entries
3136 * that have already been shown to try to free up some space.
3138 static void gc_boundary(struct object_array
*array
)
3140 if (array
->nr
== array
->alloc
)
3141 object_array_filter(array
, entry_unshown
, NULL
);
3144 static void create_boundary_commit_list(struct rev_info
*revs
)
3148 struct object_array
*array
= &revs
->boundary_commits
;
3149 struct object_array_entry
*objects
= array
->objects
;
3152 * If revs->commits is non-NULL at this point, an error occurred in
3153 * get_revision_1(). Ignore the error and continue printing the
3154 * boundary commits anyway. (This is what the code has always
3157 if (revs
->commits
) {
3158 free_commit_list(revs
->commits
);
3159 revs
->commits
= NULL
;
3163 * Put all of the actual boundary commits from revs->boundary_commits
3164 * into revs->commits
3166 for (i
= 0; i
< array
->nr
; i
++) {
3167 c
= (struct commit
*)(objects
[i
].item
);
3170 if (!(c
->object
.flags
& CHILD_SHOWN
))
3172 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
3174 c
->object
.flags
|= BOUNDARY
;
3175 commit_list_insert(c
, &revs
->commits
);
3179 * If revs->topo_order is set, sort the boundary commits
3180 * in topological order
3182 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
3185 static struct commit
*get_revision_internal(struct rev_info
*revs
)
3187 struct commit
*c
= NULL
;
3188 struct commit_list
*l
;
3190 if (revs
->boundary
== 2) {
3192 * All of the normal commits have already been returned,
3193 * and we are now returning boundary commits.
3194 * create_boundary_commit_list() has populated
3195 * revs->commits with the remaining commits to return.
3197 c
= pop_commit(&revs
->commits
);
3199 c
->object
.flags
|= SHOWN
;
3204 * If our max_count counter has reached zero, then we are done. We
3205 * don't simply return NULL because we still might need to show
3206 * boundary commits. But we want to avoid calling get_revision_1, which
3207 * might do a considerable amount of work finding the next commit only
3208 * for us to throw it away.
3210 * If it is non-zero, then either we don't have a max_count at all
3211 * (-1), or it is still counting, in which case we decrement.
3213 if (revs
->max_count
) {
3214 c
= get_revision_1(revs
);
3216 while (revs
->skip_count
> 0) {
3218 c
= get_revision_1(revs
);
3224 if (revs
->max_count
> 0)
3229 c
->object
.flags
|= SHOWN
;
3231 if (!revs
->boundary
)
3236 * get_revision_1() runs out the commits, and
3237 * we are done computing the boundaries.
3238 * switch to boundary commits output mode.
3243 * Update revs->commits to contain the list of
3246 create_boundary_commit_list(revs
);
3248 return get_revision_internal(revs
);
3252 * boundary commits are the commits that are parents of the
3253 * ones we got from get_revision_1() but they themselves are
3254 * not returned from get_revision_1(). Before returning
3255 * 'c', we need to mark its parents that they could be boundaries.
3258 for (l
= c
->parents
; l
; l
= l
->next
) {
3260 p
= &(l
->item
->object
);
3261 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
3263 p
->flags
|= CHILD_SHOWN
;
3264 gc_boundary(&revs
->boundary_commits
);
3265 add_object_array(p
, NULL
, &revs
->boundary_commits
);
3271 struct commit
*get_revision(struct rev_info
*revs
)
3274 struct commit_list
*reversed
;
3276 if (revs
->reverse
) {
3278 while ((c
= get_revision_internal(revs
)))
3279 commit_list_insert(c
, &reversed
);
3280 revs
->commits
= reversed
;
3282 revs
->reverse_output_stage
= 1;
3285 if (revs
->reverse_output_stage
) {
3286 c
= pop_commit(&revs
->commits
);
3287 if (revs
->track_linear
)
3288 revs
->linear
= !!(c
&& c
->object
.flags
& TRACK_LINEAR
);
3292 c
= get_revision_internal(revs
);
3293 if (c
&& revs
->graph
)
3294 graph_update(revs
->graph
, c
);
3296 free_saved_parents(revs
);
3297 if (revs
->previous_parents
) {
3298 free_commit_list(revs
->previous_parents
);
3299 revs
->previous_parents
= NULL
;
3305 char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
3307 if (commit
->object
.flags
& BOUNDARY
)
3309 else if (commit
->object
.flags
& UNINTERESTING
)
3311 else if (commit
->object
.flags
& PATCHSAME
)
3313 else if (!revs
|| revs
->left_right
) {
3314 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
3318 } else if (revs
->graph
)
3320 else if (revs
->cherry_mark
)
3325 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
3327 char *mark
= get_revision_mark(revs
, commit
);
3330 fputs(mark
, stdout
);