11 #include "reflog-walk.h"
12 #include "patch-ids.h"
15 volatile show_early_output_fn_t show_early_output
;
17 static char *path_name(struct name_path
*path
, const char *name
)
21 int nlen
= strlen(name
);
24 for (p
= path
; p
; p
= p
->up
) {
26 len
+= p
->elem_len
+ 1;
29 m
= n
+ len
- (nlen
+ 1);
31 for (p
= path
; p
; p
= p
->up
) {
34 memcpy(m
, p
->elem
, p
->elem_len
);
41 void add_object(struct object
*obj
,
42 struct object_array
*p
,
43 struct name_path
*path
,
46 add_object_array(obj
, path_name(path
, name
), p
);
49 static void mark_blob_uninteresting(struct blob
*blob
)
53 if (blob
->object
.flags
& UNINTERESTING
)
55 blob
->object
.flags
|= UNINTERESTING
;
58 void mark_tree_uninteresting(struct tree
*tree
)
60 struct tree_desc desc
;
61 struct name_entry entry
;
62 struct object
*obj
= &tree
->object
;
66 if (obj
->flags
& UNINTERESTING
)
68 obj
->flags
|= UNINTERESTING
;
69 if (!has_sha1_file(obj
->sha1
))
71 if (parse_tree(tree
) < 0)
72 die("bad tree %s", sha1_to_hex(obj
->sha1
));
74 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
75 while (tree_entry(&desc
, &entry
)) {
76 switch (object_type(entry
.mode
)) {
78 mark_tree_uninteresting(lookup_tree(entry
.sha1
));
81 mark_blob_uninteresting(lookup_blob(entry
.sha1
));
84 /* Subproject commit - not in this repository */
90 * We don't care about the tree any more
91 * after it has been marked uninteresting.
97 void mark_parents_uninteresting(struct commit
*commit
)
99 struct commit_list
*parents
= commit
->parents
;
102 struct commit
*commit
= parents
->item
;
103 if (!(commit
->object
.flags
& UNINTERESTING
)) {
104 commit
->object
.flags
|= UNINTERESTING
;
107 * Normally we haven't parsed the parent
108 * yet, so we won't have a parent of a parent
109 * here. However, it may turn out that we've
110 * reached this commit some other way (where it
111 * wasn't uninteresting), in which case we need
112 * to mark its parents recursively too..
115 mark_parents_uninteresting(commit
);
119 * A missing commit is ok iff its parent is marked
122 * We just mark such a thing parsed, so that when
123 * it is popped next time around, we won't be trying
124 * to parse it and get an error.
126 if (!has_sha1_file(commit
->object
.sha1
))
127 commit
->object
.parsed
= 1;
128 parents
= parents
->next
;
132 static void add_pending_object_with_mode(struct rev_info
*revs
, struct object
*obj
, const char *name
, unsigned mode
)
134 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
135 die("object ranges do not make sense when not walking revisions");
136 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
&&
137 add_reflog_for_walk(revs
->reflog_info
,
138 (struct commit
*)obj
, name
))
140 add_object_array_with_mode(obj
, name
, &revs
->pending
, mode
);
143 void add_pending_object(struct rev_info
*revs
, struct object
*obj
, const char *name
)
145 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
148 void add_head_to_pending(struct rev_info
*revs
)
150 unsigned char sha1
[20];
152 if (get_sha1("HEAD", sha1
))
154 obj
= parse_object(sha1
);
157 add_pending_object(revs
, obj
, "HEAD");
160 static struct object
*get_reference(struct rev_info
*revs
, const char *name
, const unsigned char *sha1
, unsigned int flags
)
162 struct object
*object
;
164 object
= parse_object(sha1
);
166 die("bad object %s", name
);
167 object
->flags
|= flags
;
171 static struct commit
*handle_commit(struct rev_info
*revs
, struct object
*object
, const char *name
)
173 unsigned long flags
= object
->flags
;
176 * Tag object? Look what it points to..
178 while (object
->type
== OBJ_TAG
) {
179 struct tag
*tag
= (struct tag
*) object
;
180 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
181 add_pending_object(revs
, object
, tag
->tag
);
184 object
= parse_object(tag
->tagged
->sha1
);
186 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
190 * Commit object? Just return it, we'll do all the complex
193 if (object
->type
== OBJ_COMMIT
) {
194 struct commit
*commit
= (struct commit
*)object
;
195 if (parse_commit(commit
) < 0)
196 die("unable to parse commit %s", name
);
197 if (flags
& UNINTERESTING
) {
198 commit
->object
.flags
|= UNINTERESTING
;
199 mark_parents_uninteresting(commit
);
206 * Tree object? Either mark it uniniteresting, or add it
207 * to the list of objects to look at later..
209 if (object
->type
== OBJ_TREE
) {
210 struct tree
*tree
= (struct tree
*)object
;
211 if (!revs
->tree_objects
)
213 if (flags
& UNINTERESTING
) {
214 mark_tree_uninteresting(tree
);
217 add_pending_object(revs
, object
, "");
222 * Blob object? You know the drill by now..
224 if (object
->type
== OBJ_BLOB
) {
225 struct blob
*blob
= (struct blob
*)object
;
226 if (!revs
->blob_objects
)
228 if (flags
& UNINTERESTING
) {
229 mark_blob_uninteresting(blob
);
232 add_pending_object(revs
, object
, "");
235 die("%s is unknown object", name
);
238 static int everybody_uninteresting(struct commit_list
*orig
)
240 struct commit_list
*list
= orig
;
242 struct commit
*commit
= list
->item
;
244 if (commit
->object
.flags
& UNINTERESTING
)
252 * The goal is to get REV_TREE_NEW as the result only if the
253 * diff consists of all '+' (and no other changes), and
254 * REV_TREE_DIFFERENT otherwise (of course if the trees are
255 * the same we want REV_TREE_SAME). That means that once we
256 * get to REV_TREE_DIFFERENT, we do not have to look any further.
258 static int tree_difference
= REV_TREE_SAME
;
260 static void file_add_remove(struct diff_options
*options
,
261 int addremove
, unsigned mode
,
262 const unsigned char *sha1
,
263 const char *fullpath
)
265 int diff
= REV_TREE_DIFFERENT
;
268 * Is it an add of a new file? It means that the old tree
269 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
270 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
271 * (and if it already was "REV_TREE_NEW", we'll keep it
272 * "REV_TREE_NEW" of course).
274 if (addremove
== '+') {
275 diff
= tree_difference
;
276 if (diff
!= REV_TREE_SAME
)
280 tree_difference
= diff
;
281 if (tree_difference
== REV_TREE_DIFFERENT
)
282 DIFF_OPT_SET(options
, HAS_CHANGES
);
285 static void file_change(struct diff_options
*options
,
286 unsigned old_mode
, unsigned new_mode
,
287 const unsigned char *old_sha1
,
288 const unsigned char *new_sha1
,
289 const char *fullpath
)
291 tree_difference
= REV_TREE_DIFFERENT
;
292 DIFF_OPT_SET(options
, HAS_CHANGES
);
295 static int rev_compare_tree(struct rev_info
*revs
, struct tree
*t1
, struct tree
*t2
)
300 return REV_TREE_DIFFERENT
;
301 tree_difference
= REV_TREE_SAME
;
302 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
303 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
305 return REV_TREE_DIFFERENT
;
306 return tree_difference
;
309 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct tree
*t1
)
314 struct tree_desc empty
, real
;
319 tree
= read_object_with_reference(t1
->object
.sha1
, tree_type
, &size
, NULL
);
322 init_tree_desc(&real
, tree
, size
);
323 init_tree_desc(&empty
, "", 0);
325 tree_difference
= REV_TREE_SAME
;
326 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
327 retval
= diff_tree(&empty
, &real
, "", &revs
->pruning
);
330 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
333 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
335 struct commit_list
**pp
, *parent
;
336 int tree_changed
= 0, tree_same
= 0;
339 * If we don't do pruning, everything is interesting
347 if (!commit
->parents
) {
348 if (rev_same_tree_as_empty(revs
, commit
->tree
))
349 commit
->object
.flags
|= TREESAME
;
354 * Normal non-merge commit? If we don't want to make the
355 * history dense, we consider it always to be a change..
357 if (!revs
->dense
&& !commit
->parents
->next
)
360 pp
= &commit
->parents
;
361 while ((parent
= *pp
) != NULL
) {
362 struct commit
*p
= parent
->item
;
364 if (parse_commit(p
) < 0)
365 die("cannot simplify commit %s (because of %s)",
366 sha1_to_hex(commit
->object
.sha1
),
367 sha1_to_hex(p
->object
.sha1
));
368 switch (rev_compare_tree(revs
, p
->tree
, commit
->tree
)) {
371 if (!revs
->simplify_history
|| (p
->object
.flags
& UNINTERESTING
)) {
372 /* Even if a merge with an uninteresting
373 * side branch brought the entire change
374 * we are interested in, we do not want
375 * to lose the other branches of this
376 * merge, so we just keep going.
382 commit
->parents
= parent
;
383 commit
->object
.flags
|= TREESAME
;
387 if (revs
->remove_empty_trees
&&
388 rev_same_tree_as_empty(revs
, p
->tree
)) {
389 /* We are adding all the specified
390 * paths from this parent, so the
391 * history beyond this parent is not
392 * interesting. Remove its parents
393 * (they are grandparents for us).
394 * IOW, we pretend this parent is a
397 if (parse_commit(p
) < 0)
398 die("cannot simplify commit %s (invalid %s)",
399 sha1_to_hex(commit
->object
.sha1
),
400 sha1_to_hex(p
->object
.sha1
));
404 case REV_TREE_DIFFERENT
:
409 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
411 if (tree_changed
&& !tree_same
)
413 commit
->object
.flags
|= TREESAME
;
416 static void insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
417 struct commit_list
*cached_base
, struct commit_list
**cache
)
419 struct commit_list
*new_entry
;
421 if (cached_base
&& p
->date
< cached_base
->item
->date
)
422 new_entry
= insert_by_date(p
, &cached_base
->next
);
424 new_entry
= insert_by_date(p
, head
);
426 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
430 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
431 struct commit_list
**list
, struct commit_list
**cache_ptr
)
433 struct commit_list
*parent
= commit
->parents
;
435 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
437 if (commit
->object
.flags
& ADDED
)
439 commit
->object
.flags
|= ADDED
;
442 * If the commit is uninteresting, don't try to
443 * prune parents - we want the maximal uninteresting
446 * Normally we haven't parsed the parent
447 * yet, so we won't have a parent of a parent
448 * here. However, it may turn out that we've
449 * reached this commit some other way (where it
450 * wasn't uninteresting), in which case we need
451 * to mark its parents recursively too..
453 if (commit
->object
.flags
& UNINTERESTING
) {
455 struct commit
*p
= parent
->item
;
456 parent
= parent
->next
;
457 if (parse_commit(p
) < 0)
459 p
->object
.flags
|= UNINTERESTING
;
461 mark_parents_uninteresting(p
);
462 if (p
->object
.flags
& SEEN
)
464 p
->object
.flags
|= SEEN
;
465 insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
471 * Ok, the commit wasn't uninteresting. Try to
472 * simplify the commit history and find the parent
473 * that has no differences in the path set if one exists.
475 try_to_simplify_commit(revs
, commit
);
480 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
482 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
483 struct commit
*p
= parent
->item
;
485 if (parse_commit(p
) < 0)
487 p
->object
.flags
|= left_flag
;
488 if (!(p
->object
.flags
& SEEN
)) {
489 p
->object
.flags
|= SEEN
;
490 insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
492 if(revs
->first_parent_only
)
498 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
500 struct commit_list
*p
;
501 int left_count
= 0, right_count
= 0;
503 struct patch_ids ids
;
505 /* First count the commits on the left and on the right */
506 for (p
= list
; p
; p
= p
->next
) {
507 struct commit
*commit
= p
->item
;
508 unsigned flags
= commit
->object
.flags
;
509 if (flags
& BOUNDARY
)
511 else if (flags
& SYMMETRIC_LEFT
)
517 if (!left_count
|| !right_count
)
520 left_first
= left_count
< right_count
;
521 init_patch_ids(&ids
);
522 if (revs
->diffopt
.nr_paths
) {
523 ids
.diffopts
.nr_paths
= revs
->diffopt
.nr_paths
;
524 ids
.diffopts
.paths
= revs
->diffopt
.paths
;
525 ids
.diffopts
.pathlens
= revs
->diffopt
.pathlens
;
528 /* Compute patch-ids for one side */
529 for (p
= list
; p
; p
= p
->next
) {
530 struct commit
*commit
= p
->item
;
531 unsigned flags
= commit
->object
.flags
;
533 if (flags
& BOUNDARY
)
536 * If we have fewer left, left_first is set and we omit
537 * commits on the right branch in this loop. If we have
538 * fewer right, we skip the left ones.
540 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
542 commit
->util
= add_commit_patch_id(commit
, &ids
);
545 /* Check the other side */
546 for (p
= list
; p
; p
= p
->next
) {
547 struct commit
*commit
= p
->item
;
549 unsigned flags
= commit
->object
.flags
;
551 if (flags
& BOUNDARY
)
554 * If we have fewer left, left_first is set and we omit
555 * commits on the left branch in this loop.
557 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
561 * Have we seen the same patch id?
563 id
= has_commit_patch_id(commit
, &ids
);
567 commit
->object
.flags
|= SHOWN
;
570 /* Now check the original side for seen ones */
571 for (p
= list
; p
; p
= p
->next
) {
572 struct commit
*commit
= p
->item
;
573 struct patch_id
*ent
;
579 commit
->object
.flags
|= SHOWN
;
583 free_patch_ids(&ids
);
586 /* How many extra uninteresting commits we want to see.. */
589 static int still_interesting(struct commit_list
*src
, unsigned long date
, int slop
)
592 * No source list at all? We're definitely done..
598 * Does the destination list contain entries with a date
599 * before the source list? Definitely _not_ done.
601 if (date
< src
->item
->date
)
605 * Does the source list still have interesting commits in
606 * it? Definitely not done..
608 if (!everybody_uninteresting(src
))
611 /* Ok, we're closing in.. */
615 static int limit_list(struct rev_info
*revs
)
618 unsigned long date
= ~0ul;
619 struct commit_list
*list
= revs
->commits
;
620 struct commit_list
*newlist
= NULL
;
621 struct commit_list
**p
= &newlist
;
624 struct commit_list
*entry
= list
;
625 struct commit
*commit
= list
->item
;
626 struct object
*obj
= &commit
->object
;
627 show_early_output_fn_t show
;
632 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
633 obj
->flags
|= UNINTERESTING
;
634 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
636 if (obj
->flags
& UNINTERESTING
) {
637 mark_parents_uninteresting(commit
);
639 p
= &commit_list_insert(commit
, p
)->next
;
640 slop
= still_interesting(list
, date
, slop
);
643 /* If showing all, add the whole pending list to the end */
648 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
651 p
= &commit_list_insert(commit
, p
)->next
;
653 show
= show_early_output
;
658 show_early_output
= NULL
;
660 if (revs
->cherry_pick
)
661 cherry_pick_list(newlist
, revs
);
663 revs
->commits
= newlist
;
669 int warned_bad_reflog
;
670 struct rev_info
*all_revs
;
671 const char *name_for_errormsg
;
674 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
676 struct all_refs_cb
*cb
= cb_data
;
677 struct object
*object
= get_reference(cb
->all_revs
, path
, sha1
,
679 add_pending_object(cb
->all_revs
, object
, path
);
683 static void handle_refs(struct rev_info
*revs
, unsigned flags
,
684 int (*for_each
)(each_ref_fn
, void *))
686 struct all_refs_cb cb
;
688 cb
.all_flags
= flags
;
689 for_each(handle_one_ref
, &cb
);
692 static void handle_one_reflog_commit(unsigned char *sha1
, void *cb_data
)
694 struct all_refs_cb
*cb
= cb_data
;
695 if (!is_null_sha1(sha1
)) {
696 struct object
*o
= parse_object(sha1
);
698 o
->flags
|= cb
->all_flags
;
699 add_pending_object(cb
->all_revs
, o
, "");
701 else if (!cb
->warned_bad_reflog
) {
702 warning("reflog of '%s' references pruned commits",
703 cb
->name_for_errormsg
);
704 cb
->warned_bad_reflog
= 1;
709 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
710 const char *email
, unsigned long timestamp
, int tz
,
711 const char *message
, void *cb_data
)
713 handle_one_reflog_commit(osha1
, cb_data
);
714 handle_one_reflog_commit(nsha1
, cb_data
);
718 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
720 struct all_refs_cb
*cb
= cb_data
;
721 cb
->warned_bad_reflog
= 0;
722 cb
->name_for_errormsg
= path
;
723 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
727 static void handle_reflog(struct rev_info
*revs
, unsigned flags
)
729 struct all_refs_cb cb
;
731 cb
.all_flags
= flags
;
732 for_each_reflog(handle_one_reflog
, &cb
);
735 static int add_parents_only(struct rev_info
*revs
, const char *arg
, int flags
)
737 unsigned char sha1
[20];
739 struct commit
*commit
;
740 struct commit_list
*parents
;
743 flags
^= UNINTERESTING
;
746 if (get_sha1(arg
, sha1
))
749 it
= get_reference(revs
, arg
, sha1
, 0);
750 if (it
->type
!= OBJ_TAG
)
752 if (!((struct tag
*)it
)->tagged
)
754 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
756 if (it
->type
!= OBJ_COMMIT
)
758 commit
= (struct commit
*)it
;
759 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
760 it
= &parents
->item
->object
;
762 add_pending_object(revs
, it
, arg
);
767 void init_revisions(struct rev_info
*revs
, const char *prefix
)
769 memset(revs
, 0, sizeof(*revs
));
771 revs
->abbrev
= DEFAULT_ABBREV
;
772 revs
->ignore_merges
= 1;
773 revs
->simplify_history
= 1;
774 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
775 DIFF_OPT_SET(&revs
->pruning
, QUIET
);
776 revs
->pruning
.add_remove
= file_add_remove
;
777 revs
->pruning
.change
= file_change
;
780 revs
->prefix
= prefix
;
783 revs
->skip_count
= -1;
784 revs
->max_count
= -1;
786 revs
->commit_format
= CMIT_FMT_DEFAULT
;
788 diff_setup(&revs
->diffopt
);
789 if (prefix
&& !revs
->diffopt
.prefix
) {
790 revs
->diffopt
.prefix
= prefix
;
791 revs
->diffopt
.prefix_length
= strlen(prefix
);
795 static void add_pending_commit_list(struct rev_info
*revs
,
796 struct commit_list
*commit_list
,
799 while (commit_list
) {
800 struct object
*object
= &commit_list
->item
->object
;
801 object
->flags
|= flags
;
802 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
803 commit_list
= commit_list
->next
;
807 static void prepare_show_merge(struct rev_info
*revs
)
809 struct commit_list
*bases
;
810 struct commit
*head
, *other
;
811 unsigned char sha1
[20];
812 const char **prune
= NULL
;
813 int i
, prune_num
= 1; /* counting terminating NULL */
815 if (get_sha1("HEAD", sha1
) || !(head
= lookup_commit(sha1
)))
816 die("--merge without HEAD?");
817 if (get_sha1("MERGE_HEAD", sha1
) || !(other
= lookup_commit(sha1
)))
818 die("--merge without MERGE_HEAD?");
819 add_pending_object(revs
, &head
->object
, "HEAD");
820 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
821 bases
= get_merge_bases(head
, other
, 1);
822 add_pending_commit_list(revs
, bases
, UNINTERESTING
);
823 free_commit_list(bases
);
824 head
->object
.flags
|= SYMMETRIC_LEFT
;
828 for (i
= 0; i
< active_nr
; i
++) {
829 struct cache_entry
*ce
= active_cache
[i
];
832 if (ce_path_match(ce
, revs
->prune_data
)) {
834 prune
= xrealloc(prune
, sizeof(*prune
) * prune_num
);
835 prune
[prune_num
-2] = ce
->name
;
836 prune
[prune_num
-1] = NULL
;
838 while ((i
+1 < active_nr
) &&
839 ce_same_name(ce
, active_cache
[i
+1]))
842 revs
->prune_data
= prune
;
846 int handle_revision_arg(const char *arg
, struct rev_info
*revs
,
848 int cant_be_filename
)
852 struct object
*object
;
853 unsigned char sha1
[20];
856 dotdot
= strstr(arg
, "..");
858 unsigned char from_sha1
[20];
859 const char *next
= dotdot
+ 2;
860 const char *this = arg
;
861 int symmetric
= *next
== '.';
862 unsigned int flags_exclude
= flags
^ UNINTERESTING
;
871 if (!get_sha1(this, from_sha1
) &&
872 !get_sha1(next
, sha1
)) {
873 struct commit
*a
, *b
;
874 struct commit_list
*exclude
;
876 a
= lookup_commit_reference(from_sha1
);
877 b
= lookup_commit_reference(sha1
);
880 "Invalid symmetric difference expression %s...%s" :
881 "Invalid revision range %s..%s",
885 if (!cant_be_filename
) {
887 verify_non_filename(revs
->prefix
, arg
);
891 exclude
= get_merge_bases(a
, b
, 1);
892 add_pending_commit_list(revs
, exclude
,
894 free_commit_list(exclude
);
895 a
->object
.flags
|= flags
| SYMMETRIC_LEFT
;
897 a
->object
.flags
|= flags_exclude
;
898 b
->object
.flags
|= flags
;
899 add_pending_object(revs
, &a
->object
, this);
900 add_pending_object(revs
, &b
->object
, next
);
905 dotdot
= strstr(arg
, "^@");
906 if (dotdot
&& !dotdot
[2]) {
908 if (add_parents_only(revs
, arg
, flags
))
912 dotdot
= strstr(arg
, "^!");
913 if (dotdot
&& !dotdot
[2]) {
915 if (!add_parents_only(revs
, arg
, flags
^ UNINTERESTING
))
921 local_flags
= UNINTERESTING
;
924 if (get_sha1_with_mode(arg
, sha1
, &mode
))
926 if (!cant_be_filename
)
927 verify_non_filename(revs
->prefix
, arg
);
928 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
929 add_pending_object_with_mode(revs
, object
, arg
, mode
);
933 void read_revisions_from_stdin(struct rev_info
*revs
)
937 while (fgets(line
, sizeof(line
), stdin
) != NULL
) {
938 int len
= strlen(line
);
939 if (len
&& line
[len
- 1] == '\n')
944 die("options not supported in --stdin mode");
945 if (handle_revision_arg(line
, revs
, 0, 1))
946 die("bad revision '%s'", line
);
950 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
952 if (!revs
->grep_filter
) {
953 struct grep_opt
*opt
= xcalloc(1, sizeof(*opt
));
954 opt
->status_only
= 1;
955 opt
->pattern_tail
= &(opt
->pattern_list
);
956 opt
->regflags
= REG_NEWLINE
;
957 revs
->grep_filter
= opt
;
959 append_grep_pattern(revs
->grep_filter
, ptn
,
960 "command line", 0, what
);
963 static void add_header_grep(struct rev_info
*revs
, const char *field
, const char *pattern
)
969 fldlen
= strlen(field
);
970 patlen
= strlen(pattern
);
971 pat
= xmalloc(patlen
+ fldlen
+ 10);
973 if (*pattern
== '^') {
977 sprintf(pat
, "^%s %s%s", field
, prefix
, pattern
);
978 add_grep(revs
, pat
, GREP_PATTERN_HEAD
);
981 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
983 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
986 static void add_ignore_packed(struct rev_info
*revs
, const char *name
)
988 int num
= ++revs
->num_ignore_packed
;
990 revs
->ignore_packed
= xrealloc(revs
->ignore_packed
,
991 sizeof(const char **) * (num
+ 1));
992 revs
->ignore_packed
[num
-1] = name
;
993 revs
->ignore_packed
[num
] = NULL
;
996 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
997 int *unkc
, const char **unkv
)
999 const char *arg
= argv
[0];
1001 /* pseudo revision arguments */
1002 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1003 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1004 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1005 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk"))
1007 unkv
[(*unkc
)++] = arg
;
1011 if (!prefixcmp(arg
, "--max-count=")) {
1012 revs
->max_count
= atoi(arg
+ 12);
1013 } else if (!prefixcmp(arg
, "--skip=")) {
1014 revs
->skip_count
= atoi(arg
+ 7);
1015 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1016 /* accept -<digit>, like traditional "head" */
1017 revs
->max_count
= atoi(arg
+ 1);
1018 } else if (!strcmp(arg
, "-n")) {
1020 return error("-n requires an argument");
1021 revs
->max_count
= atoi(argv
[1]);
1023 } else if (!prefixcmp(arg
, "-n")) {
1024 revs
->max_count
= atoi(arg
+ 2);
1025 } else if (!prefixcmp(arg
, "--max-age=")) {
1026 revs
->max_age
= atoi(arg
+ 10);
1027 } else if (!prefixcmp(arg
, "--since=")) {
1028 revs
->max_age
= approxidate(arg
+ 8);
1029 } else if (!prefixcmp(arg
, "--after=")) {
1030 revs
->max_age
= approxidate(arg
+ 8);
1031 } else if (!prefixcmp(arg
, "--min-age=")) {
1032 revs
->min_age
= atoi(arg
+ 10);
1033 } else if (!prefixcmp(arg
, "--before=")) {
1034 revs
->min_age
= approxidate(arg
+ 9);
1035 } else if (!prefixcmp(arg
, "--until=")) {
1036 revs
->min_age
= approxidate(arg
+ 8);
1037 } else if (!strcmp(arg
, "--first-parent")) {
1038 revs
->first_parent_only
= 1;
1039 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1040 init_reflog_walk(&revs
->reflog_info
);
1041 } else if (!strcmp(arg
, "--default")) {
1043 return error("bad --default argument");
1044 revs
->def
= argv
[1];
1046 } else if (!strcmp(arg
, "--merge")) {
1047 revs
->show_merge
= 1;
1048 } else if (!strcmp(arg
, "--topo-order")) {
1050 revs
->topo_order
= 1;
1051 } else if (!strcmp(arg
, "--date-order")) {
1053 revs
->topo_order
= 1;
1054 } else if (!prefixcmp(arg
, "--early-output")) {
1058 count
= atoi(arg
+15);
1061 revs
->topo_order
= 1;
1062 revs
->early_output
= count
;
1064 } else if (!strcmp(arg
, "--parents")) {
1065 revs
->rewrite_parents
= 1;
1066 revs
->print_parents
= 1;
1067 } else if (!strcmp(arg
, "--dense")) {
1069 } else if (!strcmp(arg
, "--sparse")) {
1071 } else if (!strcmp(arg
, "--show-all")) {
1073 } else if (!strcmp(arg
, "--remove-empty")) {
1074 revs
->remove_empty_trees
= 1;
1075 } else if (!strcmp(arg
, "--no-merges")) {
1076 revs
->no_merges
= 1;
1077 } else if (!strcmp(arg
, "--boundary")) {
1079 } else if (!strcmp(arg
, "--left-right")) {
1080 revs
->left_right
= 1;
1081 } else if (!strcmp(arg
, "--cherry-pick")) {
1082 revs
->cherry_pick
= 1;
1084 } else if (!strcmp(arg
, "--objects")) {
1085 revs
->tag_objects
= 1;
1086 revs
->tree_objects
= 1;
1087 revs
->blob_objects
= 1;
1088 } else if (!strcmp(arg
, "--objects-edge")) {
1089 revs
->tag_objects
= 1;
1090 revs
->tree_objects
= 1;
1091 revs
->blob_objects
= 1;
1092 revs
->edge_hint
= 1;
1093 } else if (!strcmp(arg
, "--unpacked")) {
1095 free(revs
->ignore_packed
);
1096 revs
->ignore_packed
= NULL
;
1097 revs
->num_ignore_packed
= 0;
1098 } else if (!prefixcmp(arg
, "--unpacked=")) {
1100 add_ignore_packed(revs
, arg
+11);
1101 } else if (!strcmp(arg
, "-r")) {
1103 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1104 } else if (!strcmp(arg
, "-t")) {
1106 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1107 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1108 } else if (!strcmp(arg
, "-m")) {
1109 revs
->ignore_merges
= 0;
1110 } else if (!strcmp(arg
, "-c")) {
1112 revs
->dense_combined_merges
= 0;
1113 revs
->combine_merges
= 1;
1114 } else if (!strcmp(arg
, "--cc")) {
1116 revs
->dense_combined_merges
= 1;
1117 revs
->combine_merges
= 1;
1118 } else if (!strcmp(arg
, "-v")) {
1119 revs
->verbose_header
= 1;
1120 } else if (!strcmp(arg
, "--pretty")) {
1121 revs
->verbose_header
= 1;
1122 get_commit_format(arg
+8, revs
);
1123 } else if (!prefixcmp(arg
, "--pretty=")) {
1124 revs
->verbose_header
= 1;
1125 get_commit_format(arg
+9, revs
);
1126 } else if (!strcmp(arg
, "--graph")) {
1127 revs
->topo_order
= 1;
1128 revs
->rewrite_parents
= 1;
1129 revs
->graph
= graph_init(revs
);
1130 } else if (!strcmp(arg
, "--root")) {
1131 revs
->show_root_diff
= 1;
1132 } else if (!strcmp(arg
, "--no-commit-id")) {
1133 revs
->no_commit_id
= 1;
1134 } else if (!strcmp(arg
, "--always")) {
1135 revs
->always_show_header
= 1;
1136 } else if (!strcmp(arg
, "--no-abbrev")) {
1138 } else if (!strcmp(arg
, "--abbrev")) {
1139 revs
->abbrev
= DEFAULT_ABBREV
;
1140 } else if (!prefixcmp(arg
, "--abbrev=")) {
1141 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1142 if (revs
->abbrev
< MINIMUM_ABBREV
)
1143 revs
->abbrev
= MINIMUM_ABBREV
;
1144 else if (revs
->abbrev
> 40)
1146 } else if (!strcmp(arg
, "--abbrev-commit")) {
1147 revs
->abbrev_commit
= 1;
1148 } else if (!strcmp(arg
, "--full-diff")) {
1150 revs
->full_diff
= 1;
1151 } else if (!strcmp(arg
, "--full-history")) {
1152 revs
->simplify_history
= 0;
1153 } else if (!strcmp(arg
, "--relative-date")) {
1154 revs
->date_mode
= DATE_RELATIVE
;
1155 } else if (!strncmp(arg
, "--date=", 7)) {
1156 revs
->date_mode
= parse_date_format(arg
+ 7);
1157 } else if (!strcmp(arg
, "--log-size")) {
1158 revs
->show_log_size
= 1;
1161 * Grepping the commit log
1163 else if (!prefixcmp(arg
, "--author=")) {
1164 add_header_grep(revs
, "author", arg
+9);
1165 } else if (!prefixcmp(arg
, "--committer=")) {
1166 add_header_grep(revs
, "committer", arg
+12);
1167 } else if (!prefixcmp(arg
, "--grep=")) {
1168 add_message_grep(revs
, arg
+7);
1169 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
1170 if (revs
->grep_filter
)
1171 revs
->grep_filter
->regflags
|= REG_EXTENDED
;
1172 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
1173 if (revs
->grep_filter
)
1174 revs
->grep_filter
->regflags
|= REG_ICASE
;
1175 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
1176 if (revs
->grep_filter
)
1177 revs
->grep_filter
->fixed
= 1;
1178 } else if (!strcmp(arg
, "--all-match")) {
1179 if (revs
->grep_filter
)
1180 revs
->grep_filter
->all_match
= 1;
1181 } else if (!prefixcmp(arg
, "--encoding=")) {
1183 if (strcmp(arg
, "none"))
1184 git_log_output_encoding
= xstrdup(arg
);
1186 git_log_output_encoding
= "";
1187 } else if (!strcmp(arg
, "--reverse")) {
1189 } else if (!strcmp(arg
, "--children")) {
1190 revs
->children
.name
= "children";
1193 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
);
1195 unkv
[(*unkc
)++] = arg
;
1202 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
1203 const struct option
*options
,
1204 const char * const usagestr
[])
1206 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
1207 &ctx
->cpidx
, ctx
->out
);
1209 error("unknown option `%s'", ctx
->argv
[0]);
1210 usage_with_options(usagestr
, options
);
1217 * Parse revision information, filling in the "rev_info" structure,
1218 * and removing the used arguments from the argument list.
1220 * Returns the number of arguments left that weren't recognized
1221 * (which are also moved to the head of the argument list)
1223 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, const char *def
)
1225 int i
, flags
, left
, seen_dashdash
;
1227 /* First, search for "--" */
1229 for (i
= 1; i
< argc
; i
++) {
1230 const char *arg
= argv
[i
];
1231 if (strcmp(arg
, "--"))
1236 revs
->prune_data
= get_pathspec(revs
->prefix
, argv
+ i
+ 1);
1241 /* Second, deal with arguments and options */
1243 for (left
= i
= 1; i
< argc
; i
++) {
1244 const char *arg
= argv
[i
];
1248 if (!strcmp(arg
, "--all")) {
1249 handle_refs(revs
, flags
, for_each_ref
);
1252 if (!strcmp(arg
, "--branches")) {
1253 handle_refs(revs
, flags
, for_each_branch_ref
);
1256 if (!strcmp(arg
, "--tags")) {
1257 handle_refs(revs
, flags
, for_each_tag_ref
);
1260 if (!strcmp(arg
, "--remotes")) {
1261 handle_refs(revs
, flags
, for_each_remote_ref
);
1264 if (!strcmp(arg
, "--reflog")) {
1265 handle_reflog(revs
, flags
);
1268 if (!strcmp(arg
, "--not")) {
1269 flags
^= UNINTERESTING
;
1272 if (!strcmp(arg
, "--no-walk")) {
1276 if (!strcmp(arg
, "--do-walk")) {
1281 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
1291 if (handle_revision_arg(arg
, revs
, flags
, seen_dashdash
)) {
1293 if (seen_dashdash
|| *arg
== '^')
1294 die("bad revision '%s'", arg
);
1296 /* If we didn't have a "--":
1297 * (1) all filenames must exist;
1298 * (2) all rev-args must not be interpretable
1299 * as a valid filename.
1300 * but the latter we have checked in the main loop.
1302 for (j
= i
; j
< argc
; j
++)
1303 verify_filename(revs
->prefix
, argv
[j
]);
1305 revs
->prune_data
= get_pathspec(revs
->prefix
,
1311 if (revs
->def
== NULL
)
1313 if (revs
->show_merge
)
1314 prepare_show_merge(revs
);
1315 if (revs
->def
&& !revs
->pending
.nr
) {
1316 unsigned char sha1
[20];
1317 struct object
*object
;
1319 if (get_sha1_with_mode(revs
->def
, sha1
, &mode
))
1320 die("bad default revision '%s'", revs
->def
);
1321 object
= get_reference(revs
, revs
->def
, sha1
, 0);
1322 add_pending_object_with_mode(revs
, object
, revs
->def
, mode
);
1325 /* Did the user ask for any diff output? Run the diff! */
1326 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
1329 /* Pickaxe, diff-filter and rename following need diffs */
1330 if (revs
->diffopt
.pickaxe
||
1331 revs
->diffopt
.filter
||
1332 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1335 if (revs
->topo_order
)
1338 if (revs
->prune_data
) {
1339 diff_tree_setup_paths(revs
->prune_data
, &revs
->pruning
);
1340 /* Can't prune commits with rename following: the paths change.. */
1341 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1343 if (!revs
->full_diff
)
1344 diff_tree_setup_paths(revs
->prune_data
, &revs
->diffopt
);
1346 if (revs
->combine_merges
) {
1347 revs
->ignore_merges
= 0;
1348 if (revs
->dense_combined_merges
&& !revs
->diffopt
.output_format
)
1349 revs
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
1351 revs
->diffopt
.abbrev
= revs
->abbrev
;
1352 if (diff_setup_done(&revs
->diffopt
) < 0)
1353 die("diff_setup_done failed");
1355 if (revs
->grep_filter
) {
1356 compile_grep_patterns(revs
->grep_filter
);
1359 if (revs
->reverse
&& revs
->reflog_info
)
1360 die("cannot combine --reverse with --walk-reflogs");
1361 if (revs
->rewrite_parents
&& revs
->children
.name
)
1362 die("cannot combine --parents and --children");
1365 * Limitations on the graph functionality
1367 if (revs
->reverse
&& revs
->graph
)
1368 die("cannot combine --reverse with --graph");
1370 if (revs
->reflog_info
&& revs
->graph
)
1371 die("cannot combine --walk-reflogs with --graph");
1376 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
1378 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
1381 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
1384 static void set_children(struct rev_info
*revs
)
1386 struct commit_list
*l
;
1387 for (l
= revs
->commits
; l
; l
= l
->next
) {
1388 struct commit
*commit
= l
->item
;
1389 struct commit_list
*p
;
1391 for (p
= commit
->parents
; p
; p
= p
->next
)
1392 add_child(revs
, p
->item
, commit
);
1396 int prepare_revision_walk(struct rev_info
*revs
)
1398 int nr
= revs
->pending
.nr
;
1399 struct object_array_entry
*e
, *list
;
1401 e
= list
= revs
->pending
.objects
;
1402 revs
->pending
.nr
= 0;
1403 revs
->pending
.alloc
= 0;
1404 revs
->pending
.objects
= NULL
;
1406 struct commit
*commit
= handle_commit(revs
, e
->item
, e
->name
);
1408 if (!(commit
->object
.flags
& SEEN
)) {
1409 commit
->object
.flags
|= SEEN
;
1410 insert_by_date(commit
, &revs
->commits
);
1420 if (limit_list(revs
) < 0)
1422 if (revs
->topo_order
)
1423 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
1424 if (revs
->children
.name
)
1429 enum rewrite_result
{
1431 rewrite_one_noparents
,
1435 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
1437 struct commit_list
*cache
= NULL
;
1440 struct commit
*p
= *pp
;
1442 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
1443 return rewrite_one_error
;
1444 if (p
->parents
&& p
->parents
->next
)
1445 return rewrite_one_ok
;
1446 if (p
->object
.flags
& UNINTERESTING
)
1447 return rewrite_one_ok
;
1448 if (!(p
->object
.flags
& TREESAME
))
1449 return rewrite_one_ok
;
1451 return rewrite_one_noparents
;
1452 *pp
= p
->parents
->item
;
1456 static void remove_duplicate_parents(struct commit
*commit
)
1458 struct commit_list
**pp
, *p
;
1460 /* Examine existing parents while marking ones we have seen... */
1461 pp
= &commit
->parents
;
1462 while ((p
= *pp
) != NULL
) {
1463 struct commit
*parent
= p
->item
;
1464 if (parent
->object
.flags
& TMP_MARK
) {
1468 parent
->object
.flags
|= TMP_MARK
;
1471 /* ... and clear the temporary mark */
1472 for (p
= commit
->parents
; p
; p
= p
->next
)
1473 p
->item
->object
.flags
&= ~TMP_MARK
;
1476 static int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
)
1478 struct commit_list
**pp
= &commit
->parents
;
1480 struct commit_list
*parent
= *pp
;
1481 switch (rewrite_one(revs
, &parent
->item
)) {
1482 case rewrite_one_ok
:
1484 case rewrite_one_noparents
:
1487 case rewrite_one_error
:
1492 remove_duplicate_parents(commit
);
1496 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
1498 if (!opt
->grep_filter
)
1500 return grep_buffer(opt
->grep_filter
,
1501 NULL
, /* we say nothing, not even filename */
1502 commit
->buffer
, strlen(commit
->buffer
));
1505 static inline int want_ancestry(struct rev_info
*revs
)
1507 return (revs
->rewrite_parents
|| revs
->children
.name
);
1510 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
1512 if (commit
->object
.flags
& SHOWN
)
1513 return commit_ignore
;
1514 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
, revs
->ignore_packed
))
1515 return commit_ignore
;
1518 if (commit
->object
.flags
& UNINTERESTING
)
1519 return commit_ignore
;
1520 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
1521 return commit_ignore
;
1522 if (revs
->no_merges
&& commit
->parents
&& commit
->parents
->next
)
1523 return commit_ignore
;
1524 if (!commit_match(commit
, revs
))
1525 return commit_ignore
;
1526 if (revs
->prune
&& revs
->dense
) {
1527 /* Commit without changes? */
1528 if (commit
->object
.flags
& TREESAME
) {
1529 /* drop merges unless we want parenthood */
1530 if (!want_ancestry(revs
))
1531 return commit_ignore
;
1532 /* non-merge - always ignore it */
1533 if (!commit
->parents
|| !commit
->parents
->next
)
1534 return commit_ignore
;
1536 if (want_ancestry(revs
) && rewrite_parents(revs
, commit
) < 0)
1537 return commit_error
;
1542 static struct commit
*get_revision_1(struct rev_info
*revs
)
1548 struct commit_list
*entry
= revs
->commits
;
1549 struct commit
*commit
= entry
->item
;
1551 revs
->commits
= entry
->next
;
1554 if (revs
->reflog_info
)
1555 fake_reflog_parent(revs
->reflog_info
, commit
);
1558 * If we haven't done the list limiting, we need to look at
1559 * the parents here. We also need to do the date-based limiting
1560 * that we'd otherwise have done in limit_list().
1562 if (!revs
->limited
) {
1563 if (revs
->max_age
!= -1 &&
1564 (commit
->date
< revs
->max_age
))
1566 if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0)
1570 switch (simplify_commit(revs
, commit
)) {
1578 } while (revs
->commits
);
1582 static void gc_boundary(struct object_array
*array
)
1584 unsigned nr
= array
->nr
;
1585 unsigned alloc
= array
->alloc
;
1586 struct object_array_entry
*objects
= array
->objects
;
1590 for (i
= j
= 0; i
< nr
; i
++) {
1591 if (objects
[i
].item
->flags
& SHOWN
)
1594 objects
[j
] = objects
[i
];
1597 for (i
= j
; i
< nr
; i
++)
1598 objects
[i
].item
= NULL
;
1603 static void create_boundary_commit_list(struct rev_info
*revs
)
1607 struct object_array
*array
= &revs
->boundary_commits
;
1608 struct object_array_entry
*objects
= array
->objects
;
1611 * If revs->commits is non-NULL at this point, an error occurred in
1612 * get_revision_1(). Ignore the error and continue printing the
1613 * boundary commits anyway. (This is what the code has always
1616 if (revs
->commits
) {
1617 free_commit_list(revs
->commits
);
1618 revs
->commits
= NULL
;
1622 * Put all of the actual boundary commits from revs->boundary_commits
1623 * into revs->commits
1625 for (i
= 0; i
< array
->nr
; i
++) {
1626 c
= (struct commit
*)(objects
[i
].item
);
1629 if (!(c
->object
.flags
& CHILD_SHOWN
))
1631 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
1633 c
->object
.flags
|= BOUNDARY
;
1634 commit_list_insert(c
, &revs
->commits
);
1638 * If revs->topo_order is set, sort the boundary commits
1639 * in topological order
1641 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
1644 static struct commit
*get_revision_internal(struct rev_info
*revs
)
1646 struct commit
*c
= NULL
;
1647 struct commit_list
*l
;
1649 if (revs
->boundary
== 2) {
1651 * All of the normal commits have already been returned,
1652 * and we are now returning boundary commits.
1653 * create_boundary_commit_list() has populated
1654 * revs->commits with the remaining commits to return.
1656 c
= pop_commit(&revs
->commits
);
1658 c
->object
.flags
|= SHOWN
;
1662 if (revs
->reverse
) {
1665 if (0 <= revs
->max_count
) {
1666 limit
= revs
->max_count
;
1667 if (0 < revs
->skip_count
)
1668 limit
+= revs
->skip_count
;
1671 while ((c
= get_revision_1(revs
))) {
1672 commit_list_insert(c
, &l
);
1673 if ((0 < limit
) && !--limit
)
1678 revs
->max_count
= -1;
1683 * Now pick up what they want to give us
1685 c
= get_revision_1(revs
);
1687 while (0 < revs
->skip_count
) {
1689 c
= get_revision_1(revs
);
1696 * Check the max_count.
1698 switch (revs
->max_count
) {
1709 c
->object
.flags
|= SHOWN
;
1711 if (!revs
->boundary
) {
1717 * get_revision_1() runs out the commits, and
1718 * we are done computing the boundaries.
1719 * switch to boundary commits output mode.
1724 * Update revs->commits to contain the list of
1727 create_boundary_commit_list(revs
);
1729 return get_revision_internal(revs
);
1733 * boundary commits are the commits that are parents of the
1734 * ones we got from get_revision_1() but they themselves are
1735 * not returned from get_revision_1(). Before returning
1736 * 'c', we need to mark its parents that they could be boundaries.
1739 for (l
= c
->parents
; l
; l
= l
->next
) {
1741 p
= &(l
->item
->object
);
1742 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
1744 p
->flags
|= CHILD_SHOWN
;
1745 gc_boundary(&revs
->boundary_commits
);
1746 add_object_array(p
, NULL
, &revs
->boundary_commits
);
1752 struct commit
*get_revision(struct rev_info
*revs
)
1754 struct commit
*c
= get_revision_internal(revs
);
1755 if (c
&& revs
->graph
)
1756 graph_update(revs
->graph
, c
);