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
)
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
);
212 void add_pending_object(struct rev_info
*revs
, struct object
*obj
, const char *name
)
214 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
217 void add_head_to_pending(struct rev_info
*revs
)
219 unsigned char sha1
[20];
221 if (get_sha1("HEAD", sha1
))
223 obj
= parse_object(sha1
);
226 add_pending_object(revs
, obj
, "HEAD");
229 static struct object
*get_reference(struct rev_info
*revs
, const char *name
, const unsigned char *sha1
, unsigned int flags
)
231 struct object
*object
;
233 object
= parse_object(sha1
);
235 if (revs
->ignore_missing
)
237 die("bad object %s", name
);
239 object
->flags
|= flags
;
243 void add_pending_sha1(struct rev_info
*revs
, const char *name
,
244 const unsigned char *sha1
, unsigned int flags
)
246 struct object
*object
= get_reference(revs
, name
, sha1
, flags
);
247 add_pending_object(revs
, object
, name
);
250 static struct commit
*handle_commit(struct rev_info
*revs
, struct object
*object
, const char *name
)
252 unsigned long flags
= object
->flags
;
255 * Tag object? Look what it points to..
257 while (object
->type
== OBJ_TAG
) {
258 struct tag
*tag
= (struct tag
*) object
;
259 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
260 add_pending_object(revs
, object
, tag
->tag
);
263 object
= parse_object(tag
->tagged
->sha1
);
265 if (flags
& UNINTERESTING
)
267 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
272 * Commit object? Just return it, we'll do all the complex
275 if (object
->type
== OBJ_COMMIT
) {
276 struct commit
*commit
= (struct commit
*)object
;
277 if (parse_commit(commit
) < 0)
278 die("unable to parse commit %s", name
);
279 if (flags
& UNINTERESTING
) {
280 commit
->object
.flags
|= UNINTERESTING
;
281 mark_parents_uninteresting(commit
);
284 if (revs
->show_source
&& !commit
->util
)
285 commit
->util
= (void *) name
;
290 * Tree object? Either mark it uninteresting, or add it
291 * to the list of objects to look at later..
293 if (object
->type
== OBJ_TREE
) {
294 struct tree
*tree
= (struct tree
*)object
;
295 if (!revs
->tree_objects
)
297 if (flags
& UNINTERESTING
) {
298 mark_tree_uninteresting(tree
);
301 add_pending_object(revs
, object
, "");
306 * Blob object? You know the drill by now..
308 if (object
->type
== OBJ_BLOB
) {
309 struct blob
*blob
= (struct blob
*)object
;
310 if (!revs
->blob_objects
)
312 if (flags
& UNINTERESTING
) {
313 mark_blob_uninteresting(blob
);
316 add_pending_object(revs
, object
, "");
319 die("%s is unknown object", name
);
322 static int everybody_uninteresting(struct commit_list
*orig
)
324 struct commit_list
*list
= orig
;
326 struct commit
*commit
= list
->item
;
328 if (commit
->object
.flags
& UNINTERESTING
)
336 * The goal is to get REV_TREE_NEW as the result only if the
337 * diff consists of all '+' (and no other changes), REV_TREE_OLD
338 * if the whole diff is removal of old data, and otherwise
339 * REV_TREE_DIFFERENT (of course if the trees are the same we
340 * want REV_TREE_SAME).
341 * That means that once we get to REV_TREE_DIFFERENT, we do not
342 * have to look any further.
344 static int tree_difference
= REV_TREE_SAME
;
346 static void file_add_remove(struct diff_options
*options
,
347 int addremove
, unsigned mode
,
348 const unsigned char *sha1
,
350 const char *fullpath
, unsigned dirty_submodule
)
352 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
354 tree_difference
|= diff
;
355 if (tree_difference
== REV_TREE_DIFFERENT
)
356 DIFF_OPT_SET(options
, HAS_CHANGES
);
359 static void file_change(struct diff_options
*options
,
360 unsigned old_mode
, unsigned new_mode
,
361 const unsigned char *old_sha1
,
362 const unsigned char *new_sha1
,
363 int old_sha1_valid
, int new_sha1_valid
,
364 const char *fullpath
,
365 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
367 tree_difference
= REV_TREE_DIFFERENT
;
368 DIFF_OPT_SET(options
, HAS_CHANGES
);
371 static int rev_compare_tree(struct rev_info
*revs
, struct commit
*parent
, struct commit
*commit
)
373 struct tree
*t1
= parent
->tree
;
374 struct tree
*t2
= commit
->tree
;
381 if (revs
->simplify_by_decoration
) {
383 * If we are simplifying by decoration, then the commit
384 * is worth showing if it has a tag pointing at it.
386 if (lookup_decoration(&name_decoration
, &commit
->object
))
387 return REV_TREE_DIFFERENT
;
389 * A commit that is not pointed by a tag is uninteresting
390 * if we are not limited by path. This means that you will
391 * see the usual "commits that touch the paths" plus any
392 * tagged commit by specifying both --simplify-by-decoration
395 if (!revs
->prune_data
.nr
)
396 return REV_TREE_SAME
;
399 tree_difference
= REV_TREE_SAME
;
400 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
401 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
403 return REV_TREE_DIFFERENT
;
404 return tree_difference
;
407 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
412 struct tree_desc empty
, real
;
413 struct tree
*t1
= commit
->tree
;
418 tree
= read_object_with_reference(t1
->object
.sha1
, tree_type
, &size
, NULL
);
421 init_tree_desc(&real
, tree
, size
);
422 init_tree_desc(&empty
, "", 0);
424 tree_difference
= REV_TREE_SAME
;
425 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
426 retval
= diff_tree(&empty
, &real
, "", &revs
->pruning
);
429 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
432 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
434 struct commit_list
**pp
, *parent
;
435 int tree_changed
= 0, tree_same
= 0, nth_parent
= 0;
438 * If we don't do pruning, everything is interesting
446 if (!commit
->parents
) {
447 if (rev_same_tree_as_empty(revs
, commit
))
448 commit
->object
.flags
|= TREESAME
;
453 * Normal non-merge commit? If we don't want to make the
454 * history dense, we consider it always to be a change..
456 if (!revs
->dense
&& !commit
->parents
->next
)
459 pp
= &commit
->parents
;
460 while ((parent
= *pp
) != NULL
) {
461 struct commit
*p
= parent
->item
;
464 * Do not compare with later parents when we care only about
465 * the first parent chain, in order to avoid derailing the
466 * traversal to follow a side branch that brought everything
467 * in the path we are limited to by the pathspec.
469 if (revs
->first_parent_only
&& nth_parent
++)
471 if (parse_commit(p
) < 0)
472 die("cannot simplify commit %s (because of %s)",
473 sha1_to_hex(commit
->object
.sha1
),
474 sha1_to_hex(p
->object
.sha1
));
475 switch (rev_compare_tree(revs
, p
, commit
)) {
478 if (!revs
->simplify_history
|| (p
->object
.flags
& UNINTERESTING
)) {
479 /* Even if a merge with an uninteresting
480 * side branch brought the entire change
481 * we are interested in, we do not want
482 * to lose the other branches of this
483 * merge, so we just keep going.
489 commit
->parents
= parent
;
490 commit
->object
.flags
|= TREESAME
;
494 if (revs
->remove_empty_trees
&&
495 rev_same_tree_as_empty(revs
, p
)) {
496 /* We are adding all the specified
497 * paths from this parent, so the
498 * history beyond this parent is not
499 * interesting. Remove its parents
500 * (they are grandparents for us).
501 * IOW, we pretend this parent is a
504 if (parse_commit(p
) < 0)
505 die("cannot simplify commit %s (invalid %s)",
506 sha1_to_hex(commit
->object
.sha1
),
507 sha1_to_hex(p
->object
.sha1
));
512 case REV_TREE_DIFFERENT
:
517 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
519 if (tree_changed
&& !tree_same
)
521 commit
->object
.flags
|= TREESAME
;
524 static void commit_list_insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
525 struct commit_list
*cached_base
, struct commit_list
**cache
)
527 struct commit_list
*new_entry
;
529 if (cached_base
&& p
->date
< cached_base
->item
->date
)
530 new_entry
= commit_list_insert_by_date(p
, &cached_base
->next
);
532 new_entry
= commit_list_insert_by_date(p
, head
);
534 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
538 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
539 struct commit_list
**list
, struct commit_list
**cache_ptr
)
541 struct commit_list
*parent
= commit
->parents
;
543 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
545 if (commit
->object
.flags
& ADDED
)
547 commit
->object
.flags
|= ADDED
;
550 * If the commit is uninteresting, don't try to
551 * prune parents - we want the maximal uninteresting
554 * Normally we haven't parsed the parent
555 * yet, so we won't have a parent of a parent
556 * here. However, it may turn out that we've
557 * reached this commit some other way (where it
558 * wasn't uninteresting), in which case we need
559 * to mark its parents recursively too..
561 if (commit
->object
.flags
& UNINTERESTING
) {
563 struct commit
*p
= parent
->item
;
564 parent
= parent
->next
;
566 p
->object
.flags
|= UNINTERESTING
;
567 if (parse_commit(p
) < 0)
570 mark_parents_uninteresting(p
);
571 if (p
->object
.flags
& SEEN
)
573 p
->object
.flags
|= SEEN
;
574 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
580 * Ok, the commit wasn't uninteresting. Try to
581 * simplify the commit history and find the parent
582 * that has no differences in the path set if one exists.
584 try_to_simplify_commit(revs
, commit
);
589 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
591 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
592 struct commit
*p
= parent
->item
;
594 if (parse_commit(p
) < 0)
596 /* skip 1st prnt if there is a 2nd one for --second-parent */
597 if ((revs
->first_parent_only
== 2) && (parent
->next
) &&
598 (parent
== commit
->parents
))
600 if (revs
->show_source
&& !p
->util
)
601 p
->util
= commit
->util
;
602 p
->object
.flags
|= left_flag
;
603 if (!(p
->object
.flags
& SEEN
)) {
604 p
->object
.flags
|= SEEN
;
605 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
607 /* only use 1 parent for --first/second-parent */
608 if (revs
->first_parent_only
)
614 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
616 struct commit_list
*p
;
617 int left_count
= 0, right_count
= 0;
619 struct patch_ids ids
;
620 unsigned cherry_flag
;
622 /* First count the commits on the left and on the right */
623 for (p
= list
; p
; p
= p
->next
) {
624 struct commit
*commit
= p
->item
;
625 unsigned flags
= commit
->object
.flags
;
626 if (flags
& BOUNDARY
)
628 else if (flags
& SYMMETRIC_LEFT
)
634 if (!left_count
|| !right_count
)
637 left_first
= left_count
< right_count
;
638 init_patch_ids(&ids
);
639 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
641 /* Compute patch-ids for one side */
642 for (p
= list
; p
; p
= p
->next
) {
643 struct commit
*commit
= p
->item
;
644 unsigned flags
= commit
->object
.flags
;
646 if (flags
& BOUNDARY
)
649 * If we have fewer left, left_first is set and we omit
650 * commits on the right branch in this loop. If we have
651 * fewer right, we skip the left ones.
653 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
655 commit
->util
= add_commit_patch_id(commit
, &ids
);
658 /* either cherry_mark or cherry_pick are true */
659 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
661 /* Check the other side */
662 for (p
= list
; p
; p
= p
->next
) {
663 struct commit
*commit
= p
->item
;
665 unsigned flags
= commit
->object
.flags
;
667 if (flags
& BOUNDARY
)
670 * If we have fewer left, left_first is set and we omit
671 * commits on the left branch in this loop.
673 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
677 * Have we seen the same patch id?
679 id
= has_commit_patch_id(commit
, &ids
);
683 commit
->object
.flags
|= cherry_flag
;
686 /* Now check the original side for seen ones */
687 for (p
= list
; p
; p
= p
->next
) {
688 struct commit
*commit
= p
->item
;
689 struct patch_id
*ent
;
695 commit
->object
.flags
|= cherry_flag
;
699 free_patch_ids(&ids
);
702 /* How many extra uninteresting commits we want to see.. */
705 static int still_interesting(struct commit_list
*src
, unsigned long date
, int slop
)
708 * No source list at all? We're definitely done..
714 * Does the destination list contain entries with a date
715 * before the source list? Definitely _not_ done.
717 if (date
< src
->item
->date
)
721 * Does the source list still have interesting commits in
722 * it? Definitely not done..
724 if (!everybody_uninteresting(src
))
727 /* Ok, we're closing in.. */
732 * "rev-list --ancestry-path A..B" computes commits that are ancestors
733 * of B but not ancestors of A but further limits the result to those
734 * that are descendants of A. This takes the list of bottom commits and
735 * the result of "A..B" without --ancestry-path, and limits the latter
736 * further to the ones that can reach one of the commits in "bottom".
738 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
740 struct commit_list
*p
;
741 struct commit_list
*rlist
= NULL
;
745 * Reverse the list so that it will be likely that we would
746 * process parents before children.
748 for (p
= list
; p
; p
= p
->next
)
749 commit_list_insert(p
->item
, &rlist
);
751 for (p
= bottom
; p
; p
= p
->next
)
752 p
->item
->object
.flags
|= TMP_MARK
;
755 * Mark the ones that can reach bottom commits in "list",
756 * in a bottom-up fashion.
760 for (p
= rlist
; p
; p
= p
->next
) {
761 struct commit
*c
= p
->item
;
762 struct commit_list
*parents
;
763 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
765 for (parents
= c
->parents
;
767 parents
= parents
->next
) {
768 if (!(parents
->item
->object
.flags
& TMP_MARK
))
770 c
->object
.flags
|= TMP_MARK
;
775 } while (made_progress
);
778 * NEEDSWORK: decide if we want to remove parents that are
779 * not marked with TMP_MARK from commit->parents for commits
780 * in the resulting list. We may not want to do that, though.
784 * The ones that are not marked with TMP_MARK are uninteresting
786 for (p
= list
; p
; p
= p
->next
) {
787 struct commit
*c
= p
->item
;
788 if (c
->object
.flags
& TMP_MARK
)
790 c
->object
.flags
|= UNINTERESTING
;
793 /* We are done with the TMP_MARK */
794 for (p
= list
; p
; p
= p
->next
)
795 p
->item
->object
.flags
&= ~TMP_MARK
;
796 for (p
= bottom
; p
; p
= p
->next
)
797 p
->item
->object
.flags
&= ~TMP_MARK
;
798 free_commit_list(rlist
);
802 * Before walking the history, keep the set of "negative" refs the
803 * caller has asked to exclude.
805 * This is used to compute "rev-list --ancestry-path A..B", as we need
806 * to filter the result of "A..B" further to the ones that can actually
809 static struct commit_list
*collect_bottom_commits(struct rev_info
*revs
)
811 struct commit_list
*bottom
= NULL
;
813 for (i
= 0; i
< revs
->cmdline
.nr
; i
++) {
814 struct rev_cmdline_entry
*elem
= &revs
->cmdline
.rev
[i
];
815 if ((elem
->flags
& UNINTERESTING
) &&
816 elem
->item
->type
== OBJ_COMMIT
)
817 commit_list_insert((struct commit
*)elem
->item
, &bottom
);
822 /* Assumes either left_only or right_only is set */
823 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
825 struct commit_list
*p
;
827 for (p
= list
; p
; p
= p
->next
) {
828 struct commit
*commit
= p
->item
;
830 if (revs
->right_only
) {
831 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
832 commit
->object
.flags
|= SHOWN
;
833 } else /* revs->left_only is set */
834 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
835 commit
->object
.flags
|= SHOWN
;
839 static int limit_list(struct rev_info
*revs
)
842 unsigned long date
= ~0ul;
843 struct commit_list
*list
= revs
->commits
;
844 struct commit_list
*newlist
= NULL
;
845 struct commit_list
**p
= &newlist
;
846 struct commit_list
*bottom
= NULL
;
848 if (revs
->ancestry_path
) {
849 bottom
= collect_bottom_commits(revs
);
851 die("--ancestry-path given but there are no bottom commits");
855 struct commit_list
*entry
= list
;
856 struct commit
*commit
= list
->item
;
857 struct object
*obj
= &commit
->object
;
858 show_early_output_fn_t show
;
863 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
864 obj
->flags
|= UNINTERESTING
;
865 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
867 if (obj
->flags
& UNINTERESTING
) {
868 mark_parents_uninteresting(commit
);
870 p
= &commit_list_insert(commit
, p
)->next
;
871 slop
= still_interesting(list
, date
, slop
);
874 /* If showing all, add the whole pending list to the end */
879 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
882 p
= &commit_list_insert(commit
, p
)->next
;
884 show
= show_early_output
;
889 show_early_output
= NULL
;
891 if (revs
->cherry_pick
|| revs
->cherry_mark
)
892 cherry_pick_list(newlist
, revs
);
894 if (revs
->left_only
|| revs
->right_only
)
895 limit_left_right(newlist
, revs
);
898 limit_to_ancestry(bottom
, newlist
);
899 free_commit_list(bottom
);
902 revs
->commits
= newlist
;
906 static void add_rev_cmdline(struct rev_info
*revs
,
912 struct rev_cmdline_info
*info
= &revs
->cmdline
;
915 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
916 info
->rev
[nr
].item
= item
;
917 info
->rev
[nr
].name
= name
;
918 info
->rev
[nr
].whence
= whence
;
919 info
->rev
[nr
].flags
= flags
;
925 int warned_bad_reflog
;
926 struct rev_info
*all_revs
;
927 const char *name_for_errormsg
;
930 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
932 struct all_refs_cb
*cb
= cb_data
;
933 struct object
*object
= get_reference(cb
->all_revs
, path
, sha1
,
935 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
936 add_pending_sha1(cb
->all_revs
, path
, sha1
, cb
->all_flags
);
940 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
944 cb
->all_flags
= flags
;
947 static void handle_refs(const char *submodule
, struct rev_info
*revs
, unsigned flags
,
948 int (*for_each
)(const char *, each_ref_fn
, void *))
950 struct all_refs_cb cb
;
951 init_all_refs_cb(&cb
, revs
, flags
);
952 for_each(submodule
, handle_one_ref
, &cb
);
955 static void handle_one_reflog_commit(unsigned char *sha1
, void *cb_data
)
957 struct all_refs_cb
*cb
= cb_data
;
958 if (!is_null_sha1(sha1
)) {
959 struct object
*o
= parse_object(sha1
);
961 o
->flags
|= cb
->all_flags
;
962 /* ??? CMDLINEFLAGS ??? */
963 add_pending_object(cb
->all_revs
, o
, "");
965 else if (!cb
->warned_bad_reflog
) {
966 warning("reflog of '%s' references pruned commits",
967 cb
->name_for_errormsg
);
968 cb
->warned_bad_reflog
= 1;
973 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
974 const char *email
, unsigned long timestamp
, int tz
,
975 const char *message
, void *cb_data
)
977 handle_one_reflog_commit(osha1
, cb_data
);
978 handle_one_reflog_commit(nsha1
, cb_data
);
982 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
984 struct all_refs_cb
*cb
= cb_data
;
985 cb
->warned_bad_reflog
= 0;
986 cb
->name_for_errormsg
= path
;
987 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
991 static void handle_reflog(struct rev_info
*revs
, unsigned flags
)
993 struct all_refs_cb cb
;
995 cb
.all_flags
= flags
;
996 for_each_reflog(handle_one_reflog
, &cb
);
999 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
)
1001 unsigned char sha1
[20];
1003 struct commit
*commit
;
1004 struct commit_list
*parents
;
1005 const char *arg
= arg_
;
1008 flags
^= UNINTERESTING
;
1011 if (get_sha1_committish(arg
, sha1
))
1014 it
= get_reference(revs
, arg
, sha1
, 0);
1015 if (!it
&& revs
->ignore_missing
)
1017 if (it
->type
!= OBJ_TAG
)
1019 if (!((struct tag
*)it
)->tagged
)
1021 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
1023 if (it
->type
!= OBJ_COMMIT
)
1025 commit
= (struct commit
*)it
;
1026 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
1027 it
= &parents
->item
->object
;
1029 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1030 add_pending_object(revs
, it
, arg
);
1035 void init_revisions(struct rev_info
*revs
, const char *prefix
)
1037 memset(revs
, 0, sizeof(*revs
));
1039 revs
->abbrev
= DEFAULT_ABBREV
;
1040 revs
->ignore_merges
= 1;
1041 revs
->simplify_history
= 1;
1042 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
1043 DIFF_OPT_SET(&revs
->pruning
, QUICK
);
1044 revs
->pruning
.add_remove
= file_add_remove
;
1045 revs
->pruning
.change
= file_change
;
1048 revs
->prefix
= prefix
;
1051 revs
->skip_count
= -1;
1052 revs
->max_count
= -1;
1053 revs
->max_parents
= -1;
1055 revs
->commit_format
= CMIT_FMT_DEFAULT
;
1057 init_grep_defaults();
1058 grep_init(&revs
->grep_filter
, prefix
);
1059 revs
->grep_filter
.status_only
= 1;
1060 revs
->grep_filter
.regflags
= REG_NEWLINE
;
1062 diff_setup(&revs
->diffopt
);
1063 if (prefix
&& !revs
->diffopt
.prefix
) {
1064 revs
->diffopt
.prefix
= prefix
;
1065 revs
->diffopt
.prefix_length
= strlen(prefix
);
1068 revs
->notes_opt
.use_default_notes
= -1;
1071 static void add_pending_commit_list(struct rev_info
*revs
,
1072 struct commit_list
*commit_list
,
1075 while (commit_list
) {
1076 struct object
*object
= &commit_list
->item
->object
;
1077 object
->flags
|= flags
;
1078 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
1079 commit_list
= commit_list
->next
;
1083 static void prepare_show_merge(struct rev_info
*revs
)
1085 struct commit_list
*bases
;
1086 struct commit
*head
, *other
;
1087 unsigned char sha1
[20];
1088 const char **prune
= NULL
;
1089 int i
, prune_num
= 1; /* counting terminating NULL */
1091 if (get_sha1("HEAD", sha1
))
1092 die("--merge without HEAD?");
1093 head
= lookup_commit_or_die(sha1
, "HEAD");
1094 if (get_sha1("MERGE_HEAD", sha1
))
1095 die("--merge without MERGE_HEAD?");
1096 other
= lookup_commit_or_die(sha1
, "MERGE_HEAD");
1097 add_pending_object(revs
, &head
->object
, "HEAD");
1098 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1099 bases
= get_merge_bases(head
, other
, 1);
1100 add_pending_commit_list(revs
, bases
, UNINTERESTING
);
1101 free_commit_list(bases
);
1102 head
->object
.flags
|= SYMMETRIC_LEFT
;
1106 for (i
= 0; i
< active_nr
; i
++) {
1107 struct cache_entry
*ce
= active_cache
[i
];
1110 if (ce_path_match(ce
, &revs
->prune_data
)) {
1112 prune
= xrealloc(prune
, sizeof(*prune
) * prune_num
);
1113 prune
[prune_num
-2] = ce
->name
;
1114 prune
[prune_num
-1] = NULL
;
1116 while ((i
+1 < active_nr
) &&
1117 ce_same_name(ce
, active_cache
[i
+1]))
1120 free_pathspec(&revs
->prune_data
);
1121 init_pathspec(&revs
->prune_data
, prune
);
1125 int handle_revision_arg(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
1127 struct object_context oc
;
1129 struct object
*object
;
1130 unsigned char sha1
[20];
1132 const char *arg
= arg_
;
1133 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
1134 unsigned get_sha1_flags
= 0;
1136 dotdot
= strstr(arg
, "..");
1138 unsigned char from_sha1
[20];
1139 const char *next
= dotdot
+ 2;
1140 const char *this = arg
;
1141 int symmetric
= *next
== '.';
1142 unsigned int flags_exclude
= flags
^ UNINTERESTING
;
1143 static const char head_by_default
[] = "HEAD";
1144 unsigned int a_flags
;
1150 next
= head_by_default
;
1152 this = head_by_default
;
1153 if (this == head_by_default
&& next
== head_by_default
&&
1156 * Just ".."? That is not a range but the
1157 * pathspec for the parent directory.
1159 if (!cant_be_filename
) {
1164 if (!get_sha1_committish(this, from_sha1
) &&
1165 !get_sha1_committish(next
, sha1
)) {
1166 struct commit
*a
, *b
;
1167 struct commit_list
*exclude
;
1169 a
= lookup_commit_reference(from_sha1
);
1170 b
= lookup_commit_reference(sha1
);
1172 if (revs
->ignore_missing
)
1175 "Invalid symmetric difference expression %s...%s" :
1176 "Invalid revision range %s..%s",
1180 if (!cant_be_filename
) {
1182 verify_non_filename(revs
->prefix
, arg
);
1186 exclude
= get_merge_bases(a
, b
, 1);
1187 add_pending_commit_list(revs
, exclude
,
1189 free_commit_list(exclude
);
1190 a_flags
= flags
| SYMMETRIC_LEFT
;
1192 a_flags
= flags_exclude
;
1193 a
->object
.flags
|= a_flags
;
1194 b
->object
.flags
|= flags
;
1195 add_rev_cmdline(revs
, &a
->object
, this,
1196 REV_CMD_LEFT
, a_flags
);
1197 add_rev_cmdline(revs
, &b
->object
, next
,
1198 REV_CMD_RIGHT
, flags
);
1199 add_pending_object(revs
, &a
->object
, this);
1200 add_pending_object(revs
, &b
->object
, next
);
1205 dotdot
= strstr(arg
, "^@");
1206 if (dotdot
&& !dotdot
[2]) {
1208 if (add_parents_only(revs
, arg
, flags
))
1212 dotdot
= strstr(arg
, "^!");
1213 if (dotdot
&& !dotdot
[2]) {
1215 if (!add_parents_only(revs
, arg
, flags
^ UNINTERESTING
))
1221 local_flags
= UNINTERESTING
;
1225 if (revarg_opt
& REVARG_COMMITTISH
)
1226 get_sha1_flags
= GET_SHA1_COMMITTISH
;
1228 if (get_sha1_with_context(arg
, get_sha1_flags
, sha1
, &oc
))
1229 return revs
->ignore_missing
? 0 : -1;
1230 if (!cant_be_filename
)
1231 verify_non_filename(revs
->prefix
, arg
);
1232 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
1233 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
1234 add_pending_object_with_mode(revs
, object
, arg
, oc
.mode
);
1238 struct cmdline_pathspec
{
1244 static void append_prune_data(struct cmdline_pathspec
*prune
, const char **av
)
1247 ALLOC_GROW(prune
->path
, prune
->nr
+1, prune
->alloc
);
1248 prune
->path
[prune
->nr
++] = *(av
++);
1252 static void read_pathspec_from_stdin(struct rev_info
*revs
, struct strbuf
*sb
,
1253 struct cmdline_pathspec
*prune
)
1255 while (strbuf_getwholeline(sb
, stdin
, '\n') != EOF
) {
1257 if (len
&& sb
->buf
[len
- 1] == '\n')
1258 sb
->buf
[--len
] = '\0';
1259 ALLOC_GROW(prune
->path
, prune
->nr
+1, prune
->alloc
);
1260 prune
->path
[prune
->nr
++] = xstrdup(sb
->buf
);
1264 static void read_revisions_from_stdin(struct rev_info
*revs
,
1265 struct cmdline_pathspec
*prune
)
1268 int seen_dashdash
= 0;
1270 strbuf_init(&sb
, 1000);
1271 while (strbuf_getwholeline(&sb
, stdin
, '\n') != EOF
) {
1273 if (len
&& sb
.buf
[len
- 1] == '\n')
1274 sb
.buf
[--len
] = '\0';
1277 if (sb
.buf
[0] == '-') {
1278 if (len
== 2 && sb
.buf
[1] == '-') {
1282 die("options not supported in --stdin mode");
1284 if (handle_revision_arg(sb
.buf
, revs
, 0, REVARG_CANNOT_BE_FILENAME
))
1285 die("bad revision '%s'", sb
.buf
);
1288 read_pathspec_from_stdin(revs
, &sb
, prune
);
1289 strbuf_release(&sb
);
1292 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
1294 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
1297 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
1299 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
1302 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
1304 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
1307 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
1308 int *unkc
, const char **unkv
)
1310 const char *arg
= argv
[0];
1314 /* pseudo revision arguments */
1315 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1316 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1317 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1318 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
1319 !strcmp(arg
, "--bisect") || !prefixcmp(arg
, "--glob=") ||
1320 !prefixcmp(arg
, "--branches=") || !prefixcmp(arg
, "--tags=") ||
1321 !prefixcmp(arg
, "--remotes=") || !prefixcmp(arg
, "--no-walk="))
1323 unkv
[(*unkc
)++] = arg
;
1327 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
1328 revs
->max_count
= atoi(optarg
);
1331 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
1332 revs
->skip_count
= atoi(optarg
);
1334 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1335 /* accept -<digit>, like traditional "head" */
1336 revs
->max_count
= atoi(arg
+ 1);
1338 } else if (!strcmp(arg
, "-n")) {
1340 return error("-n requires an argument");
1341 revs
->max_count
= atoi(argv
[1]);
1344 } else if (!prefixcmp(arg
, "-n")) {
1345 revs
->max_count
= atoi(arg
+ 2);
1347 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
1348 revs
->max_age
= atoi(optarg
);
1350 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
1351 revs
->max_age
= approxidate(optarg
);
1353 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
1354 revs
->max_age
= approxidate(optarg
);
1356 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
1357 revs
->min_age
= atoi(optarg
);
1359 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
1360 revs
->min_age
= approxidate(optarg
);
1362 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
1363 revs
->min_age
= approxidate(optarg
);
1365 } else if (!strcmp(arg
, "--first-parent")) {
1366 revs
->first_parent_only
= 1;
1367 } else if (!strcmp(arg
, "--second-parent")) {
1368 revs
->first_parent_only
= 2;
1369 } else if (!strcmp(arg
, "--ancestry-path")) {
1370 revs
->ancestry_path
= 1;
1371 revs
->simplify_history
= 0;
1373 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1374 init_reflog_walk(&revs
->reflog_info
);
1375 } else if (!strcmp(arg
, "--default")) {
1377 return error("bad --default argument");
1378 revs
->def
= argv
[1];
1380 } else if (!strcmp(arg
, "--merge")) {
1381 revs
->show_merge
= 1;
1382 } else if (!strcmp(arg
, "--topo-order")) {
1384 revs
->topo_order
= 1;
1385 } else if (!strcmp(arg
, "--simplify-merges")) {
1386 revs
->simplify_merges
= 1;
1387 revs
->topo_order
= 1;
1388 revs
->rewrite_parents
= 1;
1389 revs
->simplify_history
= 0;
1391 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
1392 revs
->simplify_merges
= 1;
1393 revs
->topo_order
= 1;
1394 revs
->rewrite_parents
= 1;
1395 revs
->simplify_history
= 0;
1396 revs
->simplify_by_decoration
= 1;
1399 load_ref_decorations(DECORATE_SHORT_REFS
);
1400 } else if (!strcmp(arg
, "--date-order")) {
1402 revs
->topo_order
= 1;
1403 } else if (!prefixcmp(arg
, "--early-output")) {
1407 count
= atoi(arg
+15);
1410 revs
->topo_order
= 1;
1411 revs
->early_output
= count
;
1413 } else if (!strcmp(arg
, "--parents")) {
1414 revs
->rewrite_parents
= 1;
1415 revs
->print_parents
= 1;
1416 } else if (!strcmp(arg
, "--dense")) {
1418 } else if (!strcmp(arg
, "--sparse")) {
1420 } else if (!strcmp(arg
, "--show-all")) {
1422 } else if (!strcmp(arg
, "--remove-empty")) {
1423 revs
->remove_empty_trees
= 1;
1424 } else if (!strcmp(arg
, "--merges")) {
1425 revs
->min_parents
= 2;
1426 } else if (!strcmp(arg
, "--no-merges")) {
1427 revs
->max_parents
= 1;
1428 } else if (!prefixcmp(arg
, "--min-parents=")) {
1429 revs
->min_parents
= atoi(arg
+14);
1430 } else if (!prefixcmp(arg
, "--no-min-parents")) {
1431 revs
->min_parents
= 0;
1432 } else if (!prefixcmp(arg
, "--max-parents=")) {
1433 revs
->max_parents
= atoi(arg
+14);
1434 } else if (!prefixcmp(arg
, "--no-max-parents")) {
1435 revs
->max_parents
= -1;
1436 } else if (!strcmp(arg
, "--boundary")) {
1438 } else if (!strcmp(arg
, "--left-right")) {
1439 revs
->left_right
= 1;
1440 } else if (!strcmp(arg
, "--left-only")) {
1441 if (revs
->right_only
)
1442 die("--left-only is incompatible with --right-only"
1444 revs
->left_only
= 1;
1445 } else if (!strcmp(arg
, "--right-only")) {
1446 if (revs
->left_only
)
1447 die("--right-only is incompatible with --left-only");
1448 revs
->right_only
= 1;
1449 } else if (!strcmp(arg
, "--cherry")) {
1450 if (revs
->left_only
)
1451 die("--cherry is incompatible with --left-only");
1452 revs
->cherry_mark
= 1;
1453 revs
->right_only
= 1;
1454 revs
->max_parents
= 1;
1456 } else if (!strcmp(arg
, "--count")) {
1458 } else if (!strcmp(arg
, "--cherry-mark")) {
1459 if (revs
->cherry_pick
)
1460 die("--cherry-mark is incompatible with --cherry-pick");
1461 revs
->cherry_mark
= 1;
1462 revs
->limited
= 1; /* needs limit_list() */
1463 } else if (!strcmp(arg
, "--cherry-pick")) {
1464 if (revs
->cherry_mark
)
1465 die("--cherry-pick is incompatible with --cherry-mark");
1466 revs
->cherry_pick
= 1;
1468 } else if (!strcmp(arg
, "--objects")) {
1469 revs
->tag_objects
= 1;
1470 revs
->tree_objects
= 1;
1471 revs
->blob_objects
= 1;
1472 } else if (!strcmp(arg
, "--objects-edge")) {
1473 revs
->tag_objects
= 1;
1474 revs
->tree_objects
= 1;
1475 revs
->blob_objects
= 1;
1476 revs
->edge_hint
= 1;
1477 } else if (!strcmp(arg
, "--verify-objects")) {
1478 revs
->tag_objects
= 1;
1479 revs
->tree_objects
= 1;
1480 revs
->blob_objects
= 1;
1481 revs
->verify_objects
= 1;
1482 } else if (!strcmp(arg
, "--unpacked")) {
1484 } else if (!prefixcmp(arg
, "--unpacked=")) {
1485 die("--unpacked=<packfile> no longer supported.");
1486 } else if (!strcmp(arg
, "-r")) {
1488 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1489 } else if (!strcmp(arg
, "-t")) {
1491 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1492 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1493 } else if (!strcmp(arg
, "-m")) {
1494 revs
->ignore_merges
= 0;
1495 } else if (!strcmp(arg
, "-c")) {
1497 revs
->dense_combined_merges
= 0;
1498 revs
->combine_merges
= 1;
1499 } else if (!strcmp(arg
, "--cc")) {
1501 revs
->dense_combined_merges
= 1;
1502 revs
->combine_merges
= 1;
1503 } else if (!strcmp(arg
, "-v")) {
1504 revs
->verbose_header
= 1;
1505 } else if (!strcmp(arg
, "--pretty")) {
1506 revs
->verbose_header
= 1;
1507 revs
->pretty_given
= 1;
1508 get_commit_format(arg
+8, revs
);
1509 } else if (!prefixcmp(arg
, "--pretty=") || !prefixcmp(arg
, "--format=")) {
1511 * Detached form ("--pretty X" as opposed to "--pretty=X")
1512 * not allowed, since the argument is optional.
1514 revs
->verbose_header
= 1;
1515 revs
->pretty_given
= 1;
1516 get_commit_format(arg
+9, revs
);
1517 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
1518 revs
->show_notes
= 1;
1519 revs
->show_notes_given
= 1;
1520 revs
->notes_opt
.use_default_notes
= 1;
1521 } else if (!strcmp(arg
, "--show-signature")) {
1522 revs
->show_signature
= 1;
1523 } else if (!prefixcmp(arg
, "--show-notes=") ||
1524 !prefixcmp(arg
, "--notes=")) {
1525 struct strbuf buf
= STRBUF_INIT
;
1526 revs
->show_notes
= 1;
1527 revs
->show_notes_given
= 1;
1528 if (!prefixcmp(arg
, "--show-notes")) {
1529 if (revs
->notes_opt
.use_default_notes
< 0)
1530 revs
->notes_opt
.use_default_notes
= 1;
1531 strbuf_addstr(&buf
, arg
+13);
1534 strbuf_addstr(&buf
, arg
+8);
1535 expand_notes_ref(&buf
);
1536 string_list_append(&revs
->notes_opt
.extra_notes_refs
,
1537 strbuf_detach(&buf
, NULL
));
1538 } else if (!strcmp(arg
, "--no-notes")) {
1539 revs
->show_notes
= 0;
1540 revs
->show_notes_given
= 1;
1541 revs
->notes_opt
.use_default_notes
= -1;
1542 /* we have been strdup'ing ourselves, so trick
1543 * string_list into free()ing strings */
1544 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 1;
1545 string_list_clear(&revs
->notes_opt
.extra_notes_refs
, 0);
1546 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 0;
1547 } else if (!strcmp(arg
, "--standard-notes")) {
1548 revs
->show_notes_given
= 1;
1549 revs
->notes_opt
.use_default_notes
= 1;
1550 } else if (!strcmp(arg
, "--no-standard-notes")) {
1551 revs
->notes_opt
.use_default_notes
= 0;
1552 } else if (!strcmp(arg
, "--oneline")) {
1553 revs
->verbose_header
= 1;
1554 get_commit_format("oneline", revs
);
1555 revs
->pretty_given
= 1;
1556 revs
->abbrev_commit
= 1;
1557 } else if (!strcmp(arg
, "--graph")) {
1558 revs
->topo_order
= 1;
1559 revs
->rewrite_parents
= 1;
1560 revs
->graph
= graph_init(revs
);
1561 } else if (!strcmp(arg
, "--root")) {
1562 revs
->show_root_diff
= 1;
1563 } else if (!strcmp(arg
, "--no-commit-id")) {
1564 revs
->no_commit_id
= 1;
1565 } else if (!strcmp(arg
, "--always")) {
1566 revs
->always_show_header
= 1;
1567 } else if (!strcmp(arg
, "--no-abbrev")) {
1569 } else if (!strcmp(arg
, "--abbrev")) {
1570 revs
->abbrev
= DEFAULT_ABBREV
;
1571 } else if (!prefixcmp(arg
, "--abbrev=")) {
1572 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1573 if (revs
->abbrev
< MINIMUM_ABBREV
)
1574 revs
->abbrev
= MINIMUM_ABBREV
;
1575 else if (revs
->abbrev
> 40)
1577 } else if (!strcmp(arg
, "--abbrev-commit")) {
1578 revs
->abbrev_commit
= 1;
1579 revs
->abbrev_commit_given
= 1;
1580 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
1581 revs
->abbrev_commit
= 0;
1582 } else if (!strcmp(arg
, "--full-diff")) {
1584 revs
->full_diff
= 1;
1585 } else if (!strcmp(arg
, "--full-history")) {
1586 revs
->simplify_history
= 0;
1587 } else if (!strcmp(arg
, "--relative-date")) {
1588 revs
->date_mode
= DATE_RELATIVE
;
1589 revs
->date_mode_explicit
= 1;
1590 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
1591 revs
->date_mode
= parse_date_format(optarg
);
1592 revs
->date_mode_explicit
= 1;
1594 } else if (!strcmp(arg
, "--log-size")) {
1595 revs
->show_log_size
= 1;
1598 * Grepping the commit log
1600 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
1601 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
1603 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
1604 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
1606 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
1607 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
1609 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
1610 add_message_grep(revs
, optarg
);
1612 } else if (!strcmp(arg
, "--grep-debug")) {
1613 revs
->grep_filter
.debug
= 1;
1614 } else if (!strcmp(arg
, "--basic-regexp")) {
1615 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE
, &revs
->grep_filter
);
1616 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
1617 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE
, &revs
->grep_filter
);
1618 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
1619 revs
->grep_filter
.regflags
|= REG_ICASE
;
1620 DIFF_OPT_SET(&revs
->diffopt
, PICKAXE_IGNORE_CASE
);
1621 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
1622 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED
, &revs
->grep_filter
);
1623 } else if (!strcmp(arg
, "--perl-regexp")) {
1624 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE
, &revs
->grep_filter
);
1625 } else if (!strcmp(arg
, "--all-match")) {
1626 revs
->grep_filter
.all_match
= 1;
1627 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
1628 if (strcmp(optarg
, "none"))
1629 git_log_output_encoding
= xstrdup(optarg
);
1631 git_log_output_encoding
= "";
1633 } else if (!strcmp(arg
, "--reverse")) {
1635 } else if (!strcmp(arg
, "--children")) {
1636 revs
->children
.name
= "children";
1638 } else if (!strcmp(arg
, "--ignore-missing")) {
1639 revs
->ignore_missing
= 1;
1641 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
);
1643 unkv
[(*unkc
)++] = arg
;
1650 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
1651 const struct option
*options
,
1652 const char * const usagestr
[])
1654 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
1655 &ctx
->cpidx
, ctx
->out
);
1657 error("unknown option `%s'", ctx
->argv
[0]);
1658 usage_with_options(usagestr
, options
);
1664 static int for_each_bad_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
1666 return for_each_ref_in_submodule(submodule
, "refs/bisect/bad", fn
, cb_data
);
1669 static int for_each_good_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
1671 return for_each_ref_in_submodule(submodule
, "refs/bisect/good", fn
, cb_data
);
1674 static int handle_revision_pseudo_opt(const char *submodule
,
1675 struct rev_info
*revs
,
1676 int argc
, const char **argv
, int *flags
)
1678 const char *arg
= argv
[0];
1685 * Commands like "git shortlog" will not accept the options below
1686 * unless parse_revision_opt queues them (as opposed to erroring
1689 * When implementing your new pseudo-option, remember to
1690 * register it in the list at the top of handle_revision_opt.
1692 if (!strcmp(arg
, "--all")) {
1693 handle_refs(submodule
, revs
, *flags
, for_each_ref_submodule
);
1694 handle_refs(submodule
, revs
, *flags
, head_ref_submodule
);
1695 } else if (!strcmp(arg
, "--branches")) {
1696 handle_refs(submodule
, revs
, *flags
, for_each_branch_ref_submodule
);
1697 } else if (!strcmp(arg
, "--bisect")) {
1698 handle_refs(submodule
, revs
, *flags
, for_each_bad_bisect_ref
);
1699 handle_refs(submodule
, revs
, *flags
^ UNINTERESTING
, for_each_good_bisect_ref
);
1701 } else if (!strcmp(arg
, "--tags")) {
1702 handle_refs(submodule
, revs
, *flags
, for_each_tag_ref_submodule
);
1703 } else if (!strcmp(arg
, "--remotes")) {
1704 handle_refs(submodule
, revs
, *flags
, for_each_remote_ref_submodule
);
1705 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
1706 struct all_refs_cb cb
;
1707 init_all_refs_cb(&cb
, revs
, *flags
);
1708 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
1710 } else if (!prefixcmp(arg
, "--branches=")) {
1711 struct all_refs_cb cb
;
1712 init_all_refs_cb(&cb
, revs
, *flags
);
1713 for_each_glob_ref_in(handle_one_ref
, arg
+ 11, "refs/heads/", &cb
);
1714 } else if (!prefixcmp(arg
, "--tags=")) {
1715 struct all_refs_cb cb
;
1716 init_all_refs_cb(&cb
, revs
, *flags
);
1717 for_each_glob_ref_in(handle_one_ref
, arg
+ 7, "refs/tags/", &cb
);
1718 } else if (!prefixcmp(arg
, "--remotes=")) {
1719 struct all_refs_cb cb
;
1720 init_all_refs_cb(&cb
, revs
, *flags
);
1721 for_each_glob_ref_in(handle_one_ref
, arg
+ 10, "refs/remotes/", &cb
);
1722 } else if (!strcmp(arg
, "--reflog")) {
1723 handle_reflog(revs
, *flags
);
1724 } else if (!strcmp(arg
, "--not")) {
1725 *flags
^= UNINTERESTING
;
1726 } else if (!strcmp(arg
, "--no-walk")) {
1727 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
1728 } else if (!prefixcmp(arg
, "--no-walk=")) {
1730 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
1731 * not allowed, since the argument is optional.
1733 if (!strcmp(arg
+ 10, "sorted"))
1734 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
1735 else if (!strcmp(arg
+ 10, "unsorted"))
1736 revs
->no_walk
= REVISION_WALK_NO_WALK_UNSORTED
;
1738 return error("invalid argument to --no-walk");
1739 } else if (!strcmp(arg
, "--do-walk")) {
1749 * Parse revision information, filling in the "rev_info" structure,
1750 * and removing the used arguments from the argument list.
1752 * Returns the number of arguments left that weren't recognized
1753 * (which are also moved to the head of the argument list)
1755 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
1757 int i
, flags
, left
, seen_dashdash
, read_from_stdin
, got_rev_arg
= 0, revarg_opt
;
1758 struct cmdline_pathspec prune_data
;
1759 const char *submodule
= NULL
;
1761 memset(&prune_data
, 0, sizeof(prune_data
));
1763 submodule
= opt
->submodule
;
1765 /* First, search for "--" */
1766 if (opt
&& opt
->assume_dashdash
) {
1770 for (i
= 1; i
< argc
; i
++) {
1771 const char *arg
= argv
[i
];
1772 if (strcmp(arg
, "--"))
1777 append_prune_data(&prune_data
, argv
+ i
+ 1);
1783 /* Second, deal with arguments and options */
1785 revarg_opt
= opt
? opt
->revarg_opt
: 0;
1787 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
1788 read_from_stdin
= 0;
1789 for (left
= i
= 1; i
< argc
; i
++) {
1790 const char *arg
= argv
[i
];
1794 opts
= handle_revision_pseudo_opt(submodule
,
1795 revs
, argc
- i
, argv
+ i
,
1802 if (!strcmp(arg
, "--stdin")) {
1803 if (revs
->disable_stdin
) {
1807 if (read_from_stdin
++)
1808 die("--stdin given twice?");
1809 read_revisions_from_stdin(revs
, &prune_data
);
1813 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
1824 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
1826 if (seen_dashdash
|| *arg
== '^')
1827 die("bad revision '%s'", arg
);
1829 /* If we didn't have a "--":
1830 * (1) all filenames must exist;
1831 * (2) all rev-args must not be interpretable
1832 * as a valid filename.
1833 * but the latter we have checked in the main loop.
1835 for (j
= i
; j
< argc
; j
++)
1836 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
1838 append_prune_data(&prune_data
, argv
+ i
);
1845 if (prune_data
.nr
) {
1847 * If we need to introduce the magic "a lone ':' means no
1848 * pathspec whatsoever", here is the place to do so.
1850 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
1851 * prune_data.nr = 0;
1852 * prune_data.alloc = 0;
1853 * free(prune_data.path);
1854 * prune_data.path = NULL;
1856 * terminate prune_data.alloc with NULL and
1857 * call init_pathspec() to set revs->prune_data here.
1860 ALLOC_GROW(prune_data
.path
, prune_data
.nr
+1, prune_data
.alloc
);
1861 prune_data
.path
[prune_data
.nr
++] = NULL
;
1862 init_pathspec(&revs
->prune_data
,
1863 get_pathspec(revs
->prefix
, prune_data
.path
));
1866 if (revs
->def
== NULL
)
1867 revs
->def
= opt
? opt
->def
: NULL
;
1868 if (opt
&& opt
->tweak
)
1869 opt
->tweak(revs
, opt
);
1870 if (revs
->show_merge
)
1871 prepare_show_merge(revs
);
1872 if (revs
->def
&& !revs
->pending
.nr
&& !got_rev_arg
) {
1873 unsigned char sha1
[20];
1874 struct object
*object
;
1875 struct object_context oc
;
1876 if (get_sha1_with_context(revs
->def
, 0, sha1
, &oc
))
1877 die("bad default revision '%s'", revs
->def
);
1878 object
= get_reference(revs
, revs
->def
, sha1
, 0);
1879 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
);
1882 /* Did the user ask for any diff output? Run the diff! */
1883 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
1886 /* Pickaxe, diff-filter and rename following need diffs */
1887 if (revs
->diffopt
.pickaxe
||
1888 revs
->diffopt
.filter
||
1889 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1892 if (revs
->topo_order
)
1895 if (revs
->prune_data
.nr
) {
1896 diff_tree_setup_paths(revs
->prune_data
.raw
, &revs
->pruning
);
1897 /* Can't prune commits with rename following: the paths change.. */
1898 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1900 if (!revs
->full_diff
)
1901 diff_tree_setup_paths(revs
->prune_data
.raw
, &revs
->diffopt
);
1903 if (revs
->combine_merges
)
1904 revs
->ignore_merges
= 0;
1905 revs
->diffopt
.abbrev
= revs
->abbrev
;
1906 diff_setup_done(&revs
->diffopt
);
1908 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED
,
1909 &revs
->grep_filter
);
1910 compile_grep_patterns(&revs
->grep_filter
);
1912 if (revs
->reverse
&& revs
->reflog_info
)
1913 die("cannot combine --reverse with --walk-reflogs");
1914 if (revs
->rewrite_parents
&& revs
->children
.name
)
1915 die("cannot combine --parents and --children");
1918 * Limitations on the graph functionality
1920 if (revs
->reverse
&& revs
->graph
)
1921 die("cannot combine --reverse with --graph");
1923 if (revs
->reflog_info
&& revs
->graph
)
1924 die("cannot combine --walk-reflogs with --graph");
1925 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
1926 die("cannot use --grep-reflog without --walk-reflogs");
1931 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
1933 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
1936 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
1939 static int remove_duplicate_parents(struct commit
*commit
)
1941 struct commit_list
**pp
, *p
;
1942 int surviving_parents
;
1944 /* Examine existing parents while marking ones we have seen... */
1945 pp
= &commit
->parents
;
1946 while ((p
= *pp
) != NULL
) {
1947 struct commit
*parent
= p
->item
;
1948 if (parent
->object
.flags
& TMP_MARK
) {
1952 parent
->object
.flags
|= TMP_MARK
;
1955 /* count them while clearing the temporary mark */
1956 surviving_parents
= 0;
1957 for (p
= commit
->parents
; p
; p
= p
->next
) {
1958 p
->item
->object
.flags
&= ~TMP_MARK
;
1959 surviving_parents
++;
1961 return surviving_parents
;
1964 struct merge_simplify_state
{
1965 struct commit
*simplified
;
1968 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
1970 struct merge_simplify_state
*st
;
1972 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
1974 st
= xcalloc(1, sizeof(*st
));
1975 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
1980 static void remove_treesame_parents(struct commit
*commit
)
1982 struct commit_list
**pp
, *p
;
1984 pp
= &commit
->parents
;
1985 while ((p
= *pp
) != NULL
) {
1986 struct commit
*parent
= p
->item
;
1987 if (parent
->object
.flags
& TREESAME
) {
1996 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
1998 struct commit_list
*p
;
1999 struct merge_simplify_state
*st
, *pst
;
2002 st
= locate_simplify_state(revs
, commit
);
2005 * Have we handled this one?
2011 * An UNINTERESTING commit simplifies to itself, so does a
2012 * root commit. We do not rewrite parents of such commit
2015 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
2016 st
->simplified
= commit
;
2021 * Do we know what commit all of our parents that matter
2022 * should be rewritten to? Otherwise we are not ready to
2023 * rewrite this one yet.
2025 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
2026 pst
= locate_simplify_state(revs
, p
->item
);
2027 if (!pst
->simplified
) {
2028 tail
= &commit_list_insert(p
->item
, tail
)->next
;
2031 if (revs
->first_parent_only
)
2035 tail
= &commit_list_insert(commit
, tail
)->next
;
2040 * Rewrite our list of parents.
2042 for (p
= commit
->parents
; p
; p
= p
->next
) {
2043 pst
= locate_simplify_state(revs
, p
->item
);
2044 p
->item
= pst
->simplified
;
2045 if (revs
->first_parent_only
)
2049 if (revs
->first_parent_only
) {
2053 * A merge with a tree-same parent is useless
2055 if (commit
->parents
&& commit
->parents
->next
)
2056 remove_treesame_parents(commit
);
2058 cnt
= remove_duplicate_parents(commit
);
2062 * It is possible that we are a merge and one side branch
2063 * does not have any commit that touches the given paths;
2064 * in such a case, the immediate parents will be rewritten
2065 * to different commits.
2067 * o----X X: the commit we are looking at;
2068 * / / o: a commit that touches the paths;
2071 * Further reduce the parents by removing redundant parents.
2074 struct commit_list
*h
= reduce_heads(commit
->parents
);
2075 cnt
= commit_list_count(h
);
2076 free_commit_list(commit
->parents
);
2077 commit
->parents
= h
;
2081 * A commit simplifies to itself if it is a root, if it is
2082 * UNINTERESTING, if it touches the given paths, or if it is a
2083 * merge and its parents simplifies to more than one commits
2084 * (the first two cases are already handled at the beginning of
2087 * Otherwise, it simplifies to what its sole parent simplifies to.
2090 (commit
->object
.flags
& UNINTERESTING
) ||
2091 !(commit
->object
.flags
& TREESAME
) ||
2093 st
->simplified
= commit
;
2095 pst
= locate_simplify_state(revs
, commit
->parents
->item
);
2096 st
->simplified
= pst
->simplified
;
2101 static void simplify_merges(struct rev_info
*revs
)
2103 struct commit_list
*list
, *next
;
2104 struct commit_list
*yet_to_do
, **tail
;
2105 struct commit
*commit
;
2110 /* feed the list reversed */
2112 for (list
= revs
->commits
; list
; list
= next
) {
2113 commit
= list
->item
;
2116 * Do not free(list) here yet; the original list
2117 * is used later in this function.
2119 commit_list_insert(commit
, &yet_to_do
);
2126 commit
= list
->item
;
2130 tail
= simplify_one(revs
, commit
, tail
);
2134 /* clean up the result, removing the simplified ones */
2135 list
= revs
->commits
;
2136 revs
->commits
= NULL
;
2137 tail
= &revs
->commits
;
2139 struct merge_simplify_state
*st
;
2141 commit
= list
->item
;
2145 st
= locate_simplify_state(revs
, commit
);
2146 if (st
->simplified
== commit
)
2147 tail
= &commit_list_insert(commit
, tail
)->next
;
2151 static void set_children(struct rev_info
*revs
)
2153 struct commit_list
*l
;
2154 for (l
= revs
->commits
; l
; l
= l
->next
) {
2155 struct commit
*commit
= l
->item
;
2156 struct commit_list
*p
;
2158 for (p
= commit
->parents
; p
; p
= p
->next
)
2159 add_child(revs
, p
->item
, commit
);
2163 void reset_revision_walk(void)
2165 clear_object_flags(SEEN
| ADDED
| SHOWN
);
2168 int prepare_revision_walk(struct rev_info
*revs
)
2170 int nr
= revs
->pending
.nr
;
2171 struct object_array_entry
*e
, *list
;
2172 struct commit_list
**next
= &revs
->commits
;
2174 e
= list
= revs
->pending
.objects
;
2175 revs
->pending
.nr
= 0;
2176 revs
->pending
.alloc
= 0;
2177 revs
->pending
.objects
= NULL
;
2179 struct commit
*commit
= handle_commit(revs
, e
->item
, e
->name
);
2181 if (!(commit
->object
.flags
& SEEN
)) {
2182 commit
->object
.flags
|= SEEN
;
2183 next
= commit_list_append(commit
, next
);
2188 if (!revs
->leak_pending
)
2191 if (revs
->no_walk
!= REVISION_WALK_NO_WALK_UNSORTED
)
2192 commit_list_sort_by_date(&revs
->commits
);
2196 if (limit_list(revs
) < 0)
2198 if (revs
->topo_order
)
2199 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
2200 if (revs
->simplify_merges
)
2201 simplify_merges(revs
);
2202 if (revs
->children
.name
)
2207 enum rewrite_result
{
2209 rewrite_one_noparents
,
2213 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
2215 struct commit_list
*cache
= NULL
;
2218 struct commit
*p
= *pp
;
2220 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
2221 return rewrite_one_error
;
2222 if (p
->parents
&& p
->parents
->next
)
2223 return rewrite_one_ok
;
2224 if (p
->object
.flags
& UNINTERESTING
)
2225 return rewrite_one_ok
;
2226 if (!(p
->object
.flags
& TREESAME
))
2227 return rewrite_one_ok
;
2229 return rewrite_one_noparents
;
2230 *pp
= p
->parents
->item
;
2234 static int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
)
2236 struct commit_list
**pp
= &commit
->parents
;
2238 struct commit_list
*parent
= *pp
;
2239 switch (rewrite_one(revs
, &parent
->item
)) {
2240 case rewrite_one_ok
:
2242 case rewrite_one_noparents
:
2245 case rewrite_one_error
:
2250 remove_duplicate_parents(commit
);
2254 static int commit_rewrite_person(struct strbuf
*buf
, const char *what
, struct string_list
*mailmap
)
2256 char *person
, *endp
;
2257 size_t len
, namelen
, maillen
;
2260 struct ident_split ident
;
2262 person
= strstr(buf
->buf
, what
);
2266 person
+= strlen(what
);
2267 endp
= strchr(person
, '\n');
2271 len
= endp
- person
;
2273 if (split_ident_line(&ident
, person
, len
))
2276 mail
= ident
.mail_begin
;
2277 maillen
= ident
.mail_end
- ident
.mail_begin
;
2278 name
= ident
.name_begin
;
2279 namelen
= ident
.name_end
- ident
.name_begin
;
2281 if (map_user(mailmap
, &mail
, &maillen
, &name
, &namelen
)) {
2282 struct strbuf namemail
= STRBUF_INIT
;
2284 strbuf_addf(&namemail
, "%.*s <%.*s>",
2285 (int)namelen
, name
, (int)maillen
, mail
);
2287 strbuf_splice(buf
, ident
.name_begin
- buf
->buf
,
2288 ident
.mail_end
- ident
.name_begin
+ 1,
2289 namemail
.buf
, namemail
.len
);
2291 strbuf_release(&namemail
);
2299 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
2302 const char *encoding
;
2304 struct strbuf buf
= STRBUF_INIT
;
2306 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
2309 /* Prepend "fake" headers as needed */
2310 if (opt
->grep_filter
.use_reflog_filter
) {
2311 strbuf_addstr(&buf
, "reflog ");
2312 get_reflog_message(&buf
, opt
->reflog_info
);
2313 strbuf_addch(&buf
, '\n');
2317 * We grep in the user's output encoding, under the assumption that it
2318 * is the encoding they are most likely to write their grep pattern
2319 * for. In addition, it means we will match the "notes" encoding below,
2320 * so we will not end up with a buffer that has two different encodings
2323 encoding
= get_log_output_encoding();
2324 message
= logmsg_reencode(commit
, encoding
);
2326 /* Copy the commit to temporary if we are using "fake" headers */
2328 strbuf_addstr(&buf
, message
);
2330 if (opt
->grep_filter
.header_list
&& opt
->mailmap
) {
2332 strbuf_addstr(&buf
, message
);
2334 commit_rewrite_person(&buf
, "\nauthor ", opt
->mailmap
);
2335 commit_rewrite_person(&buf
, "\ncommitter ", opt
->mailmap
);
2338 /* Append "fake" message parts as needed */
2339 if (opt
->show_notes
) {
2341 strbuf_addstr(&buf
, message
);
2342 format_display_notes(commit
->object
.sha1
, &buf
, encoding
, 1);
2345 /* Find either in the original commit message, or in the temporary */
2347 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
2349 retval
= grep_buffer(&opt
->grep_filter
,
2350 message
, strlen(message
));
2351 strbuf_release(&buf
);
2352 logmsg_free(message
, commit
);
2356 static inline int want_ancestry(struct rev_info
*revs
)
2358 return (revs
->rewrite_parents
|| revs
->children
.name
);
2361 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
2363 if (commit
->object
.flags
& SHOWN
)
2364 return commit_ignore
;
2365 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
))
2366 return commit_ignore
;
2369 if (commit
->object
.flags
& UNINTERESTING
)
2370 return commit_ignore
;
2371 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
2372 return commit_ignore
;
2373 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
2375 struct commit_list
*p
;
2376 for (p
= commit
->parents
; p
; p
= p
->next
)
2378 if ((n
< revs
->min_parents
) ||
2379 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
2380 return commit_ignore
;
2382 if (!commit_match(commit
, revs
))
2383 return commit_ignore
;
2384 if (revs
->prune
&& revs
->dense
) {
2385 /* Commit without changes? */
2386 if (commit
->object
.flags
& TREESAME
) {
2387 /* drop merges unless we want parenthood */
2388 if (!want_ancestry(revs
))
2389 return commit_ignore
;
2390 /* non-merge - always ignore it */
2391 if (!commit
->parents
|| !commit
->parents
->next
)
2392 return commit_ignore
;
2398 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
2400 enum commit_action action
= get_commit_action(revs
, commit
);
2402 if (action
== commit_show
&&
2404 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
2405 if (rewrite_parents(revs
, commit
) < 0)
2406 return commit_error
;
2411 static struct commit
*get_revision_1(struct rev_info
*revs
)
2417 struct commit_list
*entry
= revs
->commits
;
2418 struct commit
*commit
= entry
->item
;
2420 revs
->commits
= entry
->next
;
2423 if (revs
->reflog_info
) {
2424 fake_reflog_parent(revs
->reflog_info
, commit
);
2425 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
2429 * If we haven't done the list limiting, we need to look at
2430 * the parents here. We also need to do the date-based limiting
2431 * that we'd otherwise have done in limit_list().
2433 if (!revs
->limited
) {
2434 if (revs
->max_age
!= -1 &&
2435 (commit
->date
< revs
->max_age
))
2437 if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0)
2438 die("Failed to traverse parents of commit %s",
2439 sha1_to_hex(commit
->object
.sha1
));
2442 switch (simplify_commit(revs
, commit
)) {
2446 die("Failed to simplify parents of commit %s",
2447 sha1_to_hex(commit
->object
.sha1
));
2451 } while (revs
->commits
);
2455 static void gc_boundary(struct object_array
*array
)
2457 unsigned nr
= array
->nr
;
2458 unsigned alloc
= array
->alloc
;
2459 struct object_array_entry
*objects
= array
->objects
;
2463 for (i
= j
= 0; i
< nr
; i
++) {
2464 if (objects
[i
].item
->flags
& SHOWN
)
2467 objects
[j
] = objects
[i
];
2470 for (i
= j
; i
< nr
; i
++)
2471 objects
[i
].item
= NULL
;
2476 static void create_boundary_commit_list(struct rev_info
*revs
)
2480 struct object_array
*array
= &revs
->boundary_commits
;
2481 struct object_array_entry
*objects
= array
->objects
;
2484 * If revs->commits is non-NULL at this point, an error occurred in
2485 * get_revision_1(). Ignore the error and continue printing the
2486 * boundary commits anyway. (This is what the code has always
2489 if (revs
->commits
) {
2490 free_commit_list(revs
->commits
);
2491 revs
->commits
= NULL
;
2495 * Put all of the actual boundary commits from revs->boundary_commits
2496 * into revs->commits
2498 for (i
= 0; i
< array
->nr
; i
++) {
2499 c
= (struct commit
*)(objects
[i
].item
);
2502 if (!(c
->object
.flags
& CHILD_SHOWN
))
2504 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
2506 c
->object
.flags
|= BOUNDARY
;
2507 commit_list_insert(c
, &revs
->commits
);
2511 * If revs->topo_order is set, sort the boundary commits
2512 * in topological order
2514 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
2517 static struct commit
*get_revision_internal(struct rev_info
*revs
)
2519 struct commit
*c
= NULL
;
2520 struct commit_list
*l
;
2522 if (revs
->boundary
== 2) {
2524 * All of the normal commits have already been returned,
2525 * and we are now returning boundary commits.
2526 * create_boundary_commit_list() has populated
2527 * revs->commits with the remaining commits to return.
2529 c
= pop_commit(&revs
->commits
);
2531 c
->object
.flags
|= SHOWN
;
2536 * If our max_count counter has reached zero, then we are done. We
2537 * don't simply return NULL because we still might need to show
2538 * boundary commits. But we want to avoid calling get_revision_1, which
2539 * might do a considerable amount of work finding the next commit only
2540 * for us to throw it away.
2542 * If it is non-zero, then either we don't have a max_count at all
2543 * (-1), or it is still counting, in which case we decrement.
2545 if (revs
->max_count
) {
2546 c
= get_revision_1(revs
);
2548 while (0 < revs
->skip_count
) {
2550 c
= get_revision_1(revs
);
2556 if (revs
->max_count
> 0)
2561 c
->object
.flags
|= SHOWN
;
2563 if (!revs
->boundary
) {
2569 * get_revision_1() runs out the commits, and
2570 * we are done computing the boundaries.
2571 * switch to boundary commits output mode.
2576 * Update revs->commits to contain the list of
2579 create_boundary_commit_list(revs
);
2581 return get_revision_internal(revs
);
2585 * boundary commits are the commits that are parents of the
2586 * ones we got from get_revision_1() but they themselves are
2587 * not returned from get_revision_1(). Before returning
2588 * 'c', we need to mark its parents that they could be boundaries.
2591 for (l
= c
->parents
; l
; l
= l
->next
) {
2593 p
= &(l
->item
->object
);
2594 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
2596 p
->flags
|= CHILD_SHOWN
;
2597 gc_boundary(&revs
->boundary_commits
);
2598 add_object_array(p
, NULL
, &revs
->boundary_commits
);
2604 struct commit
*get_revision(struct rev_info
*revs
)
2607 struct commit_list
*reversed
;
2609 if (revs
->reverse
) {
2611 while ((c
= get_revision_internal(revs
))) {
2612 commit_list_insert(c
, &reversed
);
2614 revs
->commits
= reversed
;
2616 revs
->reverse_output_stage
= 1;
2619 if (revs
->reverse_output_stage
)
2620 return pop_commit(&revs
->commits
);
2622 c
= get_revision_internal(revs
);
2623 if (c
&& revs
->graph
)
2624 graph_update(revs
->graph
, c
);
2628 char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
2630 if (commit
->object
.flags
& BOUNDARY
)
2632 else if (commit
->object
.flags
& UNINTERESTING
)
2634 else if (commit
->object
.flags
& PATCHSAME
)
2636 else if (!revs
|| revs
->left_right
) {
2637 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
2641 } else if (revs
->graph
)
2643 else if (revs
->cherry_mark
)
2648 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
2650 char *mark
= get_revision_mark(revs
, commit
);
2653 fputs(mark
, stdout
);