11 #include "reflog-walk.h"
12 #include "patch-ids.h"
15 #include "string-list.h"
18 volatile show_early_output_fn_t show_early_output
;
20 char *path_name(const struct name_path
*path
, const char *name
)
22 const struct name_path
*p
;
24 int nlen
= strlen(name
);
27 for (p
= path
; p
; p
= p
->up
) {
29 len
+= p
->elem_len
+ 1;
32 m
= n
+ len
- (nlen
+ 1);
34 for (p
= path
; p
; p
= p
->up
) {
37 memcpy(m
, p
->elem
, p
->elem_len
);
44 static int show_path_component_truncated(FILE *out
, const char *name
, int len
)
47 for (cnt
= 0; cnt
< len
; cnt
++) {
49 if (!ch
|| ch
== '\n')
56 static int show_path_truncated(FILE *out
, const struct name_path
*path
)
62 emitted
= show_path_truncated(out
, path
->up
);
67 ours
= show_path_component_truncated(out
, path
->elem
, path
->elem_len
);
70 return ours
|| emitted
;
73 void show_object_with_name(FILE *out
, struct object
*obj
, const struct name_path
*path
, const char *component
)
75 struct name_path leaf
;
76 leaf
.up
= (struct name_path
*)path
;
77 leaf
.elem
= component
;
78 leaf
.elem_len
= strlen(component
);
80 fprintf(out
, "%s ", sha1_to_hex(obj
->sha1
));
81 show_path_truncated(out
, &leaf
);
85 void add_object(struct object
*obj
,
86 struct object_array
*p
,
87 struct name_path
*path
,
90 add_object_array(obj
, path_name(path
, name
), p
);
93 static void mark_blob_uninteresting(struct blob
*blob
)
97 if (blob
->object
.flags
& UNINTERESTING
)
99 blob
->object
.flags
|= UNINTERESTING
;
102 void mark_tree_uninteresting(struct tree
*tree
)
104 struct tree_desc desc
;
105 struct name_entry entry
;
106 struct object
*obj
= &tree
->object
;
110 if (obj
->flags
& UNINTERESTING
)
112 obj
->flags
|= UNINTERESTING
;
113 if (!has_sha1_file(obj
->sha1
))
115 if (parse_tree(tree
) < 0)
116 die("bad tree %s", sha1_to_hex(obj
->sha1
));
118 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
119 while (tree_entry(&desc
, &entry
)) {
120 switch (object_type(entry
.mode
)) {
122 mark_tree_uninteresting(lookup_tree(entry
.sha1
));
125 mark_blob_uninteresting(lookup_blob(entry
.sha1
));
128 /* Subproject commit - not in this repository */
134 * We don't care about the tree any more
135 * after it has been marked uninteresting.
141 void mark_parents_uninteresting(struct commit
*commit
)
143 struct commit_list
*parents
= NULL
, *l
;
145 for (l
= commit
->parents
; l
; l
= l
->next
)
146 commit_list_insert(l
->item
, &parents
);
149 struct commit
*commit
= parents
->item
;
151 parents
= parents
->next
;
156 * A missing commit is ok iff its parent is marked
159 * We just mark such a thing parsed, so that when
160 * it is popped next time around, we won't be trying
161 * to parse it and get an error.
163 if (!has_sha1_file(commit
->object
.sha1
))
164 commit
->object
.parsed
= 1;
166 if (commit
->object
.flags
& UNINTERESTING
)
169 commit
->object
.flags
|= UNINTERESTING
;
172 * Normally we haven't parsed the parent
173 * yet, so we won't have a parent of a parent
174 * here. However, it may turn out that we've
175 * reached this commit some other way (where it
176 * wasn't uninteresting), in which case we need
177 * to mark its parents recursively too..
179 if (!commit
->parents
)
182 for (l
= commit
->parents
->next
; l
; l
= l
->next
)
183 commit_list_insert(l
->item
, &parents
);
184 commit
= commit
->parents
->item
;
189 static void add_pending_object_with_mode(struct rev_info
*revs
, struct object
*obj
, const char *name
, unsigned mode
, unsigned flags
)
193 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
195 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
196 struct strbuf buf
= STRBUF_INIT
;
197 int len
= interpret_branch_name(name
, &buf
);
200 if (0 < len
&& name
[len
] && buf
.len
)
201 strbuf_addstr(&buf
, name
+ len
);
202 st
= add_reflog_for_walk(revs
->reflog_info
,
203 (struct commit
*)obj
,
204 buf
.buf
[0] ? buf
.buf
: name
);
205 strbuf_release(&buf
);
209 add_object_array_with_mode(obj
, name
, &revs
->pending
, mode
);
210 revs
->pending
.objects
[revs
->pending
.nr
-1].flags
= flags
;
213 void add_pending_object(struct rev_info
*revs
, struct object
*obj
, const char *name
)
215 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
, 0);
218 void add_head_to_pending(struct rev_info
*revs
)
220 unsigned char sha1
[20];
222 if (get_sha1("HEAD", sha1
))
224 obj
= parse_object(sha1
);
227 add_pending_object(revs
, obj
, "HEAD");
230 static struct object
*get_reference(struct rev_info
*revs
, const char *name
, const unsigned char *sha1
, unsigned int flags
)
232 struct object
*object
;
234 object
= parse_object(sha1
);
236 if (revs
->ignore_missing
)
238 die("bad object %s", name
);
240 object
->flags
|= flags
;
244 void add_pending_sha1(struct rev_info
*revs
, const char *name
,
245 const unsigned char *sha1
, unsigned int flags
)
247 struct object
*object
= get_reference(revs
, name
, sha1
, flags
);
248 add_pending_object(revs
, object
, name
);
251 static struct commit
*handle_commit(struct rev_info
*revs
, struct object
*object
, const char *name
)
253 unsigned long flags
= object
->flags
;
256 * Tag object? Look what it points to..
258 while (object
->type
== OBJ_TAG
) {
259 struct tag
*tag
= (struct tag
*) object
;
260 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
261 add_pending_object(revs
, object
, tag
->tag
);
264 object
= parse_object(tag
->tagged
->sha1
);
266 if (flags
& UNINTERESTING
)
268 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
273 * Commit object? Just return it, we'll do all the complex
276 if (object
->type
== OBJ_COMMIT
) {
277 struct commit
*commit
= (struct commit
*)object
;
278 if (parse_commit(commit
) < 0)
279 die("unable to parse commit %s", name
);
280 if (flags
& UNINTERESTING
) {
281 commit
->object
.flags
|= UNINTERESTING
;
282 mark_parents_uninteresting(commit
);
285 if (revs
->show_source
&& !commit
->util
)
286 commit
->util
= (void *) name
;
291 * Tree object? Either mark it uninteresting, or add it
292 * to the list of objects to look at later..
294 if (object
->type
== OBJ_TREE
) {
295 struct tree
*tree
= (struct tree
*)object
;
296 if (!revs
->tree_objects
)
298 if (flags
& UNINTERESTING
) {
299 mark_tree_uninteresting(tree
);
302 add_pending_object(revs
, object
, "");
307 * Blob object? You know the drill by now..
309 if (object
->type
== OBJ_BLOB
) {
310 struct blob
*blob
= (struct blob
*)object
;
311 if (!revs
->blob_objects
)
313 if (flags
& UNINTERESTING
) {
314 mark_blob_uninteresting(blob
);
317 add_pending_object(revs
, object
, "");
320 die("%s is unknown object", name
);
323 static int everybody_uninteresting(struct commit_list
*orig
)
325 struct commit_list
*list
= orig
;
327 struct commit
*commit
= list
->item
;
329 if (commit
->object
.flags
& UNINTERESTING
)
337 * The goal is to get REV_TREE_NEW as the result only if the
338 * diff consists of all '+' (and no other changes), REV_TREE_OLD
339 * if the whole diff is removal of old data, and otherwise
340 * REV_TREE_DIFFERENT (of course if the trees are the same we
341 * want REV_TREE_SAME).
342 * That means that once we get to REV_TREE_DIFFERENT, we do not
343 * have to look any further.
345 static int tree_difference
= REV_TREE_SAME
;
347 static void file_add_remove(struct diff_options
*options
,
348 int addremove
, unsigned mode
,
349 const unsigned char *sha1
,
351 const char *fullpath
, unsigned dirty_submodule
)
353 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
355 tree_difference
|= diff
;
356 if (tree_difference
== REV_TREE_DIFFERENT
)
357 DIFF_OPT_SET(options
, HAS_CHANGES
);
360 static void file_change(struct diff_options
*options
,
361 unsigned old_mode
, unsigned new_mode
,
362 const unsigned char *old_sha1
,
363 const unsigned char *new_sha1
,
364 int old_sha1_valid
, int new_sha1_valid
,
365 const char *fullpath
,
366 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
368 tree_difference
= REV_TREE_DIFFERENT
;
369 DIFF_OPT_SET(options
, HAS_CHANGES
);
372 static int rev_compare_tree(struct rev_info
*revs
, struct commit
*parent
, struct commit
*commit
)
374 struct tree
*t1
= parent
->tree
;
375 struct tree
*t2
= commit
->tree
;
382 if (revs
->simplify_by_decoration
) {
384 * If we are simplifying by decoration, then the commit
385 * is worth showing if it has a tag pointing at it.
387 if (lookup_decoration(&name_decoration
, &commit
->object
))
388 return REV_TREE_DIFFERENT
;
390 * A commit that is not pointed by a tag is uninteresting
391 * if we are not limited by path. This means that you will
392 * see the usual "commits that touch the paths" plus any
393 * tagged commit by specifying both --simplify-by-decoration
396 if (!revs
->prune_data
.nr
)
397 return REV_TREE_SAME
;
400 tree_difference
= REV_TREE_SAME
;
401 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
402 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
404 return REV_TREE_DIFFERENT
;
405 return tree_difference
;
408 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
413 struct tree_desc empty
, real
;
414 struct tree
*t1
= commit
->tree
;
419 tree
= read_object_with_reference(t1
->object
.sha1
, tree_type
, &size
, NULL
);
422 init_tree_desc(&real
, tree
, size
);
423 init_tree_desc(&empty
, "", 0);
425 tree_difference
= REV_TREE_SAME
;
426 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
427 retval
= diff_tree(&empty
, &real
, "", &revs
->pruning
);
430 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
433 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
435 struct commit_list
**pp
, *parent
;
436 int tree_changed
= 0, tree_same
= 0, nth_parent
= 0;
439 * If we don't do pruning, everything is interesting
447 if (!commit
->parents
) {
448 if (rev_same_tree_as_empty(revs
, commit
))
449 commit
->object
.flags
|= TREESAME
;
454 * Normal non-merge commit? If we don't want to make the
455 * history dense, we consider it always to be a change..
457 if (!revs
->dense
&& !commit
->parents
->next
)
460 pp
= &commit
->parents
;
461 while ((parent
= *pp
) != NULL
) {
462 struct commit
*p
= parent
->item
;
465 * Do not compare with later parents when we care only about
466 * the first parent chain, in order to avoid derailing the
467 * traversal to follow a side branch that brought everything
468 * in the path we are limited to by the pathspec.
470 if (revs
->first_parent_only
&& nth_parent
++)
472 if (parse_commit(p
) < 0)
473 die("cannot simplify commit %s (because of %s)",
474 sha1_to_hex(commit
->object
.sha1
),
475 sha1_to_hex(p
->object
.sha1
));
476 switch (rev_compare_tree(revs
, p
, commit
)) {
479 if (!revs
->simplify_history
|| (p
->object
.flags
& UNINTERESTING
)) {
480 /* Even if a merge with an uninteresting
481 * side branch brought the entire change
482 * we are interested in, we do not want
483 * to lose the other branches of this
484 * merge, so we just keep going.
490 commit
->parents
= parent
;
491 commit
->object
.flags
|= TREESAME
;
495 if (revs
->remove_empty_trees
&&
496 rev_same_tree_as_empty(revs
, p
)) {
497 /* We are adding all the specified
498 * paths from this parent, so the
499 * history beyond this parent is not
500 * interesting. Remove its parents
501 * (they are grandparents for us).
502 * IOW, we pretend this parent is a
505 if (parse_commit(p
) < 0)
506 die("cannot simplify commit %s (invalid %s)",
507 sha1_to_hex(commit
->object
.sha1
),
508 sha1_to_hex(p
->object
.sha1
));
513 case REV_TREE_DIFFERENT
:
518 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
520 if (tree_changed
&& !tree_same
)
522 commit
->object
.flags
|= TREESAME
;
525 static void commit_list_insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
526 struct commit_list
*cached_base
, struct commit_list
**cache
)
528 struct commit_list
*new_entry
;
530 if (cached_base
&& p
->date
< cached_base
->item
->date
)
531 new_entry
= commit_list_insert_by_date(p
, &cached_base
->next
);
533 new_entry
= commit_list_insert_by_date(p
, head
);
535 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
539 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
540 struct commit_list
**list
, struct commit_list
**cache_ptr
)
542 struct commit_list
*parent
= commit
->parents
;
544 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
546 if (commit
->object
.flags
& ADDED
)
548 commit
->object
.flags
|= ADDED
;
551 * If the commit is uninteresting, don't try to
552 * prune parents - we want the maximal uninteresting
555 * Normally we haven't parsed the parent
556 * yet, so we won't have a parent of a parent
557 * here. However, it may turn out that we've
558 * reached this commit some other way (where it
559 * wasn't uninteresting), in which case we need
560 * to mark its parents recursively too..
562 if (commit
->object
.flags
& UNINTERESTING
) {
564 struct commit
*p
= parent
->item
;
565 parent
= parent
->next
;
567 p
->object
.flags
|= UNINTERESTING
;
568 if (parse_commit(p
) < 0)
571 mark_parents_uninteresting(p
);
572 if (p
->object
.flags
& SEEN
)
574 p
->object
.flags
|= SEEN
;
575 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
581 * Ok, the commit wasn't uninteresting. Try to
582 * simplify the commit history and find the parent
583 * that has no differences in the path set if one exists.
585 try_to_simplify_commit(revs
, commit
);
590 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
592 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
593 struct commit
*p
= parent
->item
;
595 if (parse_commit(p
) < 0)
597 if (revs
->show_source
&& !p
->util
)
598 p
->util
= commit
->util
;
599 p
->object
.flags
|= left_flag
;
600 if (!(p
->object
.flags
& SEEN
)) {
601 p
->object
.flags
|= SEEN
;
602 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
604 if (revs
->first_parent_only
)
610 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
612 struct commit_list
*p
;
613 int left_count
= 0, right_count
= 0;
615 struct patch_ids ids
;
616 unsigned cherry_flag
;
618 /* First count the commits on the left and on the right */
619 for (p
= list
; p
; p
= p
->next
) {
620 struct commit
*commit
= p
->item
;
621 unsigned flags
= commit
->object
.flags
;
622 if (flags
& BOUNDARY
)
624 else if (flags
& SYMMETRIC_LEFT
)
630 if (!left_count
|| !right_count
)
633 left_first
= left_count
< right_count
;
634 init_patch_ids(&ids
);
635 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
637 /* Compute patch-ids for one side */
638 for (p
= list
; p
; p
= p
->next
) {
639 struct commit
*commit
= p
->item
;
640 unsigned flags
= commit
->object
.flags
;
642 if (flags
& BOUNDARY
)
645 * If we have fewer left, left_first is set and we omit
646 * commits on the right branch in this loop. If we have
647 * fewer right, we skip the left ones.
649 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
651 commit
->util
= add_commit_patch_id(commit
, &ids
);
654 /* either cherry_mark or cherry_pick are true */
655 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
657 /* Check the other side */
658 for (p
= list
; p
; p
= p
->next
) {
659 struct commit
*commit
= p
->item
;
661 unsigned flags
= commit
->object
.flags
;
663 if (flags
& BOUNDARY
)
666 * If we have fewer left, left_first is set and we omit
667 * commits on the left branch in this loop.
669 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
673 * Have we seen the same patch id?
675 id
= has_commit_patch_id(commit
, &ids
);
679 commit
->object
.flags
|= cherry_flag
;
682 /* Now check the original side for seen ones */
683 for (p
= list
; p
; p
= p
->next
) {
684 struct commit
*commit
= p
->item
;
685 struct patch_id
*ent
;
691 commit
->object
.flags
|= cherry_flag
;
695 free_patch_ids(&ids
);
698 /* How many extra uninteresting commits we want to see.. */
701 static int still_interesting(struct commit_list
*src
, unsigned long date
, int slop
)
704 * No source list at all? We're definitely done..
710 * Does the destination list contain entries with a date
711 * before the source list? Definitely _not_ done.
713 if (date
<= src
->item
->date
)
717 * Does the source list still have interesting commits in
718 * it? Definitely not done..
720 if (!everybody_uninteresting(src
))
723 /* Ok, we're closing in.. */
728 * "rev-list --ancestry-path A..B" computes commits that are ancestors
729 * of B but not ancestors of A but further limits the result to those
730 * that are descendants of A. This takes the list of bottom commits and
731 * the result of "A..B" without --ancestry-path, and limits the latter
732 * further to the ones that can reach one of the commits in "bottom".
734 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
736 struct commit_list
*p
;
737 struct commit_list
*rlist
= NULL
;
741 * Reverse the list so that it will be likely that we would
742 * process parents before children.
744 for (p
= list
; p
; p
= p
->next
)
745 commit_list_insert(p
->item
, &rlist
);
747 for (p
= bottom
; p
; p
= p
->next
)
748 p
->item
->object
.flags
|= TMP_MARK
;
751 * Mark the ones that can reach bottom commits in "list",
752 * in a bottom-up fashion.
756 for (p
= rlist
; p
; p
= p
->next
) {
757 struct commit
*c
= p
->item
;
758 struct commit_list
*parents
;
759 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
761 for (parents
= c
->parents
;
763 parents
= parents
->next
) {
764 if (!(parents
->item
->object
.flags
& TMP_MARK
))
766 c
->object
.flags
|= TMP_MARK
;
771 } while (made_progress
);
774 * NEEDSWORK: decide if we want to remove parents that are
775 * not marked with TMP_MARK from commit->parents for commits
776 * in the resulting list. We may not want to do that, though.
780 * The ones that are not marked with TMP_MARK are uninteresting
782 for (p
= list
; p
; p
= p
->next
) {
783 struct commit
*c
= p
->item
;
784 if (c
->object
.flags
& TMP_MARK
)
786 c
->object
.flags
|= UNINTERESTING
;
789 /* We are done with the TMP_MARK */
790 for (p
= list
; p
; p
= p
->next
)
791 p
->item
->object
.flags
&= ~TMP_MARK
;
792 for (p
= bottom
; p
; p
= p
->next
)
793 p
->item
->object
.flags
&= ~TMP_MARK
;
794 free_commit_list(rlist
);
798 * Before walking the history, keep the set of "negative" refs the
799 * caller has asked to exclude.
801 * This is used to compute "rev-list --ancestry-path A..B", as we need
802 * to filter the result of "A..B" further to the ones that can actually
805 static struct commit_list
*collect_bottom_commits(struct rev_info
*revs
)
807 struct commit_list
*bottom
= NULL
;
809 for (i
= 0; i
< revs
->cmdline
.nr
; i
++) {
810 struct rev_cmdline_entry
*elem
= &revs
->cmdline
.rev
[i
];
811 if ((elem
->flags
& UNINTERESTING
) &&
812 elem
->item
->type
== OBJ_COMMIT
)
813 commit_list_insert((struct commit
*)elem
->item
, &bottom
);
818 /* Assumes either left_only or right_only is set */
819 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
821 struct commit_list
*p
;
823 for (p
= list
; p
; p
= p
->next
) {
824 struct commit
*commit
= p
->item
;
826 if (revs
->right_only
) {
827 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
828 commit
->object
.flags
|= SHOWN
;
829 } else /* revs->left_only is set */
830 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
831 commit
->object
.flags
|= SHOWN
;
835 static int limit_list(struct rev_info
*revs
)
838 unsigned long date
= ~0ul;
839 struct commit_list
*list
= revs
->commits
;
840 struct commit_list
*newlist
= NULL
;
841 struct commit_list
**p
= &newlist
;
842 struct commit_list
*bottom
= NULL
;
844 if (revs
->ancestry_path
) {
845 bottom
= collect_bottom_commits(revs
);
847 die("--ancestry-path given but there are no bottom commits");
851 struct commit_list
*entry
= list
;
852 struct commit
*commit
= list
->item
;
853 struct object
*obj
= &commit
->object
;
854 show_early_output_fn_t show
;
859 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
860 obj
->flags
|= UNINTERESTING
;
861 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
863 if (obj
->flags
& UNINTERESTING
) {
864 mark_parents_uninteresting(commit
);
866 p
= &commit_list_insert(commit
, p
)->next
;
867 slop
= still_interesting(list
, date
, slop
);
870 /* If showing all, add the whole pending list to the end */
875 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
878 p
= &commit_list_insert(commit
, p
)->next
;
880 show
= show_early_output
;
885 show_early_output
= NULL
;
887 if (revs
->cherry_pick
|| revs
->cherry_mark
)
888 cherry_pick_list(newlist
, revs
);
890 if (revs
->left_only
|| revs
->right_only
)
891 limit_left_right(newlist
, revs
);
894 limit_to_ancestry(bottom
, newlist
);
895 free_commit_list(bottom
);
898 revs
->commits
= newlist
;
902 static void add_rev_cmdline(struct rev_info
*revs
,
908 struct rev_cmdline_info
*info
= &revs
->cmdline
;
911 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
912 info
->rev
[nr
].item
= item
;
913 info
->rev
[nr
].name
= name
;
914 info
->rev
[nr
].whence
= whence
;
915 info
->rev
[nr
].flags
= flags
;
921 int warned_bad_reflog
;
922 struct rev_info
*all_revs
;
923 const char *name_for_errormsg
;
926 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
928 struct all_refs_cb
*cb
= cb_data
;
929 struct object
*object
= get_reference(cb
->all_revs
, path
, sha1
,
931 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
932 add_pending_sha1(cb
->all_revs
, path
, sha1
, cb
->all_flags
);
936 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
940 cb
->all_flags
= flags
;
943 static void handle_refs(const char *submodule
, struct rev_info
*revs
, unsigned flags
,
944 int (*for_each
)(const char *, each_ref_fn
, void *))
946 struct all_refs_cb cb
;
947 init_all_refs_cb(&cb
, revs
, flags
);
948 for_each(submodule
, handle_one_ref
, &cb
);
951 static void handle_one_reflog_commit(unsigned char *sha1
, void *cb_data
)
953 struct all_refs_cb
*cb
= cb_data
;
954 if (!is_null_sha1(sha1
)) {
955 struct object
*o
= parse_object(sha1
);
957 o
->flags
|= cb
->all_flags
;
958 /* ??? CMDLINEFLAGS ??? */
959 add_pending_object(cb
->all_revs
, o
, "");
961 else if (!cb
->warned_bad_reflog
) {
962 warning("reflog of '%s' references pruned commits",
963 cb
->name_for_errormsg
);
964 cb
->warned_bad_reflog
= 1;
969 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
970 const char *email
, unsigned long timestamp
, int tz
,
971 const char *message
, void *cb_data
)
973 handle_one_reflog_commit(osha1
, cb_data
);
974 handle_one_reflog_commit(nsha1
, cb_data
);
978 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
980 struct all_refs_cb
*cb
= cb_data
;
981 cb
->warned_bad_reflog
= 0;
982 cb
->name_for_errormsg
= path
;
983 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
987 static void handle_reflog(struct rev_info
*revs
, unsigned flags
)
989 struct all_refs_cb cb
;
991 cb
.all_flags
= flags
;
992 for_each_reflog(handle_one_reflog
, &cb
);
995 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
)
997 unsigned char sha1
[20];
999 struct commit
*commit
;
1000 struct commit_list
*parents
;
1001 const char *arg
= arg_
;
1004 flags
^= UNINTERESTING
;
1007 if (get_sha1_committish(arg
, sha1
))
1010 it
= get_reference(revs
, arg
, sha1
, 0);
1011 if (!it
&& revs
->ignore_missing
)
1013 if (it
->type
!= OBJ_TAG
)
1015 if (!((struct tag
*)it
)->tagged
)
1017 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
1019 if (it
->type
!= OBJ_COMMIT
)
1021 commit
= (struct commit
*)it
;
1022 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
1023 it
= &parents
->item
->object
;
1025 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1026 add_pending_object(revs
, it
, arg
);
1031 void init_revisions(struct rev_info
*revs
, const char *prefix
)
1033 memset(revs
, 0, sizeof(*revs
));
1035 revs
->abbrev
= DEFAULT_ABBREV
;
1036 revs
->ignore_merges
= 1;
1037 revs
->simplify_history
= 1;
1038 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
1039 DIFF_OPT_SET(&revs
->pruning
, QUICK
);
1040 revs
->pruning
.add_remove
= file_add_remove
;
1041 revs
->pruning
.change
= file_change
;
1044 revs
->prefix
= prefix
;
1047 revs
->skip_count
= -1;
1048 revs
->max_count
= -1;
1049 revs
->max_parents
= -1;
1051 revs
->commit_format
= CMIT_FMT_DEFAULT
;
1053 init_grep_defaults();
1054 grep_init(&revs
->grep_filter
, prefix
);
1055 revs
->grep_filter
.status_only
= 1;
1056 revs
->grep_filter
.regflags
= REG_NEWLINE
;
1058 diff_setup(&revs
->diffopt
);
1059 if (prefix
&& !revs
->diffopt
.prefix
) {
1060 revs
->diffopt
.prefix
= prefix
;
1061 revs
->diffopt
.prefix_length
= strlen(prefix
);
1064 revs
->notes_opt
.use_default_notes
= -1;
1067 static void add_pending_commit_list(struct rev_info
*revs
,
1068 struct commit_list
*commit_list
,
1071 while (commit_list
) {
1072 struct object
*object
= &commit_list
->item
->object
;
1073 object
->flags
|= flags
;
1074 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
1075 commit_list
= commit_list
->next
;
1079 static void prepare_show_merge(struct rev_info
*revs
)
1081 struct commit_list
*bases
;
1082 struct commit
*head
, *other
;
1083 unsigned char sha1
[20];
1084 const char **prune
= NULL
;
1085 int i
, prune_num
= 1; /* counting terminating NULL */
1087 if (get_sha1("HEAD", sha1
))
1088 die("--merge without HEAD?");
1089 head
= lookup_commit_or_die(sha1
, "HEAD");
1090 if (get_sha1("MERGE_HEAD", sha1
))
1091 die("--merge without MERGE_HEAD?");
1092 other
= lookup_commit_or_die(sha1
, "MERGE_HEAD");
1093 add_pending_object(revs
, &head
->object
, "HEAD");
1094 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1095 bases
= get_merge_bases(head
, other
, 1);
1096 add_pending_commit_list(revs
, bases
, UNINTERESTING
);
1097 free_commit_list(bases
);
1098 head
->object
.flags
|= SYMMETRIC_LEFT
;
1102 for (i
= 0; i
< active_nr
; i
++) {
1103 struct cache_entry
*ce
= active_cache
[i
];
1106 if (ce_path_match(ce
, &revs
->prune_data
)) {
1108 prune
= xrealloc(prune
, sizeof(*prune
) * prune_num
);
1109 prune
[prune_num
-2] = ce
->name
;
1110 prune
[prune_num
-1] = NULL
;
1112 while ((i
+1 < active_nr
) &&
1113 ce_same_name(ce
, active_cache
[i
+1]))
1116 free_pathspec(&revs
->prune_data
);
1117 init_pathspec(&revs
->prune_data
, prune
);
1121 int handle_revision_arg(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
1123 struct object_context oc
;
1125 struct object
*object
;
1126 unsigned char sha1
[20];
1128 const char *arg
= arg_
;
1129 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
1130 unsigned get_sha1_flags
= 0;
1132 dotdot
= strstr(arg
, "..");
1134 unsigned char from_sha1
[20];
1135 const char *next
= dotdot
+ 2;
1136 const char *this = arg
;
1137 int symmetric
= *next
== '.';
1138 unsigned int flags_exclude
= flags
^ UNINTERESTING
;
1139 static const char head_by_default
[] = "HEAD";
1140 unsigned int a_flags
;
1146 next
= head_by_default
;
1148 this = head_by_default
;
1149 if (this == head_by_default
&& next
== head_by_default
&&
1152 * Just ".."? That is not a range but the
1153 * pathspec for the parent directory.
1155 if (!cant_be_filename
) {
1160 if (!get_sha1_committish(this, from_sha1
) &&
1161 !get_sha1_committish(next
, sha1
)) {
1162 struct commit
*a
, *b
;
1163 struct commit_list
*exclude
;
1165 a
= lookup_commit_reference(from_sha1
);
1166 b
= lookup_commit_reference(sha1
);
1168 if (revs
->ignore_missing
)
1171 "Invalid symmetric difference expression %s...%s" :
1172 "Invalid revision range %s..%s",
1176 if (!cant_be_filename
) {
1178 verify_non_filename(revs
->prefix
, arg
);
1182 exclude
= get_merge_bases(a
, b
, 1);
1183 add_pending_commit_list(revs
, exclude
,
1185 free_commit_list(exclude
);
1186 a_flags
= flags
| SYMMETRIC_LEFT
;
1188 a_flags
= flags_exclude
;
1189 a
->object
.flags
|= a_flags
;
1190 b
->object
.flags
|= flags
;
1191 add_rev_cmdline(revs
, &a
->object
, this,
1192 REV_CMD_LEFT
, a_flags
);
1193 add_rev_cmdline(revs
, &b
->object
, next
,
1194 REV_CMD_RIGHT
, flags
);
1195 add_pending_object_with_mode(revs
, &a
->object
, this,
1196 S_IFINVALID
, flags_exclude
);
1197 add_pending_object(revs
, &b
->object
, next
);
1202 dotdot
= strstr(arg
, "^@");
1203 if (dotdot
&& !dotdot
[2]) {
1205 if (add_parents_only(revs
, arg
, flags
))
1209 dotdot
= strstr(arg
, "^!");
1210 if (dotdot
&& !dotdot
[2]) {
1212 if (!add_parents_only(revs
, arg
, flags
^ UNINTERESTING
))
1218 local_flags
= UNINTERESTING
;
1222 if (revarg_opt
& REVARG_COMMITTISH
)
1223 get_sha1_flags
= GET_SHA1_COMMITTISH
;
1225 if (get_sha1_with_context(arg
, get_sha1_flags
, sha1
, &oc
))
1226 return revs
->ignore_missing
? 0 : -1;
1227 if (!cant_be_filename
)
1228 verify_non_filename(revs
->prefix
, arg
);
1229 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
1230 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
1231 add_pending_object_with_mode(revs
, object
, arg
, oc
.mode
, local_flags
);
1235 struct cmdline_pathspec
{
1241 static void append_prune_data(struct cmdline_pathspec
*prune
, const char **av
)
1244 ALLOC_GROW(prune
->path
, prune
->nr
+1, prune
->alloc
);
1245 prune
->path
[prune
->nr
++] = *(av
++);
1249 static void read_pathspec_from_stdin(struct rev_info
*revs
, struct strbuf
*sb
,
1250 struct cmdline_pathspec
*prune
)
1252 while (strbuf_getwholeline(sb
, stdin
, '\n') != EOF
) {
1254 if (len
&& sb
->buf
[len
- 1] == '\n')
1255 sb
->buf
[--len
] = '\0';
1256 ALLOC_GROW(prune
->path
, prune
->nr
+1, prune
->alloc
);
1257 prune
->path
[prune
->nr
++] = xstrdup(sb
->buf
);
1261 static void read_revisions_from_stdin(struct rev_info
*revs
,
1262 struct cmdline_pathspec
*prune
)
1265 int seen_dashdash
= 0;
1267 strbuf_init(&sb
, 1000);
1268 while (strbuf_getwholeline(&sb
, stdin
, '\n') != EOF
) {
1270 if (len
&& sb
.buf
[len
- 1] == '\n')
1271 sb
.buf
[--len
] = '\0';
1274 if (sb
.buf
[0] == '-') {
1275 if (len
== 2 && sb
.buf
[1] == '-') {
1279 die("options not supported in --stdin mode");
1281 if (handle_revision_arg(xstrdup(sb
.buf
), revs
, 0,
1282 REVARG_CANNOT_BE_FILENAME
))
1283 die("bad revision '%s'", sb
.buf
);
1286 read_pathspec_from_stdin(revs
, &sb
, prune
);
1287 strbuf_release(&sb
);
1290 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
1292 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
1295 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
1297 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
1300 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
1302 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
1305 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
1306 int *unkc
, const char **unkv
)
1308 const char *arg
= argv
[0];
1312 /* pseudo revision arguments */
1313 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1314 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1315 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1316 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
1317 !strcmp(arg
, "--bisect") || !prefixcmp(arg
, "--glob=") ||
1318 !prefixcmp(arg
, "--branches=") || !prefixcmp(arg
, "--tags=") ||
1319 !prefixcmp(arg
, "--remotes=") || !prefixcmp(arg
, "--no-walk="))
1321 unkv
[(*unkc
)++] = arg
;
1325 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
1326 revs
->max_count
= atoi(optarg
);
1329 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
1330 revs
->skip_count
= atoi(optarg
);
1332 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1333 /* accept -<digit>, like traditional "head" */
1334 revs
->max_count
= atoi(arg
+ 1);
1336 } else if (!strcmp(arg
, "-n")) {
1338 return error("-n requires an argument");
1339 revs
->max_count
= atoi(argv
[1]);
1342 } else if (!prefixcmp(arg
, "-n")) {
1343 revs
->max_count
= atoi(arg
+ 2);
1345 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
1346 revs
->max_age
= atoi(optarg
);
1348 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
1349 revs
->max_age
= approxidate(optarg
);
1351 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
1352 revs
->max_age
= approxidate(optarg
);
1354 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
1355 revs
->min_age
= atoi(optarg
);
1357 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
1358 revs
->min_age
= approxidate(optarg
);
1360 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
1361 revs
->min_age
= approxidate(optarg
);
1363 } else if (!strcmp(arg
, "--first-parent")) {
1364 revs
->first_parent_only
= 1;
1365 } else if (!strcmp(arg
, "--ancestry-path")) {
1366 revs
->ancestry_path
= 1;
1367 revs
->simplify_history
= 0;
1369 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1370 init_reflog_walk(&revs
->reflog_info
);
1371 } else if (!strcmp(arg
, "--default")) {
1373 return error("bad --default argument");
1374 revs
->def
= argv
[1];
1376 } else if (!strcmp(arg
, "--merge")) {
1377 revs
->show_merge
= 1;
1378 } else if (!strcmp(arg
, "--topo-order")) {
1380 revs
->topo_order
= 1;
1381 } else if (!strcmp(arg
, "--simplify-merges")) {
1382 revs
->simplify_merges
= 1;
1383 revs
->topo_order
= 1;
1384 revs
->rewrite_parents
= 1;
1385 revs
->simplify_history
= 0;
1387 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
1388 revs
->simplify_merges
= 1;
1389 revs
->topo_order
= 1;
1390 revs
->rewrite_parents
= 1;
1391 revs
->simplify_history
= 0;
1392 revs
->simplify_by_decoration
= 1;
1395 load_ref_decorations(DECORATE_SHORT_REFS
);
1396 } else if (!strcmp(arg
, "--date-order")) {
1398 revs
->topo_order
= 1;
1399 } else if (!prefixcmp(arg
, "--early-output")) {
1403 count
= atoi(arg
+15);
1406 revs
->topo_order
= 1;
1407 revs
->early_output
= count
;
1409 } else if (!strcmp(arg
, "--parents")) {
1410 revs
->rewrite_parents
= 1;
1411 revs
->print_parents
= 1;
1412 } else if (!strcmp(arg
, "--dense")) {
1414 } else if (!strcmp(arg
, "--sparse")) {
1416 } else if (!strcmp(arg
, "--show-all")) {
1418 } else if (!strcmp(arg
, "--remove-empty")) {
1419 revs
->remove_empty_trees
= 1;
1420 } else if (!strcmp(arg
, "--merges")) {
1421 revs
->min_parents
= 2;
1422 } else if (!strcmp(arg
, "--no-merges")) {
1423 revs
->max_parents
= 1;
1424 } else if (!prefixcmp(arg
, "--min-parents=")) {
1425 revs
->min_parents
= atoi(arg
+14);
1426 } else if (!prefixcmp(arg
, "--no-min-parents")) {
1427 revs
->min_parents
= 0;
1428 } else if (!prefixcmp(arg
, "--max-parents=")) {
1429 revs
->max_parents
= atoi(arg
+14);
1430 } else if (!prefixcmp(arg
, "--no-max-parents")) {
1431 revs
->max_parents
= -1;
1432 } else if (!strcmp(arg
, "--boundary")) {
1434 } else if (!strcmp(arg
, "--left-right")) {
1435 revs
->left_right
= 1;
1436 } else if (!strcmp(arg
, "--left-only")) {
1437 if (revs
->right_only
)
1438 die("--left-only is incompatible with --right-only"
1440 revs
->left_only
= 1;
1441 } else if (!strcmp(arg
, "--right-only")) {
1442 if (revs
->left_only
)
1443 die("--right-only is incompatible with --left-only");
1444 revs
->right_only
= 1;
1445 } else if (!strcmp(arg
, "--cherry")) {
1446 if (revs
->left_only
)
1447 die("--cherry is incompatible with --left-only");
1448 revs
->cherry_mark
= 1;
1449 revs
->right_only
= 1;
1450 revs
->max_parents
= 1;
1452 } else if (!strcmp(arg
, "--count")) {
1454 } else if (!strcmp(arg
, "--cherry-mark")) {
1455 if (revs
->cherry_pick
)
1456 die("--cherry-mark is incompatible with --cherry-pick");
1457 revs
->cherry_mark
= 1;
1458 revs
->limited
= 1; /* needs limit_list() */
1459 } else if (!strcmp(arg
, "--cherry-pick")) {
1460 if (revs
->cherry_mark
)
1461 die("--cherry-pick is incompatible with --cherry-mark");
1462 revs
->cherry_pick
= 1;
1464 } else if (!strcmp(arg
, "--objects")) {
1465 revs
->tag_objects
= 1;
1466 revs
->tree_objects
= 1;
1467 revs
->blob_objects
= 1;
1468 } else if (!strcmp(arg
, "--objects-edge")) {
1469 revs
->tag_objects
= 1;
1470 revs
->tree_objects
= 1;
1471 revs
->blob_objects
= 1;
1472 revs
->edge_hint
= 1;
1473 } else if (!strcmp(arg
, "--verify-objects")) {
1474 revs
->tag_objects
= 1;
1475 revs
->tree_objects
= 1;
1476 revs
->blob_objects
= 1;
1477 revs
->verify_objects
= 1;
1478 } else if (!strcmp(arg
, "--unpacked")) {
1480 } else if (!prefixcmp(arg
, "--unpacked=")) {
1481 die("--unpacked=<packfile> no longer supported.");
1482 } else if (!strcmp(arg
, "-r")) {
1484 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1485 } else if (!strcmp(arg
, "-t")) {
1487 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1488 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1489 } else if (!strcmp(arg
, "-m")) {
1490 revs
->ignore_merges
= 0;
1491 } else if (!strcmp(arg
, "-c")) {
1493 revs
->dense_combined_merges
= 0;
1494 revs
->combine_merges
= 1;
1495 } else if (!strcmp(arg
, "--cc")) {
1497 revs
->dense_combined_merges
= 1;
1498 revs
->combine_merges
= 1;
1499 } else if (!strcmp(arg
, "-v")) {
1500 revs
->verbose_header
= 1;
1501 } else if (!strcmp(arg
, "--pretty")) {
1502 revs
->verbose_header
= 1;
1503 revs
->pretty_given
= 1;
1504 get_commit_format(arg
+8, revs
);
1505 } else if (!prefixcmp(arg
, "--pretty=") || !prefixcmp(arg
, "--format=")) {
1507 * Detached form ("--pretty X" as opposed to "--pretty=X")
1508 * not allowed, since the argument is optional.
1510 revs
->verbose_header
= 1;
1511 revs
->pretty_given
= 1;
1512 get_commit_format(arg
+9, revs
);
1513 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
1514 revs
->show_notes
= 1;
1515 revs
->show_notes_given
= 1;
1516 revs
->notes_opt
.use_default_notes
= 1;
1517 } else if (!strcmp(arg
, "--show-signature")) {
1518 revs
->show_signature
= 1;
1519 } else if (!prefixcmp(arg
, "--show-notes=") ||
1520 !prefixcmp(arg
, "--notes=")) {
1521 struct strbuf buf
= STRBUF_INIT
;
1522 revs
->show_notes
= 1;
1523 revs
->show_notes_given
= 1;
1524 if (!prefixcmp(arg
, "--show-notes")) {
1525 if (revs
->notes_opt
.use_default_notes
< 0)
1526 revs
->notes_opt
.use_default_notes
= 1;
1527 strbuf_addstr(&buf
, arg
+13);
1530 strbuf_addstr(&buf
, arg
+8);
1531 expand_notes_ref(&buf
);
1532 string_list_append(&revs
->notes_opt
.extra_notes_refs
,
1533 strbuf_detach(&buf
, NULL
));
1534 } else if (!strcmp(arg
, "--no-notes")) {
1535 revs
->show_notes
= 0;
1536 revs
->show_notes_given
= 1;
1537 revs
->notes_opt
.use_default_notes
= -1;
1538 /* we have been strdup'ing ourselves, so trick
1539 * string_list into free()ing strings */
1540 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 1;
1541 string_list_clear(&revs
->notes_opt
.extra_notes_refs
, 0);
1542 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 0;
1543 } else if (!strcmp(arg
, "--standard-notes")) {
1544 revs
->show_notes_given
= 1;
1545 revs
->notes_opt
.use_default_notes
= 1;
1546 } else if (!strcmp(arg
, "--no-standard-notes")) {
1547 revs
->notes_opt
.use_default_notes
= 0;
1548 } else if (!strcmp(arg
, "--oneline")) {
1549 revs
->verbose_header
= 1;
1550 get_commit_format("oneline", revs
);
1551 revs
->pretty_given
= 1;
1552 revs
->abbrev_commit
= 1;
1553 } else if (!strcmp(arg
, "--graph")) {
1554 revs
->topo_order
= 1;
1555 revs
->rewrite_parents
= 1;
1556 revs
->graph
= graph_init(revs
);
1557 } else if (!strcmp(arg
, "--root")) {
1558 revs
->show_root_diff
= 1;
1559 } else if (!strcmp(arg
, "--no-commit-id")) {
1560 revs
->no_commit_id
= 1;
1561 } else if (!strcmp(arg
, "--always")) {
1562 revs
->always_show_header
= 1;
1563 } else if (!strcmp(arg
, "--no-abbrev")) {
1565 } else if (!strcmp(arg
, "--abbrev")) {
1566 revs
->abbrev
= DEFAULT_ABBREV
;
1567 } else if (!prefixcmp(arg
, "--abbrev=")) {
1568 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1569 if (revs
->abbrev
< MINIMUM_ABBREV
)
1570 revs
->abbrev
= MINIMUM_ABBREV
;
1571 else if (revs
->abbrev
> 40)
1573 } else if (!strcmp(arg
, "--abbrev-commit")) {
1574 revs
->abbrev_commit
= 1;
1575 revs
->abbrev_commit_given
= 1;
1576 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
1577 revs
->abbrev_commit
= 0;
1578 } else if (!strcmp(arg
, "--full-diff")) {
1580 revs
->full_diff
= 1;
1581 } else if (!strcmp(arg
, "--full-history")) {
1582 revs
->simplify_history
= 0;
1583 } else if (!strcmp(arg
, "--relative-date")) {
1584 revs
->date_mode
= DATE_RELATIVE
;
1585 revs
->date_mode_explicit
= 1;
1586 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
1587 revs
->date_mode
= parse_date_format(optarg
);
1588 revs
->date_mode_explicit
= 1;
1590 } else if (!strcmp(arg
, "--log-size")) {
1591 revs
->show_log_size
= 1;
1594 * Grepping the commit log
1596 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
1597 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
1599 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
1600 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
1602 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
1603 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
1605 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
1606 add_message_grep(revs
, optarg
);
1608 } else if (!strcmp(arg
, "--grep-debug")) {
1609 revs
->grep_filter
.debug
= 1;
1610 } else if (!strcmp(arg
, "--basic-regexp")) {
1611 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE
, &revs
->grep_filter
);
1612 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
1613 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE
, &revs
->grep_filter
);
1614 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
1615 revs
->grep_filter
.regflags
|= REG_ICASE
;
1616 DIFF_OPT_SET(&revs
->diffopt
, PICKAXE_IGNORE_CASE
);
1617 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
1618 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED
, &revs
->grep_filter
);
1619 } else if (!strcmp(arg
, "--perl-regexp")) {
1620 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE
, &revs
->grep_filter
);
1621 } else if (!strcmp(arg
, "--all-match")) {
1622 revs
->grep_filter
.all_match
= 1;
1623 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
1624 if (strcmp(optarg
, "none"))
1625 git_log_output_encoding
= xstrdup(optarg
);
1627 git_log_output_encoding
= "";
1629 } else if (!strcmp(arg
, "--reverse")) {
1631 } else if (!strcmp(arg
, "--children")) {
1632 revs
->children
.name
= "children";
1634 } else if (!strcmp(arg
, "--ignore-missing")) {
1635 revs
->ignore_missing
= 1;
1637 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
);
1639 unkv
[(*unkc
)++] = arg
;
1646 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
1647 const struct option
*options
,
1648 const char * const usagestr
[])
1650 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
1651 &ctx
->cpidx
, ctx
->out
);
1653 error("unknown option `%s'", ctx
->argv
[0]);
1654 usage_with_options(usagestr
, options
);
1660 static int for_each_bad_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
1662 return for_each_ref_in_submodule(submodule
, "refs/bisect/bad", fn
, cb_data
);
1665 static int for_each_good_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
1667 return for_each_ref_in_submodule(submodule
, "refs/bisect/good", fn
, cb_data
);
1670 static int handle_revision_pseudo_opt(const char *submodule
,
1671 struct rev_info
*revs
,
1672 int argc
, const char **argv
, int *flags
)
1674 const char *arg
= argv
[0];
1681 * Commands like "git shortlog" will not accept the options below
1682 * unless parse_revision_opt queues them (as opposed to erroring
1685 * When implementing your new pseudo-option, remember to
1686 * register it in the list at the top of handle_revision_opt.
1688 if (!strcmp(arg
, "--all")) {
1689 handle_refs(submodule
, revs
, *flags
, for_each_ref_submodule
);
1690 handle_refs(submodule
, revs
, *flags
, head_ref_submodule
);
1691 } else if (!strcmp(arg
, "--branches")) {
1692 handle_refs(submodule
, revs
, *flags
, for_each_branch_ref_submodule
);
1693 } else if (!strcmp(arg
, "--bisect")) {
1694 handle_refs(submodule
, revs
, *flags
, for_each_bad_bisect_ref
);
1695 handle_refs(submodule
, revs
, *flags
^ UNINTERESTING
, for_each_good_bisect_ref
);
1697 } else if (!strcmp(arg
, "--tags")) {
1698 handle_refs(submodule
, revs
, *flags
, for_each_tag_ref_submodule
);
1699 } else if (!strcmp(arg
, "--remotes")) {
1700 handle_refs(submodule
, revs
, *flags
, for_each_remote_ref_submodule
);
1701 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
1702 struct all_refs_cb cb
;
1703 init_all_refs_cb(&cb
, revs
, *flags
);
1704 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
1706 } else if (!prefixcmp(arg
, "--branches=")) {
1707 struct all_refs_cb cb
;
1708 init_all_refs_cb(&cb
, revs
, *flags
);
1709 for_each_glob_ref_in(handle_one_ref
, arg
+ 11, "refs/heads/", &cb
);
1710 } else if (!prefixcmp(arg
, "--tags=")) {
1711 struct all_refs_cb cb
;
1712 init_all_refs_cb(&cb
, revs
, *flags
);
1713 for_each_glob_ref_in(handle_one_ref
, arg
+ 7, "refs/tags/", &cb
);
1714 } else if (!prefixcmp(arg
, "--remotes=")) {
1715 struct all_refs_cb cb
;
1716 init_all_refs_cb(&cb
, revs
, *flags
);
1717 for_each_glob_ref_in(handle_one_ref
, arg
+ 10, "refs/remotes/", &cb
);
1718 } else if (!strcmp(arg
, "--reflog")) {
1719 handle_reflog(revs
, *flags
);
1720 } else if (!strcmp(arg
, "--not")) {
1721 *flags
^= UNINTERESTING
;
1722 } else if (!strcmp(arg
, "--no-walk")) {
1723 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
1724 } else if (!prefixcmp(arg
, "--no-walk=")) {
1726 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
1727 * not allowed, since the argument is optional.
1729 if (!strcmp(arg
+ 10, "sorted"))
1730 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
1731 else if (!strcmp(arg
+ 10, "unsorted"))
1732 revs
->no_walk
= REVISION_WALK_NO_WALK_UNSORTED
;
1734 return error("invalid argument to --no-walk");
1735 } else if (!strcmp(arg
, "--do-walk")) {
1745 * Parse revision information, filling in the "rev_info" structure,
1746 * and removing the used arguments from the argument list.
1748 * Returns the number of arguments left that weren't recognized
1749 * (which are also moved to the head of the argument list)
1751 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
1753 int i
, flags
, left
, seen_dashdash
, read_from_stdin
, got_rev_arg
= 0, revarg_opt
;
1754 struct cmdline_pathspec prune_data
;
1755 const char *submodule
= NULL
;
1757 memset(&prune_data
, 0, sizeof(prune_data
));
1759 submodule
= opt
->submodule
;
1761 /* First, search for "--" */
1762 if (opt
&& opt
->assume_dashdash
) {
1766 for (i
= 1; i
< argc
; i
++) {
1767 const char *arg
= argv
[i
];
1768 if (strcmp(arg
, "--"))
1773 append_prune_data(&prune_data
, argv
+ i
+ 1);
1779 /* Second, deal with arguments and options */
1781 revarg_opt
= opt
? opt
->revarg_opt
: 0;
1783 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
1784 read_from_stdin
= 0;
1785 for (left
= i
= 1; i
< argc
; i
++) {
1786 const char *arg
= argv
[i
];
1790 opts
= handle_revision_pseudo_opt(submodule
,
1791 revs
, argc
- i
, argv
+ i
,
1798 if (!strcmp(arg
, "--stdin")) {
1799 if (revs
->disable_stdin
) {
1803 if (read_from_stdin
++)
1804 die("--stdin given twice?");
1805 read_revisions_from_stdin(revs
, &prune_data
);
1809 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
1820 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
1822 if (seen_dashdash
|| *arg
== '^')
1823 die("bad revision '%s'", arg
);
1825 /* If we didn't have a "--":
1826 * (1) all filenames must exist;
1827 * (2) all rev-args must not be interpretable
1828 * as a valid filename.
1829 * but the latter we have checked in the main loop.
1831 for (j
= i
; j
< argc
; j
++)
1832 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
1834 append_prune_data(&prune_data
, argv
+ i
);
1841 if (prune_data
.nr
) {
1843 * If we need to introduce the magic "a lone ':' means no
1844 * pathspec whatsoever", here is the place to do so.
1846 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
1847 * prune_data.nr = 0;
1848 * prune_data.alloc = 0;
1849 * free(prune_data.path);
1850 * prune_data.path = NULL;
1852 * terminate prune_data.alloc with NULL and
1853 * call init_pathspec() to set revs->prune_data here.
1856 ALLOC_GROW(prune_data
.path
, prune_data
.nr
+1, prune_data
.alloc
);
1857 prune_data
.path
[prune_data
.nr
++] = NULL
;
1858 init_pathspec(&revs
->prune_data
,
1859 get_pathspec(revs
->prefix
, prune_data
.path
));
1862 if (revs
->def
== NULL
)
1863 revs
->def
= opt
? opt
->def
: NULL
;
1864 if (opt
&& opt
->tweak
)
1865 opt
->tweak(revs
, opt
);
1866 if (revs
->show_merge
)
1867 prepare_show_merge(revs
);
1868 if (revs
->def
&& !revs
->pending
.nr
&& !got_rev_arg
) {
1869 unsigned char sha1
[20];
1870 struct object
*object
;
1871 struct object_context oc
;
1872 if (get_sha1_with_context(revs
->def
, 0, sha1
, &oc
))
1873 die("bad default revision '%s'", revs
->def
);
1874 object
= get_reference(revs
, revs
->def
, sha1
, 0);
1875 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
, 0);
1878 /* Did the user ask for any diff output? Run the diff! */
1879 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
1882 /* Pickaxe, diff-filter and rename following need diffs */
1883 if (revs
->diffopt
.pickaxe
||
1884 revs
->diffopt
.filter
||
1885 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1888 if (revs
->topo_order
)
1891 if (revs
->prune_data
.nr
) {
1892 diff_tree_setup_paths(revs
->prune_data
.raw
, &revs
->pruning
);
1893 /* Can't prune commits with rename following: the paths change.. */
1894 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1896 if (!revs
->full_diff
)
1897 diff_tree_setup_paths(revs
->prune_data
.raw
, &revs
->diffopt
);
1899 if (revs
->combine_merges
)
1900 revs
->ignore_merges
= 0;
1901 revs
->diffopt
.abbrev
= revs
->abbrev
;
1902 diff_setup_done(&revs
->diffopt
);
1904 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED
,
1905 &revs
->grep_filter
);
1906 compile_grep_patterns(&revs
->grep_filter
);
1908 if (revs
->reverse
&& revs
->reflog_info
)
1909 die("cannot combine --reverse with --walk-reflogs");
1910 if (revs
->rewrite_parents
&& revs
->children
.name
)
1911 die("cannot combine --parents and --children");
1914 * Limitations on the graph functionality
1916 if (revs
->reverse
&& revs
->graph
)
1917 die("cannot combine --reverse with --graph");
1919 if (revs
->reflog_info
&& revs
->graph
)
1920 die("cannot combine --walk-reflogs with --graph");
1921 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
1922 die("cannot use --grep-reflog without --walk-reflogs");
1927 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
1929 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
1932 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
1935 static int remove_duplicate_parents(struct commit
*commit
)
1937 struct commit_list
**pp
, *p
;
1938 int surviving_parents
;
1940 /* Examine existing parents while marking ones we have seen... */
1941 pp
= &commit
->parents
;
1942 while ((p
= *pp
) != NULL
) {
1943 struct commit
*parent
= p
->item
;
1944 if (parent
->object
.flags
& TMP_MARK
) {
1948 parent
->object
.flags
|= TMP_MARK
;
1951 /* count them while clearing the temporary mark */
1952 surviving_parents
= 0;
1953 for (p
= commit
->parents
; p
; p
= p
->next
) {
1954 p
->item
->object
.flags
&= ~TMP_MARK
;
1955 surviving_parents
++;
1957 return surviving_parents
;
1960 struct merge_simplify_state
{
1961 struct commit
*simplified
;
1964 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
1966 struct merge_simplify_state
*st
;
1968 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
1970 st
= xcalloc(1, sizeof(*st
));
1971 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
1976 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
1978 struct commit_list
*p
;
1979 struct merge_simplify_state
*st
, *pst
;
1982 st
= locate_simplify_state(revs
, commit
);
1985 * Have we handled this one?
1991 * An UNINTERESTING commit simplifies to itself, so does a
1992 * root commit. We do not rewrite parents of such commit
1995 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
1996 st
->simplified
= commit
;
2001 * Do we know what commit all of our parents that matter
2002 * should be rewritten to? Otherwise we are not ready to
2003 * rewrite this one yet.
2005 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
2006 pst
= locate_simplify_state(revs
, p
->item
);
2007 if (!pst
->simplified
) {
2008 tail
= &commit_list_insert(p
->item
, tail
)->next
;
2011 if (revs
->first_parent_only
)
2015 tail
= &commit_list_insert(commit
, tail
)->next
;
2020 * Rewrite our list of parents.
2022 for (p
= commit
->parents
; p
; p
= p
->next
) {
2023 pst
= locate_simplify_state(revs
, p
->item
);
2024 p
->item
= pst
->simplified
;
2025 if (revs
->first_parent_only
)
2029 if (revs
->first_parent_only
)
2032 cnt
= remove_duplicate_parents(commit
);
2035 * It is possible that we are a merge and one side branch
2036 * does not have any commit that touches the given paths;
2037 * in such a case, the immediate parents will be rewritten
2038 * to different commits.
2040 * o----X X: the commit we are looking at;
2041 * / / o: a commit that touches the paths;
2044 * Further reduce the parents by removing redundant parents.
2047 struct commit_list
*h
= reduce_heads(commit
->parents
);
2048 cnt
= commit_list_count(h
);
2049 free_commit_list(commit
->parents
);
2050 commit
->parents
= h
;
2054 * A commit simplifies to itself if it is a root, if it is
2055 * UNINTERESTING, if it touches the given paths, or if it is a
2056 * merge and its parents simplifies to more than one commits
2057 * (the first two cases are already handled at the beginning of
2060 * Otherwise, it simplifies to what its sole parent simplifies to.
2063 (commit
->object
.flags
& UNINTERESTING
) ||
2064 !(commit
->object
.flags
& TREESAME
) ||
2066 st
->simplified
= commit
;
2068 pst
= locate_simplify_state(revs
, commit
->parents
->item
);
2069 st
->simplified
= pst
->simplified
;
2074 static void simplify_merges(struct rev_info
*revs
)
2076 struct commit_list
*list
, *next
;
2077 struct commit_list
*yet_to_do
, **tail
;
2078 struct commit
*commit
;
2083 /* feed the list reversed */
2085 for (list
= revs
->commits
; list
; list
= next
) {
2086 commit
= list
->item
;
2089 * Do not free(list) here yet; the original list
2090 * is used later in this function.
2092 commit_list_insert(commit
, &yet_to_do
);
2099 commit
= list
->item
;
2103 tail
= simplify_one(revs
, commit
, tail
);
2107 /* clean up the result, removing the simplified ones */
2108 list
= revs
->commits
;
2109 revs
->commits
= NULL
;
2110 tail
= &revs
->commits
;
2112 struct merge_simplify_state
*st
;
2114 commit
= list
->item
;
2118 st
= locate_simplify_state(revs
, commit
);
2119 if (st
->simplified
== commit
)
2120 tail
= &commit_list_insert(commit
, tail
)->next
;
2124 static void set_children(struct rev_info
*revs
)
2126 struct commit_list
*l
;
2127 for (l
= revs
->commits
; l
; l
= l
->next
) {
2128 struct commit
*commit
= l
->item
;
2129 struct commit_list
*p
;
2131 for (p
= commit
->parents
; p
; p
= p
->next
)
2132 add_child(revs
, p
->item
, commit
);
2136 void reset_revision_walk(void)
2138 clear_object_flags(SEEN
| ADDED
| SHOWN
);
2141 int prepare_revision_walk(struct rev_info
*revs
)
2143 int nr
= revs
->pending
.nr
;
2144 struct object_array_entry
*e
, *list
;
2145 struct commit_list
**next
= &revs
->commits
;
2147 e
= list
= revs
->pending
.objects
;
2148 revs
->pending
.nr
= 0;
2149 revs
->pending
.alloc
= 0;
2150 revs
->pending
.objects
= NULL
;
2152 struct commit
*commit
= handle_commit(revs
, e
->item
, e
->name
);
2154 if (!(commit
->object
.flags
& SEEN
)) {
2155 commit
->object
.flags
|= SEEN
;
2156 next
= commit_list_append(commit
, next
);
2161 if (!revs
->leak_pending
)
2164 if (revs
->no_walk
!= REVISION_WALK_NO_WALK_UNSORTED
)
2165 commit_list_sort_by_date(&revs
->commits
);
2169 if (limit_list(revs
) < 0)
2171 if (revs
->topo_order
)
2172 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
2173 if (revs
->simplify_merges
)
2174 simplify_merges(revs
);
2175 if (revs
->children
.name
)
2180 enum rewrite_result
{
2182 rewrite_one_noparents
,
2186 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
2188 struct commit_list
*cache
= NULL
;
2191 struct commit
*p
= *pp
;
2193 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
2194 return rewrite_one_error
;
2195 if (p
->parents
&& p
->parents
->next
)
2196 return rewrite_one_ok
;
2197 if (p
->object
.flags
& UNINTERESTING
)
2198 return rewrite_one_ok
;
2199 if (!(p
->object
.flags
& TREESAME
))
2200 return rewrite_one_ok
;
2202 return rewrite_one_noparents
;
2203 *pp
= p
->parents
->item
;
2207 static int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
)
2209 struct commit_list
**pp
= &commit
->parents
;
2211 struct commit_list
*parent
= *pp
;
2212 switch (rewrite_one(revs
, &parent
->item
)) {
2213 case rewrite_one_ok
:
2215 case rewrite_one_noparents
:
2218 case rewrite_one_error
:
2223 remove_duplicate_parents(commit
);
2227 static int commit_rewrite_person(struct strbuf
*buf
, const char *what
, struct string_list
*mailmap
)
2229 char *person
, *endp
;
2230 size_t len
, namelen
, maillen
;
2233 struct ident_split ident
;
2235 person
= strstr(buf
->buf
, what
);
2239 person
+= strlen(what
);
2240 endp
= strchr(person
, '\n');
2244 len
= endp
- person
;
2246 if (split_ident_line(&ident
, person
, len
))
2249 mail
= ident
.mail_begin
;
2250 maillen
= ident
.mail_end
- ident
.mail_begin
;
2251 name
= ident
.name_begin
;
2252 namelen
= ident
.name_end
- ident
.name_begin
;
2254 if (map_user(mailmap
, &mail
, &maillen
, &name
, &namelen
)) {
2255 struct strbuf namemail
= STRBUF_INIT
;
2257 strbuf_addf(&namemail
, "%.*s <%.*s>",
2258 (int)namelen
, name
, (int)maillen
, mail
);
2260 strbuf_splice(buf
, ident
.name_begin
- buf
->buf
,
2261 ident
.mail_end
- ident
.name_begin
+ 1,
2262 namemail
.buf
, namemail
.len
);
2264 strbuf_release(&namemail
);
2272 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
2275 const char *encoding
;
2277 struct strbuf buf
= STRBUF_INIT
;
2279 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
2282 /* Prepend "fake" headers as needed */
2283 if (opt
->grep_filter
.use_reflog_filter
) {
2284 strbuf_addstr(&buf
, "reflog ");
2285 get_reflog_message(&buf
, opt
->reflog_info
);
2286 strbuf_addch(&buf
, '\n');
2290 * We grep in the user's output encoding, under the assumption that it
2291 * is the encoding they are most likely to write their grep pattern
2292 * for. In addition, it means we will match the "notes" encoding below,
2293 * so we will not end up with a buffer that has two different encodings
2296 encoding
= get_log_output_encoding();
2297 message
= logmsg_reencode(commit
, NULL
, encoding
);
2299 /* Copy the commit to temporary if we are using "fake" headers */
2301 strbuf_addstr(&buf
, message
);
2303 if (opt
->grep_filter
.header_list
&& opt
->mailmap
) {
2305 strbuf_addstr(&buf
, message
);
2307 commit_rewrite_person(&buf
, "\nauthor ", opt
->mailmap
);
2308 commit_rewrite_person(&buf
, "\ncommitter ", opt
->mailmap
);
2311 /* Append "fake" message parts as needed */
2312 if (opt
->show_notes
) {
2314 strbuf_addstr(&buf
, message
);
2315 format_display_notes(commit
->object
.sha1
, &buf
, encoding
, 1);
2318 /* Find either in the original commit message, or in the temporary */
2320 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
2322 retval
= grep_buffer(&opt
->grep_filter
,
2323 message
, strlen(message
));
2324 strbuf_release(&buf
);
2325 logmsg_free(message
, commit
);
2329 static inline int want_ancestry(struct rev_info
*revs
)
2331 return (revs
->rewrite_parents
|| revs
->children
.name
);
2334 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
2336 if (commit
->object
.flags
& SHOWN
)
2337 return commit_ignore
;
2338 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
))
2339 return commit_ignore
;
2342 if (commit
->object
.flags
& UNINTERESTING
)
2343 return commit_ignore
;
2344 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
2345 return commit_ignore
;
2346 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
2348 struct commit_list
*p
;
2349 for (p
= commit
->parents
; p
; p
= p
->next
)
2351 if ((n
< revs
->min_parents
) ||
2352 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
2353 return commit_ignore
;
2355 if (!commit_match(commit
, revs
))
2356 return commit_ignore
;
2357 if (revs
->prune
&& revs
->dense
) {
2358 /* Commit without changes? */
2359 if (commit
->object
.flags
& TREESAME
) {
2360 /* drop merges unless we want parenthood */
2361 if (!want_ancestry(revs
))
2362 return commit_ignore
;
2363 /* non-merge - always ignore it */
2364 if (!commit
->parents
|| !commit
->parents
->next
)
2365 return commit_ignore
;
2371 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
2373 enum commit_action action
= get_commit_action(revs
, commit
);
2375 if (action
== commit_show
&&
2377 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
2378 if (rewrite_parents(revs
, commit
) < 0)
2379 return commit_error
;
2384 static struct commit
*get_revision_1(struct rev_info
*revs
)
2390 struct commit_list
*entry
= revs
->commits
;
2391 struct commit
*commit
= entry
->item
;
2393 revs
->commits
= entry
->next
;
2396 if (revs
->reflog_info
) {
2397 fake_reflog_parent(revs
->reflog_info
, commit
);
2398 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
2402 * If we haven't done the list limiting, we need to look at
2403 * the parents here. We also need to do the date-based limiting
2404 * that we'd otherwise have done in limit_list().
2406 if (!revs
->limited
) {
2407 if (revs
->max_age
!= -1 &&
2408 (commit
->date
< revs
->max_age
))
2410 if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0)
2411 die("Failed to traverse parents of commit %s",
2412 sha1_to_hex(commit
->object
.sha1
));
2415 switch (simplify_commit(revs
, commit
)) {
2419 die("Failed to simplify parents of commit %s",
2420 sha1_to_hex(commit
->object
.sha1
));
2424 } while (revs
->commits
);
2428 static void gc_boundary(struct object_array
*array
)
2430 unsigned nr
= array
->nr
;
2431 unsigned alloc
= array
->alloc
;
2432 struct object_array_entry
*objects
= array
->objects
;
2436 for (i
= j
= 0; i
< nr
; i
++) {
2437 if (objects
[i
].item
->flags
& SHOWN
)
2440 objects
[j
] = objects
[i
];
2443 for (i
= j
; i
< nr
; i
++)
2444 objects
[i
].item
= NULL
;
2449 static void create_boundary_commit_list(struct rev_info
*revs
)
2453 struct object_array
*array
= &revs
->boundary_commits
;
2454 struct object_array_entry
*objects
= array
->objects
;
2457 * If revs->commits is non-NULL at this point, an error occurred in
2458 * get_revision_1(). Ignore the error and continue printing the
2459 * boundary commits anyway. (This is what the code has always
2462 if (revs
->commits
) {
2463 free_commit_list(revs
->commits
);
2464 revs
->commits
= NULL
;
2468 * Put all of the actual boundary commits from revs->boundary_commits
2469 * into revs->commits
2471 for (i
= 0; i
< array
->nr
; i
++) {
2472 c
= (struct commit
*)(objects
[i
].item
);
2475 if (!(c
->object
.flags
& CHILD_SHOWN
))
2477 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
2479 c
->object
.flags
|= BOUNDARY
;
2480 commit_list_insert(c
, &revs
->commits
);
2484 * If revs->topo_order is set, sort the boundary commits
2485 * in topological order
2487 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
2490 static struct commit
*get_revision_internal(struct rev_info
*revs
)
2492 struct commit
*c
= NULL
;
2493 struct commit_list
*l
;
2495 if (revs
->boundary
== 2) {
2497 * All of the normal commits have already been returned,
2498 * and we are now returning boundary commits.
2499 * create_boundary_commit_list() has populated
2500 * revs->commits with the remaining commits to return.
2502 c
= pop_commit(&revs
->commits
);
2504 c
->object
.flags
|= SHOWN
;
2509 * If our max_count counter has reached zero, then we are done. We
2510 * don't simply return NULL because we still might need to show
2511 * boundary commits. But we want to avoid calling get_revision_1, which
2512 * might do a considerable amount of work finding the next commit only
2513 * for us to throw it away.
2515 * If it is non-zero, then either we don't have a max_count at all
2516 * (-1), or it is still counting, in which case we decrement.
2518 if (revs
->max_count
) {
2519 c
= get_revision_1(revs
);
2521 while (0 < revs
->skip_count
) {
2523 c
= get_revision_1(revs
);
2529 if (revs
->max_count
> 0)
2534 c
->object
.flags
|= SHOWN
;
2536 if (!revs
->boundary
) {
2542 * get_revision_1() runs out the commits, and
2543 * we are done computing the boundaries.
2544 * switch to boundary commits output mode.
2549 * Update revs->commits to contain the list of
2552 create_boundary_commit_list(revs
);
2554 return get_revision_internal(revs
);
2558 * boundary commits are the commits that are parents of the
2559 * ones we got from get_revision_1() but they themselves are
2560 * not returned from get_revision_1(). Before returning
2561 * 'c', we need to mark its parents that they could be boundaries.
2564 for (l
= c
->parents
; l
; l
= l
->next
) {
2566 p
= &(l
->item
->object
);
2567 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
2569 p
->flags
|= CHILD_SHOWN
;
2570 gc_boundary(&revs
->boundary_commits
);
2571 add_object_array(p
, NULL
, &revs
->boundary_commits
);
2577 struct commit
*get_revision(struct rev_info
*revs
)
2580 struct commit_list
*reversed
;
2582 if (revs
->reverse
) {
2584 while ((c
= get_revision_internal(revs
))) {
2585 commit_list_insert(c
, &reversed
);
2587 revs
->commits
= reversed
;
2589 revs
->reverse_output_stage
= 1;
2592 if (revs
->reverse_output_stage
)
2593 return pop_commit(&revs
->commits
);
2595 c
= get_revision_internal(revs
);
2596 if (c
&& revs
->graph
)
2597 graph_update(revs
->graph
, c
);
2601 char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
2603 if (commit
->object
.flags
& BOUNDARY
)
2605 else if (commit
->object
.flags
& UNINTERESTING
)
2607 else if (commit
->object
.flags
& PATCHSAME
)
2609 else if (!revs
|| revs
->left_right
) {
2610 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
2614 } else if (revs
->graph
)
2616 else if (revs
->cherry_mark
)
2621 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
2623 char *mark
= get_revision_mark(revs
, commit
);
2626 fputs(mark
, stdout
);