11 #include "reflog-walk.h"
12 #include "patch-ids.h"
16 volatile show_early_output_fn_t show_early_output
;
18 char *path_name(const struct name_path
*path
, const char *name
)
20 const struct name_path
*p
;
22 int nlen
= strlen(name
);
25 for (p
= path
; p
; p
= p
->up
) {
27 len
+= p
->elem_len
+ 1;
30 m
= n
+ len
- (nlen
+ 1);
32 for (p
= path
; p
; p
= p
->up
) {
35 memcpy(m
, p
->elem
, p
->elem_len
);
42 void add_object(struct object
*obj
,
43 struct object_array
*p
,
44 struct name_path
*path
,
47 add_object_array(obj
, path_name(path
, name
), p
);
50 static void mark_blob_uninteresting(struct blob
*blob
)
54 if (blob
->object
.flags
& UNINTERESTING
)
56 blob
->object
.flags
|= UNINTERESTING
;
59 void mark_tree_uninteresting(struct tree
*tree
)
61 struct tree_desc desc
;
62 struct name_entry entry
;
63 struct object
*obj
= &tree
->object
;
67 if (obj
->flags
& UNINTERESTING
)
69 obj
->flags
|= UNINTERESTING
;
70 if (!has_sha1_file(obj
->sha1
))
72 if (parse_tree(tree
) < 0)
73 die("bad tree %s", sha1_to_hex(obj
->sha1
));
75 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
76 while (tree_entry(&desc
, &entry
)) {
77 switch (object_type(entry
.mode
)) {
79 mark_tree_uninteresting(lookup_tree(entry
.sha1
));
82 mark_blob_uninteresting(lookup_blob(entry
.sha1
));
85 /* Subproject commit - not in this repository */
91 * We don't care about the tree any more
92 * after it has been marked uninteresting.
98 void mark_parents_uninteresting(struct commit
*commit
)
100 struct commit_list
*parents
= commit
->parents
;
103 struct commit
*commit
= parents
->item
;
104 if (!(commit
->object
.flags
& UNINTERESTING
)) {
105 commit
->object
.flags
|= UNINTERESTING
;
108 * Normally we haven't parsed the parent
109 * yet, so we won't have a parent of a parent
110 * here. However, it may turn out that we've
111 * reached this commit some other way (where it
112 * wasn't uninteresting), in which case we need
113 * to mark its parents recursively too..
116 mark_parents_uninteresting(commit
);
120 * A missing commit is ok iff its parent is marked
123 * We just mark such a thing parsed, so that when
124 * it is popped next time around, we won't be trying
125 * to parse it and get an error.
127 if (!has_sha1_file(commit
->object
.sha1
))
128 commit
->object
.parsed
= 1;
129 parents
= parents
->next
;
133 static void add_pending_object_with_mode(struct rev_info
*revs
, struct object
*obj
, const char *name
, unsigned mode
)
135 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
137 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
&&
138 add_reflog_for_walk(revs
->reflog_info
,
139 (struct commit
*)obj
, name
))
141 add_object_array_with_mode(obj
, name
, &revs
->pending
, mode
);
144 void add_pending_object(struct rev_info
*revs
, struct object
*obj
, const char *name
)
146 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
149 void add_head_to_pending(struct rev_info
*revs
)
151 unsigned char sha1
[20];
153 if (get_sha1("HEAD", sha1
))
155 obj
= parse_object(sha1
);
158 add_pending_object(revs
, obj
, "HEAD");
161 static struct object
*get_reference(struct rev_info
*revs
, const char *name
, const unsigned char *sha1
, unsigned int flags
)
163 struct object
*object
;
165 object
= parse_object(sha1
);
167 die("bad object %s", name
);
168 object
->flags
|= flags
;
172 static struct commit
*handle_commit(struct rev_info
*revs
, struct object
*object
, const char *name
)
174 unsigned long flags
= object
->flags
;
177 * Tag object? Look what it points to..
179 while (object
->type
== OBJ_TAG
) {
180 struct tag
*tag
= (struct tag
*) object
;
181 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
182 add_pending_object(revs
, object
, tag
->tag
);
185 object
= parse_object(tag
->tagged
->sha1
);
187 if (flags
& UNINTERESTING
)
189 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
194 * Commit object? Just return it, we'll do all the complex
197 if (object
->type
== OBJ_COMMIT
) {
198 struct commit
*commit
= (struct commit
*)object
;
199 if (parse_commit(commit
) < 0)
200 die("unable to parse commit %s", name
);
201 if (flags
& UNINTERESTING
) {
202 commit
->object
.flags
|= UNINTERESTING
;
203 mark_parents_uninteresting(commit
);
206 if (revs
->show_source
&& !commit
->util
)
207 commit
->util
= (void *) name
;
212 * Tree object? Either mark it uninteresting, or add it
213 * to the list of objects to look at later..
215 if (object
->type
== OBJ_TREE
) {
216 struct tree
*tree
= (struct tree
*)object
;
217 if (!revs
->tree_objects
)
219 if (flags
& UNINTERESTING
) {
220 mark_tree_uninteresting(tree
);
223 add_pending_object(revs
, object
, "");
228 * Blob object? You know the drill by now..
230 if (object
->type
== OBJ_BLOB
) {
231 struct blob
*blob
= (struct blob
*)object
;
232 if (!revs
->blob_objects
)
234 if (flags
& UNINTERESTING
) {
235 mark_blob_uninteresting(blob
);
238 add_pending_object(revs
, object
, "");
241 die("%s is unknown object", name
);
244 static int everybody_uninteresting(struct commit_list
*orig
)
246 struct commit_list
*list
= orig
;
248 struct commit
*commit
= list
->item
;
250 if (commit
->object
.flags
& UNINTERESTING
)
258 * The goal is to get REV_TREE_NEW as the result only if the
259 * diff consists of all '+' (and no other changes), REV_TREE_OLD
260 * if the whole diff is removal of old data, and otherwise
261 * REV_TREE_DIFFERENT (of course if the trees are the same we
262 * want REV_TREE_SAME).
263 * That means that once we get to REV_TREE_DIFFERENT, we do not
264 * have to look any further.
266 static int tree_difference
= REV_TREE_SAME
;
268 static void file_add_remove(struct diff_options
*options
,
269 int addremove
, unsigned mode
,
270 const unsigned char *sha1
,
271 const char *fullpath
, unsigned dirty_submodule
)
273 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
275 tree_difference
|= diff
;
276 if (tree_difference
== REV_TREE_DIFFERENT
)
277 DIFF_OPT_SET(options
, HAS_CHANGES
);
280 static void file_change(struct diff_options
*options
,
281 unsigned old_mode
, unsigned new_mode
,
282 const unsigned char *old_sha1
,
283 const unsigned char *new_sha1
,
284 const char *fullpath
,
285 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
287 tree_difference
= REV_TREE_DIFFERENT
;
288 DIFF_OPT_SET(options
, HAS_CHANGES
);
291 static int rev_compare_tree(struct rev_info
*revs
, struct commit
*parent
, struct commit
*commit
)
293 struct tree
*t1
= parent
->tree
;
294 struct tree
*t2
= commit
->tree
;
301 if (revs
->simplify_by_decoration
) {
303 * If we are simplifying by decoration, then the commit
304 * is worth showing if it has a tag pointing at it.
306 if (lookup_decoration(&name_decoration
, &commit
->object
))
307 return REV_TREE_DIFFERENT
;
309 * A commit that is not pointed by a tag is uninteresting
310 * if we are not limited by path. This means that you will
311 * see the usual "commits that touch the paths" plus any
312 * tagged commit by specifying both --simplify-by-decoration
315 if (!revs
->prune_data
)
316 return REV_TREE_SAME
;
319 tree_difference
= REV_TREE_SAME
;
320 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
321 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
323 return REV_TREE_DIFFERENT
;
324 return tree_difference
;
327 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
332 struct tree_desc empty
, real
;
333 struct tree
*t1
= commit
->tree
;
338 tree
= read_object_with_reference(t1
->object
.sha1
, tree_type
, &size
, NULL
);
341 init_tree_desc(&real
, tree
, size
);
342 init_tree_desc(&empty
, "", 0);
344 tree_difference
= REV_TREE_SAME
;
345 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
346 retval
= diff_tree(&empty
, &real
, "", &revs
->pruning
);
349 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
352 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
354 struct commit_list
**pp
, *parent
;
355 int tree_changed
= 0, tree_same
= 0;
358 * If we don't do pruning, everything is interesting
366 if (!commit
->parents
) {
367 if (rev_same_tree_as_empty(revs
, commit
))
368 commit
->object
.flags
|= TREESAME
;
373 * Normal non-merge commit? If we don't want to make the
374 * history dense, we consider it always to be a change..
376 if (!revs
->dense
&& !commit
->parents
->next
)
379 pp
= &commit
->parents
;
380 while ((parent
= *pp
) != NULL
) {
381 struct commit
*p
= parent
->item
;
383 if (parse_commit(p
) < 0)
384 die("cannot simplify commit %s (because of %s)",
385 sha1_to_hex(commit
->object
.sha1
),
386 sha1_to_hex(p
->object
.sha1
));
387 switch (rev_compare_tree(revs
, p
, commit
)) {
390 if (!revs
->simplify_history
|| (p
->object
.flags
& UNINTERESTING
)) {
391 /* Even if a merge with an uninteresting
392 * side branch brought the entire change
393 * we are interested in, we do not want
394 * to lose the other branches of this
395 * merge, so we just keep going.
401 commit
->parents
= parent
;
402 commit
->object
.flags
|= TREESAME
;
406 if (revs
->remove_empty_trees
&&
407 rev_same_tree_as_empty(revs
, p
)) {
408 /* We are adding all the specified
409 * paths from this parent, so the
410 * history beyond this parent is not
411 * interesting. Remove its parents
412 * (they are grandparents for us).
413 * IOW, we pretend this parent is a
416 if (parse_commit(p
) < 0)
417 die("cannot simplify commit %s (invalid %s)",
418 sha1_to_hex(commit
->object
.sha1
),
419 sha1_to_hex(p
->object
.sha1
));
424 case REV_TREE_DIFFERENT
:
429 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
431 if (tree_changed
&& !tree_same
)
433 commit
->object
.flags
|= TREESAME
;
436 static void insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
437 struct commit_list
*cached_base
, struct commit_list
**cache
)
439 struct commit_list
*new_entry
;
441 if (cached_base
&& p
->date
< cached_base
->item
->date
)
442 new_entry
= insert_by_date(p
, &cached_base
->next
);
444 new_entry
= insert_by_date(p
, head
);
446 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
450 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
451 struct commit_list
**list
, struct commit_list
**cache_ptr
)
453 struct commit_list
*parent
= commit
->parents
;
455 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
457 if (commit
->object
.flags
& ADDED
)
459 commit
->object
.flags
|= ADDED
;
462 * If the commit is uninteresting, don't try to
463 * prune parents - we want the maximal uninteresting
466 * Normally we haven't parsed the parent
467 * yet, so we won't have a parent of a parent
468 * here. However, it may turn out that we've
469 * reached this commit some other way (where it
470 * wasn't uninteresting), in which case we need
471 * to mark its parents recursively too..
473 if (commit
->object
.flags
& UNINTERESTING
) {
475 struct commit
*p
= parent
->item
;
476 parent
= parent
->next
;
478 p
->object
.flags
|= UNINTERESTING
;
479 if (parse_commit(p
) < 0)
482 mark_parents_uninteresting(p
);
483 if (p
->object
.flags
& SEEN
)
485 p
->object
.flags
|= SEEN
;
486 insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
492 * Ok, the commit wasn't uninteresting. Try to
493 * simplify the commit history and find the parent
494 * that has no differences in the path set if one exists.
496 try_to_simplify_commit(revs
, commit
);
501 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
503 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
504 struct commit
*p
= parent
->item
;
506 if (parse_commit(p
) < 0)
508 if (revs
->show_source
&& !p
->util
)
509 p
->util
= commit
->util
;
510 p
->object
.flags
|= left_flag
;
511 if (!(p
->object
.flags
& SEEN
)) {
512 p
->object
.flags
|= SEEN
;
513 insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
515 if (revs
->first_parent_only
)
521 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
523 struct commit_list
*p
;
524 int left_count
= 0, right_count
= 0;
526 struct patch_ids ids
;
528 /* First count the commits on the left and on the right */
529 for (p
= list
; p
; p
= p
->next
) {
530 struct commit
*commit
= p
->item
;
531 unsigned flags
= commit
->object
.flags
;
532 if (flags
& BOUNDARY
)
534 else if (flags
& SYMMETRIC_LEFT
)
540 left_first
= left_count
< right_count
;
541 init_patch_ids(&ids
);
542 if (revs
->diffopt
.nr_paths
) {
543 ids
.diffopts
.nr_paths
= revs
->diffopt
.nr_paths
;
544 ids
.diffopts
.paths
= revs
->diffopt
.paths
;
545 ids
.diffopts
.pathlens
= revs
->diffopt
.pathlens
;
548 /* Compute patch-ids for one side */
549 for (p
= list
; p
; p
= p
->next
) {
550 struct commit
*commit
= p
->item
;
551 unsigned flags
= commit
->object
.flags
;
553 if (flags
& BOUNDARY
)
556 * If we have fewer left, left_first is set and we omit
557 * commits on the right branch in this loop. If we have
558 * fewer right, we skip the left ones.
560 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
562 commit
->util
= add_commit_patch_id(commit
, &ids
);
565 /* Check the other side */
566 for (p
= list
; p
; p
= p
->next
) {
567 struct commit
*commit
= p
->item
;
569 unsigned flags
= commit
->object
.flags
;
571 if (flags
& BOUNDARY
)
574 * If we have fewer left, left_first is set and we omit
575 * commits on the left branch in this loop.
577 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
581 * Have we seen the same patch id?
583 id
= has_commit_patch_id(commit
, &ids
);
587 commit
->object
.flags
|= SHOWN
;
590 /* Now check the original side for seen ones */
591 for (p
= list
; p
; p
= p
->next
) {
592 struct commit
*commit
= p
->item
;
593 struct patch_id
*ent
;
599 commit
->object
.flags
|= SHOWN
;
603 free_patch_ids(&ids
);
606 /* How many extra uninteresting commits we want to see.. */
609 static int still_interesting(struct commit_list
*src
, unsigned long date
, int slop
)
612 * No source list at all? We're definitely done..
618 * Does the destination list contain entries with a date
619 * before the source list? Definitely _not_ done.
621 if (date
< src
->item
->date
)
625 * Does the source list still have interesting commits in
626 * it? Definitely not done..
628 if (!everybody_uninteresting(src
))
631 /* Ok, we're closing in.. */
635 static int limit_list(struct rev_info
*revs
)
638 unsigned long date
= ~0ul;
639 struct commit_list
*list
= revs
->commits
;
640 struct commit_list
*newlist
= NULL
;
641 struct commit_list
**p
= &newlist
;
644 struct commit_list
*entry
= list
;
645 struct commit
*commit
= list
->item
;
646 struct object
*obj
= &commit
->object
;
647 show_early_output_fn_t show
;
652 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
653 obj
->flags
|= UNINTERESTING
;
654 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
656 if (obj
->flags
& UNINTERESTING
) {
657 mark_parents_uninteresting(commit
);
659 p
= &commit_list_insert(commit
, p
)->next
;
660 slop
= still_interesting(list
, date
, slop
);
663 /* If showing all, add the whole pending list to the end */
668 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
671 p
= &commit_list_insert(commit
, p
)->next
;
673 show
= show_early_output
;
678 show_early_output
= NULL
;
680 if (revs
->cherry_pick
)
681 cherry_pick_list(newlist
, revs
);
683 revs
->commits
= newlist
;
689 int warned_bad_reflog
;
690 struct rev_info
*all_revs
;
691 const char *name_for_errormsg
;
694 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
696 struct all_refs_cb
*cb
= cb_data
;
697 struct object
*object
= get_reference(cb
->all_revs
, path
, sha1
,
699 add_pending_object(cb
->all_revs
, object
, path
);
703 static void handle_refs(struct rev_info
*revs
, unsigned flags
,
704 int (*for_each
)(each_ref_fn
, void *))
706 struct all_refs_cb cb
;
708 cb
.all_flags
= flags
;
709 for_each(handle_one_ref
, &cb
);
712 static void handle_one_reflog_commit(unsigned char *sha1
, void *cb_data
)
714 struct all_refs_cb
*cb
= cb_data
;
715 if (!is_null_sha1(sha1
)) {
716 struct object
*o
= parse_object(sha1
);
718 o
->flags
|= cb
->all_flags
;
719 add_pending_object(cb
->all_revs
, o
, "");
721 else if (!cb
->warned_bad_reflog
) {
722 warning("reflog of '%s' references pruned commits",
723 cb
->name_for_errormsg
);
724 cb
->warned_bad_reflog
= 1;
729 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
730 const char *email
, unsigned long timestamp
, int tz
,
731 const char *message
, void *cb_data
)
733 handle_one_reflog_commit(osha1
, cb_data
);
734 handle_one_reflog_commit(nsha1
, cb_data
);
738 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
740 struct all_refs_cb
*cb
= cb_data
;
741 cb
->warned_bad_reflog
= 0;
742 cb
->name_for_errormsg
= path
;
743 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
747 static void handle_reflog(struct rev_info
*revs
, unsigned flags
)
749 struct all_refs_cb cb
;
751 cb
.all_flags
= flags
;
752 for_each_reflog(handle_one_reflog
, &cb
);
755 static int add_parents_only(struct rev_info
*revs
, const char *arg
, int flags
)
757 unsigned char sha1
[20];
759 struct commit
*commit
;
760 struct commit_list
*parents
;
763 flags
^= UNINTERESTING
;
766 if (get_sha1(arg
, sha1
))
769 it
= get_reference(revs
, arg
, sha1
, 0);
770 if (it
->type
!= OBJ_TAG
)
772 if (!((struct tag
*)it
)->tagged
)
774 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
776 if (it
->type
!= OBJ_COMMIT
)
778 commit
= (struct commit
*)it
;
779 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
780 it
= &parents
->item
->object
;
782 add_pending_object(revs
, it
, arg
);
787 void init_revisions(struct rev_info
*revs
, const char *prefix
)
789 memset(revs
, 0, sizeof(*revs
));
791 revs
->abbrev
= DEFAULT_ABBREV
;
792 revs
->ignore_merges
= 1;
793 revs
->simplify_history
= 1;
794 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
795 DIFF_OPT_SET(&revs
->pruning
, QUICK
);
796 revs
->pruning
.add_remove
= file_add_remove
;
797 revs
->pruning
.change
= file_change
;
800 revs
->prefix
= prefix
;
803 revs
->skip_count
= -1;
804 revs
->max_count
= -1;
806 revs
->commit_format
= CMIT_FMT_DEFAULT
;
808 revs
->grep_filter
.status_only
= 1;
809 revs
->grep_filter
.pattern_tail
= &(revs
->grep_filter
.pattern_list
);
810 revs
->grep_filter
.regflags
= REG_NEWLINE
;
812 diff_setup(&revs
->diffopt
);
813 if (prefix
&& !revs
->diffopt
.prefix
) {
814 revs
->diffopt
.prefix
= prefix
;
815 revs
->diffopt
.prefix_length
= strlen(prefix
);
819 static void add_pending_commit_list(struct rev_info
*revs
,
820 struct commit_list
*commit_list
,
823 while (commit_list
) {
824 struct object
*object
= &commit_list
->item
->object
;
825 object
->flags
|= flags
;
826 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
827 commit_list
= commit_list
->next
;
831 static void prepare_show_merge(struct rev_info
*revs
)
833 struct commit_list
*bases
;
834 struct commit
*head
, *other
;
835 unsigned char sha1
[20];
836 const char **prune
= NULL
;
837 int i
, prune_num
= 1; /* counting terminating NULL */
839 if (get_sha1("HEAD", sha1
) || !(head
= lookup_commit(sha1
)))
840 die("--merge without HEAD?");
841 if (get_sha1("MERGE_HEAD", sha1
) || !(other
= lookup_commit(sha1
)))
842 die("--merge without MERGE_HEAD?");
843 add_pending_object(revs
, &head
->object
, "HEAD");
844 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
845 bases
= get_merge_bases(head
, other
, 1);
846 add_pending_commit_list(revs
, bases
, UNINTERESTING
);
847 free_commit_list(bases
);
848 head
->object
.flags
|= SYMMETRIC_LEFT
;
852 for (i
= 0; i
< active_nr
; i
++) {
853 struct cache_entry
*ce
= active_cache
[i
];
856 if (ce_path_match(ce
, revs
->prune_data
)) {
858 prune
= xrealloc(prune
, sizeof(*prune
) * prune_num
);
859 prune
[prune_num
-2] = ce
->name
;
860 prune
[prune_num
-1] = NULL
;
862 while ((i
+1 < active_nr
) &&
863 ce_same_name(ce
, active_cache
[i
+1]))
866 revs
->prune_data
= prune
;
870 int handle_revision_arg(const char *arg
, struct rev_info
*revs
,
872 int cant_be_filename
)
876 struct object
*object
;
877 unsigned char sha1
[20];
880 dotdot
= strstr(arg
, "..");
882 unsigned char from_sha1
[20];
883 const char *next
= dotdot
+ 2;
884 const char *this = arg
;
885 int symmetric
= *next
== '.';
886 unsigned int flags_exclude
= flags
^ UNINTERESTING
;
895 if (!get_sha1(this, from_sha1
) &&
896 !get_sha1(next
, sha1
)) {
897 struct commit
*a
, *b
;
898 struct commit_list
*exclude
;
900 a
= lookup_commit_reference(from_sha1
);
901 b
= lookup_commit_reference(sha1
);
904 "Invalid symmetric difference expression %s...%s" :
905 "Invalid revision range %s..%s",
909 if (!cant_be_filename
) {
911 verify_non_filename(revs
->prefix
, arg
);
915 exclude
= get_merge_bases(a
, b
, 1);
916 add_pending_commit_list(revs
, exclude
,
918 free_commit_list(exclude
);
919 a
->object
.flags
|= flags
| SYMMETRIC_LEFT
;
921 a
->object
.flags
|= flags_exclude
;
922 b
->object
.flags
|= flags
;
923 add_pending_object(revs
, &a
->object
, this);
924 add_pending_object(revs
, &b
->object
, next
);
929 dotdot
= strstr(arg
, "^@");
930 if (dotdot
&& !dotdot
[2]) {
932 if (add_parents_only(revs
, arg
, flags
))
936 dotdot
= strstr(arg
, "^!");
937 if (dotdot
&& !dotdot
[2]) {
939 if (!add_parents_only(revs
, arg
, flags
^ UNINTERESTING
))
945 local_flags
= UNINTERESTING
;
948 if (get_sha1_with_mode(arg
, sha1
, &mode
))
950 if (!cant_be_filename
)
951 verify_non_filename(revs
->prefix
, arg
);
952 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
953 add_pending_object_with_mode(revs
, object
, arg
, mode
);
957 static void read_pathspec_from_stdin(struct rev_info
*revs
, struct strbuf
*sb
, const char ***prune_data
)
959 const char **prune
= *prune_data
;
963 /* count existing ones */
967 for (prune_nr
= 0; prune
[prune_nr
]; prune_nr
++)
969 prune_alloc
= prune_nr
; /* not really, but we do not know */
971 while (strbuf_getwholeline(sb
, stdin
, '\n') != EOF
) {
973 if (len
&& sb
->buf
[len
- 1] == '\n')
974 sb
->buf
[--len
] = '\0';
975 ALLOC_GROW(prune
, prune_nr
+1, prune_alloc
);
976 prune
[prune_nr
++] = xstrdup(sb
->buf
);
979 ALLOC_GROW(prune
, prune_nr
+1, prune_alloc
);
980 prune
[prune_nr
] = NULL
;
985 static void read_revisions_from_stdin(struct rev_info
*revs
, const char ***prune
)
988 int seen_dashdash
= 0;
990 strbuf_init(&sb
, 1000);
991 while (strbuf_getwholeline(&sb
, stdin
, '\n') != EOF
) {
993 if (len
&& sb
.buf
[len
- 1] == '\n')
994 sb
.buf
[--len
] = '\0';
997 if (sb
.buf
[0] == '-') {
998 if (len
== 2 && sb
.buf
[1] == '-') {
1002 die("options not supported in --stdin mode");
1004 if (handle_revision_arg(sb
.buf
, revs
, 0, 1))
1005 die("bad revision '%s'", sb
.buf
);
1008 read_pathspec_from_stdin(revs
, &sb
, prune
);
1009 strbuf_release(&sb
);
1012 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
1014 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
1017 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
1019 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
1022 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
1024 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
1027 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
1028 int *unkc
, const char **unkv
)
1030 const char *arg
= argv
[0];
1032 /* pseudo revision arguments */
1033 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1034 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1035 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1036 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
1037 !strcmp(arg
, "--bisect"))
1039 unkv
[(*unkc
)++] = arg
;
1043 if (!prefixcmp(arg
, "--max-count=")) {
1044 revs
->max_count
= atoi(arg
+ 12);
1045 } else if (!prefixcmp(arg
, "--skip=")) {
1046 revs
->skip_count
= atoi(arg
+ 7);
1047 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1048 /* accept -<digit>, like traditional "head" */
1049 revs
->max_count
= atoi(arg
+ 1);
1050 } else if (!strcmp(arg
, "-n")) {
1052 return error("-n requires an argument");
1053 revs
->max_count
= atoi(argv
[1]);
1055 } else if (!prefixcmp(arg
, "-n")) {
1056 revs
->max_count
= atoi(arg
+ 2);
1057 } else if (!prefixcmp(arg
, "--max-age=")) {
1058 revs
->max_age
= atoi(arg
+ 10);
1059 } else if (!prefixcmp(arg
, "--since=")) {
1060 revs
->max_age
= approxidate(arg
+ 8);
1061 } else if (!prefixcmp(arg
, "--after=")) {
1062 revs
->max_age
= approxidate(arg
+ 8);
1063 } else if (!prefixcmp(arg
, "--min-age=")) {
1064 revs
->min_age
= atoi(arg
+ 10);
1065 } else if (!prefixcmp(arg
, "--before=")) {
1066 revs
->min_age
= approxidate(arg
+ 9);
1067 } else if (!prefixcmp(arg
, "--until=")) {
1068 revs
->min_age
= approxidate(arg
+ 8);
1069 } else if (!strcmp(arg
, "--first-parent")) {
1070 revs
->first_parent_only
= 1;
1071 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1072 init_reflog_walk(&revs
->reflog_info
);
1073 } else if (!strcmp(arg
, "--default")) {
1075 return error("bad --default argument");
1076 revs
->def
= argv
[1];
1078 } else if (!strcmp(arg
, "--merge")) {
1079 revs
->show_merge
= 1;
1080 } else if (!strcmp(arg
, "--topo-order")) {
1082 revs
->topo_order
= 1;
1083 } else if (!strcmp(arg
, "--simplify-merges")) {
1084 revs
->simplify_merges
= 1;
1085 revs
->rewrite_parents
= 1;
1086 revs
->simplify_history
= 0;
1088 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
1089 revs
->simplify_merges
= 1;
1090 revs
->rewrite_parents
= 1;
1091 revs
->simplify_history
= 0;
1092 revs
->simplify_by_decoration
= 1;
1095 load_ref_decorations(DECORATE_SHORT_REFS
);
1096 } else if (!strcmp(arg
, "--date-order")) {
1098 revs
->topo_order
= 1;
1099 } else if (!prefixcmp(arg
, "--early-output")) {
1103 count
= atoi(arg
+15);
1106 revs
->topo_order
= 1;
1107 revs
->early_output
= count
;
1109 } else if (!strcmp(arg
, "--parents")) {
1110 revs
->rewrite_parents
= 1;
1111 revs
->print_parents
= 1;
1112 } else if (!strcmp(arg
, "--dense")) {
1114 } else if (!strcmp(arg
, "--sparse")) {
1116 } else if (!strcmp(arg
, "--show-all")) {
1118 } else if (!strcmp(arg
, "--remove-empty")) {
1119 revs
->remove_empty_trees
= 1;
1120 } else if (!strcmp(arg
, "--merges")) {
1121 revs
->merges_only
= 1;
1122 } else if (!strcmp(arg
, "--no-merges")) {
1123 revs
->no_merges
= 1;
1124 } else if (!strcmp(arg
, "--boundary")) {
1126 } else if (!strcmp(arg
, "--left-right")) {
1127 revs
->left_right
= 1;
1128 } else if (!strcmp(arg
, "--cherry-pick")) {
1129 revs
->cherry_pick
= 1;
1131 } else if (!strcmp(arg
, "--objects")) {
1132 revs
->tag_objects
= 1;
1133 revs
->tree_objects
= 1;
1134 revs
->blob_objects
= 1;
1135 } else if (!strcmp(arg
, "--objects-edge")) {
1136 revs
->tag_objects
= 1;
1137 revs
->tree_objects
= 1;
1138 revs
->blob_objects
= 1;
1139 revs
->edge_hint
= 1;
1140 } else if (!strcmp(arg
, "--unpacked")) {
1142 } else if (!prefixcmp(arg
, "--unpacked=")) {
1143 die("--unpacked=<packfile> no longer supported.");
1144 } else if (!strcmp(arg
, "-r")) {
1146 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1147 } else if (!strcmp(arg
, "-t")) {
1149 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1150 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1151 } else if (!strcmp(arg
, "-m")) {
1152 revs
->ignore_merges
= 0;
1153 } else if (!strcmp(arg
, "-c")) {
1155 revs
->dense_combined_merges
= 0;
1156 revs
->combine_merges
= 1;
1157 } else if (!strcmp(arg
, "--cc")) {
1159 revs
->dense_combined_merges
= 1;
1160 revs
->combine_merges
= 1;
1161 } else if (!strcmp(arg
, "-v")) {
1162 revs
->verbose_header
= 1;
1163 } else if (!strcmp(arg
, "--pretty")) {
1164 revs
->verbose_header
= 1;
1165 get_commit_format(arg
+8, revs
);
1166 } else if (!prefixcmp(arg
, "--pretty=") || !prefixcmp(arg
, "--format=")) {
1167 revs
->verbose_header
= 1;
1168 get_commit_format(arg
+9, revs
);
1169 } else if (!strcmp(arg
, "--oneline")) {
1170 revs
->verbose_header
= 1;
1171 get_commit_format("oneline", revs
);
1172 revs
->abbrev_commit
= 1;
1173 } else if (!strcmp(arg
, "--graph")) {
1174 revs
->topo_order
= 1;
1175 revs
->rewrite_parents
= 1;
1176 revs
->graph
= graph_init(revs
);
1177 } else if (!strcmp(arg
, "--root")) {
1178 revs
->show_root_diff
= 1;
1179 } else if (!strcmp(arg
, "--no-commit-id")) {
1180 revs
->no_commit_id
= 1;
1181 } else if (!strcmp(arg
, "--always")) {
1182 revs
->always_show_header
= 1;
1183 } else if (!strcmp(arg
, "--no-abbrev")) {
1185 } else if (!strcmp(arg
, "--abbrev")) {
1186 revs
->abbrev
= DEFAULT_ABBREV
;
1187 } else if (!prefixcmp(arg
, "--abbrev=")) {
1188 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1189 if (revs
->abbrev
< MINIMUM_ABBREV
)
1190 revs
->abbrev
= MINIMUM_ABBREV
;
1191 else if (revs
->abbrev
> 40)
1193 } else if (!strcmp(arg
, "--abbrev-commit")) {
1194 revs
->abbrev_commit
= 1;
1195 } else if (!strcmp(arg
, "--full-diff")) {
1197 revs
->full_diff
= 1;
1198 } else if (!strcmp(arg
, "--full-history")) {
1199 revs
->simplify_history
= 0;
1200 } else if (!strcmp(arg
, "--relative-date")) {
1201 revs
->date_mode
= DATE_RELATIVE
;
1202 revs
->date_mode_explicit
= 1;
1203 } else if (!strncmp(arg
, "--date=", 7)) {
1204 revs
->date_mode
= parse_date_format(arg
+ 7);
1205 revs
->date_mode_explicit
= 1;
1206 } else if (!strcmp(arg
, "--log-size")) {
1207 revs
->show_log_size
= 1;
1210 * Grepping the commit log
1212 else if (!prefixcmp(arg
, "--author=")) {
1213 add_header_grep(revs
, GREP_HEADER_AUTHOR
, arg
+9);
1214 } else if (!prefixcmp(arg
, "--committer=")) {
1215 add_header_grep(revs
, GREP_HEADER_COMMITTER
, arg
+12);
1216 } else if (!prefixcmp(arg
, "--grep=")) {
1217 add_message_grep(revs
, arg
+7);
1218 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
1219 revs
->grep_filter
.regflags
|= REG_EXTENDED
;
1220 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
1221 revs
->grep_filter
.regflags
|= REG_ICASE
;
1222 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
1223 revs
->grep_filter
.fixed
= 1;
1224 } else if (!strcmp(arg
, "--all-match")) {
1225 revs
->grep_filter
.all_match
= 1;
1226 } else if (!prefixcmp(arg
, "--encoding=")) {
1228 if (strcmp(arg
, "none"))
1229 git_log_output_encoding
= xstrdup(arg
);
1231 git_log_output_encoding
= "";
1232 } else if (!strcmp(arg
, "--reverse")) {
1234 } else if (!strcmp(arg
, "--children")) {
1235 revs
->children
.name
= "children";
1238 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
);
1240 unkv
[(*unkc
)++] = arg
;
1247 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
1248 const struct option
*options
,
1249 const char * const usagestr
[])
1251 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
1252 &ctx
->cpidx
, ctx
->out
);
1254 error("unknown option `%s'", ctx
->argv
[0]);
1255 usage_with_options(usagestr
, options
);
1261 static int for_each_bad_bisect_ref(each_ref_fn fn
, void *cb_data
)
1263 return for_each_ref_in("refs/bisect/bad", fn
, cb_data
);
1266 static int for_each_good_bisect_ref(each_ref_fn fn
, void *cb_data
)
1268 return for_each_ref_in("refs/bisect/good", fn
, cb_data
);
1271 static void append_prune_data(const char ***prune_data
, const char **av
)
1273 const char **prune
= *prune_data
;
1282 /* count existing ones */
1283 for (prune_nr
= 0; prune
[prune_nr
]; prune_nr
++)
1285 prune_alloc
= prune_nr
; /* not really, but we do not know */
1288 ALLOC_GROW(prune
, prune_nr
+1, prune_alloc
);
1289 prune
[prune_nr
++] = *av
;
1293 ALLOC_GROW(prune
, prune_nr
+1, prune_alloc
);
1294 prune
[prune_nr
] = NULL
;
1296 *prune_data
= prune
;
1300 * Parse revision information, filling in the "rev_info" structure,
1301 * and removing the used arguments from the argument list.
1303 * Returns the number of arguments left that weren't recognized
1304 * (which are also moved to the head of the argument list)
1306 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, const char *def
)
1308 int i
, flags
, left
, seen_dashdash
, read_from_stdin
;
1309 const char **prune_data
= NULL
;
1311 /* First, search for "--" */
1313 for (i
= 1; i
< argc
; i
++) {
1314 const char *arg
= argv
[i
];
1315 if (strcmp(arg
, "--"))
1320 prune_data
= argv
+ i
+ 1;
1325 /* Second, deal with arguments and options */
1327 read_from_stdin
= 0;
1328 for (left
= i
= 1; i
< argc
; i
++) {
1329 const char *arg
= argv
[i
];
1333 if (!strcmp(arg
, "--all")) {
1334 handle_refs(revs
, flags
, for_each_ref
);
1335 handle_refs(revs
, flags
, head_ref
);
1338 if (!strcmp(arg
, "--branches")) {
1339 handle_refs(revs
, flags
, for_each_branch_ref
);
1342 if (!strcmp(arg
, "--bisect")) {
1343 handle_refs(revs
, flags
, for_each_bad_bisect_ref
);
1344 handle_refs(revs
, flags
^ UNINTERESTING
, for_each_good_bisect_ref
);
1348 if (!strcmp(arg
, "--tags")) {
1349 handle_refs(revs
, flags
, for_each_tag_ref
);
1352 if (!strcmp(arg
, "--remotes")) {
1353 handle_refs(revs
, flags
, for_each_remote_ref
);
1356 if (!strcmp(arg
, "--reflog")) {
1357 handle_reflog(revs
, flags
);
1360 if (!strcmp(arg
, "--not")) {
1361 flags
^= UNINTERESTING
;
1364 if (!strcmp(arg
, "--no-walk")) {
1368 if (!strcmp(arg
, "--do-walk")) {
1372 if (!strcmp(arg
, "--stdin")) {
1373 if (revs
->disable_stdin
) {
1377 if (read_from_stdin
++)
1378 die("--stdin given twice?");
1379 read_revisions_from_stdin(revs
, &prune_data
);
1383 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
1393 if (handle_revision_arg(arg
, revs
, flags
, seen_dashdash
)) {
1395 if (seen_dashdash
|| *arg
== '^')
1396 die("bad revision '%s'", arg
);
1398 /* If we didn't have a "--":
1399 * (1) all filenames must exist;
1400 * (2) all rev-args must not be interpretable
1401 * as a valid filename.
1402 * but the latter we have checked in the main loop.
1404 for (j
= i
; j
< argc
; j
++)
1405 verify_filename(revs
->prefix
, argv
[j
]);
1407 append_prune_data(&prune_data
, argv
+ i
);
1413 revs
->prune_data
= get_pathspec(revs
->prefix
, prune_data
);
1415 if (revs
->def
== NULL
)
1417 if (revs
->show_merge
)
1418 prepare_show_merge(revs
);
1419 if (revs
->def
&& !revs
->pending
.nr
) {
1420 unsigned char sha1
[20];
1421 struct object
*object
;
1423 if (get_sha1_with_mode(revs
->def
, sha1
, &mode
))
1424 die("bad default revision '%s'", revs
->def
);
1425 object
= get_reference(revs
, revs
->def
, sha1
, 0);
1426 add_pending_object_with_mode(revs
, object
, revs
->def
, mode
);
1429 /* Did the user ask for any diff output? Run the diff! */
1430 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
1433 /* Pickaxe, diff-filter and rename following need diffs */
1434 if (revs
->diffopt
.pickaxe
||
1435 revs
->diffopt
.filter
||
1436 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1439 if (revs
->topo_order
)
1442 if (revs
->prune_data
) {
1443 diff_tree_setup_paths(revs
->prune_data
, &revs
->pruning
);
1444 /* Can't prune commits with rename following: the paths change.. */
1445 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1447 if (!revs
->full_diff
)
1448 diff_tree_setup_paths(revs
->prune_data
, &revs
->diffopt
);
1450 if (revs
->combine_merges
) {
1451 revs
->ignore_merges
= 0;
1452 if (revs
->dense_combined_merges
&& !revs
->diffopt
.output_format
)
1453 revs
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
1455 revs
->diffopt
.abbrev
= revs
->abbrev
;
1456 if (diff_setup_done(&revs
->diffopt
) < 0)
1457 die("diff_setup_done failed");
1459 compile_grep_patterns(&revs
->grep_filter
);
1461 if (revs
->reverse
&& revs
->reflog_info
)
1462 die("cannot combine --reverse with --walk-reflogs");
1463 if (revs
->rewrite_parents
&& revs
->children
.name
)
1464 die("cannot combine --parents and --children");
1467 * Limitations on the graph functionality
1469 if (revs
->reverse
&& revs
->graph
)
1470 die("cannot combine --reverse with --graph");
1472 if (revs
->reflog_info
&& revs
->graph
)
1473 die("cannot combine --walk-reflogs with --graph");
1478 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
1480 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
1483 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
1486 static int remove_duplicate_parents(struct commit
*commit
)
1488 struct commit_list
**pp
, *p
;
1489 int surviving_parents
;
1491 /* Examine existing parents while marking ones we have seen... */
1492 pp
= &commit
->parents
;
1493 while ((p
= *pp
) != NULL
) {
1494 struct commit
*parent
= p
->item
;
1495 if (parent
->object
.flags
& TMP_MARK
) {
1499 parent
->object
.flags
|= TMP_MARK
;
1502 /* count them while clearing the temporary mark */
1503 surviving_parents
= 0;
1504 for (p
= commit
->parents
; p
; p
= p
->next
) {
1505 p
->item
->object
.flags
&= ~TMP_MARK
;
1506 surviving_parents
++;
1508 return surviving_parents
;
1511 struct merge_simplify_state
{
1512 struct commit
*simplified
;
1515 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
1517 struct merge_simplify_state
*st
;
1519 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
1521 st
= xcalloc(1, sizeof(*st
));
1522 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
1527 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
1529 struct commit_list
*p
;
1530 struct merge_simplify_state
*st
, *pst
;
1533 st
= locate_simplify_state(revs
, commit
);
1536 * Have we handled this one?
1542 * An UNINTERESTING commit simplifies to itself, so does a
1543 * root commit. We do not rewrite parents of such commit
1546 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
1547 st
->simplified
= commit
;
1552 * Do we know what commit all of our parents should be rewritten to?
1553 * Otherwise we are not ready to rewrite this one yet.
1555 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
1556 pst
= locate_simplify_state(revs
, p
->item
);
1557 if (!pst
->simplified
) {
1558 tail
= &commit_list_insert(p
->item
, tail
)->next
;
1563 tail
= &commit_list_insert(commit
, tail
)->next
;
1568 * Rewrite our list of parents.
1570 for (p
= commit
->parents
; p
; p
= p
->next
) {
1571 pst
= locate_simplify_state(revs
, p
->item
);
1572 p
->item
= pst
->simplified
;
1574 cnt
= remove_duplicate_parents(commit
);
1577 * It is possible that we are a merge and one side branch
1578 * does not have any commit that touches the given paths;
1579 * in such a case, the immediate parents will be rewritten
1580 * to different commits.
1582 * o----X X: the commit we are looking at;
1583 * / / o: a commit that touches the paths;
1586 * Further reduce the parents by removing redundant parents.
1589 struct commit_list
*h
= reduce_heads(commit
->parents
);
1590 cnt
= commit_list_count(h
);
1591 free_commit_list(commit
->parents
);
1592 commit
->parents
= h
;
1596 * A commit simplifies to itself if it is a root, if it is
1597 * UNINTERESTING, if it touches the given paths, or if it is a
1598 * merge and its parents simplifies to more than one commits
1599 * (the first two cases are already handled at the beginning of
1602 * Otherwise, it simplifies to what its sole parent simplifies to.
1605 (commit
->object
.flags
& UNINTERESTING
) ||
1606 !(commit
->object
.flags
& TREESAME
) ||
1608 st
->simplified
= commit
;
1610 pst
= locate_simplify_state(revs
, commit
->parents
->item
);
1611 st
->simplified
= pst
->simplified
;
1616 static void simplify_merges(struct rev_info
*revs
)
1618 struct commit_list
*list
;
1619 struct commit_list
*yet_to_do
, **tail
;
1621 if (!revs
->topo_order
)
1622 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
1626 /* feed the list reversed */
1628 for (list
= revs
->commits
; list
; list
= list
->next
)
1629 commit_list_insert(list
->item
, &yet_to_do
);
1635 struct commit
*commit
= list
->item
;
1636 struct commit_list
*next
= list
->next
;
1639 tail
= simplify_one(revs
, commit
, tail
);
1643 /* clean up the result, removing the simplified ones */
1644 list
= revs
->commits
;
1645 revs
->commits
= NULL
;
1646 tail
= &revs
->commits
;
1648 struct commit
*commit
= list
->item
;
1649 struct commit_list
*next
= list
->next
;
1650 struct merge_simplify_state
*st
;
1653 st
= locate_simplify_state(revs
, commit
);
1654 if (st
->simplified
== commit
)
1655 tail
= &commit_list_insert(commit
, tail
)->next
;
1659 static void set_children(struct rev_info
*revs
)
1661 struct commit_list
*l
;
1662 for (l
= revs
->commits
; l
; l
= l
->next
) {
1663 struct commit
*commit
= l
->item
;
1664 struct commit_list
*p
;
1666 for (p
= commit
->parents
; p
; p
= p
->next
)
1667 add_child(revs
, p
->item
, commit
);
1671 int prepare_revision_walk(struct rev_info
*revs
)
1673 int nr
= revs
->pending
.nr
;
1674 struct object_array_entry
*e
, *list
;
1676 e
= list
= revs
->pending
.objects
;
1677 revs
->pending
.nr
= 0;
1678 revs
->pending
.alloc
= 0;
1679 revs
->pending
.objects
= NULL
;
1681 struct commit
*commit
= handle_commit(revs
, e
->item
, e
->name
);
1683 if (!(commit
->object
.flags
& SEEN
)) {
1684 commit
->object
.flags
|= SEEN
;
1685 insert_by_date(commit
, &revs
->commits
);
1695 if (limit_list(revs
) < 0)
1697 if (revs
->topo_order
)
1698 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
1699 if (revs
->simplify_merges
)
1700 simplify_merges(revs
);
1701 if (revs
->children
.name
)
1706 enum rewrite_result
{
1708 rewrite_one_noparents
,
1712 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
1714 struct commit_list
*cache
= NULL
;
1717 struct commit
*p
= *pp
;
1719 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
1720 return rewrite_one_error
;
1721 if (p
->parents
&& p
->parents
->next
)
1722 return rewrite_one_ok
;
1723 if (p
->object
.flags
& UNINTERESTING
)
1724 return rewrite_one_ok
;
1725 if (!(p
->object
.flags
& TREESAME
))
1726 return rewrite_one_ok
;
1728 return rewrite_one_noparents
;
1729 *pp
= p
->parents
->item
;
1733 static int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
)
1735 struct commit_list
**pp
= &commit
->parents
;
1737 struct commit_list
*parent
= *pp
;
1738 switch (rewrite_one(revs
, &parent
->item
)) {
1739 case rewrite_one_ok
:
1741 case rewrite_one_noparents
:
1744 case rewrite_one_error
:
1749 remove_duplicate_parents(commit
);
1753 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
1755 if (!opt
->grep_filter
.pattern_list
)
1757 return grep_buffer(&opt
->grep_filter
,
1758 NULL
, /* we say nothing, not even filename */
1759 commit
->buffer
, strlen(commit
->buffer
));
1762 static inline int want_ancestry(struct rev_info
*revs
)
1764 return (revs
->rewrite_parents
|| revs
->children
.name
);
1767 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
1769 if (commit
->object
.flags
& SHOWN
)
1770 return commit_ignore
;
1771 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
))
1772 return commit_ignore
;
1775 if (commit
->object
.flags
& UNINTERESTING
)
1776 return commit_ignore
;
1777 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
1778 return commit_ignore
;
1779 if (revs
->no_merges
&& commit
->parents
&& commit
->parents
->next
)
1780 return commit_ignore
;
1781 if (revs
->merges_only
&& !(commit
->parents
&& commit
->parents
->next
))
1782 return commit_ignore
;
1783 if (!commit_match(commit
, revs
))
1784 return commit_ignore
;
1785 if (revs
->prune
&& revs
->dense
) {
1786 /* Commit without changes? */
1787 if (commit
->object
.flags
& TREESAME
) {
1788 /* drop merges unless we want parenthood */
1789 if (!want_ancestry(revs
))
1790 return commit_ignore
;
1791 /* non-merge - always ignore it */
1792 if (!commit
->parents
|| !commit
->parents
->next
)
1793 return commit_ignore
;
1799 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
1801 enum commit_action action
= get_commit_action(revs
, commit
);
1803 if (action
== commit_show
&&
1805 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
1806 if (rewrite_parents(revs
, commit
) < 0)
1807 return commit_error
;
1812 static struct commit
*get_revision_1(struct rev_info
*revs
)
1818 struct commit_list
*entry
= revs
->commits
;
1819 struct commit
*commit
= entry
->item
;
1821 revs
->commits
= entry
->next
;
1824 if (revs
->reflog_info
)
1825 fake_reflog_parent(revs
->reflog_info
, commit
);
1828 * If we haven't done the list limiting, we need to look at
1829 * the parents here. We also need to do the date-based limiting
1830 * that we'd otherwise have done in limit_list().
1832 if (!revs
->limited
) {
1833 if (revs
->max_age
!= -1 &&
1834 (commit
->date
< revs
->max_age
))
1836 if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0)
1837 die("Failed to traverse parents of commit %s",
1838 sha1_to_hex(commit
->object
.sha1
));
1841 switch (simplify_commit(revs
, commit
)) {
1845 die("Failed to simplify parents of commit %s",
1846 sha1_to_hex(commit
->object
.sha1
));
1850 } while (revs
->commits
);
1854 static void gc_boundary(struct object_array
*array
)
1856 unsigned nr
= array
->nr
;
1857 unsigned alloc
= array
->alloc
;
1858 struct object_array_entry
*objects
= array
->objects
;
1862 for (i
= j
= 0; i
< nr
; i
++) {
1863 if (objects
[i
].item
->flags
& SHOWN
)
1866 objects
[j
] = objects
[i
];
1869 for (i
= j
; i
< nr
; i
++)
1870 objects
[i
].item
= NULL
;
1875 static void create_boundary_commit_list(struct rev_info
*revs
)
1879 struct object_array
*array
= &revs
->boundary_commits
;
1880 struct object_array_entry
*objects
= array
->objects
;
1883 * If revs->commits is non-NULL at this point, an error occurred in
1884 * get_revision_1(). Ignore the error and continue printing the
1885 * boundary commits anyway. (This is what the code has always
1888 if (revs
->commits
) {
1889 free_commit_list(revs
->commits
);
1890 revs
->commits
= NULL
;
1894 * Put all of the actual boundary commits from revs->boundary_commits
1895 * into revs->commits
1897 for (i
= 0; i
< array
->nr
; i
++) {
1898 c
= (struct commit
*)(objects
[i
].item
);
1901 if (!(c
->object
.flags
& CHILD_SHOWN
))
1903 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
1905 c
->object
.flags
|= BOUNDARY
;
1906 commit_list_insert(c
, &revs
->commits
);
1910 * If revs->topo_order is set, sort the boundary commits
1911 * in topological order
1913 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
1916 static struct commit
*get_revision_internal(struct rev_info
*revs
)
1918 struct commit
*c
= NULL
;
1919 struct commit_list
*l
;
1921 if (revs
->boundary
== 2) {
1923 * All of the normal commits have already been returned,
1924 * and we are now returning boundary commits.
1925 * create_boundary_commit_list() has populated
1926 * revs->commits with the remaining commits to return.
1928 c
= pop_commit(&revs
->commits
);
1930 c
->object
.flags
|= SHOWN
;
1935 * Now pick up what they want to give us
1937 c
= get_revision_1(revs
);
1939 while (0 < revs
->skip_count
) {
1941 c
= get_revision_1(revs
);
1948 * Check the max_count.
1950 switch (revs
->max_count
) {
1961 c
->object
.flags
|= SHOWN
;
1963 if (!revs
->boundary
) {
1969 * get_revision_1() runs out the commits, and
1970 * we are done computing the boundaries.
1971 * switch to boundary commits output mode.
1976 * Update revs->commits to contain the list of
1979 create_boundary_commit_list(revs
);
1981 return get_revision_internal(revs
);
1985 * boundary commits are the commits that are parents of the
1986 * ones we got from get_revision_1() but they themselves are
1987 * not returned from get_revision_1(). Before returning
1988 * 'c', we need to mark its parents that they could be boundaries.
1991 for (l
= c
->parents
; l
; l
= l
->next
) {
1993 p
= &(l
->item
->object
);
1994 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
1996 p
->flags
|= CHILD_SHOWN
;
1997 gc_boundary(&revs
->boundary_commits
);
1998 add_object_array(p
, NULL
, &revs
->boundary_commits
);
2004 struct commit
*get_revision(struct rev_info
*revs
)
2007 struct commit_list
*reversed
;
2009 if (revs
->reverse
) {
2011 while ((c
= get_revision_internal(revs
))) {
2012 commit_list_insert(c
, &reversed
);
2014 revs
->commits
= reversed
;
2016 revs
->reverse_output_stage
= 1;
2019 if (revs
->reverse_output_stage
)
2020 return pop_commit(&revs
->commits
);
2022 c
= get_revision_internal(revs
);
2023 if (c
&& revs
->graph
)
2024 graph_update(revs
->graph
, c
);