10 #include "reflog-walk.h"
11 #include "patch-ids.h"
13 volatile show_early_output_fn_t show_early_output
;
15 static char *path_name(struct name_path
*path
, const char *name
)
19 int nlen
= strlen(name
);
22 for (p
= path
; p
; p
= p
->up
) {
24 len
+= p
->elem_len
+ 1;
27 m
= n
+ len
- (nlen
+ 1);
29 for (p
= path
; p
; p
= p
->up
) {
32 memcpy(m
, p
->elem
, p
->elem_len
);
39 void add_object(struct object
*obj
,
40 struct object_array
*p
,
41 struct name_path
*path
,
44 add_object_array(obj
, path_name(path
, name
), p
);
47 static void mark_blob_uninteresting(struct blob
*blob
)
49 if (blob
->object
.flags
& UNINTERESTING
)
51 blob
->object
.flags
|= UNINTERESTING
;
54 void mark_tree_uninteresting(struct tree
*tree
)
56 struct tree_desc desc
;
57 struct name_entry entry
;
58 struct object
*obj
= &tree
->object
;
60 if (obj
->flags
& UNINTERESTING
)
62 obj
->flags
|= UNINTERESTING
;
63 if (!has_sha1_file(obj
->sha1
))
65 if (parse_tree(tree
) < 0)
66 die("bad tree %s", sha1_to_hex(obj
->sha1
));
68 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
69 while (tree_entry(&desc
, &entry
)) {
70 switch (object_type(entry
.mode
)) {
72 mark_tree_uninteresting(lookup_tree(entry
.sha1
));
75 mark_blob_uninteresting(lookup_blob(entry
.sha1
));
78 /* Subproject commit - not in this repository */
84 * We don't care about the tree any more
85 * after it has been marked uninteresting.
91 void mark_parents_uninteresting(struct commit
*commit
)
93 struct commit_list
*parents
= commit
->parents
;
96 struct commit
*commit
= parents
->item
;
97 if (!(commit
->object
.flags
& UNINTERESTING
)) {
98 commit
->object
.flags
|= UNINTERESTING
;
101 * Normally we haven't parsed the parent
102 * yet, so we won't have a parent of a parent
103 * here. However, it may turn out that we've
104 * reached this commit some other way (where it
105 * wasn't uninteresting), in which case we need
106 * to mark its parents recursively too..
109 mark_parents_uninteresting(commit
);
113 * A missing commit is ok iff its parent is marked
116 * We just mark such a thing parsed, so that when
117 * it is popped next time around, we won't be trying
118 * to parse it and get an error.
120 if (!has_sha1_file(commit
->object
.sha1
))
121 commit
->object
.parsed
= 1;
122 parents
= parents
->next
;
126 static void add_pending_object_with_mode(struct rev_info
*revs
, struct object
*obj
, const char *name
, unsigned mode
)
128 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
129 die("object ranges do not make sense when not walking revisions");
130 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
&&
131 add_reflog_for_walk(revs
->reflog_info
,
132 (struct commit
*)obj
, name
))
134 add_object_array_with_mode(obj
, name
, &revs
->pending
, mode
);
137 void add_pending_object(struct rev_info
*revs
, struct object
*obj
, const char *name
)
139 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
142 void add_head_to_pending(struct rev_info
*revs
)
144 unsigned char sha1
[20];
146 if (get_sha1("HEAD", sha1
))
148 obj
= parse_object(sha1
);
151 add_pending_object(revs
, obj
, "HEAD");
154 static struct object
*get_reference(struct rev_info
*revs
, const char *name
, const unsigned char *sha1
, unsigned int flags
)
156 struct object
*object
;
158 object
= parse_object(sha1
);
160 die("bad object %s", name
);
161 object
->flags
|= flags
;
165 static struct commit
*handle_commit(struct rev_info
*revs
, struct object
*object
, const char *name
)
167 unsigned long flags
= object
->flags
;
170 * Tag object? Look what it points to..
172 while (object
->type
== OBJ_TAG
) {
173 struct tag
*tag
= (struct tag
*) object
;
174 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
175 add_pending_object(revs
, object
, tag
->tag
);
176 object
= parse_object(tag
->tagged
->sha1
);
178 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
182 * Commit object? Just return it, we'll do all the complex
185 if (object
->type
== OBJ_COMMIT
) {
186 struct commit
*commit
= (struct commit
*)object
;
187 if (parse_commit(commit
) < 0)
188 die("unable to parse commit %s", name
);
189 if (flags
& UNINTERESTING
) {
190 commit
->object
.flags
|= UNINTERESTING
;
191 mark_parents_uninteresting(commit
);
198 * Tree object? Either mark it uniniteresting, or add it
199 * to the list of objects to look at later..
201 if (object
->type
== OBJ_TREE
) {
202 struct tree
*tree
= (struct tree
*)object
;
203 if (!revs
->tree_objects
)
205 if (flags
& UNINTERESTING
) {
206 mark_tree_uninteresting(tree
);
209 add_pending_object(revs
, object
, "");
214 * Blob object? You know the drill by now..
216 if (object
->type
== OBJ_BLOB
) {
217 struct blob
*blob
= (struct blob
*)object
;
218 if (!revs
->blob_objects
)
220 if (flags
& UNINTERESTING
) {
221 mark_blob_uninteresting(blob
);
224 add_pending_object(revs
, object
, "");
227 die("%s is unknown object", name
);
230 static int everybody_uninteresting(struct commit_list
*orig
)
232 struct commit_list
*list
= orig
;
234 struct commit
*commit
= list
->item
;
236 if (commit
->object
.flags
& UNINTERESTING
)
244 * The goal is to get REV_TREE_NEW as the result only if the
245 * diff consists of all '+' (and no other changes), and
246 * REV_TREE_DIFFERENT otherwise (of course if the trees are
247 * the same we want REV_TREE_SAME). That means that once we
248 * get to REV_TREE_DIFFERENT, we do not have to look any further.
250 static int tree_difference
= REV_TREE_SAME
;
252 static void file_add_remove(struct diff_options
*options
,
253 int addremove
, unsigned mode
,
254 const unsigned char *sha1
,
255 const char *base
, const char *path
)
257 int diff
= REV_TREE_DIFFERENT
;
260 * Is it an add of a new file? It means that the old tree
261 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
262 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
263 * (and if it already was "REV_TREE_NEW", we'll keep it
264 * "REV_TREE_NEW" of course).
266 if (addremove
== '+') {
267 diff
= tree_difference
;
268 if (diff
!= REV_TREE_SAME
)
272 tree_difference
= diff
;
273 if (tree_difference
== REV_TREE_DIFFERENT
)
274 DIFF_OPT_SET(options
, HAS_CHANGES
);
277 static void file_change(struct diff_options
*options
,
278 unsigned old_mode
, unsigned new_mode
,
279 const unsigned char *old_sha1
,
280 const unsigned char *new_sha1
,
281 const char *base
, const char *path
)
283 tree_difference
= REV_TREE_DIFFERENT
;
284 DIFF_OPT_SET(options
, HAS_CHANGES
);
287 static int rev_compare_tree(struct rev_info
*revs
, struct tree
*t1
, struct tree
*t2
)
292 return REV_TREE_DIFFERENT
;
293 tree_difference
= REV_TREE_SAME
;
294 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
295 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
297 return REV_TREE_DIFFERENT
;
298 return tree_difference
;
301 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct tree
*t1
)
306 struct tree_desc empty
, real
;
311 tree
= read_object_with_reference(t1
->object
.sha1
, tree_type
, &size
, NULL
);
314 init_tree_desc(&real
, tree
, size
);
315 init_tree_desc(&empty
, "", 0);
317 tree_difference
= REV_TREE_SAME
;
318 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
319 retval
= diff_tree(&empty
, &real
, "", &revs
->pruning
);
322 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
325 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
327 struct commit_list
**pp
, *parent
;
328 int tree_changed
= 0, tree_same
= 0;
331 * If we don't do pruning, everything is interesting
339 if (!commit
->parents
) {
340 if (rev_same_tree_as_empty(revs
, commit
->tree
))
341 commit
->object
.flags
|= TREESAME
;
346 * Normal non-merge commit? If we don't want to make the
347 * history dense, we consider it always to be a change..
349 if (!revs
->dense
&& !commit
->parents
->next
)
352 pp
= &commit
->parents
;
353 while ((parent
= *pp
) != NULL
) {
354 struct commit
*p
= parent
->item
;
356 if (parse_commit(p
) < 0)
357 die("cannot simplify commit %s (because of %s)",
358 sha1_to_hex(commit
->object
.sha1
),
359 sha1_to_hex(p
->object
.sha1
));
360 switch (rev_compare_tree(revs
, p
->tree
, commit
->tree
)) {
363 if (!revs
->simplify_history
|| (p
->object
.flags
& UNINTERESTING
)) {
364 /* Even if a merge with an uninteresting
365 * side branch brought the entire change
366 * we are interested in, we do not want
367 * to lose the other branches of this
368 * merge, so we just keep going.
374 commit
->parents
= parent
;
375 commit
->object
.flags
|= TREESAME
;
379 if (revs
->remove_empty_trees
&&
380 rev_same_tree_as_empty(revs
, p
->tree
)) {
381 /* We are adding all the specified
382 * paths from this parent, so the
383 * history beyond this parent is not
384 * interesting. Remove its parents
385 * (they are grandparents for us).
386 * IOW, we pretend this parent is a
389 if (parse_commit(p
) < 0)
390 die("cannot simplify commit %s (invalid %s)",
391 sha1_to_hex(commit
->object
.sha1
),
392 sha1_to_hex(p
->object
.sha1
));
396 case REV_TREE_DIFFERENT
:
401 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
403 if (tree_changed
&& !tree_same
)
405 commit
->object
.flags
|= TREESAME
;
408 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**list
)
410 struct commit_list
*parent
= commit
->parents
;
414 if (commit
->object
.flags
& ADDED
)
416 commit
->object
.flags
|= ADDED
;
419 * If the commit is uninteresting, don't try to
420 * prune parents - we want the maximal uninteresting
423 * Normally we haven't parsed the parent
424 * yet, so we won't have a parent of a parent
425 * here. However, it may turn out that we've
426 * reached this commit some other way (where it
427 * wasn't uninteresting), in which case we need
428 * to mark its parents recursively too..
430 if (commit
->object
.flags
& UNINTERESTING
) {
432 struct commit
*p
= parent
->item
;
433 parent
= parent
->next
;
434 if (parse_commit(p
) < 0)
436 p
->object
.flags
|= UNINTERESTING
;
438 mark_parents_uninteresting(p
);
439 if (p
->object
.flags
& SEEN
)
441 p
->object
.flags
|= SEEN
;
442 insert_by_date(p
, list
);
448 * Ok, the commit wasn't uninteresting. Try to
449 * simplify the commit history and find the parent
450 * that has no differences in the path set if one exists.
452 try_to_simplify_commit(revs
, commit
);
457 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
459 rest
= !revs
->first_parent_only
;
460 for (parent
= commit
->parents
, add
= 1; parent
; add
= rest
) {
461 struct commit
*p
= parent
->item
;
463 parent
= parent
->next
;
464 if (parse_commit(p
) < 0)
466 p
->object
.flags
|= left_flag
;
467 if (p
->object
.flags
& SEEN
)
469 p
->object
.flags
|= SEEN
;
471 insert_by_date(p
, list
);
476 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
478 struct commit_list
*p
;
479 int left_count
= 0, right_count
= 0;
481 struct patch_ids ids
;
483 /* First count the commits on the left and on the right */
484 for (p
= list
; p
; p
= p
->next
) {
485 struct commit
*commit
= p
->item
;
486 unsigned flags
= commit
->object
.flags
;
487 if (flags
& BOUNDARY
)
489 else if (flags
& SYMMETRIC_LEFT
)
495 left_first
= left_count
< right_count
;
496 init_patch_ids(&ids
);
497 if (revs
->diffopt
.nr_paths
) {
498 ids
.diffopts
.nr_paths
= revs
->diffopt
.nr_paths
;
499 ids
.diffopts
.paths
= revs
->diffopt
.paths
;
500 ids
.diffopts
.pathlens
= revs
->diffopt
.pathlens
;
503 /* Compute patch-ids for one side */
504 for (p
= list
; p
; p
= p
->next
) {
505 struct commit
*commit
= p
->item
;
506 unsigned flags
= commit
->object
.flags
;
508 if (flags
& BOUNDARY
)
511 * If we have fewer left, left_first is set and we omit
512 * commits on the right branch in this loop. If we have
513 * fewer right, we skip the left ones.
515 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
517 commit
->util
= add_commit_patch_id(commit
, &ids
);
520 /* Check the other side */
521 for (p
= list
; p
; p
= p
->next
) {
522 struct commit
*commit
= p
->item
;
524 unsigned flags
= commit
->object
.flags
;
526 if (flags
& BOUNDARY
)
529 * If we have fewer left, left_first is set and we omit
530 * commits on the left branch in this loop.
532 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
536 * Have we seen the same patch id?
538 id
= has_commit_patch_id(commit
, &ids
);
542 commit
->object
.flags
|= SHOWN
;
545 /* Now check the original side for seen ones */
546 for (p
= list
; p
; p
= p
->next
) {
547 struct commit
*commit
= p
->item
;
548 struct patch_id
*ent
;
554 commit
->object
.flags
|= SHOWN
;
558 free_patch_ids(&ids
);
561 static void add_to_list(struct commit_list
**p
, struct commit
*commit
, struct commit_list
*n
)
563 p
= &commit_list_insert(commit
, p
)->next
;
567 static int limit_list(struct rev_info
*revs
)
569 struct commit_list
*list
= revs
->commits
;
570 struct commit_list
*newlist
= NULL
;
571 struct commit_list
**p
= &newlist
;
574 struct commit_list
*entry
= list
;
575 struct commit
*commit
= list
->item
;
576 struct object
*obj
= &commit
->object
;
577 show_early_output_fn_t show
;
582 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
583 obj
->flags
|= UNINTERESTING
;
584 if (add_parents_to_list(revs
, commit
, &list
) < 0)
586 if (obj
->flags
& UNINTERESTING
) {
587 mark_parents_uninteresting(commit
);
588 if (everybody_uninteresting(list
)) {
590 add_to_list(p
, commit
, list
);
596 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
598 p
= &commit_list_insert(commit
, p
)->next
;
600 show
= show_early_output
;
605 show_early_output
= NULL
;
607 if (revs
->cherry_pick
)
608 cherry_pick_list(newlist
, revs
);
610 revs
->commits
= newlist
;
616 int warned_bad_reflog
;
617 struct rev_info
*all_revs
;
618 const char *name_for_errormsg
;
621 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
623 struct all_refs_cb
*cb
= cb_data
;
624 struct object
*object
= get_reference(cb
->all_revs
, path
, sha1
,
626 add_pending_object(cb
->all_revs
, object
, path
);
630 static void handle_all(struct rev_info
*revs
, unsigned flags
)
632 struct all_refs_cb cb
;
634 cb
.all_flags
= flags
;
635 for_each_ref(handle_one_ref
, &cb
);
638 static void handle_one_reflog_commit(unsigned char *sha1
, void *cb_data
)
640 struct all_refs_cb
*cb
= cb_data
;
641 if (!is_null_sha1(sha1
)) {
642 struct object
*o
= parse_object(sha1
);
644 o
->flags
|= cb
->all_flags
;
645 add_pending_object(cb
->all_revs
, o
, "");
647 else if (!cb
->warned_bad_reflog
) {
648 warning("reflog of '%s' references pruned commits",
649 cb
->name_for_errormsg
);
650 cb
->warned_bad_reflog
= 1;
655 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
656 const char *email
, unsigned long timestamp
, int tz
,
657 const char *message
, void *cb_data
)
659 handle_one_reflog_commit(osha1
, cb_data
);
660 handle_one_reflog_commit(nsha1
, cb_data
);
664 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
666 struct all_refs_cb
*cb
= cb_data
;
667 cb
->warned_bad_reflog
= 0;
668 cb
->name_for_errormsg
= path
;
669 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
673 static void handle_reflog(struct rev_info
*revs
, unsigned flags
)
675 struct all_refs_cb cb
;
677 cb
.all_flags
= flags
;
678 for_each_reflog(handle_one_reflog
, &cb
);
681 static int add_parents_only(struct rev_info
*revs
, const char *arg
, int flags
)
683 unsigned char sha1
[20];
685 struct commit
*commit
;
686 struct commit_list
*parents
;
689 flags
^= UNINTERESTING
;
692 if (get_sha1(arg
, sha1
))
695 it
= get_reference(revs
, arg
, sha1
, 0);
696 if (it
->type
!= OBJ_TAG
)
698 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
700 if (it
->type
!= OBJ_COMMIT
)
702 commit
= (struct commit
*)it
;
703 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
704 it
= &parents
->item
->object
;
706 add_pending_object(revs
, it
, arg
);
711 void init_revisions(struct rev_info
*revs
, const char *prefix
)
713 memset(revs
, 0, sizeof(*revs
));
715 revs
->abbrev
= DEFAULT_ABBREV
;
716 revs
->ignore_merges
= 1;
717 revs
->simplify_history
= 1;
718 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
719 DIFF_OPT_SET(&revs
->pruning
, QUIET
);
720 revs
->pruning
.add_remove
= file_add_remove
;
721 revs
->pruning
.change
= file_change
;
724 revs
->prefix
= prefix
;
727 revs
->skip_count
= -1;
728 revs
->max_count
= -1;
730 revs
->commit_format
= CMIT_FMT_DEFAULT
;
732 diff_setup(&revs
->diffopt
);
735 static void add_pending_commit_list(struct rev_info
*revs
,
736 struct commit_list
*commit_list
,
739 while (commit_list
) {
740 struct object
*object
= &commit_list
->item
->object
;
741 object
->flags
|= flags
;
742 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
743 commit_list
= commit_list
->next
;
747 static void prepare_show_merge(struct rev_info
*revs
)
749 struct commit_list
*bases
;
750 struct commit
*head
, *other
;
751 unsigned char sha1
[20];
752 const char **prune
= NULL
;
753 int i
, prune_num
= 1; /* counting terminating NULL */
755 if (get_sha1("HEAD", sha1
) || !(head
= lookup_commit(sha1
)))
756 die("--merge without HEAD?");
757 if (get_sha1("MERGE_HEAD", sha1
) || !(other
= lookup_commit(sha1
)))
758 die("--merge without MERGE_HEAD?");
759 add_pending_object(revs
, &head
->object
, "HEAD");
760 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
761 bases
= get_merge_bases(head
, other
, 1);
763 struct commit
*it
= bases
->item
;
764 struct commit_list
*n
= bases
->next
;
767 it
->object
.flags
|= UNINTERESTING
;
768 add_pending_object(revs
, &it
->object
, "(merge-base)");
773 for (i
= 0; i
< active_nr
; i
++) {
774 struct cache_entry
*ce
= active_cache
[i
];
777 if (ce_path_match(ce
, revs
->prune_data
)) {
779 prune
= xrealloc(prune
, sizeof(*prune
) * prune_num
);
780 prune
[prune_num
-2] = ce
->name
;
781 prune
[prune_num
-1] = NULL
;
783 while ((i
+1 < active_nr
) &&
784 ce_same_name(ce
, active_cache
[i
+1]))
787 revs
->prune_data
= prune
;
790 int handle_revision_arg(const char *arg
, struct rev_info
*revs
,
792 int cant_be_filename
)
796 struct object
*object
;
797 unsigned char sha1
[20];
800 dotdot
= strstr(arg
, "..");
802 unsigned char from_sha1
[20];
803 const char *next
= dotdot
+ 2;
804 const char *this = arg
;
805 int symmetric
= *next
== '.';
806 unsigned int flags_exclude
= flags
^ UNINTERESTING
;
815 if (!get_sha1(this, from_sha1
) &&
816 !get_sha1(next
, sha1
)) {
817 struct commit
*a
, *b
;
818 struct commit_list
*exclude
;
820 a
= lookup_commit_reference(from_sha1
);
821 b
= lookup_commit_reference(sha1
);
824 "Invalid symmetric difference expression %s...%s" :
825 "Invalid revision range %s..%s",
829 if (!cant_be_filename
) {
831 verify_non_filename(revs
->prefix
, arg
);
835 exclude
= get_merge_bases(a
, b
, 1);
836 add_pending_commit_list(revs
, exclude
,
838 free_commit_list(exclude
);
839 a
->object
.flags
|= flags
| SYMMETRIC_LEFT
;
841 a
->object
.flags
|= flags_exclude
;
842 b
->object
.flags
|= flags
;
843 add_pending_object(revs
, &a
->object
, this);
844 add_pending_object(revs
, &b
->object
, next
);
849 dotdot
= strstr(arg
, "^@");
850 if (dotdot
&& !dotdot
[2]) {
852 if (add_parents_only(revs
, arg
, flags
))
856 dotdot
= strstr(arg
, "^!");
857 if (dotdot
&& !dotdot
[2]) {
859 if (!add_parents_only(revs
, arg
, flags
^ UNINTERESTING
))
865 local_flags
= UNINTERESTING
;
868 if (get_sha1_with_mode(arg
, sha1
, &mode
))
870 if (!cant_be_filename
)
871 verify_non_filename(revs
->prefix
, arg
);
872 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
873 add_pending_object_with_mode(revs
, object
, arg
, mode
);
877 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
879 if (!revs
->grep_filter
) {
880 struct grep_opt
*opt
= xcalloc(1, sizeof(*opt
));
881 opt
->status_only
= 1;
882 opt
->pattern_tail
= &(opt
->pattern_list
);
883 opt
->regflags
= REG_NEWLINE
;
884 revs
->grep_filter
= opt
;
886 append_grep_pattern(revs
->grep_filter
, ptn
,
887 "command line", 0, what
);
890 static void add_header_grep(struct rev_info
*revs
, const char *field
, const char *pattern
)
896 fldlen
= strlen(field
);
897 patlen
= strlen(pattern
);
898 pat
= xmalloc(patlen
+ fldlen
+ 10);
900 if (*pattern
== '^') {
904 sprintf(pat
, "^%s %s%s", field
, prefix
, pattern
);
905 add_grep(revs
, pat
, GREP_PATTERN_HEAD
);
908 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
910 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
913 static void add_ignore_packed(struct rev_info
*revs
, const char *name
)
915 int num
= ++revs
->num_ignore_packed
;
917 revs
->ignore_packed
= xrealloc(revs
->ignore_packed
,
918 sizeof(const char **) * (num
+ 1));
919 revs
->ignore_packed
[num
-1] = name
;
920 revs
->ignore_packed
[num
] = NULL
;
924 * Parse revision information, filling in the "rev_info" structure,
925 * and removing the used arguments from the argument list.
927 * Returns the number of arguments left that weren't recognized
928 * (which are also moved to the head of the argument list)
930 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, const char *def
)
932 int i
, flags
, seen_dashdash
, show_merge
;
933 const char **unrecognized
= argv
+ 1;
938 /* First, search for "--" */
940 for (i
= 1; i
< argc
; i
++) {
941 const char *arg
= argv
[i
];
942 if (strcmp(arg
, "--"))
947 revs
->prune_data
= get_pathspec(revs
->prefix
, argv
+ i
+ 1);
952 flags
= show_merge
= 0;
953 for (i
= 1; i
< argc
; i
++) {
954 const char *arg
= argv
[i
];
957 if (!prefixcmp(arg
, "--max-count=")) {
958 revs
->max_count
= atoi(arg
+ 12);
961 if (!prefixcmp(arg
, "--skip=")) {
962 revs
->skip_count
= atoi(arg
+ 7);
965 /* accept -<digit>, like traditional "head" */
966 if ((*arg
== '-') && isdigit(arg
[1])) {
967 revs
->max_count
= atoi(arg
+ 1);
970 if (!strcmp(arg
, "-n")) {
972 die("-n requires an argument");
973 revs
->max_count
= atoi(argv
[++i
]);
976 if (!prefixcmp(arg
, "-n")) {
977 revs
->max_count
= atoi(arg
+ 2);
980 if (!prefixcmp(arg
, "--max-age=")) {
981 revs
->max_age
= atoi(arg
+ 10);
984 if (!prefixcmp(arg
, "--since=")) {
985 revs
->max_age
= approxidate(arg
+ 8);
988 if (!prefixcmp(arg
, "--after=")) {
989 revs
->max_age
= approxidate(arg
+ 8);
992 if (!prefixcmp(arg
, "--min-age=")) {
993 revs
->min_age
= atoi(arg
+ 10);
996 if (!prefixcmp(arg
, "--before=")) {
997 revs
->min_age
= approxidate(arg
+ 9);
1000 if (!prefixcmp(arg
, "--until=")) {
1001 revs
->min_age
= approxidate(arg
+ 8);
1004 if (!strcmp(arg
, "--all")) {
1005 handle_all(revs
, flags
);
1008 if (!strcmp(arg
, "--first-parent")) {
1009 revs
->first_parent_only
= 1;
1012 if (!strcmp(arg
, "--reflog")) {
1013 handle_reflog(revs
, flags
);
1016 if (!strcmp(arg
, "-g") ||
1017 !strcmp(arg
, "--walk-reflogs")) {
1018 init_reflog_walk(&revs
->reflog_info
);
1021 if (!strcmp(arg
, "--not")) {
1022 flags
^= UNINTERESTING
;
1025 if (!strcmp(arg
, "--default")) {
1027 die("bad --default argument");
1031 if (!strcmp(arg
, "--merge")) {
1035 if (!strcmp(arg
, "--topo-order")) {
1036 revs
->topo_order
= 1;
1039 if (!strcmp(arg
, "--date-order")) {
1041 revs
->topo_order
= 1;
1044 if (!prefixcmp(arg
, "--early-output")) {
1048 count
= atoi(arg
+15);
1051 revs
->topo_order
= 1;
1052 revs
->early_output
= count
;
1056 if (!strcmp(arg
, "--parents")) {
1060 if (!strcmp(arg
, "--dense")) {
1064 if (!strcmp(arg
, "--sparse")) {
1068 if (!strcmp(arg
, "--show-all")) {
1072 if (!strcmp(arg
, "--remove-empty")) {
1073 revs
->remove_empty_trees
= 1;
1076 if (!strcmp(arg
, "--no-merges")) {
1077 revs
->no_merges
= 1;
1080 if (!strcmp(arg
, "--boundary")) {
1084 if (!strcmp(arg
, "--left-right")) {
1085 revs
->left_right
= 1;
1088 if (!strcmp(arg
, "--cherry-pick")) {
1089 revs
->cherry_pick
= 1;
1093 if (!strcmp(arg
, "--objects")) {
1094 revs
->tag_objects
= 1;
1095 revs
->tree_objects
= 1;
1096 revs
->blob_objects
= 1;
1099 if (!strcmp(arg
, "--objects-edge")) {
1100 revs
->tag_objects
= 1;
1101 revs
->tree_objects
= 1;
1102 revs
->blob_objects
= 1;
1103 revs
->edge_hint
= 1;
1106 if (!strcmp(arg
, "--unpacked")) {
1108 free(revs
->ignore_packed
);
1109 revs
->ignore_packed
= NULL
;
1110 revs
->num_ignore_packed
= 0;
1113 if (!prefixcmp(arg
, "--unpacked=")) {
1115 add_ignore_packed(revs
, arg
+11);
1118 if (!strcmp(arg
, "-r")) {
1120 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1123 if (!strcmp(arg
, "-t")) {
1125 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1126 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1129 if (!strcmp(arg
, "-m")) {
1130 revs
->ignore_merges
= 0;
1133 if (!strcmp(arg
, "-c")) {
1135 revs
->dense_combined_merges
= 0;
1136 revs
->combine_merges
= 1;
1139 if (!strcmp(arg
, "--cc")) {
1141 revs
->dense_combined_merges
= 1;
1142 revs
->combine_merges
= 1;
1145 if (!strcmp(arg
, "-v")) {
1146 revs
->verbose_header
= 1;
1149 if (!prefixcmp(arg
, "--pretty")) {
1150 revs
->verbose_header
= 1;
1151 revs
->commit_format
= get_commit_format(arg
+8);
1154 if (!strcmp(arg
, "--root")) {
1155 revs
->show_root_diff
= 1;
1158 if (!strcmp(arg
, "--no-commit-id")) {
1159 revs
->no_commit_id
= 1;
1162 if (!strcmp(arg
, "--always")) {
1163 revs
->always_show_header
= 1;
1166 if (!strcmp(arg
, "--no-abbrev")) {
1170 if (!strcmp(arg
, "--abbrev")) {
1171 revs
->abbrev
= DEFAULT_ABBREV
;
1174 if (!prefixcmp(arg
, "--abbrev=")) {
1175 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1176 if (revs
->abbrev
< MINIMUM_ABBREV
)
1177 revs
->abbrev
= MINIMUM_ABBREV
;
1178 else if (revs
->abbrev
> 40)
1182 if (!strcmp(arg
, "--abbrev-commit")) {
1183 revs
->abbrev_commit
= 1;
1186 if (!strcmp(arg
, "--full-diff")) {
1188 revs
->full_diff
= 1;
1191 if (!strcmp(arg
, "--full-history")) {
1192 revs
->simplify_history
= 0;
1195 if (!strcmp(arg
, "--relative-date")) {
1196 revs
->date_mode
= DATE_RELATIVE
;
1199 if (!strncmp(arg
, "--date=", 7)) {
1200 revs
->date_mode
= parse_date_format(arg
+ 7);
1203 if (!strcmp(arg
, "--log-size")) {
1204 revs
->show_log_size
= 1;
1209 * Grepping the commit log
1211 if (!prefixcmp(arg
, "--author=")) {
1212 add_header_grep(revs
, "author", arg
+9);
1215 if (!prefixcmp(arg
, "--committer=")) {
1216 add_header_grep(revs
, "committer", arg
+12);
1219 if (!prefixcmp(arg
, "--grep=")) {
1220 add_message_grep(revs
, arg
+7);
1223 if (!strcmp(arg
, "--extended-regexp") ||
1224 !strcmp(arg
, "-E")) {
1225 regflags
|= REG_EXTENDED
;
1228 if (!strcmp(arg
, "--regexp-ignore-case") ||
1229 !strcmp(arg
, "-i")) {
1230 regflags
|= REG_ICASE
;
1233 if (!strcmp(arg
, "--all-match")) {
1237 if (!prefixcmp(arg
, "--encoding=")) {
1239 if (strcmp(arg
, "none"))
1240 git_log_output_encoding
= xstrdup(arg
);
1242 git_log_output_encoding
= "";
1245 if (!strcmp(arg
, "--reverse")) {
1249 if (!strcmp(arg
, "--no-walk")) {
1253 if (!strcmp(arg
, "--do-walk")) {
1258 opts
= diff_opt_parse(&revs
->diffopt
, argv
+i
, argc
-i
);
1263 *unrecognized
++ = arg
;
1268 if (handle_revision_arg(arg
, revs
, flags
, seen_dashdash
)) {
1270 if (seen_dashdash
|| *arg
== '^')
1271 die("bad revision '%s'", arg
);
1273 /* If we didn't have a "--":
1274 * (1) all filenames must exist;
1275 * (2) all rev-args must not be interpretable
1276 * as a valid filename.
1277 * but the latter we have checked in the main loop.
1279 for (j
= i
; j
< argc
; j
++)
1280 verify_filename(revs
->prefix
, argv
[j
]);
1282 revs
->prune_data
= get_pathspec(revs
->prefix
,
1288 if (revs
->grep_filter
)
1289 revs
->grep_filter
->regflags
|= regflags
;
1292 prepare_show_merge(revs
);
1293 if (def
&& !revs
->pending
.nr
) {
1294 unsigned char sha1
[20];
1295 struct object
*object
;
1297 if (get_sha1_with_mode(def
, sha1
, &mode
))
1298 die("bad default revision '%s'", def
);
1299 object
= get_reference(revs
, def
, sha1
, 0);
1300 add_pending_object_with_mode(revs
, object
, def
, mode
);
1303 /* Did the user ask for any diff output? Run the diff! */
1304 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
1307 /* Pickaxe, diff-filter and rename following need diffs */
1308 if (revs
->diffopt
.pickaxe
||
1309 revs
->diffopt
.filter
||
1310 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1313 if (revs
->topo_order
)
1316 if (revs
->prune_data
) {
1317 diff_tree_setup_paths(revs
->prune_data
, &revs
->pruning
);
1318 /* Can't prune commits with rename following: the paths change.. */
1319 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
1321 if (!revs
->full_diff
)
1322 diff_tree_setup_paths(revs
->prune_data
, &revs
->diffopt
);
1324 if (revs
->combine_merges
) {
1325 revs
->ignore_merges
= 0;
1326 if (revs
->dense_combined_merges
&& !revs
->diffopt
.output_format
)
1327 revs
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
1329 revs
->diffopt
.abbrev
= revs
->abbrev
;
1330 if (diff_setup_done(&revs
->diffopt
) < 0)
1331 die("diff_setup_done failed");
1333 if (revs
->grep_filter
) {
1334 revs
->grep_filter
->all_match
= all_match
;
1335 compile_grep_patterns(revs
->grep_filter
);
1338 if (revs
->reverse
&& revs
->reflog_info
)
1339 die("cannot combine --reverse with --walk-reflogs");
1344 int prepare_revision_walk(struct rev_info
*revs
)
1346 int nr
= revs
->pending
.nr
;
1347 struct object_array_entry
*e
, *list
;
1349 e
= list
= revs
->pending
.objects
;
1350 revs
->pending
.nr
= 0;
1351 revs
->pending
.alloc
= 0;
1352 revs
->pending
.objects
= NULL
;
1354 struct commit
*commit
= handle_commit(revs
, e
->item
, e
->name
);
1356 if (!(commit
->object
.flags
& SEEN
)) {
1357 commit
->object
.flags
|= SEEN
;
1358 insert_by_date(commit
, &revs
->commits
);
1368 if (limit_list(revs
) < 0)
1370 if (revs
->topo_order
)
1371 sort_in_topological_order(&revs
->commits
, revs
->lifo
);
1375 enum rewrite_result
{
1377 rewrite_one_noparents
,
1381 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
1384 struct commit
*p
= *pp
;
1386 if (add_parents_to_list(revs
, p
, &revs
->commits
) < 0)
1387 return rewrite_one_error
;
1388 if (p
->parents
&& p
->parents
->next
)
1389 return rewrite_one_ok
;
1390 if (p
->object
.flags
& UNINTERESTING
)
1391 return rewrite_one_ok
;
1392 if (!(p
->object
.flags
& TREESAME
))
1393 return rewrite_one_ok
;
1395 return rewrite_one_noparents
;
1396 *pp
= p
->parents
->item
;
1400 static void remove_duplicate_parents(struct commit
*commit
)
1402 struct commit_list
**pp
, *p
;
1404 /* Examine existing parents while marking ones we have seen... */
1405 pp
= &commit
->parents
;
1406 while ((p
= *pp
) != NULL
) {
1407 struct commit
*parent
= p
->item
;
1408 if (parent
->object
.flags
& TMP_MARK
) {
1412 parent
->object
.flags
|= TMP_MARK
;
1415 /* ... and clear the temporary mark */
1416 for (p
= commit
->parents
; p
; p
= p
->next
)
1417 p
->item
->object
.flags
&= ~TMP_MARK
;
1420 static int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
)
1422 struct commit_list
**pp
= &commit
->parents
;
1424 struct commit_list
*parent
= *pp
;
1425 switch (rewrite_one(revs
, &parent
->item
)) {
1426 case rewrite_one_ok
:
1428 case rewrite_one_noparents
:
1431 case rewrite_one_error
:
1436 remove_duplicate_parents(commit
);
1440 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
1442 if (!opt
->grep_filter
)
1444 return grep_buffer(opt
->grep_filter
,
1445 NULL
, /* we say nothing, not even filename */
1446 commit
->buffer
, strlen(commit
->buffer
));
1449 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
1451 if (commit
->object
.flags
& SHOWN
)
1452 return commit_ignore
;
1453 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
, revs
->ignore_packed
))
1454 return commit_ignore
;
1457 if (commit
->object
.flags
& UNINTERESTING
)
1458 return commit_ignore
;
1459 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
1460 return commit_ignore
;
1461 if (revs
->no_merges
&& commit
->parents
&& commit
->parents
->next
)
1462 return commit_ignore
;
1463 if (!commit_match(commit
, revs
))
1464 return commit_ignore
;
1465 if (revs
->prune
&& revs
->dense
) {
1466 /* Commit without changes? */
1467 if (commit
->object
.flags
& TREESAME
) {
1468 /* drop merges unless we want parenthood */
1470 return commit_ignore
;
1471 /* non-merge - always ignore it */
1472 if (!commit
->parents
|| !commit
->parents
->next
)
1473 return commit_ignore
;
1475 if (revs
->parents
&& rewrite_parents(revs
, commit
) < 0)
1476 return commit_error
;
1481 static struct commit
*get_revision_1(struct rev_info
*revs
)
1487 struct commit_list
*entry
= revs
->commits
;
1488 struct commit
*commit
= entry
->item
;
1490 revs
->commits
= entry
->next
;
1493 if (revs
->reflog_info
)
1494 fake_reflog_parent(revs
->reflog_info
, commit
);
1497 * If we haven't done the list limiting, we need to look at
1498 * the parents here. We also need to do the date-based limiting
1499 * that we'd otherwise have done in limit_list().
1501 if (!revs
->limited
) {
1502 if (revs
->max_age
!= -1 &&
1503 (commit
->date
< revs
->max_age
))
1505 if (add_parents_to_list(revs
, commit
, &revs
->commits
) < 0)
1509 switch (simplify_commit(revs
, commit
)) {
1517 } while (revs
->commits
);
1521 static void gc_boundary(struct object_array
*array
)
1523 unsigned nr
= array
->nr
;
1524 unsigned alloc
= array
->alloc
;
1525 struct object_array_entry
*objects
= array
->objects
;
1529 for (i
= j
= 0; i
< nr
; i
++) {
1530 if (objects
[i
].item
->flags
& SHOWN
)
1533 objects
[j
] = objects
[i
];
1536 for (i
= j
; i
< nr
; i
++)
1537 objects
[i
].item
= NULL
;
1542 struct commit
*get_revision(struct rev_info
*revs
)
1544 struct commit
*c
= NULL
;
1545 struct commit_list
*l
;
1547 if (revs
->boundary
== 2) {
1549 struct object_array
*array
= &revs
->boundary_commits
;
1550 struct object_array_entry
*objects
= array
->objects
;
1551 for (i
= 0; i
< array
->nr
; i
++) {
1552 c
= (struct commit
*)(objects
[i
].item
);
1555 if (!(c
->object
.flags
& CHILD_SHOWN
))
1557 if (!(c
->object
.flags
& SHOWN
))
1563 c
->object
.flags
|= SHOWN
| BOUNDARY
;
1567 if (revs
->reverse
) {
1570 if (0 <= revs
->max_count
) {
1571 limit
= revs
->max_count
;
1572 if (0 < revs
->skip_count
)
1573 limit
+= revs
->skip_count
;
1576 while ((c
= get_revision_1(revs
))) {
1577 commit_list_insert(c
, &l
);
1578 if ((0 < limit
) && !--limit
)
1583 revs
->max_count
= -1;
1588 * Now pick up what they want to give us
1590 c
= get_revision_1(revs
);
1592 while (0 < revs
->skip_count
) {
1594 c
= get_revision_1(revs
);
1601 * Check the max_count.
1603 switch (revs
->max_count
) {
1614 c
->object
.flags
|= SHOWN
;
1616 if (!revs
->boundary
) {
1622 * get_revision_1() runs out the commits, and
1623 * we are done computing the boundaries.
1624 * switch to boundary commits output mode.
1627 return get_revision(revs
);
1631 * boundary commits are the commits that are parents of the
1632 * ones we got from get_revision_1() but they themselves are
1633 * not returned from get_revision_1(). Before returning
1634 * 'c', we need to mark its parents that they could be boundaries.
1637 for (l
= c
->parents
; l
; l
= l
->next
) {
1639 p
= &(l
->item
->object
);
1640 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
1642 p
->flags
|= CHILD_SHOWN
;
1643 gc_boundary(&revs
->boundary_commits
);
1644 add_object_array(p
, NULL
, &revs
->boundary_commits
);