10 static char *path_name(struct name_path
*path
, const char *name
)
14 int nlen
= strlen(name
);
17 for (p
= path
; p
; p
= p
->up
) {
19 len
+= p
->elem_len
+ 1;
22 m
= n
+ len
- (nlen
+ 1);
24 for (p
= path
; p
; p
= p
->up
) {
27 memcpy(m
, p
->elem
, p
->elem_len
);
34 struct object_list
**add_object(struct object
*obj
,
35 struct object_list
**p
,
36 struct name_path
*path
,
39 struct object_list
*entry
= xmalloc(sizeof(*entry
));
42 entry
->name
= path_name(path
, name
);
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 object
*obj
= &tree
->object
;
57 struct tree_entry_list
*entry
;
59 if (obj
->flags
& UNINTERESTING
)
61 obj
->flags
|= UNINTERESTING
;
62 if (!has_sha1_file(obj
->sha1
))
64 if (parse_tree(tree
) < 0)
65 die("bad tree %s", sha1_to_hex(obj
->sha1
));
66 entry
= tree
->entries
;
69 struct tree_entry_list
*next
= entry
->next
;
71 mark_tree_uninteresting(entry
->item
.tree
);
73 mark_blob_uninteresting(entry
->item
.blob
);
79 void mark_parents_uninteresting(struct commit
*commit
)
81 struct commit_list
*parents
= commit
->parents
;
84 struct commit
*commit
= parents
->item
;
85 if (!(commit
->object
.flags
& UNINTERESTING
)) {
86 commit
->object
.flags
|= UNINTERESTING
;
89 * Normally we haven't parsed the parent
90 * yet, so we won't have a parent of a parent
91 * here. However, it may turn out that we've
92 * reached this commit some other way (where it
93 * wasn't uninteresting), in which case we need
94 * to mark its parents recursively too..
97 mark_parents_uninteresting(commit
);
101 * A missing commit is ok iff its parent is marked
104 * We just mark such a thing parsed, so that when
105 * it is popped next time around, we won't be trying
106 * to parse it and get an error.
108 if (!has_sha1_file(commit
->object
.sha1
))
109 commit
->object
.parsed
= 1;
110 parents
= parents
->next
;
114 static void add_pending_object(struct rev_info
*revs
, struct object
*obj
, const char *name
)
116 add_object(obj
, &revs
->pending_objects
, NULL
, name
);
119 static struct commit
*get_commit_reference(struct rev_info
*revs
, const char *name
, const unsigned char *sha1
, unsigned int flags
)
121 struct object
*object
;
123 object
= parse_object(sha1
);
125 die("bad object %s", name
);
128 * Tag object? Look what it points to..
130 while (object
->type
== tag_type
) {
131 struct tag
*tag
= (struct tag
*) object
;
132 object
->flags
|= flags
;
133 if (revs
->tag_objects
&& !(object
->flags
& UNINTERESTING
))
134 add_pending_object(revs
, object
, tag
->tag
);
135 object
= parse_object(tag
->tagged
->sha1
);
137 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
141 * Commit object? Just return it, we'll do all the complex
144 if (object
->type
== commit_type
) {
145 struct commit
*commit
= (struct commit
*)object
;
146 object
->flags
|= flags
;
147 if (parse_commit(commit
) < 0)
148 die("unable to parse commit %s", name
);
149 if (flags
& UNINTERESTING
) {
150 mark_parents_uninteresting(commit
);
157 * Tree object? Either mark it uniniteresting, or add it
158 * to the list of objects to look at later..
160 if (object
->type
== tree_type
) {
161 struct tree
*tree
= (struct tree
*)object
;
162 if (!revs
->tree_objects
)
164 if (flags
& UNINTERESTING
) {
165 mark_tree_uninteresting(tree
);
168 add_pending_object(revs
, object
, "");
173 * Blob object? You know the drill by now..
175 if (object
->type
== blob_type
) {
176 struct blob
*blob
= (struct blob
*)object
;
177 if (!revs
->blob_objects
)
179 if (flags
& UNINTERESTING
) {
180 mark_blob_uninteresting(blob
);
183 add_pending_object(revs
, object
, "");
186 die("%s is unknown object", name
);
189 static int everybody_uninteresting(struct commit_list
*orig
)
191 struct commit_list
*list
= orig
;
193 struct commit
*commit
= list
->item
;
195 if (commit
->object
.flags
& UNINTERESTING
)
202 static int tree_difference
= REV_TREE_SAME
;
204 static void file_add_remove(struct diff_options
*options
,
205 int addremove
, unsigned mode
,
206 const unsigned char *sha1
,
207 const char *base
, const char *path
)
209 int diff
= REV_TREE_DIFFERENT
;
212 * Is it an add of a new file? It means that the old tree
213 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
214 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
215 * (and if it already was "REV_TREE_NEW", we'll keep it
216 * "REV_TREE_NEW" of course).
218 if (addremove
== '+') {
219 diff
= tree_difference
;
220 if (diff
!= REV_TREE_SAME
)
224 tree_difference
= diff
;
227 static void file_change(struct diff_options
*options
,
228 unsigned old_mode
, unsigned new_mode
,
229 const unsigned char *old_sha1
,
230 const unsigned char *new_sha1
,
231 const char *base
, const char *path
)
233 tree_difference
= REV_TREE_DIFFERENT
;
236 int rev_compare_tree(struct rev_info
*revs
, struct tree
*t1
, struct tree
*t2
)
241 return REV_TREE_DIFFERENT
;
242 tree_difference
= REV_TREE_SAME
;
243 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
245 return REV_TREE_DIFFERENT
;
246 return tree_difference
;
249 int rev_same_tree_as_empty(struct rev_info
*revs
, struct tree
*t1
)
253 struct tree_desc empty
, real
;
258 tree
= read_object_with_reference(t1
->object
.sha1
, tree_type
, &real
.size
, NULL
);
267 retval
= diff_tree(&empty
, &real
, "", &revs
->diffopt
);
270 return retval
>= 0 && !tree_difference
;
273 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
275 struct commit_list
**pp
, *parent
;
276 int tree_changed
= 0;
281 if (!commit
->parents
) {
282 if (!rev_same_tree_as_empty(revs
, commit
->tree
))
283 commit
->object
.flags
|= TREECHANGE
;
287 pp
= &commit
->parents
;
288 while ((parent
= *pp
) != NULL
) {
289 struct commit
*p
= parent
->item
;
292 switch (rev_compare_tree(revs
, p
->tree
, commit
->tree
)) {
294 if (p
->object
.flags
& UNINTERESTING
) {
295 /* Even if a merge with an uninteresting
296 * side branch brought the entire change
297 * we are interested in, we do not want
298 * to lose the other branches of this
299 * merge, so we just keep going.
305 commit
->parents
= parent
;
309 if (revs
->remove_empty_trees
&&
310 rev_same_tree_as_empty(revs
, p
->tree
)) {
311 /* We are adding all the specified
312 * paths from this parent, so the
313 * history beyond this parent is not
314 * interesting. Remove its parents
315 * (they are grandparents for us).
316 * IOW, we pretend this parent is a
323 case REV_TREE_DIFFERENT
:
328 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
331 commit
->object
.flags
|= TREECHANGE
;
334 static void add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**list
)
336 struct commit_list
*parent
= commit
->parents
;
338 if (commit
->object
.flags
& ADDED
)
340 commit
->object
.flags
|= ADDED
;
343 * If the commit is uninteresting, don't try to
344 * prune parents - we want the maximal uninteresting
347 * Normally we haven't parsed the parent
348 * yet, so we won't have a parent of a parent
349 * here. However, it may turn out that we've
350 * reached this commit some other way (where it
351 * wasn't uninteresting), in which case we need
352 * to mark its parents recursively too..
354 if (commit
->object
.flags
& UNINTERESTING
) {
356 struct commit
*p
= parent
->item
;
357 parent
= parent
->next
;
359 p
->object
.flags
|= UNINTERESTING
;
361 mark_parents_uninteresting(p
);
362 if (p
->object
.flags
& SEEN
)
364 p
->object
.flags
|= SEEN
;
365 insert_by_date(p
, list
);
371 * Ok, the commit wasn't uninteresting. Try to
372 * simplify the commit history and find the parent
373 * that has no differences in the path set if one exists.
376 revs
->prune_fn(revs
, commit
);
378 parent
= commit
->parents
;
380 struct commit
*p
= parent
->item
;
382 parent
= parent
->next
;
385 if (p
->object
.flags
& SEEN
)
387 p
->object
.flags
|= SEEN
;
388 insert_by_date(p
, list
);
392 static void limit_list(struct rev_info
*revs
)
394 struct commit_list
*list
= revs
->commits
;
395 struct commit_list
*newlist
= NULL
;
396 struct commit_list
**p
= &newlist
;
399 struct commit_list
*entry
= list
;
400 struct commit
*commit
= list
->item
;
401 struct object
*obj
= &commit
->object
;
406 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
407 obj
->flags
|= UNINTERESTING
;
408 if (revs
->unpacked
&& has_sha1_pack(obj
->sha1
))
409 obj
->flags
|= UNINTERESTING
;
410 add_parents_to_list(revs
, commit
, &list
);
411 if (obj
->flags
& UNINTERESTING
) {
412 mark_parents_uninteresting(commit
);
413 if (everybody_uninteresting(list
))
417 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
419 p
= &commit_list_insert(commit
, p
)->next
;
421 if (revs
->boundary
) {
422 /* mark the ones that are on the result list first */
423 for (list
= newlist
; list
; list
= list
->next
) {
424 struct commit
*commit
= list
->item
;
425 commit
->object
.flags
|= TMP_MARK
;
427 for (list
= newlist
; list
; list
= list
->next
) {
428 struct commit
*commit
= list
->item
;
429 struct object
*obj
= &commit
->object
;
430 struct commit_list
*parent
;
431 if (obj
->flags
& UNINTERESTING
)
433 for (parent
= commit
->parents
;
435 parent
= parent
->next
) {
436 struct commit
*pcommit
= parent
->item
;
437 if (!(pcommit
->object
.flags
& UNINTERESTING
))
439 pcommit
->object
.flags
|= BOUNDARY
;
440 if (pcommit
->object
.flags
& TMP_MARK
)
442 pcommit
->object
.flags
|= TMP_MARK
;
443 p
= &commit_list_insert(pcommit
, p
)->next
;
446 for (list
= newlist
; list
; list
= list
->next
) {
447 struct commit
*commit
= list
->item
;
448 commit
->object
.flags
&= ~TMP_MARK
;
451 revs
->commits
= newlist
;
454 static void add_one_commit(struct commit
*commit
, struct rev_info
*revs
)
456 if (!commit
|| (commit
->object
.flags
& SEEN
))
458 commit
->object
.flags
|= SEEN
;
459 commit_list_insert(commit
, &revs
->commits
);
462 static int all_flags
;
463 static struct rev_info
*all_revs
;
465 static int handle_one_ref(const char *path
, const unsigned char *sha1
)
467 struct commit
*commit
= get_commit_reference(all_revs
, path
, sha1
, all_flags
);
468 add_one_commit(commit
, all_revs
);
472 static void handle_all(struct rev_info
*revs
, unsigned flags
)
476 for_each_ref(handle_one_ref
);
479 void init_revisions(struct rev_info
*revs
)
481 memset(revs
, 0, sizeof(*revs
));
482 revs
->diffopt
.recursive
= 1;
483 revs
->diffopt
.add_remove
= file_add_remove
;
484 revs
->diffopt
.change
= file_change
;
487 revs
->prefix
= setup_git_directory();
490 revs
->max_count
= -1;
492 revs
->prune_fn
= NULL
;
493 revs
->prune_data
= NULL
;
495 revs
->topo_setter
= topo_sort_default_setter
;
496 revs
->topo_getter
= topo_sort_default_getter
;
500 * Parse revision information, filling in the "rev_info" structure,
501 * and removing the used arguments from the argument list.
503 * Returns the number of arguments left that weren't recognized
504 * (which are also moved to the head of the argument list)
506 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, const char *def
)
508 int i
, flags
, seen_dashdash
;
509 const char **unrecognized
= argv
+ 1;
512 init_revisions(revs
);
514 /* First, search for "--" */
516 for (i
= 1; i
< argc
; i
++) {
517 const char *arg
= argv
[i
];
518 if (strcmp(arg
, "--"))
522 revs
->prune_data
= get_pathspec(revs
->prefix
, argv
+ i
+ 1);
528 for (i
= 1; i
< argc
; i
++) {
529 struct commit
*commit
;
530 const char *arg
= argv
[i
];
531 unsigned char sha1
[20];
536 if (!strncmp(arg
, "--max-count=", 12)) {
537 revs
->max_count
= atoi(arg
+ 12);
540 /* accept -<digit>, like traditilnal "head" */
541 if ((*arg
== '-') && isdigit(arg
[1])) {
542 revs
->max_count
= atoi(arg
+ 1);
545 if (!strcmp(arg
, "-n")) {
547 die("-n requires an argument");
548 revs
->max_count
= atoi(argv
[++i
]);
551 if (!strncmp(arg
,"-n",2)) {
552 revs
->max_count
= atoi(arg
+ 2);
555 if (!strncmp(arg
, "--max-age=", 10)) {
556 revs
->max_age
= atoi(arg
+ 10);
559 if (!strncmp(arg
, "--since=", 8)) {
560 revs
->max_age
= approxidate(arg
+ 8);
563 if (!strncmp(arg
, "--after=", 8)) {
564 revs
->max_age
= approxidate(arg
+ 8);
567 if (!strncmp(arg
, "--min-age=", 10)) {
568 revs
->min_age
= atoi(arg
+ 10);
571 if (!strncmp(arg
, "--before=", 9)) {
572 revs
->min_age
= approxidate(arg
+ 9);
575 if (!strncmp(arg
, "--until=", 8)) {
576 revs
->min_age
= approxidate(arg
+ 8);
579 if (!strcmp(arg
, "--all")) {
580 handle_all(revs
, flags
);
583 if (!strcmp(arg
, "--not")) {
584 flags
^= UNINTERESTING
;
587 if (!strcmp(arg
, "--default")) {
589 die("bad --default argument");
593 if (!strcmp(arg
, "--topo-order")) {
594 revs
->topo_order
= 1;
597 if (!strcmp(arg
, "--date-order")) {
599 revs
->topo_order
= 1;
602 if (!strcmp(arg
, "--parents")) {
606 if (!strcmp(arg
, "--dense")) {
610 if (!strcmp(arg
, "--sparse")) {
614 if (!strcmp(arg
, "--remove-empty")) {
615 revs
->remove_empty_trees
= 1;
618 if (!strcmp(arg
, "--no-merges")) {
622 if (!strcmp(arg
, "--boundary")) {
626 if (!strcmp(arg
, "--objects")) {
627 revs
->tag_objects
= 1;
628 revs
->tree_objects
= 1;
629 revs
->blob_objects
= 1;
632 if (!strcmp(arg
, "--objects-edge")) {
633 revs
->tag_objects
= 1;
634 revs
->tree_objects
= 1;
635 revs
->blob_objects
= 1;
639 if (!strcmp(arg
, "--unpacked")) {
643 *unrecognized
++ = arg
;
647 dotdot
= strstr(arg
, "..");
649 unsigned char from_sha1
[20];
650 const char *next
= dotdot
+ 2;
651 const char *this = arg
;
657 if (!get_sha1(this, from_sha1
) &&
658 !get_sha1(next
, sha1
)) {
659 struct commit
*exclude
;
660 struct commit
*include
;
662 exclude
= get_commit_reference(revs
, this, from_sha1
, flags
^ UNINTERESTING
);
663 include
= get_commit_reference(revs
, next
, sha1
, flags
);
664 if (!exclude
|| !include
)
665 die("Invalid revision range %s..%s", arg
, next
);
666 add_one_commit(exclude
, revs
);
667 add_one_commit(include
, revs
);
674 local_flags
= UNINTERESTING
;
677 if (get_sha1(arg
, sha1
) < 0) {
680 if (seen_dashdash
|| local_flags
)
681 die("bad revision '%s'", arg
);
683 /* If we didn't have a "--", all filenames must exist */
684 for (j
= i
; j
< argc
; j
++)
685 verify_filename(revs
->prefix
, argv
[j
]);
687 revs
->prune_data
= get_pathspec(revs
->prefix
, argv
+ i
);
690 commit
= get_commit_reference(revs
, arg
, sha1
, flags
^ local_flags
);
691 add_one_commit(commit
, revs
);
693 if (def
&& !revs
->commits
) {
694 unsigned char sha1
[20];
695 struct commit
*commit
;
696 if (get_sha1(def
, sha1
) < 0)
697 die("bad default revision '%s'", def
);
698 commit
= get_commit_reference(revs
, def
, sha1
, 0);
699 add_one_commit(commit
, revs
);
702 if (revs
->topo_order
|| revs
->unpacked
)
705 if (revs
->prune_data
) {
706 diff_tree_setup_paths(revs
->prune_data
, &revs
->diffopt
);
707 revs
->prune_fn
= try_to_simplify_commit
;
713 void prepare_revision_walk(struct rev_info
*revs
)
715 sort_by_date(&revs
->commits
);
718 if (revs
->topo_order
)
719 sort_in_topological_order_fn(&revs
->commits
, revs
->lifo
,
724 static int rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
727 struct commit
*p
= *pp
;
729 add_parents_to_list(revs
, p
, &revs
->commits
);
730 if (p
->object
.flags
& (TREECHANGE
| UNINTERESTING
))
734 *pp
= p
->parents
->item
;
738 static void rewrite_parents(struct rev_info
*revs
, struct commit
*commit
)
740 struct commit_list
**pp
= &commit
->parents
;
742 struct commit_list
*parent
= *pp
;
743 if (rewrite_one(revs
, &parent
->item
) < 0) {
751 static void mark_boundary_to_show(struct commit
*commit
)
753 struct commit_list
*p
= commit
->parents
;
757 if (commit
->object
.flags
& BOUNDARY
)
758 commit
->object
.flags
|= BOUNDARY_SHOW
;
762 struct commit
*get_revision(struct rev_info
*revs
)
764 struct commit_list
*list
= revs
->commits
;
769 /* Check the max_count ... */
770 switch (revs
->max_count
) {
780 struct commit
*commit
= revs
->commits
->item
;
782 revs
->commits
= revs
->commits
->next
;
785 * If we haven't done the list limiting, we need to look at
786 * the parents here. We also need to do the date-based limiting
787 * that we'd otherwise have done in limit_list().
789 if (!revs
->limited
) {
790 if ((revs
->unpacked
&&
791 has_sha1_pack(commit
->object
.sha1
)) ||
792 (revs
->max_age
!= -1 &&
793 (commit
->date
< revs
->max_age
)))
795 add_parents_to_list(revs
, commit
, &revs
->commits
);
797 if (commit
->object
.flags
& SHOWN
)
800 /* We want to show boundary commits only when their
801 * children are shown. When path-limiter is in effect,
802 * rewrite_parents() drops some commits from getting shown,
803 * and there is no point showing boundary parents that
804 * are not shown. After rewrite_parents() rewrites the
805 * parents of a commit that is shown, we mark the boundary
806 * parents with BOUNDARY_SHOW.
808 if (commit
->object
.flags
& BOUNDARY_SHOW
) {
809 commit
->object
.flags
|= SHOWN
;
812 if (commit
->object
.flags
& UNINTERESTING
)
814 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
816 if (revs
->no_merges
&&
817 commit
->parents
&& commit
->parents
->next
)
819 if (revs
->prune_fn
&& revs
->dense
) {
820 if (!(commit
->object
.flags
& TREECHANGE
))
823 rewrite_parents(revs
, commit
);
826 mark_boundary_to_show(commit
);
827 commit
->object
.flags
|= SHOWN
;
829 } while (revs
->commits
);