10 #define SEEN (1u << 0)
11 #define INTERESTING (1u << 1)
12 #define COUNTED (1u << 2)
13 #define SHOWN (1u << 3)
14 #define TREECHANGE (1u << 4)
15 #define TMP_MARK (1u << 5) /* for isolated cases; clean after use */
17 static const char rev_list_usage[] =
18 "git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
28 " --merge-order [ --show-breaks ]\n"
31 " formatting output:\n"
33 " --objects | --objects-edge\n"
35 " --header | --pretty\n"
36 " --abbrev=nr | --no-abbrev\n"
42 static int unpacked = 0;
43 static int bisect_list = 0;
44 static int tag_objects = 0;
45 static int tree_objects = 0;
46 static int blob_objects = 0;
47 static int edge_hint = 0;
48 static int verbose_header = 0;
49 static int abbrev = DEFAULT_ABBREV;
50 static int show_parents = 0;
51 static int hdr_termination = 0;
52 static const char *commit_prefix = "";
53 static unsigned long max_age = -1;
54 static unsigned long min_age = -1;
55 static int max_count = -1;
56 static enum cmit_fmt commit_format = CMIT_FMT_RAW;
57 static int merge_order = 0;
58 static int show_breaks = 0;
59 static int stop_traversal = 0;
60 static int topo_order = 0;
62 static int no_merges = 0;
63 static const char **paths = NULL;
64 static int remove_empty_trees = 0;
66 static void show_commit(struct commit *commit)
68 commit->object.flags |= SHOWN;
71 if (commit->object.flags & DISCONTINUITY) {
73 } else if (commit->object.flags & BOUNDARY) {
77 printf("%s%s", commit_prefix, sha1_to_hex(commit->object.sha1));
79 struct commit_list *parents = commit->parents;
81 struct object *o = &(parents->item->object);
82 parents = parents->next;
83 if (o->flags & TMP_MARK)
85 printf(" %s", sha1_to_hex(o->sha1));
88 /* TMP_MARK is a general purpose flag that can
89 * be used locally, but the user should clean
90 * things up after it is done with them.
92 for (parents = commit->parents;
94 parents = parents->next)
95 parents->item->object.flags &= ~TMP_MARK;
97 if (commit_format == CMIT_FMT_ONELINE)
102 if (verbose_header) {
103 static char pretty_header[16384];
104 pretty_print_commit(commit_format, commit, ~0, pretty_header, sizeof(pretty_header), abbrev);
105 printf("%s%c", pretty_header, hdr_termination);
110 static int rewrite_one(struct commit **pp)
113 struct commit *p = *pp;
114 if (p->object.flags & (TREECHANGE | UNINTERESTING))
118 *pp = p->parents->item;
122 static void rewrite_parents(struct commit *commit)
124 struct commit_list **pp = &commit->parents;
126 struct commit_list *parent = *pp;
127 if (rewrite_one(&parent->item) < 0) {
135 static int filter_commit(struct commit * commit)
137 if (stop_traversal && (commit->object.flags & BOUNDARY))
139 if (commit->object.flags & (UNINTERESTING|SHOWN))
141 if (min_age != -1 && (commit->date > min_age))
143 if (max_age != -1 && (commit->date < max_age)) {
147 if (no_merges && (commit->parents && commit->parents->next))
149 if (paths && dense) {
150 if (!(commit->object.flags & TREECHANGE))
152 rewrite_parents(commit);
157 static int process_commit(struct commit * commit)
159 int action=filter_commit(commit);
161 if (action == STOP) {
165 if (action == CONTINUE) {
169 if (max_count != -1 && !max_count--)
177 static struct object_list **add_object(struct object *obj, struct object_list **p, const char *name)
179 struct object_list *entry = xmalloc(sizeof(*entry));
187 static struct object_list **process_blob(struct blob *blob, struct object_list **p, const char *name)
189 struct object *obj = &blob->object;
193 if (obj->flags & (UNINTERESTING | SEEN))
196 return add_object(obj, p, name);
199 static struct object_list **process_tree(struct tree *tree, struct object_list **p, const char *name)
201 struct object *obj = &tree->object;
202 struct tree_entry_list *entry;
206 if (obj->flags & (UNINTERESTING | SEEN))
208 if (parse_tree(tree) < 0)
209 die("bad tree object %s", sha1_to_hex(obj->sha1));
211 p = add_object(obj, p, name);
212 entry = tree->entries;
213 tree->entries = NULL;
215 struct tree_entry_list *next = entry->next;
216 if (entry->directory)
217 p = process_tree(entry->item.tree, p, entry->name);
219 p = process_blob(entry->item.blob, p, entry->name);
226 static struct object_list *pending_objects = NULL;
228 static void show_commit_list(struct commit_list *list)
230 struct object_list *objects = NULL, **p = &objects, *pending;
232 struct commit *commit = pop_most_recent_commit(&list, SEEN);
234 p = process_tree(commit->tree, p, "");
235 if (process_commit(commit) == STOP)
238 for (pending = pending_objects; pending; pending = pending->next) {
239 struct object *obj = pending->item;
240 const char *name = pending->name;
241 if (obj->flags & (UNINTERESTING | SEEN))
243 if (obj->type == tag_type) {
245 p = add_object(obj, p, name);
248 if (obj->type == tree_type) {
249 p = process_tree((struct tree *)obj, p, name);
252 if (obj->type == blob_type) {
253 p = process_blob((struct blob *)obj, p, name);
256 die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
259 /* An object with name "foo\n0000000000000000000000000000000000000000"
260 * can be used confuse downstream git-pack-objects very badly.
262 const char *ep = strchr(objects->name, '\n');
264 printf("%s %.*s\n", sha1_to_hex(objects->item->sha1),
265 (int) (ep - objects->name),
269 printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name);
270 objects = objects->next;
274 static void mark_blob_uninteresting(struct blob *blob)
278 if (blob->object.flags & UNINTERESTING)
280 blob->object.flags |= UNINTERESTING;
283 static void mark_tree_uninteresting(struct tree *tree)
285 struct object *obj = &tree->object;
286 struct tree_entry_list *entry;
290 if (obj->flags & UNINTERESTING)
292 obj->flags |= UNINTERESTING;
293 if (!has_sha1_file(obj->sha1))
295 if (parse_tree(tree) < 0)
296 die("bad tree %s", sha1_to_hex(obj->sha1));
297 entry = tree->entries;
298 tree->entries = NULL;
300 struct tree_entry_list *next = entry->next;
301 if (entry->directory)
302 mark_tree_uninteresting(entry->item.tree);
304 mark_blob_uninteresting(entry->item.blob);
310 static void mark_parents_uninteresting(struct commit *commit)
312 struct commit_list *parents = commit->parents;
315 struct commit *commit = parents->item;
316 commit->object.flags |= UNINTERESTING;
319 * Normally we haven't parsed the parent
320 * yet, so we won't have a parent of a parent
321 * here. However, it may turn out that we've
322 * reached this commit some other way (where it
323 * wasn't uninteresting), in which case we need
324 * to mark its parents recursively too..
327 mark_parents_uninteresting(commit);
330 * A missing commit is ok iff its parent is marked
333 * We just mark such a thing parsed, so that when
334 * it is popped next time around, we won't be trying
335 * to parse it and get an error.
337 if (!has_sha1_file(commit->object.sha1))
338 commit->object.parsed = 1;
339 parents = parents->next;
343 static int everybody_uninteresting(struct commit_list *orig)
345 struct commit_list *list = orig;
347 struct commit *commit = list->item;
349 if (commit->object.flags & UNINTERESTING)
357 * This is a truly stupid algorithm, but it's only
358 * used for bisection, and we just don't care enough.
360 * We care just barely enough to avoid recursing for
363 static int count_distance(struct commit_list *entry)
368 struct commit *commit = entry->item;
369 struct commit_list *p;
371 if (commit->object.flags & (UNINTERESTING | COUNTED))
373 if (!paths || (commit->object.flags & TREECHANGE))
375 commit->object.flags |= COUNTED;
381 nr += count_distance(p);
390 static void clear_distance(struct commit_list *list)
393 struct commit *commit = list->item;
394 commit->object.flags &= ~COUNTED;
399 static struct commit_list *find_bisection(struct commit_list *list)
402 struct commit_list *p, *best;
407 if (!paths || (p->item->object.flags & TREECHANGE))
414 for (p = list; p; p = p->next) {
417 if (paths && !(p->item->object.flags & TREECHANGE))
420 distance = count_distance(p);
421 clear_distance(list);
422 if (nr - distance < distance)
423 distance = nr - distance;
424 if (distance > closest) {
434 static void mark_edge_parents_uninteresting(struct commit *commit)
436 struct commit_list *parents;
438 for (parents = commit->parents; parents; parents = parents->next) {
439 struct commit *parent = parents->item;
440 if (!(parent->object.flags & UNINTERESTING))
442 mark_tree_uninteresting(parent->tree);
444 printf("-%s\n", sha1_to_hex(parent->object.sha1));
448 static void mark_edges_uninteresting(struct commit_list *list)
450 for ( ; list; list = list->next) {
451 struct commit *commit = list->item;
453 if (commit->object.flags & UNINTERESTING) {
454 mark_tree_uninteresting(commit->tree);
457 mark_edge_parents_uninteresting(commit);
463 #define TREE_DIFFERENT 2
464 static int tree_difference = TREE_SAME;
466 static void file_add_remove(struct diff_options *options,
467 int addremove, unsigned mode,
468 const unsigned char *sha1,
469 const char *base, const char *path)
471 int diff = TREE_DIFFERENT;
474 * Is it an add of a new file? It means that
475 * the old tree didn't have it at all, so we
476 * will turn "TREE_SAME" -> "TREE_NEW", but
477 * leave any "TREE_DIFFERENT" alone (and if
478 * it already was "TREE_NEW", we'll keep it
479 * "TREE_NEW" of course).
481 if (addremove == '+') {
482 diff = tree_difference;
483 if (diff != TREE_SAME)
487 tree_difference = diff;
490 static void file_change(struct diff_options *options,
491 unsigned old_mode, unsigned new_mode,
492 const unsigned char *old_sha1,
493 const unsigned char *new_sha1,
494 const char *base, const char *path)
496 tree_difference = TREE_DIFFERENT;
499 static struct diff_options diff_opt = {
501 .add_remove = file_add_remove,
502 .change = file_change,
505 static int compare_tree(struct tree *t1, struct tree *t2)
510 return TREE_DIFFERENT;
511 tree_difference = TREE_SAME;
512 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "", &diff_opt) < 0)
513 return TREE_DIFFERENT;
514 return tree_difference;
517 static int same_tree_as_empty(struct tree *t1)
521 struct tree_desc empty, real;
526 tree = read_object_with_reference(t1->object.sha1, "tree", &real.size, NULL);
535 retval = diff_tree(&empty, &real, "", &diff_opt);
538 return retval >= 0 && !tree_difference;
541 static void try_to_simplify_commit(struct commit *commit)
543 struct commit_list **pp, *parent;
548 if (!commit->parents) {
549 if (!same_tree_as_empty(commit->tree))
550 commit->object.flags |= TREECHANGE;
554 pp = &commit->parents;
555 while ((parent = *pp) != NULL) {
556 struct commit *p = parent->item;
558 if (p->object.flags & UNINTERESTING) {
564 switch (compare_tree(p->tree, commit->tree)) {
567 commit->parents = parent;
571 if (remove_empty_trees && same_tree_as_empty(p->tree)) {
580 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
582 commit->object.flags |= TREECHANGE;
585 static void add_parents_to_list(struct commit *commit, struct commit_list **list)
587 struct commit_list *parent = commit->parents;
590 * If the commit is uninteresting, don't try to
591 * prune parents - we want the maximal uninteresting
594 * Normally we haven't parsed the parent
595 * yet, so we won't have a parent of a parent
596 * here. However, it may turn out that we've
597 * reached this commit some other way (where it
598 * wasn't uninteresting), in which case we need
599 * to mark its parents recursively too..
601 if (commit->object.flags & UNINTERESTING) {
603 struct commit *p = parent->item;
604 parent = parent->next;
606 p->object.flags |= UNINTERESTING;
608 mark_parents_uninteresting(p);
609 if (p->object.flags & SEEN)
611 p->object.flags |= SEEN;
612 insert_by_date(p, list);
618 * Ok, the commit wasn't uninteresting. Try to
619 * simplify the commit history and find the parent
620 * that has no differences in the path set if one exists.
623 try_to_simplify_commit(commit);
625 parent = commit->parents;
627 struct commit *p = parent->item;
629 parent = parent->next;
632 if (p->object.flags & SEEN)
634 p->object.flags |= SEEN;
635 insert_by_date(p, list);
639 static struct commit_list *limit_list(struct commit_list *list)
641 struct commit_list *newlist = NULL;
642 struct commit_list **p = &newlist;
644 struct commit_list *entry = list;
645 struct commit *commit = list->item;
646 struct object *obj = &commit->object;
651 if (max_age != -1 && (commit->date < max_age))
652 obj->flags |= UNINTERESTING;
653 if (unpacked && has_sha1_pack(obj->sha1))
654 obj->flags |= UNINTERESTING;
655 add_parents_to_list(commit, &list);
656 if (obj->flags & UNINTERESTING) {
657 mark_parents_uninteresting(commit);
658 if (everybody_uninteresting(list))
662 if (min_age != -1 && (commit->date > min_age))
664 p = &commit_list_insert(commit, p)->next;
667 mark_edges_uninteresting(newlist);
669 newlist = find_bisection(newlist);
673 static void add_pending_object(struct object *obj, const char *name)
675 add_object(obj, &pending_objects, name);
678 static struct commit *get_commit_reference(const char *name, const unsigned char *sha1, unsigned int flags)
680 struct object *object;
682 object = parse_object(sha1);
684 die("bad object %s", name);
687 * Tag object? Look what it points to..
689 while (object->type == tag_type) {
690 struct tag *tag = (struct tag *) object;
691 object->flags |= flags;
692 if (tag_objects && !(object->flags & UNINTERESTING))
693 add_pending_object(object, tag->tag);
694 object = parse_object(tag->tagged->sha1);
696 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
700 * Commit object? Just return it, we'll do all the complex
703 if (object->type == commit_type) {
704 struct commit *commit = (struct commit *)object;
705 object->flags |= flags;
706 if (parse_commit(commit) < 0)
707 die("unable to parse commit %s", name);
708 if (flags & UNINTERESTING)
709 mark_parents_uninteresting(commit);
714 * Tree object? Either mark it uniniteresting, or add it
715 * to the list of objects to look at later..
717 if (object->type == tree_type) {
718 struct tree *tree = (struct tree *)object;
721 if (flags & UNINTERESTING) {
722 mark_tree_uninteresting(tree);
725 add_pending_object(object, "");
730 * Blob object? You know the drill by now..
732 if (object->type == blob_type) {
733 struct blob *blob = (struct blob *)object;
736 if (flags & UNINTERESTING) {
737 mark_blob_uninteresting(blob);
740 add_pending_object(object, "");
743 die("%s is unknown object", name);
746 static void handle_one_commit(struct commit *com, struct commit_list **lst)
748 if (!com || com->object.flags & SEEN)
750 com->object.flags |= SEEN;
751 commit_list_insert(com, lst);
754 /* for_each_ref() callback does not allow user data -- Yuck. */
755 static struct commit_list **global_lst;
757 static int include_one_commit(const char *path, const unsigned char *sha1)
759 struct commit *com = get_commit_reference(path, sha1, 0);
760 handle_one_commit(com, global_lst);
764 static void handle_all(struct commit_list **lst)
767 for_each_ref(include_one_commit);
771 int main(int argc, const char **argv)
773 const char *prefix = setup_git_directory();
774 struct commit_list *list = NULL;
777 for (i = 1 ; i < argc; i++) {
779 const char *arg = argv[i];
781 struct commit *commit;
782 unsigned char sha1[20];
784 /* accept -<digit>, like traditilnal "head" */
785 if ((*arg == '-') && isdigit(arg[1])) {
786 max_count = atoi(arg + 1);
789 if (!strcmp(arg, "-n")) {
791 die("-n requires an argument");
792 max_count = atoi(argv[i]);
795 if (!strncmp(arg,"-n",2)) {
796 max_count = atoi(arg + 2);
799 if (!strncmp(arg, "--max-count=", 12)) {
800 max_count = atoi(arg + 12);
803 if (!strncmp(arg, "--max-age=", 10)) {
804 max_age = atoi(arg + 10);
808 if (!strncmp(arg, "--min-age=", 10)) {
809 min_age = atoi(arg + 10);
813 if (!strcmp(arg, "--header")) {
817 if (!strcmp(arg, "--no-abbrev")) {
821 if (!strncmp(arg, "--abbrev=", 9)) {
822 abbrev = strtoul(arg + 9, NULL, 10);
823 if (abbrev && abbrev < MINIMUM_ABBREV)
824 abbrev = MINIMUM_ABBREV;
825 else if (40 < abbrev)
829 if (!strncmp(arg, "--pretty", 8)) {
830 commit_format = get_commit_format(arg+8);
832 hdr_termination = '\n';
833 if (commit_format == CMIT_FMT_ONELINE)
836 commit_prefix = "commit ";
839 if (!strncmp(arg, "--no-merges", 11)) {
843 if (!strcmp(arg, "--parents")) {
847 if (!strcmp(arg, "--bisect")) {
851 if (!strcmp(arg, "--all")) {
855 if (!strcmp(arg, "--objects")) {
861 if (!strcmp(arg, "--objects-edge")) {
868 if (!strcmp(arg, "--unpacked")) {
873 if (!strcmp(arg, "--merge-order")) {
877 if (!strcmp(arg, "--show-breaks")) {
881 if (!strcmp(arg, "--topo-order")) {
887 if (!strcmp(arg, "--date-order")) {
893 if (!strcmp(arg, "--dense")) {
897 if (!strcmp(arg, "--sparse")) {
901 if (!strcmp(arg, "--remove-empty")) {
902 remove_empty_trees = 1;
905 if (!strcmp(arg, "--")) {
910 if (show_breaks && !merge_order)
911 usage(rev_list_usage);
914 dotdot = strstr(arg, "..");
916 unsigned char from_sha1[20];
917 char *next = dotdot + 2;
921 if (!get_sha1(arg, from_sha1) && !get_sha1(next, sha1)) {
922 struct commit *exclude;
923 struct commit *include;
925 exclude = get_commit_reference(arg, from_sha1, UNINTERESTING);
926 include = get_commit_reference(next, sha1, 0);
927 if (!exclude || !include)
928 die("Invalid revision range %s..%s", arg, next);
930 handle_one_commit(exclude, &list);
931 handle_one_commit(include, &list);
937 flags = UNINTERESTING;
941 if (get_sha1(arg, sha1) < 0) {
943 if (lstat(arg, &st) < 0)
944 die("'%s': %s", arg, strerror(errno));
947 commit = get_commit_reference(arg, sha1, flags);
948 handle_one_commit(commit, &list);
952 (!(tag_objects||tree_objects||blob_objects) && !pending_objects))
953 usage(rev_list_usage);
955 paths = get_pathspec(prefix, argv + i);
958 diff_tree_setup_paths(paths);
961 save_commit_buffer = verbose_header;
962 track_object_refs = 0;
966 if (list && !limited && max_count == 1 &&
967 !tag_objects && !tree_objects && !blob_objects) {
968 show_commit(list->item);
972 list = limit_list(list);
974 sort_in_topological_order(&list, lifo);
975 show_commit_list(list);
978 if (sort_list_in_merge_order(list, &process_commit)) {
979 die("merge order sort failed\n");
982 die("merge order sort unsupported, OpenSSL not linked");