11 #include "reflog-walk.h"
12 #include "patch-ids.h"
15 #include "string-list.h"
17 volatile show_early_output_fn_t show_early_output
;
19 char *path_name(const struct name_path
*path
, const char *name
)
21 const struct name_path
*p
;
23 int nlen
= strlen(name
);
26 for (p
= path
; p
; p
= p
->up
) {
28 len
+= p
->elem_len
+ 1;
31 m
= n
+ len
- (nlen
+ 1);
33 for (p
= path
; p
; p
= p
->up
) {
36 memcpy(m
, p
->elem
, p
->elem_len
);
43 void add_object(struct object
*obj
,
44 struct object_array
*p
,
45 struct name_path
*path
,
48 add_object_array(obj
, path_name(path
, name
), p
);
51 static void mark_blob_uninteresting(struct blob
*blob
)
55 if (blob
->object
.flags
& UNINTERESTING
)
57 blob
->object
.flags
|= UNINTERESTING
;
60 void mark_tree_uninteresting(struct tree
*tree
)
62 struct tree_desc desc
;
63 struct name_entry entry
;
64 struct object
*obj
= &tree
->object
;
68 if (obj
->flags
& UNINTERESTING
)
70 obj
->flags
|= UNINTERESTING
;
71 if (!has_sha1_file(obj
->sha1
))
73 if (parse_tree(tree
) < 0)
74 die("bad tree %s", sha1_to_hex(obj
->sha1
));
76 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
77 while (tree_entry(&desc
, &entry
)) {
78 switch (object_type(entry
.mode
)) {
80 mark_tree_uninteresting(lookup_tree(entry
.sha1
));
83 mark_blob_uninteresting(lookup_blob(entry
.sha1
));
86 /* Subproject commit - not in this repository */
92 * We don't care about the tree any more
93 * after it has been marked uninteresting.
99 void mark_parents_uninteresting(struct commit
*commit
)
101 struct commit_list
*parents
= commit
->parents
;
104 struct commit
*commit
= parents
->item
;
105 if (!(commit
->object
.flags
& UNINTERESTING
)) {
106 commit
->object
.flags
|= UNINTERESTING
;
109 * Normally we haven't parsed the parent
110 * yet, so we won't have a parent of a parent
111 * here. However, it may turn out that we've
112 * reached this commit some other way (where it
113 * wasn't uninteresting), in which case we need
114 * to mark its parents recursively too..
117 mark_parents_uninteresting(commit
);
121 * A missing commit is ok iff its parent is marked
124 * We just mark such a thing parsed, so that when
125 * it is popped next time around, we won't be trying
126 * to parse it and get an error.
128 if (!has_sha1_file(commit
->object
.sha1
))
129 commit
->object
.parsed
= 1;
130 parents
= parents
->next
;
134 static void add_pending_object_with_mode(struct rev_info
*revs
, struct object
*obj
, const char *name
, unsigned mode
)
136 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
138 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
139 struct strbuf buf
= STRBUF_INIT
;
140 int len
= interpret_branch_name(name
, &buf
);
143 if (0 < len
&& name
[len
] && buf
.len
)
144 strbuf_addstr(&buf
, name
+ len
);
145 st
= add_reflog_for_walk(revs
->reflog_info
,
146 (struct commit
*)obj
,
147 buf
.buf
[0] ? buf
.buf
: name
);
148 strbuf_release(&buf
);
152 add_object_array_with_mode(obj
, name
, &revs
->pending
, mode
);
155 void add_pending_object(struct rev_info
*revs
, struct object
*obj
, const char *name
)
157 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
160 void add_head_to_pending(struct rev_info
*revs
)
162 unsigned char sha1
[20];
164 if (get_sha1("HEAD", sha1
))
166 obj
= parse_object(sha1
);
169 add_pending_object(revs
, obj
, "HEAD");
172 static struct object
*get_reference(struct rev_info
*revs
, const char *name
, const unsigned char *sha1
, unsigned int flags
)
174 struct object
*object
;
176 object
= parse_object(sha1
);
178 die("bad object %s", name
);
179 object
->flags
|= flags
;
183 static struct commit
*handle_commit(struct rev_info
*revs
, struct object
*object
, const char *name
)
185 unsigned long flags
= object
->flags
;
188 * Tag object? Look what it points to..
190 while (object
->type
== OBJ_TAG
) {
191 struct tag
*tag
= (struct tag
*) object
;
192 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
193 add_pending_object(revs
, object
, tag
->tag
);
196 object
= parse_object(tag
->tagged
->sha1
);
198 if (flags
& UNINTERESTING
)
200 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
205 * Commit object? Just return it, we'll do all the complex
208 if (object
->type
== OBJ_COMMIT
) {
209 struct commit
*commit
= (struct commit
*)object
;
210 if (parse_commit(commit
) < 0)
211 die("unable to parse commit %s", name
);
212 if (flags
& UNINTERESTING
) {
213 commit
->object
.flags
|= UNINTERESTING
;
214 mark_parents_uninteresting(commit
);
217 if (revs
->show_source
&& !commit
->util
)
218 commit
->util
= (void *) name
;
223 * Tree object? Either mark it uninteresting, or add it
224 * to the list of objects to look at later..
226 if (object
->type
== OBJ_TREE
) {
227 struct tree
*tree
= (struct tree
*)object
;
228 if (!revs
->tree_objects
)
230 if (flags
& UNINTERESTING
) {
231 mark_tree_uninteresting(tree
);
234 add_pending_object(revs
, object
, "");
239 * Blob object? You know the drill by now..
241 if (object
->type
== OBJ_BLOB
) {
242 struct blob
*blob
= (struct blob
*)object
;
243 if (!revs
->blob_objects
)
245 if (flags
& UNINTERESTING
) {
246 mark_blob_uninteresting(blob
);
249 add_pending_object(revs
, object
, "");
252 die("%s is unknown object", name
);
255 static int everybody_uninteresting(struct commit_list
*orig
)
257 struct commit_list
*list
= orig
;
259 struct commit
*commit
= list
->item
;
261 if (commit
->object
.flags
& UNINTERESTING
)
269 * The goal is to get REV_TREE_NEW as the result only if the
270 * diff consists of all '+' (and no other changes), REV_TREE_OLD
271 * if the whole diff is removal of old data, and otherwise
272 * REV_TREE_DIFFERENT (of course if the trees are the same we
273 * want REV_TREE_SAME).
274 * That means that once we get to REV_TREE_DIFFERENT, we do not
275 * have to look any further.
277 static int tree_difference
= REV_TREE_SAME
;
279 static void file_add_remove(struct diff_options
*options
,
280 int addremove
, unsigned mode
,
281 const unsigned char *sha1
,
282 const char *fullpath
, unsigned dirty_submodule
)
284 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
286 tree_difference
|= diff
;
287 if (tree_difference
== REV_TREE_DIFFERENT
)
288 DIFF_OPT_SET(options
, HAS_CHANGES
);
291 static void file_change(struct diff_options
*options
,
292 unsigned old_mode
, unsigned new_mode
,
293 const unsigned char *old_sha1
,
294 const unsigned char *new_sha1
,
295 const char *fullpath
,
296 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
298 tree_difference
= REV_TREE_DIFFERENT
;
299 DIFF_OPT_SET(options
, HAS_CHANGES
);
302 static int rev_compare_tree(struct rev_info
*revs
, struct commit
*parent
, struct commit
*commit
)
304 struct tree
*t1
= parent
->tree
;
305 struct tree
*t2
= commit
->tree
;
312 if (revs
->simplify_by_decoration
) {
314 * If we are simplifying by decoration, then the commit
315 * is worth showing if it has a tag pointing at it.
317 if (lookup_decoration(&name_decoration
, &commit
->object
))
318 return REV_TREE_DIFFERENT
;
320 * A commit that is not pointed by a tag is uninteresting
321 * if we are not limited by path. This means that you will
322 * see the usual "commits that touch the paths" plus any
323 * tagged commit by specifying both --simplify-by-decoration
326 if (!revs
->prune_data
.nr
)
327 return REV_TREE_SAME
;
330 tree_difference
= REV_TREE_SAME
;
331 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
332 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
334 return REV_TREE_DIFFERENT
;
335 return tree_difference
;
338 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
343 struct tree_desc empty
, real
;
344 struct tree
*t1
= commit
->tree
;
349 tree
= read_object_with_reference(t1
->object
.sha1
, tree_type
, &size
, NULL
);
352 init_tree_desc(&real
, tree
, size
);
353 init_tree_desc(&empty
, "", 0);
355 tree_difference
= REV_TREE_SAME
;
356 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
357 retval
= diff_tree(&empty
, &real
, "", &revs
->pruning
);
360 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
363 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
365 struct commit_list
**pp
, *parent
;
366 int tree_changed
= 0, tree_same
= 0;
369 * If we don't do pruning, everything is interesting
377 if (!commit
->parents
) {
378 if (rev_same_tree_as_empty(revs
, commit
))
379 commit
->object
.flags
|= TREESAME
;
384 * Normal non-merge commit? If we don't want to make the
385 * history dense, we consider it always to be a change..
387 if (!revs
->dense
&& !commit
->parents
->next
)
390 pp
= &commit
->parents
;
391 while ((parent
= *pp
) != NULL
) {
392 struct commit
*p
= parent
->item
;
394 if (parse_commit(p
) < 0)
395 die("cannot simplify commit %s (because of %s)",
396 sha1_to_hex(commit
->object
.sha1
),
397 sha1_to_hex(p
->object
.sha1
));
398 switch (rev_compare_tree(revs
, p
, commit
)) {
401 if (!revs
->simplify_history
|| (p
->object
.flags
& UNINTERESTING
)) {
402 /* Even if a merge with an uninteresting
403 * side branch brought the entire change
404 * we are interested in, we do not want
405 * to lose the other branches of this
406 * merge, so we just keep going.
412 commit
->parents
= parent
;
413 commit
->object
.flags
|= TREESAME
;
417 if (revs
->remove_empty_trees
&&
418 rev_same_tree_as_empty(revs
, p
)) {
419 /* We are adding all the specified
420 * paths from this parent, so the
421 * history beyond this parent is not
422 * interesting. Remove its parents
423 * (they are grandparents for us).
424 * IOW, we pretend this parent is a
427 if (parse_commit(p
) < 0)
428 die("cannot simplify commit %s (invalid %s)",
429 sha1_to_hex(commit
->object
.sha1
),
430 sha1_to_hex(p
->object
.sha1
));
435 case REV_TREE_DIFFERENT
:
440 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
442 if (tree_changed
&& !tree_same
)
444 commit
->object
.flags
|= TREESAME
;
447 static void commit_list_insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
448 struct commit_list
*cached_base
, struct commit_list
**cache
)
450 struct commit_list
*new_entry
;
452 if (cached_base
&& p
->date
< cached_base
->item
->date
)
453 new_entry
= commit_list_insert_by_date(p
, &cached_base
->next
);
455 new_entry
= commit_list_insert_by_date(p
, head
);
457 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
461 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
462 struct commit_list
**list
, struct commit_list
**cache_ptr
)
464 struct commit_list
*parent
= commit
->parents
;
466 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
468 if (commit
->object
.flags
& ADDED
)
470 commit
->object
.flags
|= ADDED
;
473 * If the commit is uninteresting, don't try to
474 * prune parents - we want the maximal uninteresting
477 * Normally we haven't parsed the parent
478 * yet, so we won't have a parent of a parent
479 * here. However, it may turn out that we've
480 * reached this commit some other way (where it
481 * wasn't uninteresting), in which case we need
482 * to mark its parents recursively too..
484 if (commit
->object
.flags
& UNINTERESTING
) {
486 struct commit
*p
= parent
->item
;
487 parent
= parent
->next
;
489 p
->object
.flags
|= UNINTERESTING
;
490 if (parse_commit(p
) < 0)
493 mark_parents_uninteresting(p
);
494 if (p
->object
.flags
& SEEN
)
496 p
->object
.flags
|= SEEN
;
497 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
503 * Ok, the commit wasn't uninteresting. Try to
504 * simplify the commit history and find the parent
505 * that has no differences in the path set if one exists.
507 try_to_simplify_commit(revs
, commit
);
512 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
514 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
515 struct commit
*p
= parent
->item
;
517 if (parse_commit(p
) < 0)
519 if (revs
->show_source
&& !p
->util
)
520 p
->util
= commit
->util
;
521 p
->object
.flags
|= left_flag
;
522 if (!(p
->object
.flags
& SEEN
)) {
523 p
->object
.flags
|= SEEN
;
524 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
526 if (revs
->first_parent_only
)
532 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
534 struct commit_list
*p
;
535 int left_count
= 0, right_count
= 0;
537 struct patch_ids ids
;
538 unsigned cherry_flag
;
540 /* First count the commits on the left and on the right */
541 for (p
= list
; p
; p
= p
->next
) {
542 struct commit
*commit
= p
->item
;
543 unsigned flags
= commit
->object
.flags
;
544 if (flags
& BOUNDARY
)
546 else if (flags
& SYMMETRIC_LEFT
)
552 if (!left_count
|| !right_count
)
555 left_first
= left_count
< right_count
;
556 init_patch_ids(&ids
);
557 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
559 /* Compute patch-ids for one side */
560 for (p
= list
; p
; p
= p
->next
) {
561 struct commit
*commit
= p
->item
;
562 unsigned flags
= commit
->object
.flags
;
564 if (flags
& BOUNDARY
)
567 * If we have fewer left, left_first is set and we omit
568 * commits on the right branch in this loop. If we have
569 * fewer right, we skip the left ones.
571 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
573 commit
->util
= add_commit_patch_id(commit
, &ids
);
576 /* either cherry_mark or cherry_pick are true */
577 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
579 /* Check the other side */
580 for (p
= list
; p
; p
= p
->next
) {
581 struct commit
*commit
= p
->item
;
583 unsigned flags
= commit
->object
.flags
;
585 if (flags
& BOUNDARY
)
588 * If we have fewer left, left_first is set and we omit
589 * commits on the left branch in this loop.
591 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
595 * Have we seen the same patch id?
597 id
= has_commit_patch_id(commit
, &ids
);
601 commit
->object
.flags
|= cherry_flag
;
604 /* Now check the original side for seen ones */
605 for (p
= list
; p
; p
= p
->next
) {
606 struct commit
*commit
= p
->item
;
607 struct patch_id
*ent
;
613 commit
->object
.flags
|= cherry_flag
;
617 free_patch_ids(&ids
);
620 /* How many extra uninteresting commits we want to see.. */
623 static int still_interesting(struct commit_list
*src
, unsigned long date
, int slop
)
626 * No source list at all? We're definitely done..
632 * Does the destination list contain entries with a date
633 * before the source list? Definitely _not_ done.
635 if (date
< src
->item
->date
)
639 * Does the source list still have interesting commits in
640 * it? Definitely not done..
642 if (!everybody_uninteresting(src
))
645 /* Ok, we're closing in.. */
650 * "rev-list --ancestry-path A..B" computes commits that are ancestors
651 * of B but not ancestors of A but further limits the result to those
652 * that are descendants of A. This takes the list of bottom commits and
653 * the result of "A..B" without --ancestry-path, and limits the latter
654 * further to the ones that can reach one of the commits in "bottom".
656 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
658 struct commit_list
*p
;
659 struct commit_list
*rlist
= NULL
;
663 * Reverse the list so that it will be likely that we would
664 * process parents before children.
666 for (p
= list
; p
; p
= p
->next
)
667 commit_list_insert(p
->item
, &rlist
);
669 for (p
= bottom
; p
; p
= p
->next
)
670 p
->item
->object
.flags
|= TMP_MARK
;
673 * Mark the ones that can reach bottom commits in "list",
674 * in a bottom-up fashion.
678 for (p
= rlist
; p
; p
= p
->next
) {
679 struct commit
*c
= p
->item
;
680 struct commit_list
*parents
;
681 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
683 for (parents
= c
->parents
;
685 parents
= parents
->next
) {
686 if (!(parents
->item
->object
.flags
& TMP_MARK
))
688 c
->object
.flags
|= TMP_MARK
;
693 } while (made_progress
);
696 * NEEDSWORK: decide if we want to remove parents that are
697 * not marked with TMP_MARK from commit->parents for commits
698 * in the resulting list. We may not want to do that, though.
702 * The ones that are not marked with TMP_MARK are uninteresting
704 for (p
= list
; p
; p
= p
->next
) {
705 struct commit
*c
= p
->item
;
706 if (c
->object
.flags
& TMP_MARK
)
708 c
->object
.flags
|= UNINTERESTING
;
711 /* We are done with the TMP_MARK */
712 for (p
= list
; p
; p
= p
->next
)
713 p
->item
->object
.flags
&= ~TMP_MARK
;
714 for (p
= bottom
; p
; p
= p
->next
)
715 p
->item
->object
.flags
&= ~TMP_MARK
;
716 free_commit_list(rlist
);
720 * Before walking the history, keep the set of "negative" refs the
721 * caller has asked to exclude.
723 * This is used to compute "rev-list --ancestry-path A..B", as we need
724 * to filter the result of "A..B" further to the ones that can actually
727 static struct commit_list
*collect_bottom_commits(struct commit_list
*list
)
729 struct commit_list
*elem
, *bottom
= NULL
;
730 for (elem
= list
; elem
; elem
= elem
->next
)
731 if (elem
->item
->object
.flags
& UNINTERESTING
)
732 commit_list_insert(elem
->item
, &bottom
);
736 /* Assumes either left_only or right_only is set */
737 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
739 struct commit_list
*p
;
741 for (p
= list
; p
; p
= p
->next
) {
742 struct commit
*commit
= p
->item
;
744 if (revs
->right_only
) {
745 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
746 commit
->object
.flags
|= SHOWN
;
747 } else /* revs->left_only is set */
748 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
749 commit
->object
.flags
|= SHOWN
;
753 static int limit_list(struct rev_info
*revs
)
756 unsigned long date
= ~0ul;
757 struct commit_list
*list
= revs
->commits
;
758 struct commit_list
*newlist
= NULL
;
759 struct commit_list
**p
= &newlist
;
760 struct commit_list
*bottom
= NULL
;
762 if (revs
->ancestry_path
) {
763 bottom
= collect_bottom_commits(list
);
765 die("--ancestry-path given but there are no bottom commits");
769 struct commit_list
*entry
= list
;
770 struct commit
*commit
= list
->item
;
771 struct object
*obj
= &commit
->object
;
772 show_early_output_fn_t show
;
777 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
778 obj
->flags
|= UNINTERESTING
;
779 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
781 if (obj
->flags
& UNINTERESTING
) {
782 mark_parents_uninteresting(commit
);
784 p
= &commit_list_insert(commit
, p
)->next
;
785 slop
= still_interesting(list
, date
, slop
);
788 /* If showing all, add the whole pending list to the end */
793 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
796 p
= &commit_list_insert(commit
, p
)->next
;
798 show
= show_early_output
;
803 show_early_output
= NULL
;
805 if (revs
->cherry_pick
|| revs
->cherry_mark
)
806 cherry_pick_list(newlist
, revs
);
808 if (revs
->left_only
|| revs
->right_only
)
809 limit_left_right(newlist
, revs
);
812 limit_to_ancestry(bottom
, newlist
);
813 free_commit_list(bottom
);
816 revs
->commits
= newlist
;
822 int warned_bad_reflog
;
823 struct rev_info
*all_revs
;
824 const char *name_for_errormsg
;
827 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
829 struct all_refs_cb
*cb
= cb_data
;
830 struct object
*object
= get_reference(cb
->all_revs
, path
, sha1
,
832 add_pending_object(cb
->all_revs
, object
, path
);
836 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
840 cb
->all_flags
= flags
;
843 static void handle_refs(const char *submodule
, struct rev_info
*revs
, unsigned flags
,
844 int (*for_each
)(const char *, each_ref_fn
, void *))
846 struct all_refs_cb cb
;
847 init_all_refs_cb(&cb
, revs
, flags
);
848 for_each(submodule
, handle_one_ref
, &cb
);
851 static void handle_one_reflog_commit(unsigned char *sha1
, void *cb_data
)
853 struct all_refs_cb
*cb
= cb_data
;
854 if (!is_null_sha1(sha1
)) {
855 struct object
*o
= parse_object(sha1
);
857 o
->flags
|= cb
->all_flags
;
858 add_pending_object(cb
->all_revs
, o
, "");
860 else if (!cb
->warned_bad_reflog
) {
861 warning("reflog of '%s' references pruned commits",
862 cb
->name_for_errormsg
);
863 cb
->warned_bad_reflog
= 1;
868 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
869 const char *email
, unsigned long timestamp
, int tz
,
870 const char *message
, void *cb_data
)
872 handle_one_reflog_commit(osha1
, cb_data
);
873 handle_one_reflog_commit(nsha1
, cb_data
);
877 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
879 struct all_refs_cb
*cb
= cb_data
;
880 cb
->warned_bad_reflog
= 0;
881 cb
->name_for_errormsg
= path
;
882 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
886 static void handle_reflog(struct rev_info
*revs
, unsigned flags
)
888 struct all_refs_cb cb
;
890 cb
.all_flags
= flags
;
891 for_each_reflog(handle_one_reflog
, &cb
);
894 static int add_parents_only(struct rev_info
*revs
, const char *arg
, int flags
)
896 unsigned char sha1
[20];
898 struct commit
*commit
;
899 struct commit_list
*parents
;
902 flags
^= UNINTERESTING
;
905 if (get_sha1(arg
, sha1
))
908 it
= get_reference(revs
, arg
, sha1
, 0);
909 if (it
->type
!= OBJ_TAG
)
911 if (!((struct tag
*)it
)->tagged
)
913 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
915 if (it
->type
!= OBJ_COMMIT
)
917 commit
= (struct commit
*)it
;
918 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
919 it
= &parents
->item
->object
;
921 add_pending_object(revs
, it
, arg
);
926 void init_revisions(struct rev_info
*revs
, const char *prefix
)
928 memset(revs
, 0, sizeof(*revs
));
930 revs
->abbrev
= DEFAULT_ABBREV
;
931 revs
->ignore_merges
= 1;
932 revs
->simplify_history
= 1;
933 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
934 DIFF_OPT_SET(&revs
->pruning
, QUICK
);
935 revs
->pruning
.add_remove
= file_add_remove
;
936 revs
->pruning
.change
= file_change
;
939 revs
->prefix
= prefix
;
942 revs
->skip_count
= -1;
943 revs
->max_count
= -1;
945 revs
->commit_format
= CMIT_FMT_DEFAULT
;
947 revs
->grep_filter
.status_only
= 1;
948 revs
->grep_filter
.pattern_tail
= &(revs
->grep_filter
.pattern_list
);
949 revs
->grep_filter
.header_tail
= &(revs
->grep_filter
.header_list
);
950 revs
->grep_filter
.regflags
= REG_NEWLINE
;
952 diff_setup(&revs
->diffopt
);
953 if (prefix
&& !revs
->diffopt
.prefix
) {
954 revs
->diffopt
.prefix
= prefix
;
955 revs
->diffopt
.prefix_length
= strlen(prefix
);
959 static void add_pending_commit_list(struct rev_info
*revs
,
960 struct commit_list
*commit_list
,
963 while (commit_list
) {
964 struct object
*object
= &commit_list
->item
->object
;
965 object
->flags
|= flags
;
966 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
967 commit_list
= commit_list
->next
;
971 static void prepare_show_merge(struct rev_info
*revs
)
973 struct commit_list
*bases
;
974 struct commit
*head
, *other
;
975 unsigned char sha1
[20];
976 const char **prune
= NULL
;
977 int i
, prune_num
= 1; /* counting terminating NULL */
979 if (get_sha1("HEAD", sha1
) || !(head
= lookup_commit(sha1
)))
980 die("--merge without HEAD?");
981 if (get_sha1("MERGE_HEAD", sha1
) || !(other
= lookup_commit(sha1
)))
982 die("--merge without MERGE_HEAD?");
983 add_pending_object(revs
, &head
->object
, "HEAD");
984 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
985 bases
= get_merge_bases(head
, other
, 1);
986 add_pending_commit_list(revs
, bases
, UNINTERESTING
);
987 free_commit_list(bases
);
988 head
->object
.flags
|= SYMMETRIC_LEFT
;
992 for (i
= 0; i
< active_nr
; i
++) {
993 struct cache_entry
*ce
= active_cache
[i
];
996 if (ce_path_match(ce
, &revs
->prune_data
)) {
998 prune
= xrealloc(prune
, sizeof(*prune
) * prune_num
);
999 prune
[prune_num
-2] = ce
->name
;
1000 prune
[prune_num
-1] = NULL
;
1002 while ((i
+1 < active_nr
) &&
1003 ce_same_name(ce
, active_cache
[i
+1]))
1006 free_pathspec(&revs
->prune_data
);
1007 init_pathspec(&revs
->prune_data
, prune
);
1011 int handle_revision_arg(const char *arg
, struct rev_info
*revs
,
1013 int cant_be_filename
)
1017 struct object
*object
;
1018 unsigned char sha1
[20];
1021 dotdot
= strstr(arg
, "..");
1023 unsigned char from_sha1
[20];
1024 const char *next
= dotdot
+ 2;
1025 const char *this = arg
;
1026 int symmetric
= *next
== '.';
1027 unsigned int flags_exclude
= flags
^ UNINTERESTING
;
1036 if (!get_sha1(this, from_sha1
) &&
1037 !get_sha1(next
, sha1
)) {
1038 struct commit
*a
, *b
;
1039 struct commit_list
*exclude
;
1041 a
= lookup_commit_reference(from_sha1
);
1042 b
= lookup_commit_reference(sha1
);
1045 "Invalid symmetric difference expression %s...%s" :
1046 "Invalid revision range %s..%s",
1050 if (!cant_be_filename
) {
1052 verify_non_filename(revs
->prefix
, arg
);
1056 exclude
= get_merge_bases(a
, b
, 1);
1057 add_pending_commit_list(revs
, exclude
,
1059 free_commit_list(exclude
);
1060 a
->object
.flags
|= flags
| SYMMETRIC_LEFT
;
1062 a
->object
.flags
|= flags_exclude
;
1063 b
->object
.flags
|= flags
;
1064 add_pending_object(revs
, &a
->object
, this);
1065 add_pending_object(revs
, &b
->object
, next
);
1070 dotdot
= strstr(arg
, "^@");
1071 if (dotdot
&& !dotdot
[2]) {
1073 if (add_parents_only(revs
, arg
, flags
))
1077 dotdot
= strstr(arg
, "^!");
1078 if (dotdot
&& !dotdot
[2]) {
1080 if (!add_parents_only(revs
, arg
, flags
^ UNINTERESTING
))
1086 local_flags
= UNINTERESTING
;
1089 if (get_sha1_with_mode(arg
, sha1
, &mode
))
1091 if (!cant_be_filename
)
1092 verify_non_filename(revs
->prefix
, arg
);
1093 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
1094 add_pending_object_with_mode(revs
, object
, arg
, mode
);
1098 static void read_pathspec_from_stdin(struct rev_info
*revs
, struct strbuf
*sb
, const char ***prune_data
)
1100 const char **prune
= *prune_data
;
1104 /* count existing ones */
1108 for (prune_nr
= 0; prune
[prune_nr
]; prune_nr
++)
1110 prune_alloc
= prune_nr
; /* not really, but we do not know */
1112 while (strbuf_getwholeline(sb
, stdin
, '\n') != EOF
) {
1114 if (len
&& sb
->buf
[len
- 1] == '\n')
1115 sb
->buf
[--len
] = '\0';
1116 ALLOC_GROW(prune
, prune_nr
+1, prune_alloc
);
1117 prune
[prune_nr
++] = xstrdup(sb
->buf
);
1120 ALLOC_GROW(prune
, prune_nr
+1, prune_alloc
);
1121 prune
[prune_nr
] = NULL
;
1123 *prune_data
= prune
;
1126 static void read_revisions_from_stdin(struct rev_info
*revs
, const char ***prune
)
1129 int seen_dashdash
= 0;
1131 strbuf_init(&sb
, 1000);
1132 while (strbuf_getwholeline(&sb
, stdin
, '\n') != EOF
) {
1134 if (len
&& sb
.buf
[len
- 1] == '\n')
1135 sb
.buf
[--len
] = '\0';
1138 if (sb
.buf
[0] == '-') {
1139 if (len
== 2 && sb
.buf
[1] == '-') {
1143 die("options not supported in --stdin mode");
1145 if (handle_revision_arg(sb
.buf
, revs
, 0, 1))
1146 die("bad revision '%s'", sb
.buf
);
1149 read_pathspec_from_stdin(revs
, &sb
, prune
);
1150 strbuf_release(&sb
);
1153 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
1155 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
1158 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
1160 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
1163 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
1165 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
1168 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
1169 int *unkc
, const char **unkv
)
1171 const char *arg
= argv
[0];
1175 /* pseudo revision arguments */
1176 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1177 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1178 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1179 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
1180 !strcmp(arg
, "--bisect"))
1182 unkv
[(*unkc
)++] = arg
;
1186 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
1187 revs
->max_count
= atoi(optarg
);
1190 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
1191 revs
->skip_count
= atoi(optarg
);
1193 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1194 /* accept -<digit>, like traditional "head" */
1195 revs
->max_count
= atoi(arg
+ 1);
1197 } else if (!strcmp(arg
, "-n")) {
1199 return error("-n requires an argument");
1200 revs
->max_count
= atoi(argv
[1]);
1203 } else if (!prefixcmp(arg
, "-n")) {
1204 revs
->max_count
= atoi(arg
+ 2);
1206 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
1207 revs
->max_age
= atoi(optarg
);
1209 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
1210 revs
->max_age
= approxidate(optarg
);
1212 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
1213 revs
->max_age
= approxidate(optarg
);
1215 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
1216 revs
->min_age
= atoi(optarg
);
1218 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
1219 revs
->min_age
= approxidate(optarg
);
1221 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
1222 revs
->min_age
= approxidate(optarg
);
1224 } else if (!strcmp(arg
, "--first-parent")) {
1225 revs
->first_parent_only
= 1;
1226 } else if (!strcmp(arg
, "--ancestry-path")) {
1227 revs
->ancestry_path
= 1;
1228 revs
->simplify_history
= 0;
1230 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1231 init_reflog_walk(&revs
->reflog_info
);
1232 } else if (!strcmp(arg
, "--default")) {
1234 return error("bad --default argument");
1235 revs
->def
= argv
[1];
1237 } else if (!strcmp(arg
, "--merge")) {
1238 revs
->show_merge
= 1;
1239 } else if (!strcmp(arg
, "--topo-order")) {
1241 revs
->topo_order
= 1;
1242 } else if (!strcmp(arg
, "--simplify-merges")) {
1243 revs
->simplify_merges
= 1;
1244 revs
->rewrite_parents
= 1;
1245 revs
->simplify_history
= 0;
1247 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
1248 revs
->simplify_merges
= 1;
1249 revs
->rewrite_parents
= 1;
1250 revs
->simplify_history
= 0;
1251 revs
->simplify_by_decoration
= 1;
1254 load_ref_decorations(DECORATE_SHORT_REFS
);
1255 } else if (!strcmp(arg
, "--date-order")) {
1257 revs
->topo_order
= 1;
1258 } else if (!prefixcmp(arg
, "--early-output")) {
1262 count
= atoi(arg
+15);
1265 revs
->topo_order
= 1;
1266 revs
->early_output
= count
;
1268 } else if (!strcmp(arg
, "--parents")) {
1269 revs
->rewrite_parents
= 1;
1270 revs
->print_parents
= 1;
1271 } else if (!strcmp(arg
, "--dense")) {
1273 } else if (!strcmp(arg
, "--sparse")) {
1275 } else if (!strcmp(arg
, "--show-all")) {
1277 } else if (!strcmp(arg
, "--remove-empty")) {
1278 revs
->remove_empty_trees
= 1;
1279 } else if (!strcmp(arg
, "--merges")) {
1280 revs
->merges_only
= 1;
1281 } else if (!strcmp(arg
, "--no-merges")) {
1282 revs
->no_merges
= 1;
1283 } else if (!strcmp(arg
, "--boundary")) {
1285 } else if (!strcmp(arg
, "--left-right")) {
1286 revs
->left_right
= 1;
1287 } else if (!strcmp(arg
, "--left-only")) {
1288 if (revs
->right_only
)
1289 die("--left-only is incompatible with --right-only"
1291 revs
->left_only
= 1;
1292 } else if (!strcmp(arg
, "--right-only")) {
1293 if (revs
->left_only
)
1294 die("--right-only is incompatible with --left-only");
1295 revs
->right_only
= 1;
1296 } else if (!strcmp(arg
, "--cherry")) {
1297 if (revs
->left_only
)
1298 die("--cherry is incompatible with --left-only");
1299 revs
->cherry_mark
= 1;
1300 revs
->right_only
= 1;
1301 revs
->no_merges
= 1;
1303 } else if (!strcmp(arg
, "--count")) {
1305 } else if (!strcmp(arg
, "--cherry-mark")) {
1306 if (revs
->cherry_pick
)
1307 die("--cherry-mark is incompatible with --cherry-pick");
1308 revs
->cherry_mark
= 1;
1309 revs
->limited
= 1; /* needs limit_list() */
1310 } else if (!strcmp(arg
, "--cherry-pick")) {
1311 if (revs
->cherry_mark
)
1312 die("--cherry-pick is incompatible with --cherry-mark");
1313 revs
->cherry_pick
= 1;
1315 } else if (!strcmp(arg
, "--objects")) {
1316 revs
->tag_objects
= 1;
1317 revs
->tree_objects
= 1;
1318 revs
->blob_objects
= 1;
1319 } else if (!strcmp(arg
, "--objects-edge")) {
1320 revs
->tag_objects
= 1;
1321 revs
->tree_objects
= 1;
1322 revs
->blob_objects
= 1;
1323 revs
->edge_hint
= 1;
1324 } else if (!strcmp(arg
, "--unpacked")) {
1326 } else if (!prefixcmp(arg
, "--unpacked=")) {
1327 die("--unpacked=<packfile> no longer supported.");
1328 } else if (!strcmp(arg
, "-r")) {
1330 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1331 } else if (!strcmp(arg
, "-t")) {
1333 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1334 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1335 } else if (!strcmp(arg
, "-m")) {
1336 revs
->ignore_merges
= 0;
1337 } else if (!strcmp(arg
, "-c")) {
1339 revs
->dense_combined_merges
= 0;
1340 revs
->combine_merges
= 1;
1341 } else if (!strcmp(arg
, "--cc")) {
1343 revs
->dense_combined_merges
= 1;
1344 revs
->combine_merges
= 1;
1345 } else if (!strcmp(arg
, "-v")) {
1346 revs
->verbose_header
= 1;
1347 } else if (!strcmp(arg
, "--pretty")) {
1348 revs
->verbose_header
= 1;
1349 revs
->pretty_given
= 1;
1350 get_commit_format(arg
+8, revs
);
1351 } else if (!prefixcmp(arg
, "--pretty=") || !prefixcmp(arg
, "--format=")) {
1353 * Detached form ("--pretty X" as opposed to "--pretty=X")
1354 * not allowed, since the argument is optional.
1356 revs
->verbose_header
= 1;
1357 revs
->pretty_given
= 1;
1358 get_commit_format(arg
+9, revs
);
1359 } else if (!strcmp(arg
, "--show-notes")) {
1360 revs
->show_notes
= 1;
1361 revs
->show_notes_given
= 1;
1362 } else if (!prefixcmp(arg
, "--show-notes=")) {
1363 struct strbuf buf
= STRBUF_INIT
;
1364 revs
->show_notes
= 1;
1365 revs
->show_notes_given
= 1;
1366 if (!revs
->notes_opt
.extra_notes_refs
)
1367 revs
->notes_opt
.extra_notes_refs
= xcalloc(1, sizeof(struct string_list
));
1368 if (!prefixcmp(arg
+13, "refs/"))
1370 else if (!prefixcmp(arg
+13, "notes/"))
1371 strbuf_addstr(&buf
, "refs/");
1373 strbuf_addstr(&buf
, "refs/notes/");
1374 strbuf_addstr(&buf
, arg
+13);
1375 string_list_append(revs
->notes_opt
.extra_notes_refs
,
1376 strbuf_detach(&buf
, NULL
));
1377 } else if (!strcmp(arg
, "--no-notes")) {
1378 revs
->show_notes
= 0;
1379 revs
->show_notes_given
= 1;
1380 } else if (!strcmp(arg
, "--standard-notes")) {
1381 revs
->show_notes_given
= 1;
1382 revs
->notes_opt
.suppress_default_notes
= 0;
1383 } else if (!strcmp(arg
, "--no-standard-notes")) {
1384 revs
->notes_opt
.suppress_default_notes
= 1;
1385 } else if (!strcmp(arg
, "--oneline")) {
1386 revs
->verbose_header
= 1;
1387 get_commit_format("oneline", revs
);
1388 revs
->pretty_given
= 1;
1389 revs
->abbrev_commit
= 1;
1390 } else if (!strcmp(arg
, "--graph")) {
1391 revs
->topo_order
= 1;
1392 revs
->rewrite_parents
= 1;
1393 revs
->graph
= graph_init(revs
);
1394 } else if (!strcmp(arg
, "--root")) {
1395 revs
->show_root_diff
= 1;
1396 } else if (!strcmp(arg
, "--no-commit-id")) {
1397 revs
->no_commit_id
= 1;
1398 } else if (!strcmp(arg
, "--always")) {
1399 revs
->always_show_header
= 1;
1400 } else if (!strcmp(arg
, "--no-abbrev")) {
1402 } else if (!strcmp(arg
, "--abbrev")) {
1403 revs
->abbrev
= DEFAULT_ABBREV
;
1404 } else if (!prefixcmp(arg
, "--abbrev=")) {
1405 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1406 if (revs
->abbrev
< MINIMUM_ABBREV
)
1407 revs
->abbrev
= MINIMUM_ABBREV
;
1408 else if (revs
->abbrev
> 40)
1410 } else if (!strcmp(arg
, "--abbrev-commit")) {
1411 revs
->abbrev_commit
= 1;
1412 } else if (!strcmp(arg
, "--full-diff")) {
1414 revs
->full_diff
= 1;
1415 } else if (!strcmp(arg
, "--full-history")) {
1416 revs
->simplify_history
= 0;
1417 } else if (!strcmp(arg
, "--relative-date")) {
1418 revs
->date_mode
= DATE_RELATIVE
;
1419 revs
->date_mode_explicit
= 1;
1420 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
1421 revs
->date_mode
= parse_date_format(optarg
);
1422 revs
->date_mode_explicit
= 1;
1424 } else if (!strcmp(arg
, "--log-size")) {
1425 revs
->show_log_size
= 1;
1428 * Grepping the commit log
1430 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
1431 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
1433 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
1434 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
1436 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
1437 add_message_grep(revs
, optarg
);
1439 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
1440 revs
->grep_filter
.regflags
|= REG_EXTENDED
;
1441 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
1442 revs
->grep_filter
.regflags
|= REG_ICASE
;
1443 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
1444 revs
->grep_filter
.fixed
= 1;
1445 } else if (!strcmp(arg
, "--all-match")) {
1446 revs
->grep_filter
.all_match
= 1;
1447 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
1448 if (strcmp(optarg
, "none"))
1449 git_log_output_encoding
= xstrdup(optarg
);
1451 git_log_output_encoding
= "";
1453 } else if (!strcmp(arg
, "--reverse")) {
1455 } else if (!strcmp(arg
, "--children")) {
1456 revs
->children
.name
= "children";
1459 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
);
1461 unkv
[(*unkc
)++] = arg
;
1468 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
1469 const struct option
*options
,
1470 const char * const usagestr
[])
1472 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
1473 &ctx
->cpidx
, ctx
->out
);
1475 error("unknown option `%s'", ctx
->argv
[0]);
1476 usage_with_options(usagestr
, options
);
1482 static int for_each_bad_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
1484 return for_each_ref_in_submodule(submodule
, "refs/bisect/bad", fn
, cb_data
);
1487 static int for_each_good_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
1489 return for_each_ref_in_submodule(submodule
, "refs/bisect/good", fn
, cb_data
);
1492 static void append_prune_data(const char ***prune_data
, const char **av
)
1494 const char **prune
= *prune_data
;
1503 /* count existing ones */
1504 for (prune_nr
= 0; prune
[prune_nr
]; prune_nr
++)
1506 prune_alloc
= prune_nr
; /* not really, but we do not know */
1509 ALLOC_GROW(prune
, prune_nr
+1, prune_alloc
);
1510 prune
[prune_nr
++] = *av
;
1514 ALLOC_GROW(prune
, prune_nr
+1, prune_alloc
);
1515 prune
[prune_nr
] = NULL
;
1517 *prune_data
= prune
;
1521 * Parse revision information, filling in the "rev_info" structure,
1522 * and removing the used arguments from the argument list.
1524 * Returns the number of arguments left that weren't recognized
1525 * (which are also moved to the head of the argument list)
1527 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
1529 int i
, flags
, left
, seen_dashdash
, read_from_stdin
, got_rev_arg
= 0;
1530 const char **prune_data
= NULL
;
1531 const char *submodule
= NULL
;
1536 submodule
= opt
->submodule
;
1538 /* First, search for "--" */
1540 for (i
= 1; i
< argc
; i
++) {
1541 const char *arg
= argv
[i
];
1542 if (strcmp(arg
, "--"))
1547 prune_data
= argv
+ i
+ 1;
1552 /* Second, deal with arguments and options */
1554 read_from_stdin
= 0;
1555 for (left
= i
= 1; i
< argc
; i
++) {
1556 const char *arg
= argv
[i
];
1560 if (!strcmp(arg
, "--all")) {
1561 handle_refs(submodule
, revs
, flags
, for_each_ref_submodule
);
1562 handle_refs(submodule
, revs
, flags
, head_ref_submodule
);
1565 if (!strcmp(arg
, "--branches")) {
1566 handle_refs(submodule
, revs
, flags
, for_each_branch_ref_submodule
);
1569 if (!strcmp(arg
, "--bisect")) {
1570 handle_refs(submodule
, revs
, flags
, for_each_bad_bisect_ref
);
1571 handle_refs(submodule
, revs
, flags
^ UNINTERESTING
, for_each_good_bisect_ref
);
1575 if (!strcmp(arg
, "--tags")) {
1576 handle_refs(submodule
, revs
, flags
, for_each_tag_ref_submodule
);
1579 if (!strcmp(arg
, "--remotes")) {
1580 handle_refs(submodule
, revs
, flags
, for_each_remote_ref_submodule
);
1583 if ((argcount
= parse_long_opt("glob", argv
+ i
, &optarg
))) {
1584 struct all_refs_cb cb
;
1586 init_all_refs_cb(&cb
, revs
, flags
);
1587 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
1590 if (!prefixcmp(arg
, "--branches=")) {
1591 struct all_refs_cb cb
;
1592 init_all_refs_cb(&cb
, revs
, flags
);
1593 for_each_glob_ref_in(handle_one_ref
, arg
+ 11, "refs/heads/", &cb
);
1596 if (!prefixcmp(arg
, "--tags=")) {
1597 struct all_refs_cb cb
;
1598 init_all_refs_cb(&cb
, revs
, flags
);
1599 for_each_glob_ref_in(handle_one_ref
, arg
+ 7, "refs/tags/", &cb
);
1602 if (!prefixcmp(arg
, "--remotes=")) {
1603 struct all_refs_cb cb
;
1604 init_all_refs_cb(&cb
, revs
, flags
);
1605 for_each_glob_ref_in(handle_one_ref
, arg
+ 10, "refs/remotes/", &cb
);
1608 if (!strcmp(arg
, "--reflog")) {
1609 handle_reflog(revs
, flags
);
1612 if (!strcmp(arg
, "--not")) {
1613 flags
^= UNINTERESTING
;
1616 if (!strcmp(arg
, "--no-walk")) {
1620 if (!strcmp(arg
, "--do-walk")) {
1624 if (!strcmp(arg
, "--stdin")) {
1625 if (revs
->disable_stdin
) {
1629 if (read_from_stdin
++)
1630 die("--stdin given twice?");
1631 read_revisions_from_stdin(revs
, &prune_data
);
1635 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
1645 if (handle_revision_arg(arg
, revs
, flags
, seen_dashdash
)) {
1647 if (seen_dashdash
|| *arg
== '^')
1648 die("bad revision '%s'", arg
);
1650 /* If we didn't have a "--":
1651 * (1) all filenames must exist;
1652 * (2) all rev-args must not be interpretable
1653 * as a valid filename.
1654 * but the latter we have checked in the main loop.
1656 for (j
= i
; j
< argc
; j
++)
1657 verify_filename(revs
->prefix
, argv
[j
]);
1659 append_prune_data(&prune_data
, argv
+ i
);
1667 init_pathspec(&revs
->prune_data
, get_pathspec(revs
->prefix
, prune_data
));
1669 if (revs
->def
== NULL
)
1670 revs
->def
= opt
? opt
->def
: NULL
;
1671 if (opt
&& opt
->tweak
)
1672 opt
->tweak(revs
, opt
);
1673 if (revs
->show_merge
)
1674 prepare_show_merge(revs
);
1675 if (revs
->def
&& !revs
->pending
.nr
&& !got_rev_arg
) {
1676 unsigned char sha1
[20];
1677 struct object
*object
;
1679 if (get_sha1_with_mode(revs
->def
, sha1
, &mode
))
1680 die("bad default revision '%s'", revs
->def
);
1681 object
= get_reference(revs
, revs
->def
, sha1
, 0);
1682 add_pending_object_with_mode(revs
, object
, revs
->def
, mode
);
1685 /* Did the user ask for any diff output? Run the diff! */
1686 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
1689 /* Pickaxe, diff-filter and rename following need diffs */
1690 if (revs
->diffopt
.pickaxe
||
1691 revs
->diffopt
.filter
||
1692 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1695 if (revs
->topo_order
)
1698 if (revs
->prune_data
.nr
) {
1699 diff_tree_setup_paths(revs
->prune_data
.raw
, &revs
->pruning
);
1700 /* Can't prune commits with rename following: the paths change.. */
1701 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1703 if (!revs
->full_diff
)
1704 diff_tree_setup_paths(revs
->prune_data
.raw
, &revs
->diffopt
);
1706 if (revs
->combine_merges
)
1707 revs
->ignore_merges
= 0;
1708 revs
->diffopt
.abbrev
= revs
->abbrev
;
1709 if (diff_setup_done(&revs
->diffopt
) < 0)
1710 die("diff_setup_done failed");
1712 compile_grep_patterns(&revs
->grep_filter
);
1714 if (revs
->reverse
&& revs
->reflog_info
)
1715 die("cannot combine --reverse with --walk-reflogs");
1716 if (revs
->rewrite_parents
&& revs
->children
.name
)
1717 die("cannot combine --parents and --children");
1720 * Limitations on the graph functionality
1722 if (revs
->reverse
&& revs
->graph
)
1723 die("cannot combine --reverse with --graph");
1725 if (revs
->reflog_info
&& revs
->graph
)
1726 die("cannot combine --walk-reflogs with --graph");
1731 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
1733 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
1736 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
1739 static int remove_duplicate_parents(struct commit
*commit
)
1741 struct commit_list
**pp
, *p
;
1742 int surviving_parents
;
1744 /* Examine existing parents while marking ones we have seen... */
1745 pp
= &commit
->parents
;
1746 while ((p
= *pp
) != NULL
) {
1747 struct commit
*parent
= p
->item
;
1748 if (parent
->object
.flags
& TMP_MARK
) {
1752 parent
->object
.flags
|= TMP_MARK
;
1755 /* count them while clearing the temporary mark */
1756 surviving_parents
= 0;
1757 for (p
= commit
->parents
; p
; p
= p
->next
) {
1758 p
->item
->object
.flags
&= ~TMP_MARK
;
1759 surviving_parents
++;
1761 return surviving_parents
;
1764 struct merge_simplify_state
{
1765 struct commit
*simplified
;
1768 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
1770 struct merge_simplify_state
*st
;
1772 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
1774 st
= xcalloc(1, sizeof(*st
));
1775 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
1780 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
1782 struct commit_list
*p
;
1783 struct merge_simplify_state
*st
, *pst
;
1786 st
= locate_simplify_state(revs
, commit
);
1789 * Have we handled this one?
1795 * An UNINTERESTING commit simplifies to itself, so does a
1796 * root commit. We do not rewrite parents of such commit
1799 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
1800 st
->simplified
= commit
;
1805 * Do we know what commit all of our parents should be rewritten to?
1806 * Otherwise we are not ready to rewrite this one yet.
1808 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
1809 pst
= locate_simplify_state(revs
, p
->item
);
1810 if (!pst
->simplified
) {
1811 tail
= &commit_list_insert(p
->item
, tail
)->next
;
1816 tail
= &commit_list_insert(commit
, tail
)->next
;
1821 * Rewrite our list of parents.
1823 for (p
= commit
->parents
; p
; p
= p
->next
) {
1824 pst
= locate_simplify_state(revs
, p
->item
);
1825 p
->item
= pst
->simplified
;
1827 cnt
= remove_duplicate_parents(commit
);
1830 * It is possible that we are a merge and one side branch
1831 * does not have any commit that touches the given paths;
1832 * in such a case, the immediate parents will be rewritten
1833 * to different commits.
1835 * o----X X: the commit we are looking at;
1836 * / / o: a commit that touches the paths;
1839 * Further reduce the parents by removing redundant parents.
1842 struct commit_list
*h
= reduce_heads(commit
->parents
);
1843 cnt
= commit_list_count(h
);
1844 free_commit_list(commit
->parents
);
1845 commit
->parents
= h
;
1849 * A commit simplifies to itself if it is a root, if it is
1850 * UNINTERESTING, if it touches the given paths, or if it is a
1851 * merge and its parents simplifies to more than one commits
1852 * (the first two cases are already handled at the beginning of
1855 * Otherwise, it simplifies to what its sole parent simplifies to.
1858 (commit
->object
.flags
& UNINTERESTING
) ||
1859 !(commit
->object
.flags
& TREESAME
) ||
1861 st
->simplified
= commit
;
1863 pst
= locate_simplify_state(revs
, commit
->parents
->item
);
1864 st
->simplified
= pst
->simplified
;
1869 static void simplify_merges(struct rev_info
*revs
)
1871 struct commit_list
*list
;
1872 struct commit_list
*yet_to_do
, **tail
;
1874 if (!revs
->topo_order
)
1875 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
1879 /* feed the list reversed */
1881 for (list
= revs
->commits
; list
; list
= list
->next
)
1882 commit_list_insert(list
->item
, &yet_to_do
);
1888 struct commit
*commit
= list
->item
;
1889 struct commit_list
*next
= list
->next
;
1892 tail
= simplify_one(revs
, commit
, tail
);
1896 /* clean up the result, removing the simplified ones */
1897 list
= revs
->commits
;
1898 revs
->commits
= NULL
;
1899 tail
= &revs
->commits
;
1901 struct commit
*commit
= list
->item
;
1902 struct commit_list
*next
= list
->next
;
1903 struct merge_simplify_state
*st
;
1906 st
= locate_simplify_state(revs
, commit
);
1907 if (st
->simplified
== commit
)
1908 tail
= &commit_list_insert(commit
, tail
)->next
;
1912 static void set_children(struct rev_info
*revs
)
1914 struct commit_list
*l
;
1915 for (l
= revs
->commits
; l
; l
= l
->next
) {
1916 struct commit
*commit
= l
->item
;
1917 struct commit_list
*p
;
1919 for (p
= commit
->parents
; p
; p
= p
->next
)
1920 add_child(revs
, p
->item
, commit
);
1924 int prepare_revision_walk(struct rev_info
*revs
)
1926 int nr
= revs
->pending
.nr
;
1927 struct object_array_entry
*e
, *list
;
1929 e
= list
= revs
->pending
.objects
;
1930 revs
->pending
.nr
= 0;
1931 revs
->pending
.alloc
= 0;
1932 revs
->pending
.objects
= NULL
;
1934 struct commit
*commit
= handle_commit(revs
, e
->item
, e
->name
);
1936 if (!(commit
->object
.flags
& SEEN
)) {
1937 commit
->object
.flags
|= SEEN
;
1938 commit_list_insert_by_date(commit
, &revs
->commits
);
1948 if (limit_list(revs
) < 0)
1950 if (revs
->topo_order
)
1951 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
1952 if (revs
->simplify_merges
)
1953 simplify_merges(revs
);
1954 if (revs
->children
.name
)
1959 enum rewrite_result
{
1961 rewrite_one_noparents
,
1965 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
1967 struct commit_list
*cache
= NULL
;
1970 struct commit
*p
= *pp
;
1972 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
1973 return rewrite_one_error
;
1974 if (p
->parents
&& p
->parents
->next
)
1975 return rewrite_one_ok
;
1976 if (p
->object
.flags
& UNINTERESTING
)
1977 return rewrite_one_ok
;
1978 if (!(p
->object
.flags
& TREESAME
))
1979 return rewrite_one_ok
;
1981 return rewrite_one_noparents
;
1982 *pp
= p
->parents
->item
;
1986 static int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
)
1988 struct commit_list
**pp
= &commit
->parents
;
1990 struct commit_list
*parent
= *pp
;
1991 switch (rewrite_one(revs
, &parent
->item
)) {
1992 case rewrite_one_ok
:
1994 case rewrite_one_noparents
:
1997 case rewrite_one_error
:
2002 remove_duplicate_parents(commit
);
2006 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
2008 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
2010 return grep_buffer(&opt
->grep_filter
,
2011 NULL
, /* we say nothing, not even filename */
2012 commit
->buffer
, strlen(commit
->buffer
));
2015 static inline int want_ancestry(struct rev_info
*revs
)
2017 return (revs
->rewrite_parents
|| revs
->children
.name
);
2020 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
2022 if (commit
->object
.flags
& SHOWN
)
2023 return commit_ignore
;
2024 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
))
2025 return commit_ignore
;
2028 if (commit
->object
.flags
& UNINTERESTING
)
2029 return commit_ignore
;
2030 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
2031 return commit_ignore
;
2032 if (revs
->no_merges
&& commit
->parents
&& commit
->parents
->next
)
2033 return commit_ignore
;
2034 if (revs
->merges_only
&& !(commit
->parents
&& commit
->parents
->next
))
2035 return commit_ignore
;
2036 if (!commit_match(commit
, revs
))
2037 return commit_ignore
;
2038 if (revs
->prune
&& revs
->dense
) {
2039 /* Commit without changes? */
2040 if (commit
->object
.flags
& TREESAME
) {
2041 /* drop merges unless we want parenthood */
2042 if (!want_ancestry(revs
))
2043 return commit_ignore
;
2044 /* non-merge - always ignore it */
2045 if (!commit
->parents
|| !commit
->parents
->next
)
2046 return commit_ignore
;
2052 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
2054 enum commit_action action
= get_commit_action(revs
, commit
);
2056 if (action
== commit_show
&&
2058 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
2059 if (rewrite_parents(revs
, commit
) < 0)
2060 return commit_error
;
2065 static struct commit
*get_revision_1(struct rev_info
*revs
)
2071 struct commit_list
*entry
= revs
->commits
;
2072 struct commit
*commit
= entry
->item
;
2074 revs
->commits
= entry
->next
;
2077 if (revs
->reflog_info
) {
2078 fake_reflog_parent(revs
->reflog_info
, commit
);
2079 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
2083 * If we haven't done the list limiting, we need to look at
2084 * the parents here. We also need to do the date-based limiting
2085 * that we'd otherwise have done in limit_list().
2087 if (!revs
->limited
) {
2088 if (revs
->max_age
!= -1 &&
2089 (commit
->date
< revs
->max_age
))
2091 if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0)
2092 die("Failed to traverse parents of commit %s",
2093 sha1_to_hex(commit
->object
.sha1
));
2096 switch (simplify_commit(revs
, commit
)) {
2100 die("Failed to simplify parents of commit %s",
2101 sha1_to_hex(commit
->object
.sha1
));
2105 } while (revs
->commits
);
2109 static void gc_boundary(struct object_array
*array
)
2111 unsigned nr
= array
->nr
;
2112 unsigned alloc
= array
->alloc
;
2113 struct object_array_entry
*objects
= array
->objects
;
2117 for (i
= j
= 0; i
< nr
; i
++) {
2118 if (objects
[i
].item
->flags
& SHOWN
)
2121 objects
[j
] = objects
[i
];
2124 for (i
= j
; i
< nr
; i
++)
2125 objects
[i
].item
= NULL
;
2130 static void create_boundary_commit_list(struct rev_info
*revs
)
2134 struct object_array
*array
= &revs
->boundary_commits
;
2135 struct object_array_entry
*objects
= array
->objects
;
2138 * If revs->commits is non-NULL at this point, an error occurred in
2139 * get_revision_1(). Ignore the error and continue printing the
2140 * boundary commits anyway. (This is what the code has always
2143 if (revs
->commits
) {
2144 free_commit_list(revs
->commits
);
2145 revs
->commits
= NULL
;
2149 * Put all of the actual boundary commits from revs->boundary_commits
2150 * into revs->commits
2152 for (i
= 0; i
< array
->nr
; i
++) {
2153 c
= (struct commit
*)(objects
[i
].item
);
2156 if (!(c
->object
.flags
& CHILD_SHOWN
))
2158 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
2160 c
->object
.flags
|= BOUNDARY
;
2161 commit_list_insert(c
, &revs
->commits
);
2165 * If revs->topo_order is set, sort the boundary commits
2166 * in topological order
2168 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
2171 static struct commit
*get_revision_internal(struct rev_info
*revs
)
2173 struct commit
*c
= NULL
;
2174 struct commit_list
*l
;
2176 if (revs
->boundary
== 2) {
2178 * All of the normal commits have already been returned,
2179 * and we are now returning boundary commits.
2180 * create_boundary_commit_list() has populated
2181 * revs->commits with the remaining commits to return.
2183 c
= pop_commit(&revs
->commits
);
2185 c
->object
.flags
|= SHOWN
;
2190 * Now pick up what they want to give us
2192 c
= get_revision_1(revs
);
2194 while (0 < revs
->skip_count
) {
2196 c
= get_revision_1(revs
);
2203 * Check the max_count.
2205 switch (revs
->max_count
) {
2216 c
->object
.flags
|= SHOWN
;
2218 if (!revs
->boundary
) {
2224 * get_revision_1() runs out the commits, and
2225 * we are done computing the boundaries.
2226 * switch to boundary commits output mode.
2231 * Update revs->commits to contain the list of
2234 create_boundary_commit_list(revs
);
2236 return get_revision_internal(revs
);
2240 * boundary commits are the commits that are parents of the
2241 * ones we got from get_revision_1() but they themselves are
2242 * not returned from get_revision_1(). Before returning
2243 * 'c', we need to mark its parents that they could be boundaries.
2246 for (l
= c
->parents
; l
; l
= l
->next
) {
2248 p
= &(l
->item
->object
);
2249 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
2251 p
->flags
|= CHILD_SHOWN
;
2252 gc_boundary(&revs
->boundary_commits
);
2253 add_object_array(p
, NULL
, &revs
->boundary_commits
);
2259 struct commit
*get_revision(struct rev_info
*revs
)
2262 struct commit_list
*reversed
;
2264 if (revs
->reverse
) {
2266 while ((c
= get_revision_internal(revs
))) {
2267 commit_list_insert(c
, &reversed
);
2269 revs
->commits
= reversed
;
2271 revs
->reverse_output_stage
= 1;
2274 if (revs
->reverse_output_stage
)
2275 return pop_commit(&revs
->commits
);
2277 c
= get_revision_internal(revs
);
2278 if (c
&& revs
->graph
)
2279 graph_update(revs
->graph
, c
);
2283 char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
2285 if (commit
->object
.flags
& BOUNDARY
)
2287 else if (commit
->object
.flags
& UNINTERESTING
)
2289 else if (commit
->object
.flags
& PATCHSAME
)
2291 else if (!revs
|| revs
->left_right
) {
2292 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
2296 } else if (revs
->graph
)
2298 else if (revs
->cherry_mark
)
2303 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
2305 char *mark
= get_revision_mark(revs
, commit
);
2308 fputs(mark
, stdout
);