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 static int show_path_component_truncated(FILE *out
, const char *name
, int len
)
46 for (cnt
= 0; cnt
< len
; cnt
++) {
48 if (!ch
|| ch
== '\n')
55 static int show_path_truncated(FILE *out
, const struct name_path
*path
)
61 emitted
= show_path_truncated(out
, path
->up
);
66 ours
= show_path_component_truncated(out
, path
->elem
, path
->elem_len
);
69 return ours
|| emitted
;
72 void show_object_with_name(FILE *out
, struct object
*obj
, const struct name_path
*path
, const char *component
)
74 struct name_path leaf
;
75 leaf
.up
= (struct name_path
*)path
;
76 leaf
.elem
= component
;
77 leaf
.elem_len
= strlen(component
);
79 fprintf(out
, "%s ", sha1_to_hex(obj
->sha1
));
80 show_path_truncated(out
, &leaf
);
84 void add_object(struct object
*obj
,
85 struct object_array
*p
,
86 struct name_path
*path
,
89 add_object_array(obj
, path_name(path
, name
), p
);
92 static void mark_blob_uninteresting(struct blob
*blob
)
96 if (blob
->object
.flags
& UNINTERESTING
)
98 blob
->object
.flags
|= UNINTERESTING
;
101 void mark_tree_uninteresting(struct tree
*tree
)
103 struct tree_desc desc
;
104 struct name_entry entry
;
105 struct object
*obj
= &tree
->object
;
109 if (obj
->flags
& UNINTERESTING
)
111 obj
->flags
|= UNINTERESTING
;
112 if (!has_sha1_file(obj
->sha1
))
114 if (parse_tree(tree
) < 0)
115 die("bad tree %s", sha1_to_hex(obj
->sha1
));
117 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
118 while (tree_entry(&desc
, &entry
)) {
119 switch (object_type(entry
.mode
)) {
121 mark_tree_uninteresting(lookup_tree(entry
.sha1
));
124 mark_blob_uninteresting(lookup_blob(entry
.sha1
));
127 /* Subproject commit - not in this repository */
133 * We don't care about the tree any more
134 * after it has been marked uninteresting.
140 void mark_parents_uninteresting(struct commit
*commit
)
142 struct commit_list
*parents
= NULL
, *l
;
144 for (l
= commit
->parents
; l
; l
= l
->next
)
145 commit_list_insert(l
->item
, &parents
);
148 struct commit
*commit
= parents
->item
;
150 parents
= parents
->next
;
155 * A missing commit is ok iff its parent is marked
158 * We just mark such a thing parsed, so that when
159 * it is popped next time around, we won't be trying
160 * to parse it and get an error.
162 if (!has_sha1_file(commit
->object
.sha1
))
163 commit
->object
.parsed
= 1;
165 if (commit
->object
.flags
& UNINTERESTING
)
168 commit
->object
.flags
|= UNINTERESTING
;
171 * Normally we haven't parsed the parent
172 * yet, so we won't have a parent of a parent
173 * here. However, it may turn out that we've
174 * reached this commit some other way (where it
175 * wasn't uninteresting), in which case we need
176 * to mark its parents recursively too..
178 if (!commit
->parents
)
181 for (l
= commit
->parents
->next
; l
; l
= l
->next
)
182 commit_list_insert(l
->item
, &parents
);
183 commit
= commit
->parents
->item
;
188 static void add_pending_object_with_mode(struct rev_info
*revs
, struct object
*obj
, const char *name
, unsigned mode
)
192 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
194 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
195 struct strbuf buf
= STRBUF_INIT
;
196 int len
= interpret_branch_name(name
, &buf
);
199 if (0 < len
&& name
[len
] && buf
.len
)
200 strbuf_addstr(&buf
, name
+ len
);
201 st
= add_reflog_for_walk(revs
->reflog_info
,
202 (struct commit
*)obj
,
203 buf
.buf
[0] ? buf
.buf
: name
);
204 strbuf_release(&buf
);
208 add_object_array_with_mode(obj
, name
, &revs
->pending
, mode
);
211 void add_pending_object(struct rev_info
*revs
, struct object
*obj
, const char *name
)
213 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
216 void add_head_to_pending(struct rev_info
*revs
)
218 unsigned char sha1
[20];
220 if (get_sha1("HEAD", sha1
))
222 obj
= parse_object(sha1
);
225 add_pending_object(revs
, obj
, "HEAD");
228 static struct object
*get_reference(struct rev_info
*revs
, const char *name
, const unsigned char *sha1
, unsigned int flags
)
230 struct object
*object
;
232 object
= parse_object(sha1
);
234 if (revs
->ignore_missing
)
236 die("bad object %s", name
);
238 object
->flags
|= flags
;
242 void add_pending_sha1(struct rev_info
*revs
, const char *name
,
243 const unsigned char *sha1
, unsigned int flags
)
245 struct object
*object
= get_reference(revs
, name
, sha1
, flags
);
246 add_pending_object(revs
, object
, name
);
249 static struct commit
*handle_commit(struct rev_info
*revs
, struct object
*object
, const char *name
)
251 unsigned long flags
= object
->flags
;
254 * Tag object? Look what it points to..
256 while (object
->type
== OBJ_TAG
) {
257 struct tag
*tag
= (struct tag
*) object
;
258 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
259 add_pending_object(revs
, object
, tag
->tag
);
262 object
= parse_object(tag
->tagged
->sha1
);
264 if (flags
& UNINTERESTING
)
266 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
271 * Commit object? Just return it, we'll do all the complex
274 if (object
->type
== OBJ_COMMIT
) {
275 struct commit
*commit
= (struct commit
*)object
;
276 if (parse_commit(commit
) < 0)
277 die("unable to parse commit %s", name
);
278 if (flags
& UNINTERESTING
) {
279 commit
->object
.flags
|= UNINTERESTING
;
280 mark_parents_uninteresting(commit
);
283 if (revs
->show_source
&& !commit
->util
)
284 commit
->util
= (void *) name
;
289 * Tree object? Either mark it uninteresting, or add it
290 * to the list of objects to look at later..
292 if (object
->type
== OBJ_TREE
) {
293 struct tree
*tree
= (struct tree
*)object
;
294 if (!revs
->tree_objects
)
296 if (flags
& UNINTERESTING
) {
297 mark_tree_uninteresting(tree
);
300 add_pending_object(revs
, object
, "");
305 * Blob object? You know the drill by now..
307 if (object
->type
== OBJ_BLOB
) {
308 struct blob
*blob
= (struct blob
*)object
;
309 if (!revs
->blob_objects
)
311 if (flags
& UNINTERESTING
) {
312 mark_blob_uninteresting(blob
);
315 add_pending_object(revs
, object
, "");
318 die("%s is unknown object", name
);
321 static int everybody_uninteresting(struct commit_list
*orig
)
323 struct commit_list
*list
= orig
;
325 struct commit
*commit
= list
->item
;
327 if (commit
->object
.flags
& UNINTERESTING
)
335 * The goal is to get REV_TREE_NEW as the result only if the
336 * diff consists of all '+' (and no other changes), REV_TREE_OLD
337 * if the whole diff is removal of old data, and otherwise
338 * REV_TREE_DIFFERENT (of course if the trees are the same we
339 * want REV_TREE_SAME).
340 * That means that once we get to REV_TREE_DIFFERENT, we do not
341 * have to look any further.
343 static int tree_difference
= REV_TREE_SAME
;
345 static void file_add_remove(struct diff_options
*options
,
346 int addremove
, unsigned mode
,
347 const unsigned char *sha1
,
349 const char *fullpath
, unsigned dirty_submodule
)
351 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
353 tree_difference
|= diff
;
354 if (tree_difference
== REV_TREE_DIFFERENT
)
355 DIFF_OPT_SET(options
, HAS_CHANGES
);
358 static void file_change(struct diff_options
*options
,
359 unsigned old_mode
, unsigned new_mode
,
360 const unsigned char *old_sha1
,
361 const unsigned char *new_sha1
,
362 int old_sha1_valid
, int new_sha1_valid
,
363 const char *fullpath
,
364 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
366 tree_difference
= REV_TREE_DIFFERENT
;
367 DIFF_OPT_SET(options
, HAS_CHANGES
);
370 static int rev_compare_tree(struct rev_info
*revs
, struct commit
*parent
, struct commit
*commit
)
372 struct tree
*t1
= parent
->tree
;
373 struct tree
*t2
= commit
->tree
;
380 if (revs
->simplify_by_decoration
) {
382 * If we are simplifying by decoration, then the commit
383 * is worth showing if it has a tag pointing at it.
385 if (lookup_decoration(&name_decoration
, &commit
->object
))
386 return REV_TREE_DIFFERENT
;
388 * A commit that is not pointed by a tag is uninteresting
389 * if we are not limited by path. This means that you will
390 * see the usual "commits that touch the paths" plus any
391 * tagged commit by specifying both --simplify-by-decoration
394 if (!revs
->prune_data
.nr
)
395 return REV_TREE_SAME
;
398 tree_difference
= REV_TREE_SAME
;
399 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
400 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
402 return REV_TREE_DIFFERENT
;
403 return tree_difference
;
406 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
411 struct tree_desc empty
, real
;
412 struct tree
*t1
= commit
->tree
;
417 tree
= read_object_with_reference(t1
->object
.sha1
, tree_type
, &size
, NULL
);
420 init_tree_desc(&real
, tree
, size
);
421 init_tree_desc(&empty
, "", 0);
423 tree_difference
= REV_TREE_SAME
;
424 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
425 retval
= diff_tree(&empty
, &real
, "", &revs
->pruning
);
428 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
431 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
433 struct commit_list
**pp
, *parent
;
434 int tree_changed
= 0, tree_same
= 0, nth_parent
= 0;
437 * If we don't do pruning, everything is interesting
445 if (!commit
->parents
) {
446 if (rev_same_tree_as_empty(revs
, commit
))
447 commit
->object
.flags
|= TREESAME
;
452 * Normal non-merge commit? If we don't want to make the
453 * history dense, we consider it always to be a change..
455 if (!revs
->dense
&& !commit
->parents
->next
)
458 pp
= &commit
->parents
;
459 while ((parent
= *pp
) != NULL
) {
460 struct commit
*p
= parent
->item
;
463 * Do not compare with later parents when we care only about
464 * the first parent chain, in order to avoid derailing the
465 * traversal to follow a side branch that brought everything
466 * in the path we are limited to by the pathspec.
468 if (revs
->first_parent_only
&& nth_parent
++)
470 if (parse_commit(p
) < 0)
471 die("cannot simplify commit %s (because of %s)",
472 sha1_to_hex(commit
->object
.sha1
),
473 sha1_to_hex(p
->object
.sha1
));
474 switch (rev_compare_tree(revs
, p
, commit
)) {
477 if (!revs
->simplify_history
|| (p
->object
.flags
& UNINTERESTING
)) {
478 /* Even if a merge with an uninteresting
479 * side branch brought the entire change
480 * we are interested in, we do not want
481 * to lose the other branches of this
482 * merge, so we just keep going.
488 commit
->parents
= parent
;
489 commit
->object
.flags
|= TREESAME
;
493 if (revs
->remove_empty_trees
&&
494 rev_same_tree_as_empty(revs
, p
)) {
495 /* We are adding all the specified
496 * paths from this parent, so the
497 * history beyond this parent is not
498 * interesting. Remove its parents
499 * (they are grandparents for us).
500 * IOW, we pretend this parent is a
503 if (parse_commit(p
) < 0)
504 die("cannot simplify commit %s (invalid %s)",
505 sha1_to_hex(commit
->object
.sha1
),
506 sha1_to_hex(p
->object
.sha1
));
511 case REV_TREE_DIFFERENT
:
516 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
518 if (tree_changed
&& !tree_same
)
520 commit
->object
.flags
|= TREESAME
;
523 static void commit_list_insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
524 struct commit_list
*cached_base
, struct commit_list
**cache
)
526 struct commit_list
*new_entry
;
528 if (cached_base
&& p
->date
< cached_base
->item
->date
)
529 new_entry
= commit_list_insert_by_date(p
, &cached_base
->next
);
531 new_entry
= commit_list_insert_by_date(p
, head
);
533 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
537 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
538 struct commit_list
**list
, struct commit_list
**cache_ptr
)
540 struct commit_list
*parent
= commit
->parents
;
542 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
544 if (commit
->object
.flags
& ADDED
)
546 commit
->object
.flags
|= ADDED
;
549 * If the commit is uninteresting, don't try to
550 * prune parents - we want the maximal uninteresting
553 * Normally we haven't parsed the parent
554 * yet, so we won't have a parent of a parent
555 * here. However, it may turn out that we've
556 * reached this commit some other way (where it
557 * wasn't uninteresting), in which case we need
558 * to mark its parents recursively too..
560 if (commit
->object
.flags
& UNINTERESTING
) {
562 struct commit
*p
= parent
->item
;
563 parent
= parent
->next
;
565 p
->object
.flags
|= UNINTERESTING
;
566 if (parse_commit(p
) < 0)
569 mark_parents_uninteresting(p
);
570 if (p
->object
.flags
& SEEN
)
572 p
->object
.flags
|= SEEN
;
573 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
579 * Ok, the commit wasn't uninteresting. Try to
580 * simplify the commit history and find the parent
581 * that has no differences in the path set if one exists.
583 try_to_simplify_commit(revs
, commit
);
588 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
590 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
591 struct commit
*p
= parent
->item
;
593 if (parse_commit(p
) < 0)
595 if (revs
->show_source
&& !p
->util
)
596 p
->util
= commit
->util
;
597 p
->object
.flags
|= left_flag
;
598 if (!(p
->object
.flags
& SEEN
)) {
599 p
->object
.flags
|= SEEN
;
600 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
602 if (revs
->first_parent_only
)
608 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
610 struct commit_list
*p
;
611 int left_count
= 0, right_count
= 0;
613 struct patch_ids ids
;
614 unsigned cherry_flag
;
616 /* First count the commits on the left and on the right */
617 for (p
= list
; p
; p
= p
->next
) {
618 struct commit
*commit
= p
->item
;
619 unsigned flags
= commit
->object
.flags
;
620 if (flags
& BOUNDARY
)
622 else if (flags
& SYMMETRIC_LEFT
)
628 if (!left_count
|| !right_count
)
631 left_first
= left_count
< right_count
;
632 init_patch_ids(&ids
);
633 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
635 /* Compute patch-ids for one side */
636 for (p
= list
; p
; p
= p
->next
) {
637 struct commit
*commit
= p
->item
;
638 unsigned flags
= commit
->object
.flags
;
640 if (flags
& BOUNDARY
)
643 * If we have fewer left, left_first is set and we omit
644 * commits on the right branch in this loop. If we have
645 * fewer right, we skip the left ones.
647 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
649 commit
->util
= add_commit_patch_id(commit
, &ids
);
652 /* either cherry_mark or cherry_pick are true */
653 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
655 /* Check the other side */
656 for (p
= list
; p
; p
= p
->next
) {
657 struct commit
*commit
= p
->item
;
659 unsigned flags
= commit
->object
.flags
;
661 if (flags
& BOUNDARY
)
664 * If we have fewer left, left_first is set and we omit
665 * commits on the left branch in this loop.
667 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
671 * Have we seen the same patch id?
673 id
= has_commit_patch_id(commit
, &ids
);
677 commit
->object
.flags
|= cherry_flag
;
680 /* Now check the original side for seen ones */
681 for (p
= list
; p
; p
= p
->next
) {
682 struct commit
*commit
= p
->item
;
683 struct patch_id
*ent
;
689 commit
->object
.flags
|= cherry_flag
;
693 free_patch_ids(&ids
);
696 /* How many extra uninteresting commits we want to see.. */
699 static int still_interesting(struct commit_list
*src
, unsigned long date
, int slop
)
702 * No source list at all? We're definitely done..
708 * Does the destination list contain entries with a date
709 * before the source list? Definitely _not_ done.
711 if (date
< src
->item
->date
)
715 * Does the source list still have interesting commits in
716 * it? Definitely not done..
718 if (!everybody_uninteresting(src
))
721 /* Ok, we're closing in.. */
726 * "rev-list --ancestry-path A..B" computes commits that are ancestors
727 * of B but not ancestors of A but further limits the result to those
728 * that are descendants of A. This takes the list of bottom commits and
729 * the result of "A..B" without --ancestry-path, and limits the latter
730 * further to the ones that can reach one of the commits in "bottom".
732 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
734 struct commit_list
*p
;
735 struct commit_list
*rlist
= NULL
;
739 * Reverse the list so that it will be likely that we would
740 * process parents before children.
742 for (p
= list
; p
; p
= p
->next
)
743 commit_list_insert(p
->item
, &rlist
);
745 for (p
= bottom
; p
; p
= p
->next
)
746 p
->item
->object
.flags
|= TMP_MARK
;
749 * Mark the ones that can reach bottom commits in "list",
750 * in a bottom-up fashion.
754 for (p
= rlist
; p
; p
= p
->next
) {
755 struct commit
*c
= p
->item
;
756 struct commit_list
*parents
;
757 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
759 for (parents
= c
->parents
;
761 parents
= parents
->next
) {
762 if (!(parents
->item
->object
.flags
& TMP_MARK
))
764 c
->object
.flags
|= TMP_MARK
;
769 } while (made_progress
);
772 * NEEDSWORK: decide if we want to remove parents that are
773 * not marked with TMP_MARK from commit->parents for commits
774 * in the resulting list. We may not want to do that, though.
778 * The ones that are not marked with TMP_MARK are uninteresting
780 for (p
= list
; p
; p
= p
->next
) {
781 struct commit
*c
= p
->item
;
782 if (c
->object
.flags
& TMP_MARK
)
784 c
->object
.flags
|= UNINTERESTING
;
787 /* We are done with the TMP_MARK */
788 for (p
= list
; p
; p
= p
->next
)
789 p
->item
->object
.flags
&= ~TMP_MARK
;
790 for (p
= bottom
; p
; p
= p
->next
)
791 p
->item
->object
.flags
&= ~TMP_MARK
;
792 free_commit_list(rlist
);
796 * Before walking the history, keep the set of "negative" refs the
797 * caller has asked to exclude.
799 * This is used to compute "rev-list --ancestry-path A..B", as we need
800 * to filter the result of "A..B" further to the ones that can actually
803 static struct commit_list
*collect_bottom_commits(struct rev_info
*revs
)
805 struct commit_list
*bottom
= NULL
;
807 for (i
= 0; i
< revs
->cmdline
.nr
; i
++) {
808 struct rev_cmdline_entry
*elem
= &revs
->cmdline
.rev
[i
];
809 if ((elem
->flags
& UNINTERESTING
) &&
810 elem
->item
->type
== OBJ_COMMIT
)
811 commit_list_insert((struct commit
*)elem
->item
, &bottom
);
816 /* Assumes either left_only or right_only is set */
817 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
819 struct commit_list
*p
;
821 for (p
= list
; p
; p
= p
->next
) {
822 struct commit
*commit
= p
->item
;
824 if (revs
->right_only
) {
825 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
826 commit
->object
.flags
|= SHOWN
;
827 } else /* revs->left_only is set */
828 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
829 commit
->object
.flags
|= SHOWN
;
833 static int limit_list(struct rev_info
*revs
)
836 unsigned long date
= ~0ul;
837 struct commit_list
*list
= revs
->commits
;
838 struct commit_list
*newlist
= NULL
;
839 struct commit_list
**p
= &newlist
;
840 struct commit_list
*bottom
= NULL
;
842 if (revs
->ancestry_path
) {
843 bottom
= collect_bottom_commits(revs
);
845 die("--ancestry-path given but there are no bottom commits");
849 struct commit_list
*entry
= list
;
850 struct commit
*commit
= list
->item
;
851 struct object
*obj
= &commit
->object
;
852 show_early_output_fn_t show
;
857 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
858 obj
->flags
|= UNINTERESTING
;
859 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
861 if (obj
->flags
& UNINTERESTING
) {
862 mark_parents_uninteresting(commit
);
864 p
= &commit_list_insert(commit
, p
)->next
;
865 slop
= still_interesting(list
, date
, slop
);
868 /* If showing all, add the whole pending list to the end */
873 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
876 p
= &commit_list_insert(commit
, p
)->next
;
878 show
= show_early_output
;
883 show_early_output
= NULL
;
885 if (revs
->cherry_pick
|| revs
->cherry_mark
)
886 cherry_pick_list(newlist
, revs
);
888 if (revs
->left_only
|| revs
->right_only
)
889 limit_left_right(newlist
, revs
);
892 limit_to_ancestry(bottom
, newlist
);
893 free_commit_list(bottom
);
896 revs
->commits
= newlist
;
900 static void add_rev_cmdline(struct rev_info
*revs
,
906 struct rev_cmdline_info
*info
= &revs
->cmdline
;
909 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
910 info
->rev
[nr
].item
= item
;
911 info
->rev
[nr
].name
= name
;
912 info
->rev
[nr
].whence
= whence
;
913 info
->rev
[nr
].flags
= flags
;
919 int warned_bad_reflog
;
920 struct rev_info
*all_revs
;
921 const char *name_for_errormsg
;
924 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
926 struct all_refs_cb
*cb
= cb_data
;
927 struct object
*object
= get_reference(cb
->all_revs
, path
, sha1
,
929 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
930 add_pending_sha1(cb
->all_revs
, path
, sha1
, cb
->all_flags
);
934 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
938 cb
->all_flags
= flags
;
941 static void handle_refs(const char *submodule
, struct rev_info
*revs
, unsigned flags
,
942 int (*for_each
)(const char *, each_ref_fn
, void *))
944 struct all_refs_cb cb
;
945 init_all_refs_cb(&cb
, revs
, flags
);
946 for_each(submodule
, handle_one_ref
, &cb
);
949 static void handle_one_reflog_commit(unsigned char *sha1
, void *cb_data
)
951 struct all_refs_cb
*cb
= cb_data
;
952 if (!is_null_sha1(sha1
)) {
953 struct object
*o
= parse_object(sha1
);
955 o
->flags
|= cb
->all_flags
;
956 /* ??? CMDLINEFLAGS ??? */
957 add_pending_object(cb
->all_revs
, o
, "");
959 else if (!cb
->warned_bad_reflog
) {
960 warning("reflog of '%s' references pruned commits",
961 cb
->name_for_errormsg
);
962 cb
->warned_bad_reflog
= 1;
967 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
968 const char *email
, unsigned long timestamp
, int tz
,
969 const char *message
, void *cb_data
)
971 handle_one_reflog_commit(osha1
, cb_data
);
972 handle_one_reflog_commit(nsha1
, cb_data
);
976 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
978 struct all_refs_cb
*cb
= cb_data
;
979 cb
->warned_bad_reflog
= 0;
980 cb
->name_for_errormsg
= path
;
981 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
985 static void handle_reflog(struct rev_info
*revs
, unsigned flags
)
987 struct all_refs_cb cb
;
989 cb
.all_flags
= flags
;
990 for_each_reflog(handle_one_reflog
, &cb
);
993 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
)
995 unsigned char sha1
[20];
997 struct commit
*commit
;
998 struct commit_list
*parents
;
999 const char *arg
= arg_
;
1002 flags
^= UNINTERESTING
;
1005 if (get_sha1_committish(arg
, sha1
))
1008 it
= get_reference(revs
, arg
, sha1
, 0);
1009 if (!it
&& revs
->ignore_missing
)
1011 if (it
->type
!= OBJ_TAG
)
1013 if (!((struct tag
*)it
)->tagged
)
1015 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
1017 if (it
->type
!= OBJ_COMMIT
)
1019 commit
= (struct commit
*)it
;
1020 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
1021 it
= &parents
->item
->object
;
1023 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1024 add_pending_object(revs
, it
, arg
);
1029 void init_revisions(struct rev_info
*revs
, const char *prefix
)
1031 memset(revs
, 0, sizeof(*revs
));
1033 revs
->abbrev
= DEFAULT_ABBREV
;
1034 revs
->ignore_merges
= 1;
1035 revs
->simplify_history
= 1;
1036 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
1037 DIFF_OPT_SET(&revs
->pruning
, QUICK
);
1038 revs
->pruning
.add_remove
= file_add_remove
;
1039 revs
->pruning
.change
= file_change
;
1042 revs
->prefix
= prefix
;
1045 revs
->skip_count
= -1;
1046 revs
->max_count
= -1;
1047 revs
->max_parents
= -1;
1049 revs
->commit_format
= CMIT_FMT_DEFAULT
;
1051 init_grep_defaults();
1052 grep_init(&revs
->grep_filter
, prefix
);
1053 revs
->grep_filter
.status_only
= 1;
1054 revs
->grep_filter
.regflags
= REG_NEWLINE
;
1056 diff_setup(&revs
->diffopt
);
1057 if (prefix
&& !revs
->diffopt
.prefix
) {
1058 revs
->diffopt
.prefix
= prefix
;
1059 revs
->diffopt
.prefix_length
= strlen(prefix
);
1062 revs
->notes_opt
.use_default_notes
= -1;
1065 static void add_pending_commit_list(struct rev_info
*revs
,
1066 struct commit_list
*commit_list
,
1069 while (commit_list
) {
1070 struct object
*object
= &commit_list
->item
->object
;
1071 object
->flags
|= flags
;
1072 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
1073 commit_list
= commit_list
->next
;
1077 static void prepare_show_merge(struct rev_info
*revs
)
1079 struct commit_list
*bases
;
1080 struct commit
*head
, *other
;
1081 unsigned char sha1
[20];
1082 const char **prune
= NULL
;
1083 int i
, prune_num
= 1; /* counting terminating NULL */
1085 if (get_sha1("HEAD", sha1
))
1086 die("--merge without HEAD?");
1087 head
= lookup_commit_or_die(sha1
, "HEAD");
1088 if (get_sha1("MERGE_HEAD", sha1
))
1089 die("--merge without MERGE_HEAD?");
1090 other
= lookup_commit_or_die(sha1
, "MERGE_HEAD");
1091 add_pending_object(revs
, &head
->object
, "HEAD");
1092 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1093 bases
= get_merge_bases(head
, other
, 1);
1094 add_pending_commit_list(revs
, bases
, UNINTERESTING
);
1095 free_commit_list(bases
);
1096 head
->object
.flags
|= SYMMETRIC_LEFT
;
1100 for (i
= 0; i
< active_nr
; i
++) {
1101 struct cache_entry
*ce
= active_cache
[i
];
1104 if (ce_path_match(ce
, &revs
->prune_data
)) {
1106 prune
= xrealloc(prune
, sizeof(*prune
) * prune_num
);
1107 prune
[prune_num
-2] = ce
->name
;
1108 prune
[prune_num
-1] = NULL
;
1110 while ((i
+1 < active_nr
) &&
1111 ce_same_name(ce
, active_cache
[i
+1]))
1114 free_pathspec(&revs
->prune_data
);
1115 init_pathspec(&revs
->prune_data
, prune
);
1119 int handle_revision_arg(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
1121 struct object_context oc
;
1123 struct object
*object
;
1124 unsigned char sha1
[20];
1126 const char *arg
= arg_
;
1127 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
1128 unsigned get_sha1_flags
= 0;
1130 dotdot
= strstr(arg
, "..");
1132 unsigned char from_sha1
[20];
1133 const char *next
= dotdot
+ 2;
1134 const char *this = arg
;
1135 int symmetric
= *next
== '.';
1136 unsigned int flags_exclude
= flags
^ UNINTERESTING
;
1137 static const char head_by_default
[] = "HEAD";
1138 unsigned int a_flags
;
1144 next
= head_by_default
;
1146 this = head_by_default
;
1147 if (this == head_by_default
&& next
== head_by_default
&&
1150 * Just ".."? That is not a range but the
1151 * pathspec for the parent directory.
1153 if (!cant_be_filename
) {
1158 if (!get_sha1_committish(this, from_sha1
) &&
1159 !get_sha1_committish(next
, sha1
)) {
1160 struct commit
*a
, *b
;
1161 struct commit_list
*exclude
;
1163 a
= lookup_commit_reference(from_sha1
);
1164 b
= lookup_commit_reference(sha1
);
1166 if (revs
->ignore_missing
)
1169 "Invalid symmetric difference expression %s...%s" :
1170 "Invalid revision range %s..%s",
1174 if (!cant_be_filename
) {
1176 verify_non_filename(revs
->prefix
, arg
);
1180 exclude
= get_merge_bases(a
, b
, 1);
1181 add_pending_commit_list(revs
, exclude
,
1183 free_commit_list(exclude
);
1184 a_flags
= flags
| SYMMETRIC_LEFT
;
1186 a_flags
= flags_exclude
;
1187 a
->object
.flags
|= a_flags
;
1188 b
->object
.flags
|= flags
;
1189 add_rev_cmdline(revs
, &a
->object
, this,
1190 REV_CMD_LEFT
, a_flags
);
1191 add_rev_cmdline(revs
, &b
->object
, next
,
1192 REV_CMD_RIGHT
, flags
);
1193 add_pending_object(revs
, &a
->object
, this);
1194 add_pending_object(revs
, &b
->object
, next
);
1199 dotdot
= strstr(arg
, "^@");
1200 if (dotdot
&& !dotdot
[2]) {
1202 if (add_parents_only(revs
, arg
, flags
))
1206 dotdot
= strstr(arg
, "^!");
1207 if (dotdot
&& !dotdot
[2]) {
1209 if (!add_parents_only(revs
, arg
, flags
^ UNINTERESTING
))
1215 local_flags
= UNINTERESTING
;
1219 if (revarg_opt
& REVARG_COMMITTISH
)
1220 get_sha1_flags
= GET_SHA1_COMMITTISH
;
1222 if (get_sha1_with_context(arg
, get_sha1_flags
, sha1
, &oc
))
1223 return revs
->ignore_missing
? 0 : -1;
1224 if (!cant_be_filename
)
1225 verify_non_filename(revs
->prefix
, arg
);
1226 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
1227 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
1228 add_pending_object_with_mode(revs
, object
, arg
, oc
.mode
);
1232 struct cmdline_pathspec
{
1238 static void append_prune_data(struct cmdline_pathspec
*prune
, const char **av
)
1241 ALLOC_GROW(prune
->path
, prune
->nr
+1, prune
->alloc
);
1242 prune
->path
[prune
->nr
++] = *(av
++);
1246 static void read_pathspec_from_stdin(struct rev_info
*revs
, struct strbuf
*sb
,
1247 struct cmdline_pathspec
*prune
)
1249 while (strbuf_getwholeline(sb
, stdin
, '\n') != EOF
) {
1251 if (len
&& sb
->buf
[len
- 1] == '\n')
1252 sb
->buf
[--len
] = '\0';
1253 ALLOC_GROW(prune
->path
, prune
->nr
+1, prune
->alloc
);
1254 prune
->path
[prune
->nr
++] = xstrdup(sb
->buf
);
1258 static void read_revisions_from_stdin(struct rev_info
*revs
,
1259 struct cmdline_pathspec
*prune
)
1262 int seen_dashdash
= 0;
1264 strbuf_init(&sb
, 1000);
1265 while (strbuf_getwholeline(&sb
, stdin
, '\n') != EOF
) {
1267 if (len
&& sb
.buf
[len
- 1] == '\n')
1268 sb
.buf
[--len
] = '\0';
1271 if (sb
.buf
[0] == '-') {
1272 if (len
== 2 && sb
.buf
[1] == '-') {
1276 die("options not supported in --stdin mode");
1278 if (handle_revision_arg(sb
.buf
, revs
, 0, REVARG_CANNOT_BE_FILENAME
))
1279 die("bad revision '%s'", sb
.buf
);
1282 read_pathspec_from_stdin(revs
, &sb
, prune
);
1283 strbuf_release(&sb
);
1286 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
1288 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
1291 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
1293 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
1296 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
1298 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
1301 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
1302 int *unkc
, const char **unkv
)
1304 const char *arg
= argv
[0];
1308 /* pseudo revision arguments */
1309 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1310 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1311 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1312 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
1313 !strcmp(arg
, "--bisect") || !prefixcmp(arg
, "--glob=") ||
1314 !prefixcmp(arg
, "--branches=") || !prefixcmp(arg
, "--tags=") ||
1315 !prefixcmp(arg
, "--remotes=") || !prefixcmp(arg
, "--no-walk="))
1317 unkv
[(*unkc
)++] = arg
;
1321 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
1322 revs
->max_count
= atoi(optarg
);
1325 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
1326 revs
->skip_count
= atoi(optarg
);
1328 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1329 /* accept -<digit>, like traditional "head" */
1330 revs
->max_count
= atoi(arg
+ 1);
1332 } else if (!strcmp(arg
, "-n")) {
1334 return error("-n requires an argument");
1335 revs
->max_count
= atoi(argv
[1]);
1338 } else if (!prefixcmp(arg
, "-n")) {
1339 revs
->max_count
= atoi(arg
+ 2);
1341 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
1342 revs
->max_age
= atoi(optarg
);
1344 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
1345 revs
->max_age
= approxidate(optarg
);
1347 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
1348 revs
->max_age
= approxidate(optarg
);
1350 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
1351 revs
->min_age
= atoi(optarg
);
1353 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
1354 revs
->min_age
= approxidate(optarg
);
1356 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
1357 revs
->min_age
= approxidate(optarg
);
1359 } else if (!strcmp(arg
, "--first-parent")) {
1360 revs
->first_parent_only
= 1;
1361 } else if (!strcmp(arg
, "--ancestry-path")) {
1362 revs
->ancestry_path
= 1;
1363 revs
->simplify_history
= 0;
1365 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1366 init_reflog_walk(&revs
->reflog_info
);
1367 } else if (!strcmp(arg
, "--default")) {
1369 return error("bad --default argument");
1370 revs
->def
= argv
[1];
1372 } else if (!strcmp(arg
, "--merge")) {
1373 revs
->show_merge
= 1;
1374 } else if (!strcmp(arg
, "--topo-order")) {
1376 revs
->topo_order
= 1;
1377 } else if (!strcmp(arg
, "--simplify-merges")) {
1378 revs
->simplify_merges
= 1;
1379 revs
->topo_order
= 1;
1380 revs
->rewrite_parents
= 1;
1381 revs
->simplify_history
= 0;
1383 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
1384 revs
->simplify_merges
= 1;
1385 revs
->topo_order
= 1;
1386 revs
->rewrite_parents
= 1;
1387 revs
->simplify_history
= 0;
1388 revs
->simplify_by_decoration
= 1;
1391 load_ref_decorations(DECORATE_SHORT_REFS
);
1392 } else if (!strcmp(arg
, "--date-order")) {
1394 revs
->topo_order
= 1;
1395 } else if (!prefixcmp(arg
, "--early-output")) {
1399 count
= atoi(arg
+15);
1402 revs
->topo_order
= 1;
1403 revs
->early_output
= count
;
1405 } else if (!strcmp(arg
, "--parents")) {
1406 revs
->rewrite_parents
= 1;
1407 revs
->print_parents
= 1;
1408 } else if (!strcmp(arg
, "--dense")) {
1410 } else if (!strcmp(arg
, "--sparse")) {
1412 } else if (!strcmp(arg
, "--show-all")) {
1414 } else if (!strcmp(arg
, "--remove-empty")) {
1415 revs
->remove_empty_trees
= 1;
1416 } else if (!strcmp(arg
, "--merges")) {
1417 revs
->min_parents
= 2;
1418 } else if (!strcmp(arg
, "--no-merges")) {
1419 revs
->max_parents
= 1;
1420 } else if (!prefixcmp(arg
, "--min-parents=")) {
1421 revs
->min_parents
= atoi(arg
+14);
1422 } else if (!prefixcmp(arg
, "--no-min-parents")) {
1423 revs
->min_parents
= 0;
1424 } else if (!prefixcmp(arg
, "--max-parents=")) {
1425 revs
->max_parents
= atoi(arg
+14);
1426 } else if (!prefixcmp(arg
, "--no-max-parents")) {
1427 revs
->max_parents
= -1;
1428 } else if (!strcmp(arg
, "--boundary")) {
1430 } else if (!strcmp(arg
, "--left-right")) {
1431 revs
->left_right
= 1;
1432 } else if (!strcmp(arg
, "--left-only")) {
1433 if (revs
->right_only
)
1434 die("--left-only is incompatible with --right-only"
1436 revs
->left_only
= 1;
1437 } else if (!strcmp(arg
, "--right-only")) {
1438 if (revs
->left_only
)
1439 die("--right-only is incompatible with --left-only");
1440 revs
->right_only
= 1;
1441 } else if (!strcmp(arg
, "--cherry")) {
1442 if (revs
->left_only
)
1443 die("--cherry is incompatible with --left-only");
1444 revs
->cherry_mark
= 1;
1445 revs
->right_only
= 1;
1446 revs
->max_parents
= 1;
1448 } else if (!strcmp(arg
, "--count")) {
1450 } else if (!strcmp(arg
, "--cherry-mark")) {
1451 if (revs
->cherry_pick
)
1452 die("--cherry-mark is incompatible with --cherry-pick");
1453 revs
->cherry_mark
= 1;
1454 revs
->limited
= 1; /* needs limit_list() */
1455 } else if (!strcmp(arg
, "--cherry-pick")) {
1456 if (revs
->cherry_mark
)
1457 die("--cherry-pick is incompatible with --cherry-mark");
1458 revs
->cherry_pick
= 1;
1460 } else if (!strcmp(arg
, "--objects")) {
1461 revs
->tag_objects
= 1;
1462 revs
->tree_objects
= 1;
1463 revs
->blob_objects
= 1;
1464 } else if (!strcmp(arg
, "--objects-edge")) {
1465 revs
->tag_objects
= 1;
1466 revs
->tree_objects
= 1;
1467 revs
->blob_objects
= 1;
1468 revs
->edge_hint
= 1;
1469 } else if (!strcmp(arg
, "--verify-objects")) {
1470 revs
->tag_objects
= 1;
1471 revs
->tree_objects
= 1;
1472 revs
->blob_objects
= 1;
1473 revs
->verify_objects
= 1;
1474 } else if (!strcmp(arg
, "--unpacked")) {
1476 } else if (!prefixcmp(arg
, "--unpacked=")) {
1477 die("--unpacked=<packfile> no longer supported.");
1478 } else if (!strcmp(arg
, "-r")) {
1480 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1481 } else if (!strcmp(arg
, "-t")) {
1483 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1484 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1485 } else if (!strcmp(arg
, "-m")) {
1486 revs
->ignore_merges
= 0;
1487 } else if (!strcmp(arg
, "-c")) {
1489 revs
->dense_combined_merges
= 0;
1490 revs
->combine_merges
= 1;
1491 } else if (!strcmp(arg
, "--cc")) {
1493 revs
->dense_combined_merges
= 1;
1494 revs
->combine_merges
= 1;
1495 } else if (!strcmp(arg
, "-v")) {
1496 revs
->verbose_header
= 1;
1497 } else if (!strcmp(arg
, "--pretty")) {
1498 revs
->verbose_header
= 1;
1499 revs
->pretty_given
= 1;
1500 get_commit_format(arg
+8, revs
);
1501 } else if (!prefixcmp(arg
, "--pretty=") || !prefixcmp(arg
, "--format=")) {
1503 * Detached form ("--pretty X" as opposed to "--pretty=X")
1504 * not allowed, since the argument is optional.
1506 revs
->verbose_header
= 1;
1507 revs
->pretty_given
= 1;
1508 get_commit_format(arg
+9, revs
);
1509 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
1510 revs
->show_notes
= 1;
1511 revs
->show_notes_given
= 1;
1512 revs
->notes_opt
.use_default_notes
= 1;
1513 } else if (!strcmp(arg
, "--show-signature")) {
1514 revs
->show_signature
= 1;
1515 } else if (!prefixcmp(arg
, "--show-notes=") ||
1516 !prefixcmp(arg
, "--notes=")) {
1517 struct strbuf buf
= STRBUF_INIT
;
1518 revs
->show_notes
= 1;
1519 revs
->show_notes_given
= 1;
1520 if (!prefixcmp(arg
, "--show-notes")) {
1521 if (revs
->notes_opt
.use_default_notes
< 0)
1522 revs
->notes_opt
.use_default_notes
= 1;
1523 strbuf_addstr(&buf
, arg
+13);
1526 strbuf_addstr(&buf
, arg
+8);
1527 expand_notes_ref(&buf
);
1528 string_list_append(&revs
->notes_opt
.extra_notes_refs
,
1529 strbuf_detach(&buf
, NULL
));
1530 } else if (!strcmp(arg
, "--no-notes")) {
1531 revs
->show_notes
= 0;
1532 revs
->show_notes_given
= 1;
1533 revs
->notes_opt
.use_default_notes
= -1;
1534 /* we have been strdup'ing ourselves, so trick
1535 * string_list into free()ing strings */
1536 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 1;
1537 string_list_clear(&revs
->notes_opt
.extra_notes_refs
, 0);
1538 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 0;
1539 } else if (!strcmp(arg
, "--standard-notes")) {
1540 revs
->show_notes_given
= 1;
1541 revs
->notes_opt
.use_default_notes
= 1;
1542 } else if (!strcmp(arg
, "--no-standard-notes")) {
1543 revs
->notes_opt
.use_default_notes
= 0;
1544 } else if (!strcmp(arg
, "--oneline")) {
1545 revs
->verbose_header
= 1;
1546 get_commit_format("oneline", revs
);
1547 revs
->pretty_given
= 1;
1548 revs
->abbrev_commit
= 1;
1549 } else if (!strcmp(arg
, "--graph")) {
1550 revs
->topo_order
= 1;
1551 revs
->rewrite_parents
= 1;
1552 revs
->graph
= graph_init(revs
);
1553 } else if (!strcmp(arg
, "--root")) {
1554 revs
->show_root_diff
= 1;
1555 } else if (!strcmp(arg
, "--no-commit-id")) {
1556 revs
->no_commit_id
= 1;
1557 } else if (!strcmp(arg
, "--always")) {
1558 revs
->always_show_header
= 1;
1559 } else if (!strcmp(arg
, "--no-abbrev")) {
1561 } else if (!strcmp(arg
, "--abbrev")) {
1562 revs
->abbrev
= DEFAULT_ABBREV
;
1563 } else if (!prefixcmp(arg
, "--abbrev=")) {
1564 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1565 if (revs
->abbrev
< MINIMUM_ABBREV
)
1566 revs
->abbrev
= MINIMUM_ABBREV
;
1567 else if (revs
->abbrev
> 40)
1569 } else if (!strcmp(arg
, "--abbrev-commit")) {
1570 revs
->abbrev_commit
= 1;
1571 revs
->abbrev_commit_given
= 1;
1572 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
1573 revs
->abbrev_commit
= 0;
1574 } else if (!strcmp(arg
, "--full-diff")) {
1576 revs
->full_diff
= 1;
1577 } else if (!strcmp(arg
, "--full-history")) {
1578 revs
->simplify_history
= 0;
1579 } else if (!strcmp(arg
, "--relative-date")) {
1580 revs
->date_mode
= DATE_RELATIVE
;
1581 revs
->date_mode_explicit
= 1;
1582 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
1583 revs
->date_mode
= parse_date_format(optarg
);
1584 revs
->date_mode_explicit
= 1;
1586 } else if (!strcmp(arg
, "--log-size")) {
1587 revs
->show_log_size
= 1;
1590 * Grepping the commit log
1592 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
1593 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
1595 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
1596 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
1598 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
1599 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
1601 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
1602 add_message_grep(revs
, optarg
);
1604 } else if (!strcmp(arg
, "--grep-debug")) {
1605 revs
->grep_filter
.debug
= 1;
1606 } else if (!strcmp(arg
, "--basic-regexp")) {
1607 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE
, &revs
->grep_filter
);
1608 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
1609 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE
, &revs
->grep_filter
);
1610 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
1611 revs
->grep_filter
.regflags
|= REG_ICASE
;
1612 DIFF_OPT_SET(&revs
->diffopt
, PICKAXE_IGNORE_CASE
);
1613 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
1614 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED
, &revs
->grep_filter
);
1615 } else if (!strcmp(arg
, "--perl-regexp")) {
1616 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE
, &revs
->grep_filter
);
1617 } else if (!strcmp(arg
, "--all-match")) {
1618 revs
->grep_filter
.all_match
= 1;
1619 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
1620 if (strcmp(optarg
, "none"))
1621 git_log_output_encoding
= xstrdup(optarg
);
1623 git_log_output_encoding
= "";
1625 } else if (!strcmp(arg
, "--reverse")) {
1627 } else if (!strcmp(arg
, "--children")) {
1628 revs
->children
.name
= "children";
1630 } else if (!strcmp(arg
, "--ignore-missing")) {
1631 revs
->ignore_missing
= 1;
1633 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
);
1635 unkv
[(*unkc
)++] = arg
;
1642 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
1643 const struct option
*options
,
1644 const char * const usagestr
[])
1646 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
1647 &ctx
->cpidx
, ctx
->out
);
1649 error("unknown option `%s'", ctx
->argv
[0]);
1650 usage_with_options(usagestr
, options
);
1656 static int for_each_bad_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
1658 return for_each_ref_in_submodule(submodule
, "refs/bisect/bad", fn
, cb_data
);
1661 static int for_each_good_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
1663 return for_each_ref_in_submodule(submodule
, "refs/bisect/good", fn
, cb_data
);
1666 static int handle_revision_pseudo_opt(const char *submodule
,
1667 struct rev_info
*revs
,
1668 int argc
, const char **argv
, int *flags
)
1670 const char *arg
= argv
[0];
1677 * Commands like "git shortlog" will not accept the options below
1678 * unless parse_revision_opt queues them (as opposed to erroring
1681 * When implementing your new pseudo-option, remember to
1682 * register it in the list at the top of handle_revision_opt.
1684 if (!strcmp(arg
, "--all")) {
1685 handle_refs(submodule
, revs
, *flags
, for_each_ref_submodule
);
1686 handle_refs(submodule
, revs
, *flags
, head_ref_submodule
);
1687 } else if (!strcmp(arg
, "--branches")) {
1688 handle_refs(submodule
, revs
, *flags
, for_each_branch_ref_submodule
);
1689 } else if (!strcmp(arg
, "--bisect")) {
1690 handle_refs(submodule
, revs
, *flags
, for_each_bad_bisect_ref
);
1691 handle_refs(submodule
, revs
, *flags
^ UNINTERESTING
, for_each_good_bisect_ref
);
1693 } else if (!strcmp(arg
, "--tags")) {
1694 handle_refs(submodule
, revs
, *flags
, for_each_tag_ref_submodule
);
1695 } else if (!strcmp(arg
, "--remotes")) {
1696 handle_refs(submodule
, revs
, *flags
, for_each_remote_ref_submodule
);
1697 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
1698 struct all_refs_cb cb
;
1699 init_all_refs_cb(&cb
, revs
, *flags
);
1700 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
1702 } else if (!prefixcmp(arg
, "--branches=")) {
1703 struct all_refs_cb cb
;
1704 init_all_refs_cb(&cb
, revs
, *flags
);
1705 for_each_glob_ref_in(handle_one_ref
, arg
+ 11, "refs/heads/", &cb
);
1706 } else if (!prefixcmp(arg
, "--tags=")) {
1707 struct all_refs_cb cb
;
1708 init_all_refs_cb(&cb
, revs
, *flags
);
1709 for_each_glob_ref_in(handle_one_ref
, arg
+ 7, "refs/tags/", &cb
);
1710 } else if (!prefixcmp(arg
, "--remotes=")) {
1711 struct all_refs_cb cb
;
1712 init_all_refs_cb(&cb
, revs
, *flags
);
1713 for_each_glob_ref_in(handle_one_ref
, arg
+ 10, "refs/remotes/", &cb
);
1714 } else if (!strcmp(arg
, "--reflog")) {
1715 handle_reflog(revs
, *flags
);
1716 } else if (!strcmp(arg
, "--not")) {
1717 *flags
^= UNINTERESTING
;
1718 } else if (!strcmp(arg
, "--no-walk")) {
1719 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
1720 } else if (!prefixcmp(arg
, "--no-walk=")) {
1722 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
1723 * not allowed, since the argument is optional.
1725 if (!strcmp(arg
+ 10, "sorted"))
1726 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
1727 else if (!strcmp(arg
+ 10, "unsorted"))
1728 revs
->no_walk
= REVISION_WALK_NO_WALK_UNSORTED
;
1730 return error("invalid argument to --no-walk");
1731 } else if (!strcmp(arg
, "--do-walk")) {
1741 * Parse revision information, filling in the "rev_info" structure,
1742 * and removing the used arguments from the argument list.
1744 * Returns the number of arguments left that weren't recognized
1745 * (which are also moved to the head of the argument list)
1747 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
1749 int i
, flags
, left
, seen_dashdash
, read_from_stdin
, got_rev_arg
= 0, revarg_opt
;
1750 struct cmdline_pathspec prune_data
;
1751 const char *submodule
= NULL
;
1753 memset(&prune_data
, 0, sizeof(prune_data
));
1755 submodule
= opt
->submodule
;
1757 /* First, search for "--" */
1758 if (opt
&& opt
->assume_dashdash
) {
1762 for (i
= 1; i
< argc
; i
++) {
1763 const char *arg
= argv
[i
];
1764 if (strcmp(arg
, "--"))
1769 append_prune_data(&prune_data
, argv
+ i
+ 1);
1775 /* Second, deal with arguments and options */
1777 revarg_opt
= opt
? opt
->revarg_opt
: 0;
1779 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
1780 read_from_stdin
= 0;
1781 for (left
= i
= 1; i
< argc
; i
++) {
1782 const char *arg
= argv
[i
];
1786 opts
= handle_revision_pseudo_opt(submodule
,
1787 revs
, argc
- i
, argv
+ i
,
1794 if (!strcmp(arg
, "--stdin")) {
1795 if (revs
->disable_stdin
) {
1799 if (read_from_stdin
++)
1800 die("--stdin given twice?");
1801 read_revisions_from_stdin(revs
, &prune_data
);
1805 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
1816 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
1818 if (seen_dashdash
|| *arg
== '^')
1819 die("bad revision '%s'", arg
);
1821 /* If we didn't have a "--":
1822 * (1) all filenames must exist;
1823 * (2) all rev-args must not be interpretable
1824 * as a valid filename.
1825 * but the latter we have checked in the main loop.
1827 for (j
= i
; j
< argc
; j
++)
1828 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
1830 append_prune_data(&prune_data
, argv
+ i
);
1837 if (prune_data
.nr
) {
1839 * If we need to introduce the magic "a lone ':' means no
1840 * pathspec whatsoever", here is the place to do so.
1842 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
1843 * prune_data.nr = 0;
1844 * prune_data.alloc = 0;
1845 * free(prune_data.path);
1846 * prune_data.path = NULL;
1848 * terminate prune_data.alloc with NULL and
1849 * call init_pathspec() to set revs->prune_data here.
1852 ALLOC_GROW(prune_data
.path
, prune_data
.nr
+1, prune_data
.alloc
);
1853 prune_data
.path
[prune_data
.nr
++] = NULL
;
1854 init_pathspec(&revs
->prune_data
,
1855 get_pathspec(revs
->prefix
, prune_data
.path
));
1858 if (revs
->def
== NULL
)
1859 revs
->def
= opt
? opt
->def
: NULL
;
1860 if (opt
&& opt
->tweak
)
1861 opt
->tweak(revs
, opt
);
1862 if (revs
->show_merge
)
1863 prepare_show_merge(revs
);
1864 if (revs
->def
&& !revs
->pending
.nr
&& !got_rev_arg
) {
1865 unsigned char sha1
[20];
1866 struct object
*object
;
1867 struct object_context oc
;
1868 if (get_sha1_with_context(revs
->def
, 0, sha1
, &oc
))
1869 die("bad default revision '%s'", revs
->def
);
1870 object
= get_reference(revs
, revs
->def
, sha1
, 0);
1871 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
);
1874 /* Did the user ask for any diff output? Run the diff! */
1875 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
1878 /* Pickaxe, diff-filter and rename following need diffs */
1879 if (revs
->diffopt
.pickaxe
||
1880 revs
->diffopt
.filter
||
1881 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1884 if (revs
->topo_order
)
1887 if (revs
->prune_data
.nr
) {
1888 diff_tree_setup_paths(revs
->prune_data
.raw
, &revs
->pruning
);
1889 /* Can't prune commits with rename following: the paths change.. */
1890 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1892 if (!revs
->full_diff
)
1893 diff_tree_setup_paths(revs
->prune_data
.raw
, &revs
->diffopt
);
1895 if (revs
->combine_merges
)
1896 revs
->ignore_merges
= 0;
1897 revs
->diffopt
.abbrev
= revs
->abbrev
;
1898 diff_setup_done(&revs
->diffopt
);
1900 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED
,
1901 &revs
->grep_filter
);
1902 compile_grep_patterns(&revs
->grep_filter
);
1904 if (revs
->reverse
&& revs
->reflog_info
)
1905 die("cannot combine --reverse with --walk-reflogs");
1906 if (revs
->rewrite_parents
&& revs
->children
.name
)
1907 die("cannot combine --parents and --children");
1910 * Limitations on the graph functionality
1912 if (revs
->reverse
&& revs
->graph
)
1913 die("cannot combine --reverse with --graph");
1915 if (revs
->reflog_info
&& revs
->graph
)
1916 die("cannot combine --walk-reflogs with --graph");
1917 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
1918 die("cannot use --grep-reflog without --walk-reflogs");
1923 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
1925 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
1928 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
1931 static int remove_duplicate_parents(struct commit
*commit
)
1933 struct commit_list
**pp
, *p
;
1934 int surviving_parents
;
1936 /* Examine existing parents while marking ones we have seen... */
1937 pp
= &commit
->parents
;
1938 while ((p
= *pp
) != NULL
) {
1939 struct commit
*parent
= p
->item
;
1940 if (parent
->object
.flags
& TMP_MARK
) {
1944 parent
->object
.flags
|= TMP_MARK
;
1947 /* count them while clearing the temporary mark */
1948 surviving_parents
= 0;
1949 for (p
= commit
->parents
; p
; p
= p
->next
) {
1950 p
->item
->object
.flags
&= ~TMP_MARK
;
1951 surviving_parents
++;
1953 return surviving_parents
;
1956 struct merge_simplify_state
{
1957 struct commit
*simplified
;
1960 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
1962 struct merge_simplify_state
*st
;
1964 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
1966 st
= xcalloc(1, sizeof(*st
));
1967 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
1972 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
1974 struct commit_list
*p
;
1975 struct merge_simplify_state
*st
, *pst
;
1978 st
= locate_simplify_state(revs
, commit
);
1981 * Have we handled this one?
1987 * An UNINTERESTING commit simplifies to itself, so does a
1988 * root commit. We do not rewrite parents of such commit
1991 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
1992 st
->simplified
= commit
;
1997 * Do we know what commit all of our parents that matter
1998 * should be rewritten to? Otherwise we are not ready to
1999 * rewrite this one yet.
2001 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
2002 pst
= locate_simplify_state(revs
, p
->item
);
2003 if (!pst
->simplified
) {
2004 tail
= &commit_list_insert(p
->item
, tail
)->next
;
2007 if (revs
->first_parent_only
)
2011 tail
= &commit_list_insert(commit
, tail
)->next
;
2016 * Rewrite our list of parents.
2018 for (p
= commit
->parents
; p
; p
= p
->next
) {
2019 pst
= locate_simplify_state(revs
, p
->item
);
2020 p
->item
= pst
->simplified
;
2021 if (revs
->first_parent_only
)
2024 if (!revs
->first_parent_only
)
2025 cnt
= remove_duplicate_parents(commit
);
2030 * It is possible that we are a merge and one side branch
2031 * does not have any commit that touches the given paths;
2032 * in such a case, the immediate parents will be rewritten
2033 * to different commits.
2035 * o----X X: the commit we are looking at;
2036 * / / o: a commit that touches the paths;
2039 * Further reduce the parents by removing redundant parents.
2042 struct commit_list
*h
= reduce_heads(commit
->parents
);
2043 cnt
= commit_list_count(h
);
2044 free_commit_list(commit
->parents
);
2045 commit
->parents
= h
;
2049 * A commit simplifies to itself if it is a root, if it is
2050 * UNINTERESTING, if it touches the given paths, or if it is a
2051 * merge and its parents simplifies to more than one commits
2052 * (the first two cases are already handled at the beginning of
2055 * Otherwise, it simplifies to what its sole parent simplifies to.
2058 (commit
->object
.flags
& UNINTERESTING
) ||
2059 !(commit
->object
.flags
& TREESAME
) ||
2061 st
->simplified
= commit
;
2063 pst
= locate_simplify_state(revs
, commit
->parents
->item
);
2064 st
->simplified
= pst
->simplified
;
2069 static void simplify_merges(struct rev_info
*revs
)
2071 struct commit_list
*list
, *next
;
2072 struct commit_list
*yet_to_do
, **tail
;
2073 struct commit
*commit
;
2078 /* feed the list reversed */
2080 for (list
= revs
->commits
; list
; list
= next
) {
2081 commit
= list
->item
;
2084 * Do not free(list) here yet; the original list
2085 * is used later in this function.
2087 commit_list_insert(commit
, &yet_to_do
);
2094 commit
= list
->item
;
2098 tail
= simplify_one(revs
, commit
, tail
);
2102 /* clean up the result, removing the simplified ones */
2103 list
= revs
->commits
;
2104 revs
->commits
= NULL
;
2105 tail
= &revs
->commits
;
2107 struct merge_simplify_state
*st
;
2109 commit
= list
->item
;
2113 st
= locate_simplify_state(revs
, commit
);
2114 if (st
->simplified
== commit
)
2115 tail
= &commit_list_insert(commit
, tail
)->next
;
2119 static void set_children(struct rev_info
*revs
)
2121 struct commit_list
*l
;
2122 for (l
= revs
->commits
; l
; l
= l
->next
) {
2123 struct commit
*commit
= l
->item
;
2124 struct commit_list
*p
;
2126 for (p
= commit
->parents
; p
; p
= p
->next
)
2127 add_child(revs
, p
->item
, commit
);
2131 void reset_revision_walk(void)
2133 clear_object_flags(SEEN
| ADDED
| SHOWN
);
2136 int prepare_revision_walk(struct rev_info
*revs
)
2138 int nr
= revs
->pending
.nr
;
2139 struct object_array_entry
*e
, *list
;
2140 struct commit_list
**next
= &revs
->commits
;
2142 e
= list
= revs
->pending
.objects
;
2143 revs
->pending
.nr
= 0;
2144 revs
->pending
.alloc
= 0;
2145 revs
->pending
.objects
= NULL
;
2147 struct commit
*commit
= handle_commit(revs
, e
->item
, e
->name
);
2149 if (!(commit
->object
.flags
& SEEN
)) {
2150 commit
->object
.flags
|= SEEN
;
2151 next
= commit_list_append(commit
, next
);
2156 if (!revs
->leak_pending
)
2159 if (revs
->no_walk
!= REVISION_WALK_NO_WALK_UNSORTED
)
2160 commit_list_sort_by_date(&revs
->commits
);
2164 if (limit_list(revs
) < 0)
2166 if (revs
->topo_order
)
2167 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
2168 if (revs
->simplify_merges
)
2169 simplify_merges(revs
);
2170 if (revs
->children
.name
)
2175 enum rewrite_result
{
2177 rewrite_one_noparents
,
2181 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
2183 struct commit_list
*cache
= NULL
;
2186 struct commit
*p
= *pp
;
2188 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
2189 return rewrite_one_error
;
2190 if (p
->parents
&& p
->parents
->next
)
2191 return rewrite_one_ok
;
2192 if (p
->object
.flags
& UNINTERESTING
)
2193 return rewrite_one_ok
;
2194 if (!(p
->object
.flags
& TREESAME
))
2195 return rewrite_one_ok
;
2197 return rewrite_one_noparents
;
2198 *pp
= p
->parents
->item
;
2202 static int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
)
2204 struct commit_list
**pp
= &commit
->parents
;
2206 struct commit_list
*parent
= *pp
;
2207 switch (rewrite_one(revs
, &parent
->item
)) {
2208 case rewrite_one_ok
:
2210 case rewrite_one_noparents
:
2213 case rewrite_one_error
:
2218 remove_duplicate_parents(commit
);
2222 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
2225 struct strbuf buf
= STRBUF_INIT
;
2226 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
2229 /* Prepend "fake" headers as needed */
2230 if (opt
->grep_filter
.use_reflog_filter
) {
2231 strbuf_addstr(&buf
, "reflog ");
2232 get_reflog_message(&buf
, opt
->reflog_info
);
2233 strbuf_addch(&buf
, '\n');
2236 /* Copy the commit to temporary if we are using "fake" headers */
2238 strbuf_addstr(&buf
, commit
->buffer
);
2240 /* Append "fake" message parts as needed */
2241 if (opt
->show_notes
) {
2243 strbuf_addstr(&buf
, commit
->buffer
);
2244 format_display_notes(commit
->object
.sha1
, &buf
,
2245 get_log_output_encoding(), 1);
2248 /* Find either in the commit object, or in the temporary */
2250 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
2252 retval
= grep_buffer(&opt
->grep_filter
,
2253 commit
->buffer
, strlen(commit
->buffer
));
2254 strbuf_release(&buf
);
2258 static inline int want_ancestry(struct rev_info
*revs
)
2260 return (revs
->rewrite_parents
|| revs
->children
.name
);
2263 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
2265 if (commit
->object
.flags
& SHOWN
)
2266 return commit_ignore
;
2267 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
))
2268 return commit_ignore
;
2271 if (commit
->object
.flags
& UNINTERESTING
)
2272 return commit_ignore
;
2273 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
2274 return commit_ignore
;
2275 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
2277 struct commit_list
*p
;
2278 for (p
= commit
->parents
; p
; p
= p
->next
)
2280 if ((n
< revs
->min_parents
) ||
2281 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
2282 return commit_ignore
;
2284 if (!commit_match(commit
, revs
))
2285 return commit_ignore
;
2286 if (revs
->prune
&& revs
->dense
) {
2287 /* Commit without changes? */
2288 if (commit
->object
.flags
& TREESAME
) {
2289 /* drop merges unless we want parenthood */
2290 if (!want_ancestry(revs
))
2291 return commit_ignore
;
2292 /* non-merge - always ignore it */
2293 if (!commit
->parents
|| !commit
->parents
->next
)
2294 return commit_ignore
;
2300 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
2302 enum commit_action action
= get_commit_action(revs
, commit
);
2304 if (action
== commit_show
&&
2306 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
2307 if (rewrite_parents(revs
, commit
) < 0)
2308 return commit_error
;
2313 static struct commit
*get_revision_1(struct rev_info
*revs
)
2319 struct commit_list
*entry
= revs
->commits
;
2320 struct commit
*commit
= entry
->item
;
2322 revs
->commits
= entry
->next
;
2325 if (revs
->reflog_info
) {
2326 fake_reflog_parent(revs
->reflog_info
, commit
);
2327 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
2331 * If we haven't done the list limiting, we need to look at
2332 * the parents here. We also need to do the date-based limiting
2333 * that we'd otherwise have done in limit_list().
2335 if (!revs
->limited
) {
2336 if (revs
->max_age
!= -1 &&
2337 (commit
->date
< revs
->max_age
))
2339 if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0)
2340 die("Failed to traverse parents of commit %s",
2341 sha1_to_hex(commit
->object
.sha1
));
2344 switch (simplify_commit(revs
, commit
)) {
2348 die("Failed to simplify parents of commit %s",
2349 sha1_to_hex(commit
->object
.sha1
));
2353 } while (revs
->commits
);
2357 static void gc_boundary(struct object_array
*array
)
2359 unsigned nr
= array
->nr
;
2360 unsigned alloc
= array
->alloc
;
2361 struct object_array_entry
*objects
= array
->objects
;
2365 for (i
= j
= 0; i
< nr
; i
++) {
2366 if (objects
[i
].item
->flags
& SHOWN
)
2369 objects
[j
] = objects
[i
];
2372 for (i
= j
; i
< nr
; i
++)
2373 objects
[i
].item
= NULL
;
2378 static void create_boundary_commit_list(struct rev_info
*revs
)
2382 struct object_array
*array
= &revs
->boundary_commits
;
2383 struct object_array_entry
*objects
= array
->objects
;
2386 * If revs->commits is non-NULL at this point, an error occurred in
2387 * get_revision_1(). Ignore the error and continue printing the
2388 * boundary commits anyway. (This is what the code has always
2391 if (revs
->commits
) {
2392 free_commit_list(revs
->commits
);
2393 revs
->commits
= NULL
;
2397 * Put all of the actual boundary commits from revs->boundary_commits
2398 * into revs->commits
2400 for (i
= 0; i
< array
->nr
; i
++) {
2401 c
= (struct commit
*)(objects
[i
].item
);
2404 if (!(c
->object
.flags
& CHILD_SHOWN
))
2406 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
2408 c
->object
.flags
|= BOUNDARY
;
2409 commit_list_insert(c
, &revs
->commits
);
2413 * If revs->topo_order is set, sort the boundary commits
2414 * in topological order
2416 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
2419 static struct commit
*get_revision_internal(struct rev_info
*revs
)
2421 struct commit
*c
= NULL
;
2422 struct commit_list
*l
;
2424 if (revs
->boundary
== 2) {
2426 * All of the normal commits have already been returned,
2427 * and we are now returning boundary commits.
2428 * create_boundary_commit_list() has populated
2429 * revs->commits with the remaining commits to return.
2431 c
= pop_commit(&revs
->commits
);
2433 c
->object
.flags
|= SHOWN
;
2438 * If our max_count counter has reached zero, then we are done. We
2439 * don't simply return NULL because we still might need to show
2440 * boundary commits. But we want to avoid calling get_revision_1, which
2441 * might do a considerable amount of work finding the next commit only
2442 * for us to throw it away.
2444 * If it is non-zero, then either we don't have a max_count at all
2445 * (-1), or it is still counting, in which case we decrement.
2447 if (revs
->max_count
) {
2448 c
= get_revision_1(revs
);
2450 while (0 < revs
->skip_count
) {
2452 c
= get_revision_1(revs
);
2458 if (revs
->max_count
> 0)
2463 c
->object
.flags
|= SHOWN
;
2465 if (!revs
->boundary
) {
2471 * get_revision_1() runs out the commits, and
2472 * we are done computing the boundaries.
2473 * switch to boundary commits output mode.
2478 * Update revs->commits to contain the list of
2481 create_boundary_commit_list(revs
);
2483 return get_revision_internal(revs
);
2487 * boundary commits are the commits that are parents of the
2488 * ones we got from get_revision_1() but they themselves are
2489 * not returned from get_revision_1(). Before returning
2490 * 'c', we need to mark its parents that they could be boundaries.
2493 for (l
= c
->parents
; l
; l
= l
->next
) {
2495 p
= &(l
->item
->object
);
2496 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
2498 p
->flags
|= CHILD_SHOWN
;
2499 gc_boundary(&revs
->boundary_commits
);
2500 add_object_array(p
, NULL
, &revs
->boundary_commits
);
2506 struct commit
*get_revision(struct rev_info
*revs
)
2509 struct commit_list
*reversed
;
2511 if (revs
->reverse
) {
2513 while ((c
= get_revision_internal(revs
))) {
2514 commit_list_insert(c
, &reversed
);
2516 revs
->commits
= reversed
;
2518 revs
->reverse_output_stage
= 1;
2521 if (revs
->reverse_output_stage
)
2522 return pop_commit(&revs
->commits
);
2524 c
= get_revision_internal(revs
);
2525 if (c
&& revs
->graph
)
2526 graph_update(revs
->graph
, c
);
2530 char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
2532 if (commit
->object
.flags
& BOUNDARY
)
2534 else if (commit
->object
.flags
& UNINTERESTING
)
2536 else if (commit
->object
.flags
& PATCHSAME
)
2538 else if (!revs
|| revs
->left_right
) {
2539 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
2543 } else if (revs
->graph
)
2545 else if (revs
->cherry_mark
)
2550 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
2552 char *mark
= get_revision_mark(revs
, commit
);
2555 fputs(mark
, stdout
);