11 static char *path_name(struct name_path
*path
, const char *name
)
15 int nlen
= strlen(name
);
18 for (p
= path
; p
; p
= p
->up
) {
20 len
+= p
->elem_len
+ 1;
23 m
= n
+ len
- (nlen
+ 1);
25 for (p
= path
; p
; p
= p
->up
) {
28 memcpy(m
, p
->elem
, p
->elem_len
);
35 void add_object(struct object
*obj
,
36 struct object_array
*p
,
37 struct name_path
*path
,
40 add_object_array(obj
, path_name(path
, name
), p
);
43 static void mark_blob_uninteresting(struct blob
*blob
)
45 if (blob
->object
.flags
& UNINTERESTING
)
47 blob
->object
.flags
|= UNINTERESTING
;
50 void mark_tree_uninteresting(struct tree
*tree
)
52 struct tree_desc desc
;
53 struct name_entry entry
;
54 struct object
*obj
= &tree
->object
;
56 if (obj
->flags
& UNINTERESTING
)
58 obj
->flags
|= UNINTERESTING
;
59 if (!has_sha1_file(obj
->sha1
))
61 if (parse_tree(tree
) < 0)
62 die("bad tree %s", sha1_to_hex(obj
->sha1
));
64 desc
.buf
= tree
->buffer
;
65 desc
.size
= tree
->size
;
66 while (tree_entry(&desc
, &entry
)) {
67 if (S_ISDIR(entry
.mode
))
68 mark_tree_uninteresting(lookup_tree(entry
.sha1
));
70 mark_blob_uninteresting(lookup_blob(entry
.sha1
));
74 * We don't care about the tree any more
75 * after it has been marked uninteresting.
81 void mark_parents_uninteresting(struct commit
*commit
)
83 struct commit_list
*parents
= commit
->parents
;
86 struct commit
*commit
= parents
->item
;
87 if (!(commit
->object
.flags
& UNINTERESTING
)) {
88 commit
->object
.flags
|= UNINTERESTING
;
91 * Normally we haven't parsed the parent
92 * yet, so we won't have a parent of a parent
93 * here. However, it may turn out that we've
94 * reached this commit some other way (where it
95 * wasn't uninteresting), in which case we need
96 * to mark its parents recursively too..
99 mark_parents_uninteresting(commit
);
103 * A missing commit is ok iff its parent is marked
106 * We just mark such a thing parsed, so that when
107 * it is popped next time around, we won't be trying
108 * to parse it and get an error.
110 if (!has_sha1_file(commit
->object
.sha1
))
111 commit
->object
.parsed
= 1;
112 parents
= parents
->next
;
116 void add_pending_object(struct rev_info
*revs
, struct object
*obj
, const char *name
)
118 add_object_array(obj
, name
, &revs
->pending
);
121 static struct object
*get_reference(struct rev_info
*revs
, const char *name
, const unsigned char *sha1
, unsigned int flags
)
123 struct object
*object
;
125 object
= parse_object(sha1
);
127 die("bad object %s", name
);
128 object
->flags
|= flags
;
132 static struct commit
*handle_commit(struct rev_info
*revs
, struct object
*object
, const char *name
)
134 unsigned long flags
= object
->flags
;
137 * Tag object? Look what it points to..
139 while (object
->type
== OBJ_TAG
) {
140 struct tag
*tag
= (struct tag
*) object
;
141 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
142 add_pending_object(revs
, object
, tag
->tag
);
143 object
= parse_object(tag
->tagged
->sha1
);
145 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
149 * Commit object? Just return it, we'll do all the complex
152 if (object
->type
== OBJ_COMMIT
) {
153 struct commit
*commit
= (struct commit
*)object
;
154 if (parse_commit(commit
) < 0)
155 die("unable to parse commit %s", name
);
156 if (flags
& UNINTERESTING
) {
157 commit
->object
.flags
|= UNINTERESTING
;
158 mark_parents_uninteresting(commit
);
165 * Tree object? Either mark it uniniteresting, or add it
166 * to the list of objects to look at later..
168 if (object
->type
== OBJ_TREE
) {
169 struct tree
*tree
= (struct tree
*)object
;
170 if (!revs
->tree_objects
)
172 if (flags
& UNINTERESTING
) {
173 mark_tree_uninteresting(tree
);
176 add_pending_object(revs
, object
, "");
181 * Blob object? You know the drill by now..
183 if (object
->type
== OBJ_BLOB
) {
184 struct blob
*blob
= (struct blob
*)object
;
185 if (!revs
->blob_objects
)
187 if (flags
& UNINTERESTING
) {
188 mark_blob_uninteresting(blob
);
191 add_pending_object(revs
, object
, "");
194 die("%s is unknown object", name
);
197 static int everybody_uninteresting(struct commit_list
*orig
)
199 struct commit_list
*list
= orig
;
201 struct commit
*commit
= list
->item
;
203 if (commit
->object
.flags
& UNINTERESTING
)
210 static int tree_difference
= REV_TREE_SAME
;
212 static void file_add_remove(struct diff_options
*options
,
213 int addremove
, unsigned mode
,
214 const unsigned char *sha1
,
215 const char *base
, const char *path
)
217 int diff
= REV_TREE_DIFFERENT
;
220 * Is it an add of a new file? It means that the old tree
221 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
222 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
223 * (and if it already was "REV_TREE_NEW", we'll keep it
224 * "REV_TREE_NEW" of course).
226 if (addremove
== '+') {
227 diff
= tree_difference
;
228 if (diff
!= REV_TREE_SAME
)
232 tree_difference
= diff
;
235 static void file_change(struct diff_options
*options
,
236 unsigned old_mode
, unsigned new_mode
,
237 const unsigned char *old_sha1
,
238 const unsigned char *new_sha1
,
239 const char *base
, const char *path
)
241 tree_difference
= REV_TREE_DIFFERENT
;
244 int rev_compare_tree(struct rev_info
*revs
, struct tree
*t1
, struct tree
*t2
)
249 return REV_TREE_DIFFERENT
;
250 tree_difference
= REV_TREE_SAME
;
251 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
253 return REV_TREE_DIFFERENT
;
254 return tree_difference
;
257 int rev_same_tree_as_empty(struct rev_info
*revs
, struct tree
*t1
)
261 struct tree_desc empty
, real
;
266 tree
= read_object_with_reference(t1
->object
.sha1
, tree_type
, &real
.size
, NULL
);
275 retval
= diff_tree(&empty
, &real
, "", &revs
->pruning
);
278 return retval
>= 0 && !tree_difference
;
281 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
283 struct commit_list
**pp
, *parent
;
284 int tree_changed
= 0, tree_same
= 0;
289 if (!commit
->parents
) {
290 if (!rev_same_tree_as_empty(revs
, commit
->tree
))
291 commit
->object
.flags
|= TREECHANGE
;
295 pp
= &commit
->parents
;
296 while ((parent
= *pp
) != NULL
) {
297 struct commit
*p
= parent
->item
;
300 switch (rev_compare_tree(revs
, p
->tree
, commit
->tree
)) {
303 if (!revs
->simplify_history
|| (p
->object
.flags
& UNINTERESTING
)) {
304 /* Even if a merge with an uninteresting
305 * side branch brought the entire change
306 * we are interested in, we do not want
307 * to lose the other branches of this
308 * merge, so we just keep going.
314 commit
->parents
= parent
;
318 if (revs
->remove_empty_trees
&&
319 rev_same_tree_as_empty(revs
, p
->tree
)) {
320 /* We are adding all the specified
321 * paths from this parent, so the
322 * history beyond this parent is not
323 * interesting. Remove its parents
324 * (they are grandparents for us).
325 * IOW, we pretend this parent is a
332 case REV_TREE_DIFFERENT
:
337 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
339 if (tree_changed
&& !tree_same
)
340 commit
->object
.flags
|= TREECHANGE
;
343 static void add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**list
)
345 struct commit_list
*parent
= commit
->parents
;
348 if (commit
->object
.flags
& ADDED
)
350 commit
->object
.flags
|= ADDED
;
353 * If the commit is uninteresting, don't try to
354 * prune parents - we want the maximal uninteresting
357 * Normally we haven't parsed the parent
358 * yet, so we won't have a parent of a parent
359 * here. However, it may turn out that we've
360 * reached this commit some other way (where it
361 * wasn't uninteresting), in which case we need
362 * to mark its parents recursively too..
364 if (commit
->object
.flags
& UNINTERESTING
) {
366 struct commit
*p
= parent
->item
;
367 parent
= parent
->next
;
369 p
->object
.flags
|= UNINTERESTING
;
371 mark_parents_uninteresting(p
);
372 if (p
->object
.flags
& SEEN
)
374 p
->object
.flags
|= SEEN
;
375 insert_by_date(p
, list
);
381 * Ok, the commit wasn't uninteresting. Try to
382 * simplify the commit history and find the parent
383 * that has no differences in the path set if one exists.
386 revs
->prune_fn(revs
, commit
);
391 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
392 parent
= commit
->parents
;
394 struct commit
*p
= parent
->item
;
396 parent
= parent
->next
;
399 p
->object
.flags
|= left_flag
;
400 if (p
->object
.flags
& SEEN
)
402 p
->object
.flags
|= SEEN
;
403 insert_by_date(p
, list
);
407 static void limit_list(struct rev_info
*revs
)
409 struct commit_list
*list
= revs
->commits
;
410 struct commit_list
*newlist
= NULL
;
411 struct commit_list
**p
= &newlist
;
414 struct commit_list
*entry
= list
;
415 struct commit
*commit
= list
->item
;
416 struct object
*obj
= &commit
->object
;
421 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
422 obj
->flags
|= UNINTERESTING
;
423 add_parents_to_list(revs
, commit
, &list
);
424 if (obj
->flags
& UNINTERESTING
) {
425 mark_parents_uninteresting(commit
);
426 if (everybody_uninteresting(list
))
430 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
432 p
= &commit_list_insert(commit
, p
)->next
;
434 if (revs
->boundary
) {
435 /* mark the ones that are on the result list first */
436 for (list
= newlist
; list
; list
= list
->next
) {
437 struct commit
*commit
= list
->item
;
438 commit
->object
.flags
|= TMP_MARK
;
440 for (list
= newlist
; list
; list
= list
->next
) {
441 struct commit
*commit
= list
->item
;
442 struct object
*obj
= &commit
->object
;
443 struct commit_list
*parent
;
444 if (obj
->flags
& UNINTERESTING
)
446 for (parent
= commit
->parents
;
448 parent
= parent
->next
) {
449 struct commit
*pcommit
= parent
->item
;
450 if (!(pcommit
->object
.flags
& UNINTERESTING
))
452 pcommit
->object
.flags
|= BOUNDARY
;
453 if (pcommit
->object
.flags
& TMP_MARK
)
455 pcommit
->object
.flags
|= TMP_MARK
;
456 p
= &commit_list_insert(pcommit
, p
)->next
;
459 for (list
= newlist
; list
; list
= list
->next
) {
460 struct commit
*commit
= list
->item
;
461 commit
->object
.flags
&= ~TMP_MARK
;
464 revs
->commits
= newlist
;
469 struct rev_info
*all_revs
;
470 const char *name_for_errormsg
;
473 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
475 struct all_refs_cb
*cb
= cb_data
;
476 struct object
*object
= get_reference(cb
->all_revs
, path
, sha1
,
478 add_pending_object(cb
->all_revs
, object
, "");
482 static void handle_all(struct rev_info
*revs
, unsigned flags
)
484 struct all_refs_cb cb
;
486 cb
.all_flags
= flags
;
487 for_each_ref(handle_one_ref
, &cb
);
490 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
, char *detail
, void *cb_data
)
492 struct all_refs_cb
*cb
= cb_data
;
493 struct object
*object
;
495 if (!is_null_sha1(osha1
)) {
496 object
= get_reference(cb
->all_revs
, cb
->name_for_errormsg
,
497 osha1
, cb
->all_flags
);
498 add_pending_object(cb
->all_revs
, object
, "");
500 object
= get_reference(cb
->all_revs
, cb
->name_for_errormsg
,
501 nsha1
, cb
->all_flags
);
502 add_pending_object(cb
->all_revs
, object
, "");
506 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
508 struct all_refs_cb
*cb
= cb_data
;
509 cb
->name_for_errormsg
= path
;
510 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
514 static void handle_reflog(struct rev_info
*revs
, unsigned flags
)
516 struct all_refs_cb cb
;
518 cb
.all_flags
= flags
;
519 for_each_ref(handle_one_reflog
, &cb
);
522 static int add_parents_only(struct rev_info
*revs
, const char *arg
, int flags
)
524 unsigned char sha1
[20];
526 struct commit
*commit
;
527 struct commit_list
*parents
;
530 flags
^= UNINTERESTING
;
533 if (get_sha1(arg
, sha1
))
536 it
= get_reference(revs
, arg
, sha1
, 0);
537 if (it
->type
!= OBJ_TAG
)
539 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
541 if (it
->type
!= OBJ_COMMIT
)
543 commit
= (struct commit
*)it
;
544 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
545 it
= &parents
->item
->object
;
547 add_pending_object(revs
, it
, arg
);
552 void init_revisions(struct rev_info
*revs
, const char *prefix
)
554 memset(revs
, 0, sizeof(*revs
));
556 revs
->abbrev
= DEFAULT_ABBREV
;
557 revs
->ignore_merges
= 1;
558 revs
->simplify_history
= 1;
559 revs
->pruning
.recursive
= 1;
560 revs
->pruning
.add_remove
= file_add_remove
;
561 revs
->pruning
.change
= file_change
;
564 revs
->prefix
= prefix
;
567 revs
->max_count
= -1;
569 revs
->prune_fn
= NULL
;
570 revs
->prune_data
= NULL
;
572 revs
->topo_setter
= topo_sort_default_setter
;
573 revs
->topo_getter
= topo_sort_default_getter
;
575 revs
->commit_format
= CMIT_FMT_DEFAULT
;
577 diff_setup(&revs
->diffopt
);
580 static void add_pending_commit_list(struct rev_info
*revs
,
581 struct commit_list
*commit_list
,
584 while (commit_list
) {
585 struct object
*object
= &commit_list
->item
->object
;
586 object
->flags
|= flags
;
587 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
588 commit_list
= commit_list
->next
;
592 static void prepare_show_merge(struct rev_info
*revs
)
594 struct commit_list
*bases
;
595 struct commit
*head
, *other
;
596 unsigned char sha1
[20];
597 const char **prune
= NULL
;
598 int i
, prune_num
= 1; /* counting terminating NULL */
600 if (get_sha1("HEAD", sha1
) || !(head
= lookup_commit(sha1
)))
601 die("--merge without HEAD?");
602 if (get_sha1("MERGE_HEAD", sha1
) || !(other
= lookup_commit(sha1
)))
603 die("--merge without MERGE_HEAD?");
604 add_pending_object(revs
, &head
->object
, "HEAD");
605 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
606 bases
= get_merge_bases(head
, other
, 1);
608 struct commit
*it
= bases
->item
;
609 struct commit_list
*n
= bases
->next
;
612 it
->object
.flags
|= UNINTERESTING
;
613 add_pending_object(revs
, &it
->object
, "(merge-base)");
618 for (i
= 0; i
< active_nr
; i
++) {
619 struct cache_entry
*ce
= active_cache
[i
];
622 if (ce_path_match(ce
, revs
->prune_data
)) {
624 prune
= xrealloc(prune
, sizeof(*prune
) * prune_num
);
625 prune
[prune_num
-2] = ce
->name
;
626 prune
[prune_num
-1] = NULL
;
628 while ((i
+1 < active_nr
) &&
629 ce_same_name(ce
, active_cache
[i
+1]))
632 revs
->prune_data
= prune
;
635 int handle_revision_arg(const char *arg
, struct rev_info
*revs
,
637 int cant_be_filename
)
640 struct object
*object
;
641 unsigned char sha1
[20];
644 dotdot
= strstr(arg
, "..");
646 unsigned char from_sha1
[20];
647 const char *next
= dotdot
+ 2;
648 const char *this = arg
;
649 int symmetric
= *next
== '.';
650 unsigned int flags_exclude
= flags
^ UNINTERESTING
;
659 if (!get_sha1(this, from_sha1
) &&
660 !get_sha1(next
, sha1
)) {
661 struct commit
*a
, *b
;
662 struct commit_list
*exclude
;
664 a
= lookup_commit_reference(from_sha1
);
665 b
= lookup_commit_reference(sha1
);
668 "Invalid symmetric difference expression %s...%s" :
669 "Invalid revision range %s..%s",
673 if (!cant_be_filename
) {
675 verify_non_filename(revs
->prefix
, arg
);
679 exclude
= get_merge_bases(a
, b
, 1);
680 add_pending_commit_list(revs
, exclude
,
682 free_commit_list(exclude
);
683 a
->object
.flags
|= flags
| SYMMETRIC_LEFT
;
685 a
->object
.flags
|= flags_exclude
;
686 b
->object
.flags
|= flags
;
687 add_pending_object(revs
, &a
->object
, this);
688 add_pending_object(revs
, &b
->object
, next
);
693 dotdot
= strstr(arg
, "^@");
694 if (dotdot
&& !dotdot
[2]) {
696 if (add_parents_only(revs
, arg
, flags
))
700 dotdot
= strstr(arg
, "^!");
701 if (dotdot
&& !dotdot
[2]) {
703 if (!add_parents_only(revs
, arg
, flags
^ UNINTERESTING
))
709 local_flags
= UNINTERESTING
;
712 if (get_sha1(arg
, sha1
))
714 if (!cant_be_filename
)
715 verify_non_filename(revs
->prefix
, arg
);
716 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
717 add_pending_object(revs
, object
, arg
);
721 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
723 if (!revs
->grep_filter
) {
724 struct grep_opt
*opt
= xcalloc(1, sizeof(*opt
));
725 opt
->status_only
= 1;
726 opt
->pattern_tail
= &(opt
->pattern_list
);
727 opt
->regflags
= REG_NEWLINE
;
728 revs
->grep_filter
= opt
;
730 append_grep_pattern(revs
->grep_filter
, ptn
,
731 "command line", 0, what
);
734 static void add_header_grep(struct rev_info
*revs
, const char *field
, const char *pattern
)
740 fldlen
= strlen(field
);
741 patlen
= strlen(pattern
);
742 pat
= xmalloc(patlen
+ fldlen
+ 10);
744 if (*pattern
== '^') {
748 sprintf(pat
, "^%s %s%s", field
, prefix
, pattern
);
749 add_grep(revs
, pat
, GREP_PATTERN_HEAD
);
752 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
754 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
757 static void add_ignore_packed(struct rev_info
*revs
, const char *name
)
759 int num
= ++revs
->num_ignore_packed
;
761 revs
->ignore_packed
= xrealloc(revs
->ignore_packed
,
762 sizeof(const char **) * (num
+ 1));
763 revs
->ignore_packed
[num
-1] = name
;
764 revs
->ignore_packed
[num
] = NULL
;
768 * Parse revision information, filling in the "rev_info" structure,
769 * and removing the used arguments from the argument list.
771 * Returns the number of arguments left that weren't recognized
772 * (which are also moved to the head of the argument list)
774 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, const char *def
)
776 int i
, flags
, seen_dashdash
, show_merge
;
777 const char **unrecognized
= argv
+ 1;
781 /* First, search for "--" */
783 for (i
= 1; i
< argc
; i
++) {
784 const char *arg
= argv
[i
];
785 if (strcmp(arg
, "--"))
789 revs
->prune_data
= get_pathspec(revs
->prefix
, argv
+ i
+ 1);
794 flags
= show_merge
= 0;
795 for (i
= 1; i
< argc
; i
++) {
796 const char *arg
= argv
[i
];
799 if (!strncmp(arg
, "--max-count=", 12)) {
800 revs
->max_count
= atoi(arg
+ 12);
803 /* accept -<digit>, like traditional "head" */
804 if ((*arg
== '-') && isdigit(arg
[1])) {
805 revs
->max_count
= atoi(arg
+ 1);
808 if (!strcmp(arg
, "-n")) {
810 die("-n requires an argument");
811 revs
->max_count
= atoi(argv
[++i
]);
814 if (!strncmp(arg
,"-n",2)) {
815 revs
->max_count
= atoi(arg
+ 2);
818 if (!strncmp(arg
, "--max-age=", 10)) {
819 revs
->max_age
= atoi(arg
+ 10);
822 if (!strncmp(arg
, "--since=", 8)) {
823 revs
->max_age
= approxidate(arg
+ 8);
826 if (!strncmp(arg
, "--after=", 8)) {
827 revs
->max_age
= approxidate(arg
+ 8);
830 if (!strncmp(arg
, "--min-age=", 10)) {
831 revs
->min_age
= atoi(arg
+ 10);
834 if (!strncmp(arg
, "--before=", 9)) {
835 revs
->min_age
= approxidate(arg
+ 9);
838 if (!strncmp(arg
, "--until=", 8)) {
839 revs
->min_age
= approxidate(arg
+ 8);
842 if (!strcmp(arg
, "--all")) {
843 handle_all(revs
, flags
);
846 if (!strcmp(arg
, "--reflog")) {
847 handle_reflog(revs
, flags
);
850 if (!strcmp(arg
, "--not")) {
851 flags
^= UNINTERESTING
;
854 if (!strcmp(arg
, "--default")) {
856 die("bad --default argument");
860 if (!strcmp(arg
, "--merge")) {
864 if (!strcmp(arg
, "--topo-order")) {
865 revs
->topo_order
= 1;
868 if (!strcmp(arg
, "--date-order")) {
870 revs
->topo_order
= 1;
873 if (!strcmp(arg
, "--parents")) {
877 if (!strcmp(arg
, "--dense")) {
881 if (!strcmp(arg
, "--sparse")) {
885 if (!strcmp(arg
, "--remove-empty")) {
886 revs
->remove_empty_trees
= 1;
889 if (!strcmp(arg
, "--no-merges")) {
893 if (!strcmp(arg
, "--boundary")) {
897 if (!strcmp(arg
, "--left-right")) {
898 revs
->left_right
= 1;
901 if (!strcmp(arg
, "--objects")) {
902 revs
->tag_objects
= 1;
903 revs
->tree_objects
= 1;
904 revs
->blob_objects
= 1;
907 if (!strcmp(arg
, "--objects-edge")) {
908 revs
->tag_objects
= 1;
909 revs
->tree_objects
= 1;
910 revs
->blob_objects
= 1;
914 if (!strcmp(arg
, "--unpacked")) {
916 free(revs
->ignore_packed
);
917 revs
->ignore_packed
= NULL
;
918 revs
->num_ignore_packed
= 0;
921 if (!strncmp(arg
, "--unpacked=", 11)) {
923 add_ignore_packed(revs
, arg
+11);
926 if (!strcmp(arg
, "-r")) {
928 revs
->diffopt
.recursive
= 1;
931 if (!strcmp(arg
, "-t")) {
933 revs
->diffopt
.recursive
= 1;
934 revs
->diffopt
.tree_in_recursive
= 1;
937 if (!strcmp(arg
, "-m")) {
938 revs
->ignore_merges
= 0;
941 if (!strcmp(arg
, "-c")) {
943 revs
->dense_combined_merges
= 0;
944 revs
->combine_merges
= 1;
947 if (!strcmp(arg
, "--cc")) {
949 revs
->dense_combined_merges
= 1;
950 revs
->combine_merges
= 1;
953 if (!strcmp(arg
, "-v")) {
954 revs
->verbose_header
= 1;
957 if (!strncmp(arg
, "--pretty", 8)) {
958 revs
->verbose_header
= 1;
959 revs
->commit_format
= get_commit_format(arg
+8);
962 if (!strcmp(arg
, "--root")) {
963 revs
->show_root_diff
= 1;
966 if (!strcmp(arg
, "--no-commit-id")) {
967 revs
->no_commit_id
= 1;
970 if (!strcmp(arg
, "--always")) {
971 revs
->always_show_header
= 1;
974 if (!strcmp(arg
, "--no-abbrev")) {
978 if (!strcmp(arg
, "--abbrev")) {
979 revs
->abbrev
= DEFAULT_ABBREV
;
982 if (!strncmp(arg
, "--abbrev=", 9)) {
983 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
984 if (revs
->abbrev
< MINIMUM_ABBREV
)
985 revs
->abbrev
= MINIMUM_ABBREV
;
986 else if (revs
->abbrev
> 40)
990 if (!strcmp(arg
, "--abbrev-commit")) {
991 revs
->abbrev_commit
= 1;
994 if (!strcmp(arg
, "--full-diff")) {
999 if (!strcmp(arg
, "--full-history")) {
1000 revs
->simplify_history
= 0;
1003 if (!strcmp(arg
, "--relative-date")) {
1004 revs
->relative_date
= 1;
1009 * Grepping the commit log
1011 if (!strncmp(arg
, "--author=", 9)) {
1012 add_header_grep(revs
, "author", arg
+9);
1015 if (!strncmp(arg
, "--committer=", 12)) {
1016 add_header_grep(revs
, "committer", arg
+12);
1019 if (!strncmp(arg
, "--grep=", 7)) {
1020 add_message_grep(revs
, arg
+7);
1023 if (!strcmp(arg
, "--all-match")) {
1028 opts
= diff_opt_parse(&revs
->diffopt
, argv
+i
, argc
-i
);
1034 *unrecognized
++ = arg
;
1039 if (handle_revision_arg(arg
, revs
, flags
, seen_dashdash
)) {
1041 if (seen_dashdash
|| *arg
== '^')
1042 die("bad revision '%s'", arg
);
1044 /* If we didn't have a "--":
1045 * (1) all filenames must exist;
1046 * (2) all rev-args must not be interpretable
1047 * as a valid filename.
1048 * but the latter we have checked in the main loop.
1050 for (j
= i
; j
< argc
; j
++)
1051 verify_filename(revs
->prefix
, argv
[j
]);
1053 revs
->prune_data
= get_pathspec(revs
->prefix
,
1060 prepare_show_merge(revs
);
1061 if (def
&& !revs
->pending
.nr
) {
1062 unsigned char sha1
[20];
1063 struct object
*object
;
1064 if (get_sha1(def
, sha1
))
1065 die("bad default revision '%s'", def
);
1066 object
= get_reference(revs
, def
, sha1
, 0);
1067 add_pending_object(revs
, object
, def
);
1070 if (revs
->topo_order
)
1073 if (revs
->prune_data
) {
1074 diff_tree_setup_paths(revs
->prune_data
, &revs
->pruning
);
1075 revs
->prune_fn
= try_to_simplify_commit
;
1076 if (!revs
->full_diff
)
1077 diff_tree_setup_paths(revs
->prune_data
, &revs
->diffopt
);
1079 if (revs
->combine_merges
) {
1080 revs
->ignore_merges
= 0;
1081 if (revs
->dense_combined_merges
&& !revs
->diffopt
.output_format
)
1082 revs
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
1084 revs
->diffopt
.abbrev
= revs
->abbrev
;
1085 if (diff_setup_done(&revs
->diffopt
) < 0)
1086 die("diff_setup_done failed");
1088 if (revs
->grep_filter
) {
1089 revs
->grep_filter
->all_match
= all_match
;
1090 compile_grep_patterns(revs
->grep_filter
);
1096 void prepare_revision_walk(struct rev_info
*revs
)
1098 int nr
= revs
->pending
.nr
;
1099 struct object_array_entry
*list
= revs
->pending
.objects
;
1101 revs
->pending
.nr
= 0;
1102 revs
->pending
.alloc
= 0;
1103 revs
->pending
.objects
= NULL
;
1105 struct commit
*commit
= handle_commit(revs
, list
->item
, list
->name
);
1107 if (!(commit
->object
.flags
& SEEN
)) {
1108 commit
->object
.flags
|= SEEN
;
1109 insert_by_date(commit
, &revs
->commits
);
1119 if (revs
->topo_order
)
1120 sort_in_topological_order_fn(&revs
->commits
, revs
->lifo
,
1125 static int rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
1128 struct commit
*p
= *pp
;
1130 add_parents_to_list(revs
, p
, &revs
->commits
);
1131 if (p
->parents
&& p
->parents
->next
)
1133 if (p
->object
.flags
& (TREECHANGE
| UNINTERESTING
))
1137 *pp
= p
->parents
->item
;
1141 static void rewrite_parents(struct rev_info
*revs
, struct commit
*commit
)
1143 struct commit_list
**pp
= &commit
->parents
;
1145 struct commit_list
*parent
= *pp
;
1146 if (rewrite_one(revs
, &parent
->item
) < 0) {
1154 static void mark_boundary_to_show(struct commit
*commit
)
1156 struct commit_list
*p
= commit
->parents
;
1160 if (commit
->object
.flags
& BOUNDARY
)
1161 commit
->object
.flags
|= BOUNDARY_SHOW
;
1165 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
1167 if (!opt
->grep_filter
)
1169 return grep_buffer(opt
->grep_filter
,
1170 NULL
, /* we say nothing, not even filename */
1171 commit
->buffer
, strlen(commit
->buffer
));
1174 struct commit
*get_revision(struct rev_info
*revs
)
1176 struct commit_list
*list
= revs
->commits
;
1181 /* Check the max_count ... */
1182 switch (revs
->max_count
) {
1192 struct commit_list
*entry
= revs
->commits
;
1193 struct commit
*commit
= entry
->item
;
1195 revs
->commits
= entry
->next
;
1199 * If we haven't done the list limiting, we need to look at
1200 * the parents here. We also need to do the date-based limiting
1201 * that we'd otherwise have done in limit_list().
1203 if (!revs
->limited
) {
1204 if (revs
->max_age
!= -1 &&
1205 (commit
->date
< revs
->max_age
))
1207 add_parents_to_list(revs
, commit
, &revs
->commits
);
1209 if (commit
->object
.flags
& SHOWN
)
1212 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
,
1213 revs
->ignore_packed
))
1216 /* We want to show boundary commits only when their
1217 * children are shown. When path-limiter is in effect,
1218 * rewrite_parents() drops some commits from getting shown,
1219 * and there is no point showing boundary parents that
1220 * are not shown. After rewrite_parents() rewrites the
1221 * parents of a commit that is shown, we mark the boundary
1222 * parents with BOUNDARY_SHOW.
1224 if (commit
->object
.flags
& BOUNDARY_SHOW
) {
1225 commit
->object
.flags
|= SHOWN
;
1228 if (commit
->object
.flags
& UNINTERESTING
)
1230 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
1232 if (revs
->no_merges
&&
1233 commit
->parents
&& commit
->parents
->next
)
1235 if (!commit_match(commit
, revs
))
1237 if (revs
->prune_fn
&& revs
->dense
) {
1238 /* Commit without changes? */
1239 if (!(commit
->object
.flags
& TREECHANGE
)) {
1240 /* drop merges unless we want parenthood */
1243 /* non-merge - always ignore it */
1244 if (!commit
->parents
|| !commit
->parents
->next
)
1248 rewrite_parents(revs
, commit
);
1251 mark_boundary_to_show(commit
);
1252 commit
->object
.flags
|= SHOWN
;
1254 } while (revs
->commits
);