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;
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)) {
301 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
302 /* Even if a merge with an uninteresting
303 * side branch brought the entire change
304 * we are interested in, we do not want
305 * to lose the other branches of this
306 * merge, so we just keep going.
312 commit->parents = parent;
316 if (revs->remove_empty_trees &&
317 rev_same_tree_as_empty(revs, p->tree)) {
318 /* We are adding all the specified
319 * paths from this parent, so the
320 * history beyond this parent is not
321 * interesting. Remove its parents
322 * (they are grandparents for us).
323 * IOW, we pretend this parent is a
330 case REV_TREE_DIFFERENT:
335 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
338 commit->object.flags |= TREECHANGE;
341 static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
343 struct commit_list *parent = commit->parents;
345 if (commit->object.flags & ADDED)
347 commit->object.flags |= ADDED;
350 * If the commit is uninteresting, don't try to
351 * prune parents - we want the maximal uninteresting
354 * Normally we haven't parsed the parent
355 * yet, so we won't have a parent of a parent
356 * here. However, it may turn out that we've
357 * reached this commit some other way (where it
358 * wasn't uninteresting), in which case we need
359 * to mark its parents recursively too..
361 if (commit->object.flags & UNINTERESTING) {
363 struct commit *p = parent->item;
364 parent = parent->next;
366 p->object.flags |= UNINTERESTING;
368 mark_parents_uninteresting(p);
369 if (p->object.flags & SEEN)
371 p->object.flags |= SEEN;
372 insert_by_date(p, list);
378 * Ok, the commit wasn't uninteresting. Try to
379 * simplify the commit history and find the parent
380 * that has no differences in the path set if one exists.
383 revs->prune_fn(revs, commit);
388 parent = commit->parents;
390 struct commit *p = parent->item;
392 parent = parent->next;
395 if (p->object.flags & SEEN)
397 p->object.flags |= SEEN;
398 insert_by_date(p, list);
402 static void limit_list(struct rev_info *revs)
404 struct commit_list *list = revs->commits;
405 struct commit_list *newlist = NULL;
406 struct commit_list **p = &newlist;
409 struct commit_list *entry = list;
410 struct commit *commit = list->item;
411 struct object *obj = &commit->object;
416 if (revs->max_age != -1 && (commit->date < revs->max_age))
417 obj->flags |= UNINTERESTING;
418 if (revs->unpacked && has_sha1_pack(obj->sha1))
419 obj->flags |= UNINTERESTING;
420 add_parents_to_list(revs, commit, &list);
421 if (obj->flags & UNINTERESTING) {
422 mark_parents_uninteresting(commit);
423 if (everybody_uninteresting(list))
427 if (revs->min_age != -1 && (commit->date > revs->min_age))
429 p = &commit_list_insert(commit, p)->next;
431 if (revs->boundary) {
432 /* mark the ones that are on the result list first */
433 for (list = newlist; list; list = list->next) {
434 struct commit *commit = list->item;
435 commit->object.flags |= TMP_MARK;
437 for (list = newlist; list; list = list->next) {
438 struct commit *commit = list->item;
439 struct object *obj = &commit->object;
440 struct commit_list *parent;
441 if (obj->flags & UNINTERESTING)
443 for (parent = commit->parents;
445 parent = parent->next) {
446 struct commit *pcommit = parent->item;
447 if (!(pcommit->object.flags & UNINTERESTING))
449 pcommit->object.flags |= BOUNDARY;
450 if (pcommit->object.flags & TMP_MARK)
452 pcommit->object.flags |= TMP_MARK;
453 p = &commit_list_insert(pcommit, p)->next;
456 for (list = newlist; list; list = list->next) {
457 struct commit *commit = list->item;
458 commit->object.flags &= ~TMP_MARK;
461 revs->commits = newlist;
464 static int all_flags;
465 static struct rev_info *all_revs;
467 static int handle_one_ref(const char *path, const unsigned char *sha1)
469 struct object *object = get_reference(all_revs, path, sha1, all_flags);
470 add_pending_object(all_revs, object, "");
474 static void handle_all(struct rev_info *revs, unsigned flags)
478 for_each_ref(handle_one_ref);
481 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
483 unsigned char sha1[20];
485 struct commit *commit;
486 struct commit_list *parents;
489 flags ^= UNINTERESTING;
492 if (get_sha1(arg, sha1))
495 it = get_reference(revs, arg, sha1, 0);
496 if (it->type != TYPE_TAG)
498 memcpy(sha1, ((struct tag*)it)->tagged->sha1, 20);
500 if (it->type != TYPE_COMMIT)
502 commit = (struct commit *)it;
503 for (parents = commit->parents; parents; parents = parents->next) {
504 it = &parents->item->object;
506 add_pending_object(revs, it, arg);
511 void init_revisions(struct rev_info *revs)
513 memset(revs, 0, sizeof(*revs));
515 revs->abbrev = DEFAULT_ABBREV;
516 revs->ignore_merges = 1;
517 revs->simplify_history = 1;
518 revs->pruning.recursive = 1;
519 revs->pruning.add_remove = file_add_remove;
520 revs->pruning.change = file_change;
523 revs->prefix = setup_git_directory();
526 revs->max_count = -1;
528 revs->prune_fn = NULL;
529 revs->prune_data = NULL;
531 revs->topo_setter = topo_sort_default_setter;
532 revs->topo_getter = topo_sort_default_getter;
534 revs->commit_format = CMIT_FMT_DEFAULT;
536 diff_setup(&revs->diffopt);
540 * Parse revision information, filling in the "rev_info" structure,
541 * and removing the used arguments from the argument list.
543 * Returns the number of arguments left that weren't recognized
544 * (which are also moved to the head of the argument list)
546 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
548 int i, flags, seen_dashdash;
549 const char **unrecognized = argv + 1;
552 /* First, search for "--" */
554 for (i = 1; i < argc; i++) {
555 const char *arg = argv[i];
556 if (strcmp(arg, "--"))
560 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
566 for (i = 1; i < argc; i++) {
567 struct object *object;
568 const char *arg = argv[i];
569 unsigned char sha1[20];
575 if (!strncmp(arg, "--max-count=", 12)) {
576 revs->max_count = atoi(arg + 12);
579 /* accept -<digit>, like traditional "head" */
580 if ((*arg == '-') && isdigit(arg[1])) {
581 revs->max_count = atoi(arg + 1);
584 if (!strcmp(arg, "-n")) {
586 die("-n requires an argument");
587 revs->max_count = atoi(argv[++i]);
590 if (!strncmp(arg,"-n",2)) {
591 revs->max_count = atoi(arg + 2);
594 if (!strncmp(arg, "--max-age=", 10)) {
595 revs->max_age = atoi(arg + 10);
598 if (!strncmp(arg, "--since=", 8)) {
599 revs->max_age = approxidate(arg + 8);
602 if (!strncmp(arg, "--after=", 8)) {
603 revs->max_age = approxidate(arg + 8);
606 if (!strncmp(arg, "--min-age=", 10)) {
607 revs->min_age = atoi(arg + 10);
610 if (!strncmp(arg, "--before=", 9)) {
611 revs->min_age = approxidate(arg + 9);
614 if (!strncmp(arg, "--until=", 8)) {
615 revs->min_age = approxidate(arg + 8);
618 if (!strcmp(arg, "--all")) {
619 handle_all(revs, flags);
622 if (!strcmp(arg, "--not")) {
623 flags ^= UNINTERESTING;
626 if (!strcmp(arg, "--default")) {
628 die("bad --default argument");
632 if (!strcmp(arg, "--topo-order")) {
633 revs->topo_order = 1;
636 if (!strcmp(arg, "--date-order")) {
638 revs->topo_order = 1;
641 if (!strcmp(arg, "--parents")) {
645 if (!strcmp(arg, "--dense")) {
649 if (!strcmp(arg, "--sparse")) {
653 if (!strcmp(arg, "--remove-empty")) {
654 revs->remove_empty_trees = 1;
657 if (!strcmp(arg, "--no-merges")) {
661 if (!strcmp(arg, "--boundary")) {
665 if (!strcmp(arg, "--objects")) {
666 revs->tag_objects = 1;
667 revs->tree_objects = 1;
668 revs->blob_objects = 1;
671 if (!strcmp(arg, "--objects-edge")) {
672 revs->tag_objects = 1;
673 revs->tree_objects = 1;
674 revs->blob_objects = 1;
678 if (!strcmp(arg, "--unpacked")) {
682 if (!strcmp(arg, "-r")) {
684 revs->diffopt.recursive = 1;
687 if (!strcmp(arg, "-t")) {
689 revs->diffopt.recursive = 1;
690 revs->diffopt.tree_in_recursive = 1;
693 if (!strcmp(arg, "-m")) {
694 revs->ignore_merges = 0;
697 if (!strcmp(arg, "-c")) {
699 revs->dense_combined_merges = 0;
700 revs->combine_merges = 1;
703 if (!strcmp(arg, "--cc")) {
705 revs->dense_combined_merges = 1;
706 revs->combine_merges = 1;
709 if (!strcmp(arg, "-v")) {
710 revs->verbose_header = 1;
713 if (!strncmp(arg, "--pretty", 8)) {
714 revs->verbose_header = 1;
715 revs->commit_format = get_commit_format(arg+8);
718 if (!strcmp(arg, "--root")) {
719 revs->show_root_diff = 1;
722 if (!strcmp(arg, "--no-commit-id")) {
723 revs->no_commit_id = 1;
726 if (!strcmp(arg, "--always")) {
727 revs->always_show_header = 1;
730 if (!strcmp(arg, "--no-abbrev")) {
734 if (!strcmp(arg, "--abbrev")) {
735 revs->abbrev = DEFAULT_ABBREV;
738 if (!strncmp(arg, "--abbrev=", 9)) {
739 revs->abbrev = strtoul(arg + 9, NULL, 10);
740 if (revs->abbrev < MINIMUM_ABBREV)
741 revs->abbrev = MINIMUM_ABBREV;
742 else if (revs->abbrev > 40)
746 if (!strcmp(arg, "--abbrev-commit")) {
747 revs->abbrev_commit = 1;
750 if (!strcmp(arg, "--full-diff")) {
755 if (!strcmp(arg, "--full-history")) {
756 revs->simplify_history = 0;
759 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
765 *unrecognized++ = arg;
769 dotdot = strstr(arg, "..");
771 unsigned char from_sha1[20];
772 const char *next = dotdot + 2;
773 const char *this = arg;
779 if (!get_sha1(this, from_sha1) &&
780 !get_sha1(next, sha1)) {
781 struct object *exclude;
782 struct object *include;
784 exclude = get_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
785 include = get_reference(revs, next, sha1, flags);
786 if (!exclude || !include)
787 die("Invalid revision range %s..%s", arg, next);
789 if (!seen_dashdash) {
791 verify_non_filename(revs->prefix, arg);
793 add_pending_object(revs, exclude, this);
794 add_pending_object(revs, include, next);
799 dotdot = strstr(arg, "^@");
800 if (dotdot && !dotdot[2]) {
802 if (add_parents_only(revs, arg, flags))
808 local_flags = UNINTERESTING;
811 if (get_sha1(arg, sha1)) {
814 if (seen_dashdash || local_flags)
815 die("bad revision '%s'", arg);
817 /* If we didn't have a "--":
818 * (1) all filenames must exist;
819 * (2) all rev-args must not be interpretable
820 * as a valid filename.
821 * but the latter we have checked in the main loop.
823 for (j = i; j < argc; j++)
824 verify_filename(revs->prefix, argv[j]);
826 revs->prune_data = get_pathspec(revs->prefix, argv + i);
830 verify_non_filename(revs->prefix, arg);
831 object = get_reference(revs, arg, sha1, flags ^ local_flags);
832 add_pending_object(revs, object, arg);
834 if (def && !revs->pending.nr) {
835 unsigned char sha1[20];
836 struct object *object;
837 if (get_sha1(def, sha1))
838 die("bad default revision '%s'", def);
839 object = get_reference(revs, def, sha1, 0);
840 add_pending_object(revs, object, def);
843 if (revs->topo_order || revs->unpacked)
846 if (revs->prune_data) {
847 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
848 revs->prune_fn = try_to_simplify_commit;
849 if (!revs->full_diff)
850 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
852 if (revs->combine_merges) {
853 revs->ignore_merges = 0;
854 if (revs->dense_combined_merges &&
855 (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
856 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
858 revs->diffopt.abbrev = revs->abbrev;
859 diff_setup_done(&revs->diffopt);
864 void prepare_revision_walk(struct rev_info *revs)
866 int nr = revs->pending.nr;
867 struct object_array_entry *list = revs->pending.objects;
869 revs->pending.nr = 0;
870 revs->pending.alloc = 0;
871 revs->pending.objects = NULL;
873 struct commit *commit = handle_commit(revs, list->item, list->name);
875 if (!(commit->object.flags & SEEN)) {
876 commit->object.flags |= SEEN;
877 insert_by_date(commit, &revs->commits);
887 if (revs->topo_order)
888 sort_in_topological_order_fn(&revs->commits, revs->lifo,
893 static int rewrite_one(struct rev_info *revs, struct commit **pp)
896 struct commit *p = *pp;
898 add_parents_to_list(revs, p, &revs->commits);
899 if (p->object.flags & (TREECHANGE | UNINTERESTING))
903 *pp = p->parents->item;
907 static void rewrite_parents(struct rev_info *revs, struct commit *commit)
909 struct commit_list **pp = &commit->parents;
911 struct commit_list *parent = *pp;
912 if (rewrite_one(revs, &parent->item) < 0) {
920 static void mark_boundary_to_show(struct commit *commit)
922 struct commit_list *p = commit->parents;
926 if (commit->object.flags & BOUNDARY)
927 commit->object.flags |= BOUNDARY_SHOW;
931 struct commit *get_revision(struct rev_info *revs)
933 struct commit_list *list = revs->commits;
938 /* Check the max_count ... */
939 switch (revs->max_count) {
949 struct commit_list *entry = revs->commits;
950 struct commit *commit = entry->item;
952 revs->commits = entry->next;
956 * If we haven't done the list limiting, we need to look at
957 * the parents here. We also need to do the date-based limiting
958 * that we'd otherwise have done in limit_list().
960 if (!revs->limited) {
961 if ((revs->unpacked &&
962 has_sha1_pack(commit->object.sha1)) ||
963 (revs->max_age != -1 &&
964 (commit->date < revs->max_age)))
966 add_parents_to_list(revs, commit, &revs->commits);
968 if (commit->object.flags & SHOWN)
971 /* We want to show boundary commits only when their
972 * children are shown. When path-limiter is in effect,
973 * rewrite_parents() drops some commits from getting shown,
974 * and there is no point showing boundary parents that
975 * are not shown. After rewrite_parents() rewrites the
976 * parents of a commit that is shown, we mark the boundary
977 * parents with BOUNDARY_SHOW.
979 if (commit->object.flags & BOUNDARY_SHOW) {
980 commit->object.flags |= SHOWN;
983 if (commit->object.flags & UNINTERESTING)
985 if (revs->min_age != -1 && (commit->date > revs->min_age))
987 if (revs->no_merges &&
988 commit->parents && commit->parents->next)
990 if (revs->prune_fn && revs->dense) {
991 if (!(commit->object.flags & TREECHANGE))
994 rewrite_parents(revs, commit);
997 mark_boundary_to_show(commit);
998 commit->object.flags |= SHOWN;
1000 } while (revs->commits);