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 object *get_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);
126 object->flags |= flags;
130 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
132 unsigned long flags = object->flags;
135 * Tag object? Look what it points to..
137 while (object->type == tag_type) {
138 struct tag *tag = (struct tag *) object;
139 if (revs->tag_objects && !(flags & UNINTERESTING))
140 add_pending_object(revs, object, tag->tag);
141 object = parse_object(tag->tagged->sha1);
143 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
147 * Commit object? Just return it, we'll do all the complex
150 if (object->type == commit_type) {
151 struct commit *commit = (struct commit *)object;
152 if (parse_commit(commit) < 0)
153 die("unable to parse commit %s", name);
154 if (flags & UNINTERESTING) {
155 commit->object.flags |= UNINTERESTING;
156 mark_parents_uninteresting(commit);
163 * Tree object? Either mark it uniniteresting, or add it
164 * to the list of objects to look at later..
166 if (object->type == tree_type) {
167 struct tree *tree = (struct tree *)object;
168 if (!revs->tree_objects)
170 if (flags & UNINTERESTING) {
171 mark_tree_uninteresting(tree);
174 add_pending_object(revs, object, "");
179 * Blob object? You know the drill by now..
181 if (object->type == blob_type) {
182 struct blob *blob = (struct blob *)object;
183 if (!revs->blob_objects)
185 if (flags & UNINTERESTING) {
186 mark_blob_uninteresting(blob);
189 add_pending_object(revs, object, "");
192 die("%s is unknown object", name);
195 static int everybody_uninteresting(struct commit_list *orig)
197 struct commit_list *list = orig;
199 struct commit *commit = list->item;
201 if (commit->object.flags & UNINTERESTING)
208 static int tree_difference = REV_TREE_SAME;
210 static void file_add_remove(struct diff_options *options,
211 int addremove, unsigned mode,
212 const unsigned char *sha1,
213 const char *base, const char *path)
215 int diff = REV_TREE_DIFFERENT;
218 * Is it an add of a new file? It means that the old tree
219 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
220 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
221 * (and if it already was "REV_TREE_NEW", we'll keep it
222 * "REV_TREE_NEW" of course).
224 if (addremove == '+') {
225 diff = tree_difference;
226 if (diff != REV_TREE_SAME)
230 tree_difference = diff;
233 static void file_change(struct diff_options *options,
234 unsigned old_mode, unsigned new_mode,
235 const unsigned char *old_sha1,
236 const unsigned char *new_sha1,
237 const char *base, const char *path)
239 tree_difference = REV_TREE_DIFFERENT;
242 int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
247 return REV_TREE_DIFFERENT;
248 tree_difference = REV_TREE_SAME;
249 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
251 return REV_TREE_DIFFERENT;
252 return tree_difference;
255 int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
259 struct tree_desc empty, real;
264 tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
273 retval = diff_tree(&empty, &real, "", &revs->pruning);
276 return retval >= 0 && !tree_difference;
279 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
281 struct commit_list **pp, *parent;
282 int tree_changed = 0;
287 if (!commit->parents) {
288 if (!rev_same_tree_as_empty(revs, commit->tree))
289 commit->object.flags |= TREECHANGE;
293 pp = &commit->parents;
294 while ((parent = *pp) != NULL) {
295 struct commit *p = parent->item;
298 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
300 if (p->object.flags & UNINTERESTING) {
301 /* Even if a merge with an uninteresting
302 * side branch brought the entire change
303 * we are interested in, we do not want
304 * to lose the other branches of this
305 * merge, so we just keep going.
311 commit->parents = parent;
315 if (revs->remove_empty_trees &&
316 rev_same_tree_as_empty(revs, p->tree)) {
317 /* We are adding all the specified
318 * paths from this parent, so the
319 * history beyond this parent is not
320 * interesting. Remove its parents
321 * (they are grandparents for us).
322 * IOW, we pretend this parent is a
329 case REV_TREE_DIFFERENT:
334 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
337 commit->object.flags |= TREECHANGE;
340 static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
342 struct commit_list *parent = commit->parents;
344 if (commit->object.flags & ADDED)
346 commit->object.flags |= ADDED;
349 * If the commit is uninteresting, don't try to
350 * prune parents - we want the maximal uninteresting
353 * Normally we haven't parsed the parent
354 * yet, so we won't have a parent of a parent
355 * here. However, it may turn out that we've
356 * reached this commit some other way (where it
357 * wasn't uninteresting), in which case we need
358 * to mark its parents recursively too..
360 if (commit->object.flags & UNINTERESTING) {
362 struct commit *p = parent->item;
363 parent = parent->next;
365 p->object.flags |= UNINTERESTING;
367 mark_parents_uninteresting(p);
368 if (p->object.flags & SEEN)
370 p->object.flags |= SEEN;
371 insert_by_date(p, list);
377 * Ok, the commit wasn't uninteresting. Try to
378 * simplify the commit history and find the parent
379 * that has no differences in the path set if one exists.
382 revs->prune_fn(revs, commit);
387 parent = commit->parents;
389 struct commit *p = parent->item;
391 parent = parent->next;
394 if (p->object.flags & SEEN)
396 p->object.flags |= SEEN;
397 insert_by_date(p, list);
401 static void limit_list(struct rev_info *revs)
403 struct commit_list *list = revs->commits;
404 struct commit_list *newlist = NULL;
405 struct commit_list **p = &newlist;
408 struct commit_list *entry = list;
409 struct commit *commit = list->item;
410 struct object *obj = &commit->object;
415 if (revs->max_age != -1 && (commit->date < revs->max_age))
416 obj->flags |= UNINTERESTING;
417 if (revs->unpacked && has_sha1_pack(obj->sha1))
418 obj->flags |= UNINTERESTING;
419 add_parents_to_list(revs, commit, &list);
420 if (obj->flags & UNINTERESTING) {
421 mark_parents_uninteresting(commit);
422 if (everybody_uninteresting(list))
426 if (revs->min_age != -1 && (commit->date > revs->min_age))
428 p = &commit_list_insert(commit, p)->next;
430 if (revs->boundary) {
431 /* mark the ones that are on the result list first */
432 for (list = newlist; list; list = list->next) {
433 struct commit *commit = list->item;
434 commit->object.flags |= TMP_MARK;
436 for (list = newlist; list; list = list->next) {
437 struct commit *commit = list->item;
438 struct object *obj = &commit->object;
439 struct commit_list *parent;
440 if (obj->flags & UNINTERESTING)
442 for (parent = commit->parents;
444 parent = parent->next) {
445 struct commit *pcommit = parent->item;
446 if (!(pcommit->object.flags & UNINTERESTING))
448 pcommit->object.flags |= BOUNDARY;
449 if (pcommit->object.flags & TMP_MARK)
451 pcommit->object.flags |= TMP_MARK;
452 p = &commit_list_insert(pcommit, p)->next;
455 for (list = newlist; list; list = list->next) {
456 struct commit *commit = list->item;
457 commit->object.flags &= ~TMP_MARK;
460 revs->commits = newlist;
463 static int all_flags;
464 static struct rev_info *all_revs;
466 static int handle_one_ref(const char *path, const unsigned char *sha1)
468 struct object *object = get_reference(all_revs, path, sha1, all_flags);
469 add_pending_object(all_revs, object, "");
473 static void handle_all(struct rev_info *revs, unsigned flags)
477 for_each_ref(handle_one_ref);
480 void init_revisions(struct rev_info *revs)
482 memset(revs, 0, sizeof(*revs));
484 revs->abbrev = DEFAULT_ABBREV;
485 revs->ignore_merges = 1;
486 revs->pruning.recursive = 1;
487 revs->pruning.add_remove = file_add_remove;
488 revs->pruning.change = file_change;
491 revs->prefix = setup_git_directory();
494 revs->max_count = -1;
496 revs->prune_fn = NULL;
497 revs->prune_data = NULL;
499 revs->topo_setter = topo_sort_default_setter;
500 revs->topo_getter = topo_sort_default_getter;
502 revs->commit_format = CMIT_FMT_DEFAULT;
504 diff_setup(&revs->diffopt);
508 * Parse revision information, filling in the "rev_info" structure,
509 * and removing the used arguments from the argument list.
511 * Returns the number of arguments left that weren't recognized
512 * (which are also moved to the head of the argument list)
514 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
516 int i, flags, seen_dashdash;
517 const char **unrecognized = argv + 1;
520 /* First, search for "--" */
522 for (i = 1; i < argc; i++) {
523 const char *arg = argv[i];
524 if (strcmp(arg, "--"))
528 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
534 for (i = 1; i < argc; i++) {
535 struct object *object;
536 const char *arg = argv[i];
537 unsigned char sha1[20];
543 if (!strncmp(arg, "--max-count=", 12)) {
544 revs->max_count = atoi(arg + 12);
547 /* accept -<digit>, like traditilnal "head" */
548 if ((*arg == '-') && isdigit(arg[1])) {
549 revs->max_count = atoi(arg + 1);
552 if (!strcmp(arg, "-n")) {
554 die("-n requires an argument");
555 revs->max_count = atoi(argv[++i]);
558 if (!strncmp(arg,"-n",2)) {
559 revs->max_count = atoi(arg + 2);
562 if (!strncmp(arg, "--max-age=", 10)) {
563 revs->max_age = atoi(arg + 10);
566 if (!strncmp(arg, "--since=", 8)) {
567 revs->max_age = approxidate(arg + 8);
570 if (!strncmp(arg, "--after=", 8)) {
571 revs->max_age = approxidate(arg + 8);
574 if (!strncmp(arg, "--min-age=", 10)) {
575 revs->min_age = atoi(arg + 10);
578 if (!strncmp(arg, "--before=", 9)) {
579 revs->min_age = approxidate(arg + 9);
582 if (!strncmp(arg, "--until=", 8)) {
583 revs->min_age = approxidate(arg + 8);
586 if (!strcmp(arg, "--all")) {
587 handle_all(revs, flags);
590 if (!strcmp(arg, "--not")) {
591 flags ^= UNINTERESTING;
594 if (!strcmp(arg, "--default")) {
596 die("bad --default argument");
600 if (!strcmp(arg, "--topo-order")) {
601 revs->topo_order = 1;
604 if (!strcmp(arg, "--date-order")) {
606 revs->topo_order = 1;
609 if (!strcmp(arg, "--parents")) {
613 if (!strcmp(arg, "--dense")) {
617 if (!strcmp(arg, "--sparse")) {
621 if (!strcmp(arg, "--remove-empty")) {
622 revs->remove_empty_trees = 1;
625 if (!strcmp(arg, "--no-merges")) {
629 if (!strcmp(arg, "--boundary")) {
633 if (!strcmp(arg, "--objects")) {
634 revs->tag_objects = 1;
635 revs->tree_objects = 1;
636 revs->blob_objects = 1;
639 if (!strcmp(arg, "--objects-edge")) {
640 revs->tag_objects = 1;
641 revs->tree_objects = 1;
642 revs->blob_objects = 1;
646 if (!strcmp(arg, "--unpacked")) {
650 if (!strcmp(arg, "-r")) {
652 revs->diffopt.recursive = 1;
655 if (!strcmp(arg, "-t")) {
657 revs->diffopt.recursive = 1;
658 revs->diffopt.tree_in_recursive = 1;
661 if (!strcmp(arg, "-m")) {
662 revs->ignore_merges = 0;
665 if (!strcmp(arg, "-c")) {
667 revs->combine_merges = 1;
670 if (!strcmp(arg, "--cc")) {
672 revs->dense_combined_merges = 1;
673 revs->combine_merges = 1;
676 if (!strcmp(arg, "-v")) {
677 revs->verbose_header = 1;
680 if (!strncmp(arg, "--pretty", 8)) {
681 revs->verbose_header = 1;
682 revs->commit_format = get_commit_format(arg+8);
685 if (!strcmp(arg, "--root")) {
686 revs->show_root_diff = 1;
689 if (!strcmp(arg, "--no-commit-id")) {
690 revs->no_commit_id = 1;
693 if (!strcmp(arg, "--always")) {
694 revs->always_show_header = 1;
697 if (!strcmp(arg, "--no-abbrev")) {
701 if (!strcmp(arg, "--abbrev")) {
702 revs->abbrev = DEFAULT_ABBREV;
705 if (!strcmp(arg, "--abbrev-commit")) {
706 revs->abbrev_commit = 1;
709 if (!strcmp(arg, "--full-diff")) {
714 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
720 *unrecognized++ = arg;
724 dotdot = strstr(arg, "..");
726 unsigned char from_sha1[20];
727 const char *next = dotdot + 2;
728 const char *this = arg;
734 if (!get_sha1(this, from_sha1) &&
735 !get_sha1(next, sha1)) {
736 struct object *exclude;
737 struct object *include;
739 exclude = get_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
740 include = get_reference(revs, next, sha1, flags);
741 if (!exclude || !include)
742 die("Invalid revision range %s..%s", arg, next);
743 add_pending_object(revs, exclude, this);
744 add_pending_object(revs, include, next);
751 local_flags = UNINTERESTING;
754 if (get_sha1(arg, sha1) < 0) {
757 if (seen_dashdash || local_flags)
758 die("bad revision '%s'", arg);
760 /* If we didn't have a "--", all filenames must exist */
761 for (j = i; j < argc; j++)
762 verify_filename(revs->prefix, argv[j]);
764 revs->prune_data = get_pathspec(revs->prefix, argv + i);
767 object = get_reference(revs, arg, sha1, flags ^ local_flags);
768 add_pending_object(revs, object, arg);
770 if (def && !revs->pending_objects) {
771 unsigned char sha1[20];
772 struct object *object;
773 if (get_sha1(def, sha1) < 0)
774 die("bad default revision '%s'", def);
775 object = get_reference(revs, def, sha1, 0);
776 add_pending_object(revs, object, def);
779 if (revs->topo_order || revs->unpacked)
782 if (revs->prune_data) {
783 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
784 revs->prune_fn = try_to_simplify_commit;
785 if (!revs->full_diff)
786 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
788 if (revs->combine_merges) {
789 revs->ignore_merges = 0;
790 if (revs->dense_combined_merges &&
791 (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
792 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
794 revs->diffopt.abbrev = revs->abbrev;
795 diff_setup_done(&revs->diffopt);
800 void prepare_revision_walk(struct rev_info *revs)
802 struct object_list *list;
804 list = revs->pending_objects;
805 revs->pending_objects = NULL;
807 struct commit *commit = handle_commit(revs, list->item, list->name);
809 if (!(commit->object.flags & SEEN)) {
810 commit->object.flags |= SEEN;
811 insert_by_date(commit, &revs->commits);
821 if (revs->topo_order)
822 sort_in_topological_order_fn(&revs->commits, revs->lifo,
827 static int rewrite_one(struct rev_info *revs, struct commit **pp)
830 struct commit *p = *pp;
832 add_parents_to_list(revs, p, &revs->commits);
833 if (p->object.flags & (TREECHANGE | UNINTERESTING))
837 *pp = p->parents->item;
841 static void rewrite_parents(struct rev_info *revs, struct commit *commit)
843 struct commit_list **pp = &commit->parents;
845 struct commit_list *parent = *pp;
846 if (rewrite_one(revs, &parent->item) < 0) {
854 static void mark_boundary_to_show(struct commit *commit)
856 struct commit_list *p = commit->parents;
860 if (commit->object.flags & BOUNDARY)
861 commit->object.flags |= BOUNDARY_SHOW;
865 struct commit *get_revision(struct rev_info *revs)
867 struct commit_list *list = revs->commits;
872 /* Check the max_count ... */
873 switch (revs->max_count) {
883 struct commit *commit = revs->commits->item;
885 revs->commits = revs->commits->next;
888 * If we haven't done the list limiting, we need to look at
889 * the parents here. We also need to do the date-based limiting
890 * that we'd otherwise have done in limit_list().
892 if (!revs->limited) {
893 if ((revs->unpacked &&
894 has_sha1_pack(commit->object.sha1)) ||
895 (revs->max_age != -1 &&
896 (commit->date < revs->max_age)))
898 add_parents_to_list(revs, commit, &revs->commits);
900 if (commit->object.flags & SHOWN)
903 /* We want to show boundary commits only when their
904 * children are shown. When path-limiter is in effect,
905 * rewrite_parents() drops some commits from getting shown,
906 * and there is no point showing boundary parents that
907 * are not shown. After rewrite_parents() rewrites the
908 * parents of a commit that is shown, we mark the boundary
909 * parents with BOUNDARY_SHOW.
911 if (commit->object.flags & BOUNDARY_SHOW) {
912 commit->object.flags |= SHOWN;
915 if (commit->object.flags & UNINTERESTING)
917 if (revs->min_age != -1 && (commit->date > revs->min_age))
919 if (revs->no_merges &&
920 commit->parents && commit->parents->next)
922 if (revs->prune_fn && revs->dense) {
923 if (!(commit->object.flags & TREECHANGE))
926 rewrite_parents(revs, commit);
929 mark_boundary_to_show(commit);
930 commit->object.flags |= SHOWN;
932 } while (revs->commits);