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 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 desc.buf = tree->buffer;
69 desc.size = tree->size;
70 while (tree_entry(&desc, &entry)) {
71 if (S_ISDIR(entry.mode))
72 mark_tree_uninteresting(lookup_tree(entry.sha1));
74 mark_blob_uninteresting(lookup_blob(entry.sha1));
78 * We don't care about the tree any more
79 * after it has been marked uninteresting.
85 void mark_parents_uninteresting(struct commit *commit)
87 struct commit_list *parents = commit->parents;
90 struct commit *commit = parents->item;
91 if (!(commit->object.flags & UNINTERESTING)) {
92 commit->object.flags |= UNINTERESTING;
95 * Normally we haven't parsed the parent
96 * yet, so we won't have a parent of a parent
97 * here. However, it may turn out that we've
98 * reached this commit some other way (where it
99 * wasn't uninteresting), in which case we need
100 * to mark its parents recursively too..
103 mark_parents_uninteresting(commit);
107 * A missing commit is ok iff its parent is marked
110 * We just mark such a thing parsed, so that when
111 * it is popped next time around, we won't be trying
112 * to parse it and get an error.
114 if (!has_sha1_file(commit->object.sha1))
115 commit->object.parsed = 1;
116 parents = parents->next;
120 static void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
122 add_object(obj, &revs->pending_objects, NULL, name);
125 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
127 struct object *object;
129 object = parse_object(sha1);
131 die("bad object %s", name);
132 object->flags |= flags;
136 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
138 unsigned long flags = object->flags;
141 * Tag object? Look what it points to..
143 while (object->type == TYPE_TAG) {
144 struct tag *tag = (struct tag *) object;
145 if (revs->tag_objects && !(flags & UNINTERESTING))
146 add_pending_object(revs, object, tag->tag);
147 object = parse_object(tag->tagged->sha1);
149 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
153 * Commit object? Just return it, we'll do all the complex
156 if (object->type == TYPE_COMMIT) {
157 struct commit *commit = (struct commit *)object;
158 if (parse_commit(commit) < 0)
159 die("unable to parse commit %s", name);
160 if (flags & UNINTERESTING) {
161 commit->object.flags |= UNINTERESTING;
162 mark_parents_uninteresting(commit);
169 * Tree object? Either mark it uniniteresting, or add it
170 * to the list of objects to look at later..
172 if (object->type == TYPE_TREE) {
173 struct tree *tree = (struct tree *)object;
174 if (!revs->tree_objects)
176 if (flags & UNINTERESTING) {
177 mark_tree_uninteresting(tree);
180 add_pending_object(revs, object, "");
185 * Blob object? You know the drill by now..
187 if (object->type == TYPE_BLOB) {
188 struct blob *blob = (struct blob *)object;
189 if (!revs->blob_objects)
191 if (flags & UNINTERESTING) {
192 mark_blob_uninteresting(blob);
195 add_pending_object(revs, object, "");
198 die("%s is unknown object", name);
201 static int everybody_uninteresting(struct commit_list *orig)
203 struct commit_list *list = orig;
205 struct commit *commit = list->item;
207 if (commit->object.flags & UNINTERESTING)
214 static int tree_difference = REV_TREE_SAME;
216 static void file_add_remove(struct diff_options *options,
217 int addremove, unsigned mode,
218 const unsigned char *sha1,
219 const char *base, const char *path)
221 int diff = REV_TREE_DIFFERENT;
224 * Is it an add of a new file? It means that the old tree
225 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
226 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
227 * (and if it already was "REV_TREE_NEW", we'll keep it
228 * "REV_TREE_NEW" of course).
230 if (addremove == '+') {
231 diff = tree_difference;
232 if (diff != REV_TREE_SAME)
236 tree_difference = diff;
239 static void file_change(struct diff_options *options,
240 unsigned old_mode, unsigned new_mode,
241 const unsigned char *old_sha1,
242 const unsigned char *new_sha1,
243 const char *base, const char *path)
245 tree_difference = REV_TREE_DIFFERENT;
248 int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
253 return REV_TREE_DIFFERENT;
254 tree_difference = REV_TREE_SAME;
255 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
257 return REV_TREE_DIFFERENT;
258 return tree_difference;
261 int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
265 struct tree_desc empty, real;
270 tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
279 retval = diff_tree(&empty, &real, "", &revs->pruning);
282 return retval >= 0 && !tree_difference;
285 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
287 struct commit_list **pp, *parent;
288 int tree_changed = 0;
293 if (!commit->parents) {
294 if (!rev_same_tree_as_empty(revs, commit->tree))
295 commit->object.flags |= TREECHANGE;
299 pp = &commit->parents;
300 while ((parent = *pp) != NULL) {
301 struct commit *p = parent->item;
304 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
306 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
307 /* Even if a merge with an uninteresting
308 * side branch brought the entire change
309 * we are interested in, we do not want
310 * to lose the other branches of this
311 * merge, so we just keep going.
317 commit->parents = parent;
321 if (revs->remove_empty_trees &&
322 rev_same_tree_as_empty(revs, p->tree)) {
323 /* We are adding all the specified
324 * paths from this parent, so the
325 * history beyond this parent is not
326 * interesting. Remove its parents
327 * (they are grandparents for us).
328 * IOW, we pretend this parent is a
335 case REV_TREE_DIFFERENT:
340 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
343 commit->object.flags |= TREECHANGE;
346 static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
348 struct commit_list *parent = commit->parents;
350 if (commit->object.flags & ADDED)
352 commit->object.flags |= ADDED;
355 * If the commit is uninteresting, don't try to
356 * prune parents - we want the maximal uninteresting
359 * Normally we haven't parsed the parent
360 * yet, so we won't have a parent of a parent
361 * here. However, it may turn out that we've
362 * reached this commit some other way (where it
363 * wasn't uninteresting), in which case we need
364 * to mark its parents recursively too..
366 if (commit->object.flags & UNINTERESTING) {
368 struct commit *p = parent->item;
369 parent = parent->next;
371 p->object.flags |= UNINTERESTING;
373 mark_parents_uninteresting(p);
374 if (p->object.flags & SEEN)
376 p->object.flags |= SEEN;
377 insert_by_date(p, list);
383 * Ok, the commit wasn't uninteresting. Try to
384 * simplify the commit history and find the parent
385 * that has no differences in the path set if one exists.
388 revs->prune_fn(revs, commit);
393 parent = commit->parents;
395 struct commit *p = parent->item;
397 parent = parent->next;
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 if (revs->unpacked && has_sha1_pack(obj->sha1))
424 obj->flags |= UNINTERESTING;
425 add_parents_to_list(revs, commit, &list);
426 if (obj->flags & UNINTERESTING) {
427 mark_parents_uninteresting(commit);
428 if (everybody_uninteresting(list))
432 if (revs->min_age != -1 && (commit->date > revs->min_age))
434 p = &commit_list_insert(commit, p)->next;
436 if (revs->boundary) {
437 /* mark the ones that are on the result list first */
438 for (list = newlist; list; list = list->next) {
439 struct commit *commit = list->item;
440 commit->object.flags |= TMP_MARK;
442 for (list = newlist; list; list = list->next) {
443 struct commit *commit = list->item;
444 struct object *obj = &commit->object;
445 struct commit_list *parent;
446 if (obj->flags & UNINTERESTING)
448 for (parent = commit->parents;
450 parent = parent->next) {
451 struct commit *pcommit = parent->item;
452 if (!(pcommit->object.flags & UNINTERESTING))
454 pcommit->object.flags |= BOUNDARY;
455 if (pcommit->object.flags & TMP_MARK)
457 pcommit->object.flags |= TMP_MARK;
458 p = &commit_list_insert(pcommit, p)->next;
461 for (list = newlist; list; list = list->next) {
462 struct commit *commit = list->item;
463 commit->object.flags &= ~TMP_MARK;
466 revs->commits = newlist;
469 static int all_flags;
470 static struct rev_info *all_revs;
472 static int handle_one_ref(const char *path, const unsigned char *sha1)
474 struct object *object = get_reference(all_revs, path, sha1, all_flags);
475 add_pending_object(all_revs, object, "");
479 static void handle_all(struct rev_info *revs, unsigned flags)
483 for_each_ref(handle_one_ref);
486 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
488 unsigned char sha1[20];
490 struct commit *commit;
491 struct commit_list *parents;
494 flags ^= UNINTERESTING;
497 if (get_sha1(arg, sha1))
500 it = get_reference(revs, arg, sha1, 0);
501 if (it->type != TYPE_TAG)
503 memcpy(sha1, ((struct tag*)it)->tagged->sha1, 20);
505 if (it->type != TYPE_COMMIT)
507 commit = (struct commit *)it;
508 for (parents = commit->parents; parents; parents = parents->next) {
509 it = &parents->item->object;
511 add_pending_object(revs, it, arg);
516 void init_revisions(struct rev_info *revs)
518 memset(revs, 0, sizeof(*revs));
520 revs->abbrev = DEFAULT_ABBREV;
521 revs->ignore_merges = 1;
522 revs->simplify_history = 1;
523 revs->pruning.recursive = 1;
524 revs->pruning.add_remove = file_add_remove;
525 revs->pruning.change = file_change;
528 revs->prefix = setup_git_directory();
531 revs->max_count = -1;
533 revs->prune_fn = NULL;
534 revs->prune_data = NULL;
536 revs->topo_setter = topo_sort_default_setter;
537 revs->topo_getter = topo_sort_default_getter;
539 revs->commit_format = CMIT_FMT_DEFAULT;
541 diff_setup(&revs->diffopt);
545 * Parse revision information, filling in the "rev_info" structure,
546 * and removing the used arguments from the argument list.
548 * Returns the number of arguments left that weren't recognized
549 * (which are also moved to the head of the argument list)
551 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
553 int i, flags, seen_dashdash;
554 const char **unrecognized = argv + 1;
557 /* First, search for "--" */
559 for (i = 1; i < argc; i++) {
560 const char *arg = argv[i];
561 if (strcmp(arg, "--"))
565 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
571 for (i = 1; i < argc; i++) {
572 struct object *object;
573 const char *arg = argv[i];
574 unsigned char sha1[20];
580 if (!strncmp(arg, "--max-count=", 12)) {
581 revs->max_count = atoi(arg + 12);
584 /* accept -<digit>, like traditional "head" */
585 if ((*arg == '-') && isdigit(arg[1])) {
586 revs->max_count = atoi(arg + 1);
589 if (!strcmp(arg, "-n")) {
591 die("-n requires an argument");
592 revs->max_count = atoi(argv[++i]);
595 if (!strncmp(arg,"-n",2)) {
596 revs->max_count = atoi(arg + 2);
599 if (!strncmp(arg, "--max-age=", 10)) {
600 revs->max_age = atoi(arg + 10);
603 if (!strncmp(arg, "--since=", 8)) {
604 revs->max_age = approxidate(arg + 8);
607 if (!strncmp(arg, "--after=", 8)) {
608 revs->max_age = approxidate(arg + 8);
611 if (!strncmp(arg, "--min-age=", 10)) {
612 revs->min_age = atoi(arg + 10);
615 if (!strncmp(arg, "--before=", 9)) {
616 revs->min_age = approxidate(arg + 9);
619 if (!strncmp(arg, "--until=", 8)) {
620 revs->min_age = approxidate(arg + 8);
623 if (!strcmp(arg, "--all")) {
624 handle_all(revs, flags);
627 if (!strcmp(arg, "--not")) {
628 flags ^= UNINTERESTING;
631 if (!strcmp(arg, "--default")) {
633 die("bad --default argument");
637 if (!strcmp(arg, "--topo-order")) {
638 revs->topo_order = 1;
641 if (!strcmp(arg, "--date-order")) {
643 revs->topo_order = 1;
646 if (!strcmp(arg, "--parents")) {
650 if (!strcmp(arg, "--dense")) {
654 if (!strcmp(arg, "--sparse")) {
658 if (!strcmp(arg, "--remove-empty")) {
659 revs->remove_empty_trees = 1;
662 if (!strcmp(arg, "--no-merges")) {
666 if (!strcmp(arg, "--boundary")) {
670 if (!strcmp(arg, "--objects")) {
671 revs->tag_objects = 1;
672 revs->tree_objects = 1;
673 revs->blob_objects = 1;
676 if (!strcmp(arg, "--objects-edge")) {
677 revs->tag_objects = 1;
678 revs->tree_objects = 1;
679 revs->blob_objects = 1;
683 if (!strcmp(arg, "--unpacked")) {
687 if (!strcmp(arg, "-r")) {
689 revs->diffopt.recursive = 1;
692 if (!strcmp(arg, "-t")) {
694 revs->diffopt.recursive = 1;
695 revs->diffopt.tree_in_recursive = 1;
698 if (!strcmp(arg, "-m")) {
699 revs->ignore_merges = 0;
702 if (!strcmp(arg, "-c")) {
704 revs->dense_combined_merges = 0;
705 revs->combine_merges = 1;
708 if (!strcmp(arg, "--cc")) {
710 revs->dense_combined_merges = 1;
711 revs->combine_merges = 1;
714 if (!strcmp(arg, "-v")) {
715 revs->verbose_header = 1;
718 if (!strncmp(arg, "--pretty", 8)) {
719 revs->verbose_header = 1;
720 revs->commit_format = get_commit_format(arg+8);
723 if (!strcmp(arg, "--root")) {
724 revs->show_root_diff = 1;
727 if (!strcmp(arg, "--no-commit-id")) {
728 revs->no_commit_id = 1;
731 if (!strcmp(arg, "--always")) {
732 revs->always_show_header = 1;
735 if (!strcmp(arg, "--no-abbrev")) {
739 if (!strcmp(arg, "--abbrev")) {
740 revs->abbrev = DEFAULT_ABBREV;
743 if (!strncmp(arg, "--abbrev=", 9)) {
744 revs->abbrev = strtoul(arg + 9, NULL, 10);
745 if (revs->abbrev < MINIMUM_ABBREV)
746 revs->abbrev = MINIMUM_ABBREV;
747 else if (revs->abbrev > 40)
751 if (!strcmp(arg, "--abbrev-commit")) {
752 revs->abbrev_commit = 1;
755 if (!strcmp(arg, "--full-diff")) {
760 if (!strcmp(arg, "--full-history")) {
761 revs->simplify_history = 0;
764 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
770 *unrecognized++ = arg;
774 dotdot = strstr(arg, "..");
776 unsigned char from_sha1[20];
777 const char *next = dotdot + 2;
778 const char *this = arg;
784 if (!get_sha1(this, from_sha1) &&
785 !get_sha1(next, sha1)) {
786 struct object *exclude;
787 struct object *include;
789 exclude = get_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
790 include = get_reference(revs, next, sha1, flags);
791 if (!exclude || !include)
792 die("Invalid revision range %s..%s", arg, next);
794 if (!seen_dashdash) {
796 verify_non_filename(revs->prefix, arg);
798 add_pending_object(revs, exclude, this);
799 add_pending_object(revs, include, next);
804 dotdot = strstr(arg, "^@");
805 if (dotdot && !dotdot[2]) {
807 if (add_parents_only(revs, arg, flags))
813 local_flags = UNINTERESTING;
816 if (get_sha1(arg, sha1)) {
819 if (seen_dashdash || local_flags)
820 die("bad revision '%s'", arg);
822 /* If we didn't have a "--":
823 * (1) all filenames must exist;
824 * (2) all rev-args must not be interpretable
825 * as a valid filename.
826 * but the latter we have checked in the main loop.
828 for (j = i; j < argc; j++)
829 verify_filename(revs->prefix, argv[j]);
831 revs->prune_data = get_pathspec(revs->prefix, argv + i);
835 verify_non_filename(revs->prefix, arg);
836 object = get_reference(revs, arg, sha1, flags ^ local_flags);
837 add_pending_object(revs, object, arg);
839 if (def && !revs->pending_objects) {
840 unsigned char sha1[20];
841 struct object *object;
842 if (get_sha1(def, sha1))
843 die("bad default revision '%s'", def);
844 object = get_reference(revs, def, sha1, 0);
845 add_pending_object(revs, object, def);
848 if (revs->topo_order || revs->unpacked)
851 if (revs->prune_data) {
852 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
853 revs->prune_fn = try_to_simplify_commit;
854 if (!revs->full_diff)
855 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
857 if (revs->combine_merges) {
858 revs->ignore_merges = 0;
859 if (revs->dense_combined_merges &&
860 (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
861 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
863 revs->diffopt.abbrev = revs->abbrev;
864 diff_setup_done(&revs->diffopt);
869 void prepare_revision_walk(struct rev_info *revs)
871 struct object_list *list;
873 list = revs->pending_objects;
874 revs->pending_objects = NULL;
876 struct commit *commit = handle_commit(revs, list->item, list->name);
878 if (!(commit->object.flags & SEEN)) {
879 commit->object.flags |= SEEN;
880 insert_by_date(commit, &revs->commits);
890 if (revs->topo_order)
891 sort_in_topological_order_fn(&revs->commits, revs->lifo,
896 static int rewrite_one(struct rev_info *revs, struct commit **pp)
899 struct commit *p = *pp;
901 add_parents_to_list(revs, p, &revs->commits);
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 if (!(commit->object.flags & TREECHANGE))
997 rewrite_parents(revs, commit);
1000 mark_boundary_to_show(commit);
1001 commit->object.flags |= SHOWN;
1003 } while (revs->commits);