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 void add_object(struct object *obj,
35 struct object_array *p,
36 struct name_path *path,
39 add_object_array(obj, path_name(path, name), p);
42 static void mark_blob_uninteresting(struct blob *blob)
44 if (blob->object.flags & UNINTERESTING)
46 blob->object.flags |= UNINTERESTING;
49 void mark_tree_uninteresting(struct tree *tree)
51 struct tree_desc desc;
52 struct name_entry entry;
53 struct object *obj = &tree->object;
55 if (obj->flags & UNINTERESTING)
57 obj->flags |= UNINTERESTING;
58 if (!has_sha1_file(obj->sha1))
60 if (parse_tree(tree) < 0)
61 die("bad tree %s", sha1_to_hex(obj->sha1));
63 desc.buf = tree->buffer;
64 desc.size = tree->size;
65 while (tree_entry(&desc, &entry)) {
66 if (S_ISDIR(entry.mode))
67 mark_tree_uninteresting(lookup_tree(entry.sha1));
69 mark_blob_uninteresting(lookup_blob(entry.sha1));
73 * We don't care about the tree any more
74 * after it has been marked uninteresting.
80 void mark_parents_uninteresting(struct commit *commit)
82 struct commit_list *parents = commit->parents;
85 struct commit *commit = parents->item;
86 if (!(commit->object.flags & UNINTERESTING)) {
87 commit->object.flags |= UNINTERESTING;
90 * Normally we haven't parsed the parent
91 * yet, so we won't have a parent of a parent
92 * here. However, it may turn out that we've
93 * reached this commit some other way (where it
94 * wasn't uninteresting), in which case we need
95 * to mark its parents recursively too..
98 mark_parents_uninteresting(commit);
102 * A missing commit is ok iff its parent is marked
105 * We just mark such a thing parsed, so that when
106 * it is popped next time around, we won't be trying
107 * to parse it and get an error.
109 if (!has_sha1_file(commit->object.sha1))
110 commit->object.parsed = 1;
111 parents = parents->next;
115 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
117 add_object_array(obj, name, &revs->pending);
120 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
122 struct object *object;
124 object = parse_object(sha1);
126 die("bad object %s", name);
127 object->flags |= flags;
131 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
133 unsigned long flags = object->flags;
136 * Tag object? Look what it points to..
138 while (object->type == TYPE_TAG) {
139 struct tag *tag = (struct tag *) object;
140 if (revs->tag_objects && !(flags & UNINTERESTING))
141 add_pending_object(revs, object, tag->tag);
142 object = parse_object(tag->tagged->sha1);
144 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
148 * Commit object? Just return it, we'll do all the complex
151 if (object->type == TYPE_COMMIT) {
152 struct commit *commit = (struct commit *)object;
153 if (parse_commit(commit) < 0)
154 die("unable to parse commit %s", name);
155 if (flags & UNINTERESTING) {
156 commit->object.flags |= UNINTERESTING;
157 mark_parents_uninteresting(commit);
164 * Tree object? Either mark it uniniteresting, or add it
165 * to the list of objects to look at later..
167 if (object->type == TYPE_TREE) {
168 struct tree *tree = (struct tree *)object;
169 if (!revs->tree_objects)
171 if (flags & UNINTERESTING) {
172 mark_tree_uninteresting(tree);
175 add_pending_object(revs, object, "");
180 * Blob object? You know the drill by now..
182 if (object->type == TYPE_BLOB) {
183 struct blob *blob = (struct blob *)object;
184 if (!revs->blob_objects)
186 if (flags & UNINTERESTING) {
187 mark_blob_uninteresting(blob);
190 add_pending_object(revs, object, "");
193 die("%s is unknown object", name);
196 static int everybody_uninteresting(struct commit_list *orig)
198 struct commit_list *list = orig;
200 struct commit *commit = list->item;
202 if (commit->object.flags & UNINTERESTING)
209 static int tree_difference = REV_TREE_SAME;
211 static void file_add_remove(struct diff_options *options,
212 int addremove, unsigned mode,
213 const unsigned char *sha1,
214 const char *base, const char *path)
216 int diff = REV_TREE_DIFFERENT;
219 * Is it an add of a new file? It means that the old tree
220 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
221 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
222 * (and if it already was "REV_TREE_NEW", we'll keep it
223 * "REV_TREE_NEW" of course).
225 if (addremove == '+') {
226 diff = tree_difference;
227 if (diff != REV_TREE_SAME)
231 tree_difference = diff;
234 static void file_change(struct diff_options *options,
235 unsigned old_mode, unsigned new_mode,
236 const unsigned char *old_sha1,
237 const unsigned char *new_sha1,
238 const char *base, const char *path)
240 tree_difference = REV_TREE_DIFFERENT;
243 int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
248 return REV_TREE_DIFFERENT;
249 tree_difference = REV_TREE_SAME;
250 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
252 return REV_TREE_DIFFERENT;
253 return tree_difference;
256 int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
260 struct tree_desc empty, real;
265 tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
274 retval = diff_tree(&empty, &real, "", &revs->pruning);
277 return retval >= 0 && !tree_difference;
280 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
282 struct commit_list **pp, *parent;
283 int tree_changed = 0, tree_same = 0;
288 if (!commit->parents) {
289 if (!rev_same_tree_as_empty(revs, commit->tree))
290 commit->object.flags |= TREECHANGE;
294 pp = &commit->parents;
295 while ((parent = *pp) != NULL) {
296 struct commit *p = parent->item;
299 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
302 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
303 /* Even if a merge with an uninteresting
304 * side branch brought the entire change
305 * we are interested in, we do not want
306 * to lose the other branches of this
307 * merge, so we just keep going.
313 commit->parents = parent;
317 if (revs->remove_empty_trees &&
318 rev_same_tree_as_empty(revs, p->tree)) {
319 /* We are adding all the specified
320 * paths from this parent, so the
321 * history beyond this parent is not
322 * interesting. Remove its parents
323 * (they are grandparents for us).
324 * IOW, we pretend this parent is a
331 case REV_TREE_DIFFERENT:
336 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
338 if (tree_changed && !tree_same)
339 commit->object.flags |= TREECHANGE;
342 static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
344 struct commit_list *parent = commit->parents;
346 if (commit->object.flags & ADDED)
348 commit->object.flags |= ADDED;
351 * If the commit is uninteresting, don't try to
352 * prune parents - we want the maximal uninteresting
355 * Normally we haven't parsed the parent
356 * yet, so we won't have a parent of a parent
357 * here. However, it may turn out that we've
358 * reached this commit some other way (where it
359 * wasn't uninteresting), in which case we need
360 * to mark its parents recursively too..
362 if (commit->object.flags & UNINTERESTING) {
364 struct commit *p = parent->item;
365 parent = parent->next;
367 p->object.flags |= UNINTERESTING;
369 mark_parents_uninteresting(p);
370 if (p->object.flags & SEEN)
372 p->object.flags |= SEEN;
373 insert_by_date(p, list);
379 * Ok, the commit wasn't uninteresting. Try to
380 * simplify the commit history and find the parent
381 * that has no differences in the path set if one exists.
384 revs->prune_fn(revs, commit);
389 parent = commit->parents;
391 struct commit *p = parent->item;
393 parent = parent->next;
396 if (p->object.flags & SEEN)
398 p->object.flags |= SEEN;
399 insert_by_date(p, list);
403 static void limit_list(struct rev_info *revs)
405 struct commit_list *list = revs->commits;
406 struct commit_list *newlist = NULL;
407 struct commit_list **p = &newlist;
410 struct commit_list *entry = list;
411 struct commit *commit = list->item;
412 struct object *obj = &commit->object;
417 if (revs->max_age != -1 && (commit->date < revs->max_age))
418 obj->flags |= UNINTERESTING;
419 if (revs->unpacked && has_sha1_pack(obj->sha1))
420 obj->flags |= UNINTERESTING;
421 add_parents_to_list(revs, commit, &list);
422 if (obj->flags & UNINTERESTING) {
423 mark_parents_uninteresting(commit);
424 if (everybody_uninteresting(list))
428 if (revs->min_age != -1 && (commit->date > revs->min_age))
430 p = &commit_list_insert(commit, p)->next;
432 if (revs->boundary) {
433 /* mark the ones that are on the result list first */
434 for (list = newlist; list; list = list->next) {
435 struct commit *commit = list->item;
436 commit->object.flags |= TMP_MARK;
438 for (list = newlist; list; list = list->next) {
439 struct commit *commit = list->item;
440 struct object *obj = &commit->object;
441 struct commit_list *parent;
442 if (obj->flags & UNINTERESTING)
444 for (parent = commit->parents;
446 parent = parent->next) {
447 struct commit *pcommit = parent->item;
448 if (!(pcommit->object.flags & UNINTERESTING))
450 pcommit->object.flags |= BOUNDARY;
451 if (pcommit->object.flags & TMP_MARK)
453 pcommit->object.flags |= TMP_MARK;
454 p = &commit_list_insert(pcommit, p)->next;
457 for (list = newlist; list; list = list->next) {
458 struct commit *commit = list->item;
459 commit->object.flags &= ~TMP_MARK;
462 revs->commits = newlist;
465 static int all_flags;
466 static struct rev_info *all_revs;
468 static int handle_one_ref(const char *path, const unsigned char *sha1)
470 struct object *object = get_reference(all_revs, path, sha1, all_flags);
471 add_pending_object(all_revs, object, "");
475 static void handle_all(struct rev_info *revs, unsigned flags)
479 for_each_ref(handle_one_ref);
482 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
484 unsigned char sha1[20];
486 struct commit *commit;
487 struct commit_list *parents;
490 flags ^= UNINTERESTING;
493 if (get_sha1(arg, sha1))
496 it = get_reference(revs, arg, sha1, 0);
497 if (it->type != TYPE_TAG)
499 memcpy(sha1, ((struct tag*)it)->tagged->sha1, 20);
501 if (it->type != TYPE_COMMIT)
503 commit = (struct commit *)it;
504 for (parents = commit->parents; parents; parents = parents->next) {
505 it = &parents->item->object;
507 add_pending_object(revs, it, arg);
512 void init_revisions(struct rev_info *revs)
514 memset(revs, 0, sizeof(*revs));
516 revs->abbrev = DEFAULT_ABBREV;
517 revs->ignore_merges = 1;
518 revs->simplify_history = 1;
519 revs->pruning.recursive = 1;
520 revs->pruning.add_remove = file_add_remove;
521 revs->pruning.change = file_change;
524 revs->prefix = setup_git_directory();
527 revs->max_count = -1;
529 revs->prune_fn = NULL;
530 revs->prune_data = NULL;
532 revs->topo_setter = topo_sort_default_setter;
533 revs->topo_getter = topo_sort_default_getter;
535 revs->commit_format = CMIT_FMT_DEFAULT;
537 diff_setup(&revs->diffopt);
541 * Parse revision information, filling in the "rev_info" structure,
542 * and removing the used arguments from the argument list.
544 * Returns the number of arguments left that weren't recognized
545 * (which are also moved to the head of the argument list)
547 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
549 int i, flags, seen_dashdash;
550 const char **unrecognized = argv + 1;
553 /* First, search for "--" */
555 for (i = 1; i < argc; i++) {
556 const char *arg = argv[i];
557 if (strcmp(arg, "--"))
561 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
567 for (i = 1; i < argc; i++) {
568 struct object *object;
569 const char *arg = argv[i];
570 unsigned char sha1[20];
576 if (!strncmp(arg, "--max-count=", 12)) {
577 revs->max_count = atoi(arg + 12);
580 /* accept -<digit>, like traditional "head" */
581 if ((*arg == '-') && isdigit(arg[1])) {
582 revs->max_count = atoi(arg + 1);
585 if (!strcmp(arg, "-n")) {
587 die("-n requires an argument");
588 revs->max_count = atoi(argv[++i]);
591 if (!strncmp(arg,"-n",2)) {
592 revs->max_count = atoi(arg + 2);
595 if (!strncmp(arg, "--max-age=", 10)) {
596 revs->max_age = atoi(arg + 10);
599 if (!strncmp(arg, "--since=", 8)) {
600 revs->max_age = approxidate(arg + 8);
603 if (!strncmp(arg, "--after=", 8)) {
604 revs->max_age = approxidate(arg + 8);
607 if (!strncmp(arg, "--min-age=", 10)) {
608 revs->min_age = atoi(arg + 10);
611 if (!strncmp(arg, "--before=", 9)) {
612 revs->min_age = approxidate(arg + 9);
615 if (!strncmp(arg, "--until=", 8)) {
616 revs->min_age = approxidate(arg + 8);
619 if (!strcmp(arg, "--all")) {
620 handle_all(revs, flags);
623 if (!strcmp(arg, "--not")) {
624 flags ^= UNINTERESTING;
627 if (!strcmp(arg, "--default")) {
629 die("bad --default argument");
633 if (!strcmp(arg, "--topo-order")) {
634 revs->topo_order = 1;
637 if (!strcmp(arg, "--date-order")) {
639 revs->topo_order = 1;
642 if (!strcmp(arg, "--parents")) {
646 if (!strcmp(arg, "--dense")) {
650 if (!strcmp(arg, "--sparse")) {
654 if (!strcmp(arg, "--remove-empty")) {
655 revs->remove_empty_trees = 1;
658 if (!strcmp(arg, "--no-merges")) {
662 if (!strcmp(arg, "--boundary")) {
666 if (!strcmp(arg, "--objects")) {
667 revs->tag_objects = 1;
668 revs->tree_objects = 1;
669 revs->blob_objects = 1;
672 if (!strcmp(arg, "--objects-edge")) {
673 revs->tag_objects = 1;
674 revs->tree_objects = 1;
675 revs->blob_objects = 1;
679 if (!strcmp(arg, "--unpacked")) {
683 if (!strcmp(arg, "-r")) {
685 revs->diffopt.recursive = 1;
688 if (!strcmp(arg, "-t")) {
690 revs->diffopt.recursive = 1;
691 revs->diffopt.tree_in_recursive = 1;
694 if (!strcmp(arg, "-m")) {
695 revs->ignore_merges = 0;
698 if (!strcmp(arg, "-c")) {
700 revs->dense_combined_merges = 0;
701 revs->combine_merges = 1;
704 if (!strcmp(arg, "--cc")) {
706 revs->dense_combined_merges = 1;
707 revs->combine_merges = 1;
710 if (!strcmp(arg, "-v")) {
711 revs->verbose_header = 1;
714 if (!strncmp(arg, "--pretty", 8)) {
715 revs->verbose_header = 1;
716 revs->commit_format = get_commit_format(arg+8);
719 if (!strcmp(arg, "--root")) {
720 revs->show_root_diff = 1;
723 if (!strcmp(arg, "--no-commit-id")) {
724 revs->no_commit_id = 1;
727 if (!strcmp(arg, "--always")) {
728 revs->always_show_header = 1;
731 if (!strcmp(arg, "--no-abbrev")) {
735 if (!strcmp(arg, "--abbrev")) {
736 revs->abbrev = DEFAULT_ABBREV;
739 if (!strncmp(arg, "--abbrev=", 9)) {
740 revs->abbrev = strtoul(arg + 9, NULL, 10);
741 if (revs->abbrev < MINIMUM_ABBREV)
742 revs->abbrev = MINIMUM_ABBREV;
743 else if (revs->abbrev > 40)
747 if (!strcmp(arg, "--abbrev-commit")) {
748 revs->abbrev_commit = 1;
751 if (!strcmp(arg, "--full-diff")) {
756 if (!strcmp(arg, "--full-history")) {
757 revs->simplify_history = 0;
760 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
766 *unrecognized++ = arg;
770 dotdot = strstr(arg, "..");
772 unsigned char from_sha1[20];
773 const char *next = dotdot + 2;
774 const char *this = arg;
780 if (!get_sha1(this, from_sha1) &&
781 !get_sha1(next, sha1)) {
782 struct object *exclude;
783 struct object *include;
785 exclude = get_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
786 include = get_reference(revs, next, sha1, flags);
787 if (!exclude || !include)
788 die("Invalid revision range %s..%s", arg, next);
790 if (!seen_dashdash) {
792 verify_non_filename(revs->prefix, arg);
794 add_pending_object(revs, exclude, this);
795 add_pending_object(revs, include, next);
800 dotdot = strstr(arg, "^@");
801 if (dotdot && !dotdot[2]) {
803 if (add_parents_only(revs, arg, flags))
809 local_flags = UNINTERESTING;
812 if (get_sha1(arg, sha1)) {
815 if (seen_dashdash || local_flags)
816 die("bad revision '%s'", arg);
818 /* If we didn't have a "--":
819 * (1) all filenames must exist;
820 * (2) all rev-args must not be interpretable
821 * as a valid filename.
822 * but the latter we have checked in the main loop.
824 for (j = i; j < argc; j++)
825 verify_filename(revs->prefix, argv[j]);
827 revs->prune_data = get_pathspec(revs->prefix, argv + i);
831 verify_non_filename(revs->prefix, arg);
832 object = get_reference(revs, arg, sha1, flags ^ local_flags);
833 add_pending_object(revs, object, arg);
835 if (def && !revs->pending.nr) {
836 unsigned char sha1[20];
837 struct object *object;
838 if (get_sha1(def, sha1))
839 die("bad default revision '%s'", def);
840 object = get_reference(revs, def, sha1, 0);
841 add_pending_object(revs, object, def);
844 if (revs->topo_order || revs->unpacked)
847 if (revs->prune_data) {
848 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
849 revs->prune_fn = try_to_simplify_commit;
850 if (!revs->full_diff)
851 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
853 if (revs->combine_merges) {
854 revs->ignore_merges = 0;
855 if (revs->dense_combined_merges &&
856 (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
857 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
859 revs->diffopt.abbrev = revs->abbrev;
860 diff_setup_done(&revs->diffopt);
865 void prepare_revision_walk(struct rev_info *revs)
867 int nr = revs->pending.nr;
868 struct object_array_entry *list = revs->pending.objects;
870 revs->pending.nr = 0;
871 revs->pending.alloc = 0;
872 revs->pending.objects = NULL;
874 struct commit *commit = handle_commit(revs, list->item, list->name);
876 if (!(commit->object.flags & SEEN)) {
877 commit->object.flags |= SEEN;
878 insert_by_date(commit, &revs->commits);
888 if (revs->topo_order)
889 sort_in_topological_order_fn(&revs->commits, revs->lifo,
894 static int rewrite_one(struct rev_info *revs, struct commit **pp)
897 struct commit *p = *pp;
899 add_parents_to_list(revs, p, &revs->commits);
900 if (p->parents && p->parents->next)
902 if (p->object.flags & (TREECHANGE | UNINTERESTING))
906 *pp = p->parents->item;
910 static void rewrite_parents(struct rev_info *revs, struct commit *commit)
912 struct commit_list **pp = &commit->parents;
914 struct commit_list *parent = *pp;
915 if (rewrite_one(revs, &parent->item) < 0) {
923 static void mark_boundary_to_show(struct commit *commit)
925 struct commit_list *p = commit->parents;
929 if (commit->object.flags & BOUNDARY)
930 commit->object.flags |= BOUNDARY_SHOW;
934 struct commit *get_revision(struct rev_info *revs)
936 struct commit_list *list = revs->commits;
941 /* Check the max_count ... */
942 switch (revs->max_count) {
952 struct commit_list *entry = revs->commits;
953 struct commit *commit = entry->item;
955 revs->commits = entry->next;
959 * If we haven't done the list limiting, we need to look at
960 * the parents here. We also need to do the date-based limiting
961 * that we'd otherwise have done in limit_list().
963 if (!revs->limited) {
964 if ((revs->unpacked &&
965 has_sha1_pack(commit->object.sha1)) ||
966 (revs->max_age != -1 &&
967 (commit->date < revs->max_age)))
969 add_parents_to_list(revs, commit, &revs->commits);
971 if (commit->object.flags & SHOWN)
974 /* We want to show boundary commits only when their
975 * children are shown. When path-limiter is in effect,
976 * rewrite_parents() drops some commits from getting shown,
977 * and there is no point showing boundary parents that
978 * are not shown. After rewrite_parents() rewrites the
979 * parents of a commit that is shown, we mark the boundary
980 * parents with BOUNDARY_SHOW.
982 if (commit->object.flags & BOUNDARY_SHOW) {
983 commit->object.flags |= SHOWN;
986 if (commit->object.flags & UNINTERESTING)
988 if (revs->min_age != -1 && (commit->date > revs->min_age))
990 if (revs->no_merges &&
991 commit->parents && commit->parents->next)
993 if (revs->prune_fn && revs->dense) {
994 /* Commit without changes? */
995 if (!(commit->object.flags & TREECHANGE)) {
996 /* drop merges unless we want parenthood */
999 /* non-merge - always ignore it */
1000 if (!commit->parents || !commit->parents->next)
1004 rewrite_parents(revs, commit);
1007 mark_boundary_to_show(commit);
1008 commit->object.flags |= SHOWN;
1010 } while (revs->commits);