11 #include "reflog-walk.h"
12 #include "patch-ids.h"
15 #include "string-list.h"
17 volatile show_early_output_fn_t show_early_output;
19 char *path_name(const struct name_path *path, const char *name)
21 const struct name_path *p;
23 int nlen = strlen(name);
26 for (p = path; p; p = p->up) {
28 len += p->elem_len + 1;
31 m = n + len - (nlen + 1);
33 for (p = path; p; p = p->up) {
36 memcpy(m, p->elem, p->elem_len);
43 void add_object(struct object *obj,
44 struct object_array *p,
45 struct name_path *path,
48 add_object_array(obj, path_name(path, name), p);
51 static void mark_blob_uninteresting(struct blob *blob)
55 if (blob->object.flags & UNINTERESTING)
57 blob->object.flags |= UNINTERESTING;
60 void mark_tree_uninteresting(struct tree *tree)
62 struct tree_desc desc;
63 struct name_entry entry;
64 struct object *obj = &tree->object;
68 if (obj->flags & UNINTERESTING)
70 obj->flags |= UNINTERESTING;
71 if (!has_sha1_file(obj->sha1))
73 if (parse_tree(tree) < 0)
74 die("bad tree %s", sha1_to_hex(obj->sha1));
76 init_tree_desc(&desc, tree->buffer, tree->size);
77 while (tree_entry(&desc, &entry)) {
78 switch (object_type(entry.mode)) {
80 mark_tree_uninteresting(lookup_tree(entry.sha1));
83 mark_blob_uninteresting(lookup_blob(entry.sha1));
86 /* Subproject commit - not in this repository */
92 * We don't care about the tree any more
93 * after it has been marked uninteresting.
99 void mark_parents_uninteresting(struct commit *commit)
101 struct commit_list *parents = commit->parents;
104 struct commit *commit = parents->item;
105 if (!(commit->object.flags & UNINTERESTING)) {
106 commit->object.flags |= UNINTERESTING;
109 * Normally we haven't parsed the parent
110 * yet, so we won't have a parent of a parent
111 * here. However, it may turn out that we've
112 * reached this commit some other way (where it
113 * wasn't uninteresting), in which case we need
114 * to mark its parents recursively too..
117 mark_parents_uninteresting(commit);
121 * A missing commit is ok iff its parent is marked
124 * We just mark such a thing parsed, so that when
125 * it is popped next time around, we won't be trying
126 * to parse it and get an error.
128 if (!has_sha1_file(commit->object.sha1))
129 commit->object.parsed = 1;
130 parents = parents->next;
134 static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
136 if (revs->no_walk && (obj->flags & UNINTERESTING))
138 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
139 struct strbuf buf = STRBUF_INIT;
140 int len = interpret_branch_name(name, &buf);
143 if (0 < len && name[len] && buf.len)
144 strbuf_addstr(&buf, name + len);
145 st = add_reflog_for_walk(revs->reflog_info,
146 (struct commit *)obj,
147 buf.buf[0] ? buf.buf: name);
148 strbuf_release(&buf);
152 add_object_array_with_mode(obj, name, &revs->pending, mode);
155 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
157 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
160 void add_head_to_pending(struct rev_info *revs)
162 unsigned char sha1[20];
164 if (get_sha1("HEAD", sha1))
166 obj = parse_object(sha1);
169 add_pending_object(revs, obj, "HEAD");
172 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
174 struct object *object;
176 object = parse_object(sha1);
178 die("bad object %s", name);
179 object->flags |= flags;
183 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
185 unsigned long flags = object->flags;
188 * Tag object? Look what it points to..
190 while (object->type == OBJ_TAG) {
191 struct tag *tag = (struct tag *) object;
192 if (revs->tag_objects && !(flags & UNINTERESTING))
193 add_pending_object(revs, object, tag->tag);
196 object = parse_object(tag->tagged->sha1);
198 if (flags & UNINTERESTING)
200 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
205 * Commit object? Just return it, we'll do all the complex
208 if (object->type == OBJ_COMMIT) {
209 struct commit *commit = (struct commit *)object;
210 if (parse_commit(commit) < 0)
211 die("unable to parse commit %s", name);
212 if (flags & UNINTERESTING) {
213 commit->object.flags |= UNINTERESTING;
214 mark_parents_uninteresting(commit);
217 if (revs->show_source && !commit->util)
218 commit->util = (void *) name;
223 * Tree object? Either mark it uninteresting, or add it
224 * to the list of objects to look at later..
226 if (object->type == OBJ_TREE) {
227 struct tree *tree = (struct tree *)object;
228 if (!revs->tree_objects)
230 if (flags & UNINTERESTING) {
231 mark_tree_uninteresting(tree);
234 add_pending_object(revs, object, "");
239 * Blob object? You know the drill by now..
241 if (object->type == OBJ_BLOB) {
242 struct blob *blob = (struct blob *)object;
243 if (!revs->blob_objects)
245 if (flags & UNINTERESTING) {
246 mark_blob_uninteresting(blob);
249 add_pending_object(revs, object, "");
252 die("%s is unknown object", name);
255 static int everybody_uninteresting(struct commit_list *orig)
257 struct commit_list *list = orig;
259 struct commit *commit = list->item;
261 if (commit->object.flags & UNINTERESTING)
269 * The goal is to get REV_TREE_NEW as the result only if the
270 * diff consists of all '+' (and no other changes), REV_TREE_OLD
271 * if the whole diff is removal of old data, and otherwise
272 * REV_TREE_DIFFERENT (of course if the trees are the same we
273 * want REV_TREE_SAME).
274 * That means that once we get to REV_TREE_DIFFERENT, we do not
275 * have to look any further.
277 static int tree_difference = REV_TREE_SAME;
279 static void file_add_remove(struct diff_options *options,
280 int addremove, unsigned mode,
281 const unsigned char *sha1,
282 const char *fullpath, unsigned dirty_submodule)
284 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
286 tree_difference |= diff;
287 if (tree_difference == REV_TREE_DIFFERENT)
288 DIFF_OPT_SET(options, HAS_CHANGES);
291 static void file_change(struct diff_options *options,
292 unsigned old_mode, unsigned new_mode,
293 const unsigned char *old_sha1,
294 const unsigned char *new_sha1,
295 const char *fullpath,
296 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
298 tree_difference = REV_TREE_DIFFERENT;
299 DIFF_OPT_SET(options, HAS_CHANGES);
302 static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
304 struct tree *t1 = parent->tree;
305 struct tree *t2 = commit->tree;
312 if (revs->simplify_by_decoration) {
314 * If we are simplifying by decoration, then the commit
315 * is worth showing if it has a tag pointing at it.
317 if (lookup_decoration(&name_decoration, &commit->object))
318 return REV_TREE_DIFFERENT;
320 * A commit that is not pointed by a tag is uninteresting
321 * if we are not limited by path. This means that you will
322 * see the usual "commits that touch the paths" plus any
323 * tagged commit by specifying both --simplify-by-decoration
326 if (!revs->prune_data)
327 return REV_TREE_SAME;
330 tree_difference = REV_TREE_SAME;
331 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
332 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
334 return REV_TREE_DIFFERENT;
335 return tree_difference;
338 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
343 struct tree_desc empty, real;
344 struct tree *t1 = commit->tree;
349 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
352 init_tree_desc(&real, tree, size);
353 init_tree_desc(&empty, "", 0);
355 tree_difference = REV_TREE_SAME;
356 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
357 retval = diff_tree(&empty, &real, "", &revs->pruning);
360 return retval >= 0 && (tree_difference == REV_TREE_SAME);
363 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
365 struct commit_list **pp, *parent;
366 int tree_changed = 0, tree_same = 0;
369 * If we don't do pruning, everything is interesting
377 if (!commit->parents) {
378 if (rev_same_tree_as_empty(revs, commit))
379 commit->object.flags |= TREESAME;
384 * Normal non-merge commit? If we don't want to make the
385 * history dense, we consider it always to be a change..
387 if (!revs->dense && !commit->parents->next)
390 pp = &commit->parents;
391 while ((parent = *pp) != NULL) {
392 struct commit *p = parent->item;
394 if (parse_commit(p) < 0)
395 die("cannot simplify commit %s (because of %s)",
396 sha1_to_hex(commit->object.sha1),
397 sha1_to_hex(p->object.sha1));
398 switch (rev_compare_tree(revs, p, commit)) {
401 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
402 /* Even if a merge with an uninteresting
403 * side branch brought the entire change
404 * we are interested in, we do not want
405 * to lose the other branches of this
406 * merge, so we just keep going.
412 commit->parents = parent;
413 commit->object.flags |= TREESAME;
417 if (revs->remove_empty_trees &&
418 rev_same_tree_as_empty(revs, p)) {
419 /* We are adding all the specified
420 * paths from this parent, so the
421 * history beyond this parent is not
422 * interesting. Remove its parents
423 * (they are grandparents for us).
424 * IOW, we pretend this parent is a
427 if (parse_commit(p) < 0)
428 die("cannot simplify commit %s (invalid %s)",
429 sha1_to_hex(commit->object.sha1),
430 sha1_to_hex(p->object.sha1));
435 case REV_TREE_DIFFERENT:
440 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
442 if (tree_changed && !tree_same)
444 commit->object.flags |= TREESAME;
447 static void insert_by_date_cached(struct commit *p, struct commit_list **head,
448 struct commit_list *cached_base, struct commit_list **cache)
450 struct commit_list *new_entry;
452 if (cached_base && p->date < cached_base->item->date)
453 new_entry = insert_by_date(p, &cached_base->next);
455 new_entry = insert_by_date(p, head);
457 if (cache && (!*cache || p->date < (*cache)->item->date))
461 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
462 struct commit_list **list, struct commit_list **cache_ptr)
464 struct commit_list *parent = commit->parents;
466 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
468 if (commit->object.flags & ADDED)
470 commit->object.flags |= ADDED;
473 * If the commit is uninteresting, don't try to
474 * prune parents - we want the maximal uninteresting
477 * Normally we haven't parsed the parent
478 * yet, so we won't have a parent of a parent
479 * here. However, it may turn out that we've
480 * reached this commit some other way (where it
481 * wasn't uninteresting), in which case we need
482 * to mark its parents recursively too..
484 if (commit->object.flags & UNINTERESTING) {
486 struct commit *p = parent->item;
487 parent = parent->next;
489 p->object.flags |= UNINTERESTING;
490 if (parse_commit(p) < 0)
493 mark_parents_uninteresting(p);
494 if (p->object.flags & SEEN)
496 p->object.flags |= SEEN;
497 insert_by_date_cached(p, list, cached_base, cache_ptr);
503 * Ok, the commit wasn't uninteresting. Try to
504 * simplify the commit history and find the parent
505 * that has no differences in the path set if one exists.
507 try_to_simplify_commit(revs, commit);
512 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
514 for (parent = commit->parents; parent; parent = parent->next) {
515 struct commit *p = parent->item;
517 if (parse_commit(p) < 0)
519 if (revs->show_source && !p->util)
520 p->util = commit->util;
521 p->object.flags |= left_flag;
522 if (!(p->object.flags & SEEN)) {
523 p->object.flags |= SEEN;
524 insert_by_date_cached(p, list, cached_base, cache_ptr);
526 if (revs->first_parent_only)
532 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
534 struct commit_list *p;
535 int left_count = 0, right_count = 0;
537 struct patch_ids ids;
539 /* First count the commits on the left and on the right */
540 for (p = list; p; p = p->next) {
541 struct commit *commit = p->item;
542 unsigned flags = commit->object.flags;
543 if (flags & BOUNDARY)
545 else if (flags & SYMMETRIC_LEFT)
551 if (!left_count || !right_count)
554 left_first = left_count < right_count;
555 init_patch_ids(&ids);
556 if (revs->diffopt.nr_paths) {
557 ids.diffopts.nr_paths = revs->diffopt.nr_paths;
558 ids.diffopts.paths = revs->diffopt.paths;
559 ids.diffopts.pathlens = revs->diffopt.pathlens;
562 /* Compute patch-ids for one side */
563 for (p = list; p; p = p->next) {
564 struct commit *commit = p->item;
565 unsigned flags = commit->object.flags;
567 if (flags & BOUNDARY)
570 * If we have fewer left, left_first is set and we omit
571 * commits on the right branch in this loop. If we have
572 * fewer right, we skip the left ones.
574 if (left_first != !!(flags & SYMMETRIC_LEFT))
576 commit->util = add_commit_patch_id(commit, &ids);
579 /* Check the other side */
580 for (p = list; p; p = p->next) {
581 struct commit *commit = p->item;
583 unsigned flags = commit->object.flags;
585 if (flags & BOUNDARY)
588 * If we have fewer left, left_first is set and we omit
589 * commits on the left branch in this loop.
591 if (left_first == !!(flags & SYMMETRIC_LEFT))
595 * Have we seen the same patch id?
597 id = has_commit_patch_id(commit, &ids);
601 commit->object.flags |= SHOWN;
604 /* Now check the original side for seen ones */
605 for (p = list; p; p = p->next) {
606 struct commit *commit = p->item;
607 struct patch_id *ent;
613 commit->object.flags |= SHOWN;
617 free_patch_ids(&ids);
620 /* How many extra uninteresting commits we want to see.. */
623 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
626 * No source list at all? We're definitely done..
632 * Does the destination list contain entries with a date
633 * before the source list? Definitely _not_ done.
635 if (date < src->item->date)
639 * Does the source list still have interesting commits in
640 * it? Definitely not done..
642 if (!everybody_uninteresting(src))
645 /* Ok, we're closing in.. */
649 static int limit_list(struct rev_info *revs)
652 unsigned long date = ~0ul;
653 struct commit_list *list = revs->commits;
654 struct commit_list *newlist = NULL;
655 struct commit_list **p = &newlist;
658 struct commit_list *entry = list;
659 struct commit *commit = list->item;
660 struct object *obj = &commit->object;
661 show_early_output_fn_t show;
666 if (revs->max_age != -1 && (commit->date < revs->max_age))
667 obj->flags |= UNINTERESTING;
668 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
670 if (obj->flags & UNINTERESTING) {
671 mark_parents_uninteresting(commit);
673 p = &commit_list_insert(commit, p)->next;
674 slop = still_interesting(list, date, slop);
677 /* If showing all, add the whole pending list to the end */
682 if (revs->min_age != -1 && (commit->date > revs->min_age))
685 p = &commit_list_insert(commit, p)->next;
687 show = show_early_output;
692 show_early_output = NULL;
694 if (revs->cherry_pick)
695 cherry_pick_list(newlist, revs);
697 revs->commits = newlist;
703 int warned_bad_reflog;
704 struct rev_info *all_revs;
705 const char *name_for_errormsg;
708 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
710 struct all_refs_cb *cb = cb_data;
711 struct object *object = get_reference(cb->all_revs, path, sha1,
713 add_pending_object(cb->all_revs, object, path);
717 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
721 cb->all_flags = flags;
724 static void handle_refs(struct rev_info *revs, unsigned flags,
725 int (*for_each)(each_ref_fn, void *))
727 struct all_refs_cb cb;
728 init_all_refs_cb(&cb, revs, flags);
729 for_each(handle_one_ref, &cb);
732 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
734 struct all_refs_cb *cb = cb_data;
735 if (!is_null_sha1(sha1)) {
736 struct object *o = parse_object(sha1);
738 o->flags |= cb->all_flags;
739 add_pending_object(cb->all_revs, o, "");
741 else if (!cb->warned_bad_reflog) {
742 warning("reflog of '%s' references pruned commits",
743 cb->name_for_errormsg);
744 cb->warned_bad_reflog = 1;
749 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
750 const char *email, unsigned long timestamp, int tz,
751 const char *message, void *cb_data)
753 handle_one_reflog_commit(osha1, cb_data);
754 handle_one_reflog_commit(nsha1, cb_data);
758 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
760 struct all_refs_cb *cb = cb_data;
761 cb->warned_bad_reflog = 0;
762 cb->name_for_errormsg = path;
763 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
767 static void handle_reflog(struct rev_info *revs, unsigned flags)
769 struct all_refs_cb cb;
771 cb.all_flags = flags;
772 for_each_reflog(handle_one_reflog, &cb);
775 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
777 unsigned char sha1[20];
779 struct commit *commit;
780 struct commit_list *parents;
783 flags ^= UNINTERESTING;
786 if (get_sha1(arg, sha1))
789 it = get_reference(revs, arg, sha1, 0);
790 if (it->type != OBJ_TAG)
792 if (!((struct tag*)it)->tagged)
794 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
796 if (it->type != OBJ_COMMIT)
798 commit = (struct commit *)it;
799 for (parents = commit->parents; parents; parents = parents->next) {
800 it = &parents->item->object;
802 add_pending_object(revs, it, arg);
807 void init_revisions(struct rev_info *revs, const char *prefix)
809 memset(revs, 0, sizeof(*revs));
811 revs->abbrev = DEFAULT_ABBREV;
812 revs->ignore_merges = 1;
813 revs->simplify_history = 1;
814 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
815 DIFF_OPT_SET(&revs->pruning, QUICK);
816 revs->pruning.add_remove = file_add_remove;
817 revs->pruning.change = file_change;
820 revs->prefix = prefix;
823 revs->skip_count = -1;
824 revs->max_count = -1;
826 revs->commit_format = CMIT_FMT_DEFAULT;
828 revs->grep_filter.status_only = 1;
829 revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
830 revs->grep_filter.header_tail = &(revs->grep_filter.header_list);
831 revs->grep_filter.regflags = REG_NEWLINE;
833 diff_setup(&revs->diffopt);
834 if (prefix && !revs->diffopt.prefix) {
835 revs->diffopt.prefix = prefix;
836 revs->diffopt.prefix_length = strlen(prefix);
840 static void add_pending_commit_list(struct rev_info *revs,
841 struct commit_list *commit_list,
844 while (commit_list) {
845 struct object *object = &commit_list->item->object;
846 object->flags |= flags;
847 add_pending_object(revs, object, sha1_to_hex(object->sha1));
848 commit_list = commit_list->next;
852 static void prepare_show_merge(struct rev_info *revs)
854 struct commit_list *bases;
855 struct commit *head, *other;
856 unsigned char sha1[20];
857 const char **prune = NULL;
858 int i, prune_num = 1; /* counting terminating NULL */
860 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
861 die("--merge without HEAD?");
862 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
863 die("--merge without MERGE_HEAD?");
864 add_pending_object(revs, &head->object, "HEAD");
865 add_pending_object(revs, &other->object, "MERGE_HEAD");
866 bases = get_merge_bases(head, other, 1);
867 add_pending_commit_list(revs, bases, UNINTERESTING);
868 free_commit_list(bases);
869 head->object.flags |= SYMMETRIC_LEFT;
873 for (i = 0; i < active_nr; i++) {
874 struct cache_entry *ce = active_cache[i];
877 if (ce_path_match(ce, revs->prune_data)) {
879 prune = xrealloc(prune, sizeof(*prune) * prune_num);
880 prune[prune_num-2] = ce->name;
881 prune[prune_num-1] = NULL;
883 while ((i+1 < active_nr) &&
884 ce_same_name(ce, active_cache[i+1]))
887 revs->prune_data = prune;
891 int handle_revision_arg(const char *arg, struct rev_info *revs,
893 int cant_be_filename)
897 struct object *object;
898 unsigned char sha1[20];
901 dotdot = strstr(arg, "..");
903 unsigned char from_sha1[20];
904 const char *next = dotdot + 2;
905 const char *this = arg;
906 int symmetric = *next == '.';
907 unsigned int flags_exclude = flags ^ UNINTERESTING;
916 if (!get_sha1(this, from_sha1) &&
917 !get_sha1(next, sha1)) {
918 struct commit *a, *b;
919 struct commit_list *exclude;
921 a = lookup_commit_reference(from_sha1);
922 b = lookup_commit_reference(sha1);
925 "Invalid symmetric difference expression %s...%s" :
926 "Invalid revision range %s..%s",
930 if (!cant_be_filename) {
932 verify_non_filename(revs->prefix, arg);
936 exclude = get_merge_bases(a, b, 1);
937 add_pending_commit_list(revs, exclude,
939 free_commit_list(exclude);
940 a->object.flags |= flags | SYMMETRIC_LEFT;
942 a->object.flags |= flags_exclude;
943 b->object.flags |= flags;
944 add_pending_object(revs, &a->object, this);
945 add_pending_object(revs, &b->object, next);
950 dotdot = strstr(arg, "^@");
951 if (dotdot && !dotdot[2]) {
953 if (add_parents_only(revs, arg, flags))
957 dotdot = strstr(arg, "^!");
958 if (dotdot && !dotdot[2]) {
960 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
966 local_flags = UNINTERESTING;
969 if (get_sha1_with_mode(arg, sha1, &mode))
971 if (!cant_be_filename)
972 verify_non_filename(revs->prefix, arg);
973 object = get_reference(revs, arg, sha1, flags ^ local_flags);
974 add_pending_object_with_mode(revs, object, arg, mode);
978 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb, const char ***prune_data)
980 const char **prune = *prune_data;
984 /* count existing ones */
988 for (prune_nr = 0; prune[prune_nr]; prune_nr++)
990 prune_alloc = prune_nr; /* not really, but we do not know */
992 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
994 if (len && sb->buf[len - 1] == '\n')
995 sb->buf[--len] = '\0';
996 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
997 prune[prune_nr++] = xstrdup(sb->buf);
1000 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1001 prune[prune_nr] = NULL;
1003 *prune_data = prune;
1006 static void read_revisions_from_stdin(struct rev_info *revs, const char ***prune)
1009 int seen_dashdash = 0;
1011 strbuf_init(&sb, 1000);
1012 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1014 if (len && sb.buf[len - 1] == '\n')
1015 sb.buf[--len] = '\0';
1018 if (sb.buf[0] == '-') {
1019 if (len == 2 && sb.buf[1] == '-') {
1023 die("options not supported in --stdin mode");
1025 if (handle_revision_arg(sb.buf, revs, 0, 1))
1026 die("bad revision '%s'", sb.buf);
1029 read_pathspec_from_stdin(revs, &sb, prune);
1030 strbuf_release(&sb);
1033 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1035 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1038 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1040 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1043 static void add_message_grep(struct rev_info *revs, const char *pattern)
1045 add_grep(revs, pattern, GREP_PATTERN_BODY);
1048 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1049 int *unkc, const char **unkv)
1051 const char *arg = argv[0];
1053 /* pseudo revision arguments */
1054 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1055 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1056 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1057 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1058 !strcmp(arg, "--bisect"))
1060 unkv[(*unkc)++] = arg;
1064 if (!prefixcmp(arg, "--max-count=")) {
1065 revs->max_count = atoi(arg + 12);
1067 } else if (!prefixcmp(arg, "--skip=")) {
1068 revs->skip_count = atoi(arg + 7);
1069 } else if ((*arg == '-') && isdigit(arg[1])) {
1070 /* accept -<digit>, like traditional "head" */
1071 revs->max_count = atoi(arg + 1);
1073 } else if (!strcmp(arg, "-n")) {
1075 return error("-n requires an argument");
1076 revs->max_count = atoi(argv[1]);
1079 } else if (!prefixcmp(arg, "-n")) {
1080 revs->max_count = atoi(arg + 2);
1082 } else if (!prefixcmp(arg, "--max-age=")) {
1083 revs->max_age = atoi(arg + 10);
1084 } else if (!prefixcmp(arg, "--since=")) {
1085 revs->max_age = approxidate(arg + 8);
1086 } else if (!prefixcmp(arg, "--after=")) {
1087 revs->max_age = approxidate(arg + 8);
1088 } else if (!prefixcmp(arg, "--min-age=")) {
1089 revs->min_age = atoi(arg + 10);
1090 } else if (!prefixcmp(arg, "--before=")) {
1091 revs->min_age = approxidate(arg + 9);
1092 } else if (!prefixcmp(arg, "--until=")) {
1093 revs->min_age = approxidate(arg + 8);
1094 } else if (!strcmp(arg, "--first-parent")) {
1095 revs->first_parent_only = 1;
1096 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1097 init_reflog_walk(&revs->reflog_info);
1098 } else if (!strcmp(arg, "--default")) {
1100 return error("bad --default argument");
1101 revs->def = argv[1];
1103 } else if (!strcmp(arg, "--merge")) {
1104 revs->show_merge = 1;
1105 } else if (!strcmp(arg, "--topo-order")) {
1107 revs->topo_order = 1;
1108 } else if (!strcmp(arg, "--simplify-merges")) {
1109 revs->simplify_merges = 1;
1110 revs->rewrite_parents = 1;
1111 revs->simplify_history = 0;
1113 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1114 revs->simplify_merges = 1;
1115 revs->rewrite_parents = 1;
1116 revs->simplify_history = 0;
1117 revs->simplify_by_decoration = 1;
1120 load_ref_decorations(DECORATE_SHORT_REFS);
1121 } else if (!strcmp(arg, "--date-order")) {
1123 revs->topo_order = 1;
1124 } else if (!prefixcmp(arg, "--early-output")) {
1128 count = atoi(arg+15);
1131 revs->topo_order = 1;
1132 revs->early_output = count;
1134 } else if (!strcmp(arg, "--parents")) {
1135 revs->rewrite_parents = 1;
1136 revs->print_parents = 1;
1137 } else if (!strcmp(arg, "--dense")) {
1139 } else if (!strcmp(arg, "--sparse")) {
1141 } else if (!strcmp(arg, "--show-all")) {
1143 } else if (!strcmp(arg, "--remove-empty")) {
1144 revs->remove_empty_trees = 1;
1145 } else if (!strcmp(arg, "--merges")) {
1146 revs->merges_only = 1;
1147 } else if (!strcmp(arg, "--no-merges")) {
1148 revs->no_merges = 1;
1149 } else if (!strcmp(arg, "--boundary")) {
1151 } else if (!strcmp(arg, "--left-right")) {
1152 revs->left_right = 1;
1153 } else if (!strcmp(arg, "--cherry-pick")) {
1154 revs->cherry_pick = 1;
1156 } else if (!strcmp(arg, "--objects")) {
1157 revs->tag_objects = 1;
1158 revs->tree_objects = 1;
1159 revs->blob_objects = 1;
1160 } else if (!strcmp(arg, "--objects-edge")) {
1161 revs->tag_objects = 1;
1162 revs->tree_objects = 1;
1163 revs->blob_objects = 1;
1164 revs->edge_hint = 1;
1165 } else if (!strcmp(arg, "--unpacked")) {
1167 } else if (!prefixcmp(arg, "--unpacked=")) {
1168 die("--unpacked=<packfile> no longer supported.");
1169 } else if (!strcmp(arg, "-r")) {
1171 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1172 } else if (!strcmp(arg, "-t")) {
1174 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1175 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1176 } else if (!strcmp(arg, "-m")) {
1177 revs->ignore_merges = 0;
1178 } else if (!strcmp(arg, "-c")) {
1180 revs->dense_combined_merges = 0;
1181 revs->combine_merges = 1;
1182 } else if (!strcmp(arg, "--cc")) {
1184 revs->dense_combined_merges = 1;
1185 revs->combine_merges = 1;
1186 } else if (!strcmp(arg, "-v")) {
1187 revs->verbose_header = 1;
1188 } else if (!strcmp(arg, "--pretty")) {
1189 revs->verbose_header = 1;
1190 revs->pretty_given = 1;
1191 get_commit_format(arg+8, revs);
1192 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
1193 revs->verbose_header = 1;
1194 revs->pretty_given = 1;
1195 get_commit_format(arg+9, revs);
1196 } else if (!strcmp(arg, "--show-notes")) {
1197 revs->show_notes = 1;
1198 revs->show_notes_given = 1;
1199 } else if (!prefixcmp(arg, "--show-notes=")) {
1200 struct strbuf buf = STRBUF_INIT;
1201 revs->show_notes = 1;
1202 revs->show_notes_given = 1;
1203 if (!revs->notes_opt.extra_notes_refs)
1204 revs->notes_opt.extra_notes_refs = xcalloc(1, sizeof(struct string_list));
1205 if (!prefixcmp(arg+13, "refs/"))
1207 else if (!prefixcmp(arg+13, "notes/"))
1208 strbuf_addstr(&buf, "refs/");
1210 strbuf_addstr(&buf, "refs/notes/");
1211 strbuf_addstr(&buf, arg+13);
1212 string_list_append(strbuf_detach(&buf, NULL),
1213 revs->notes_opt.extra_notes_refs);
1214 } else if (!strcmp(arg, "--no-notes")) {
1215 revs->show_notes = 0;
1216 revs->show_notes_given = 1;
1217 } else if (!strcmp(arg, "--standard-notes")) {
1218 revs->show_notes_given = 1;
1219 revs->notes_opt.suppress_default_notes = 0;
1220 } else if (!strcmp(arg, "--no-standard-notes")) {
1221 revs->notes_opt.suppress_default_notes = 1;
1222 } else if (!strcmp(arg, "--oneline")) {
1223 revs->verbose_header = 1;
1224 get_commit_format("oneline", revs);
1225 revs->pretty_given = 1;
1226 revs->abbrev_commit = 1;
1227 } else if (!strcmp(arg, "--graph")) {
1228 revs->topo_order = 1;
1229 revs->rewrite_parents = 1;
1230 revs->graph = graph_init(revs);
1231 } else if (!strcmp(arg, "--root")) {
1232 revs->show_root_diff = 1;
1233 } else if (!strcmp(arg, "--no-commit-id")) {
1234 revs->no_commit_id = 1;
1235 } else if (!strcmp(arg, "--always")) {
1236 revs->always_show_header = 1;
1237 } else if (!strcmp(arg, "--no-abbrev")) {
1239 } else if (!strcmp(arg, "--abbrev")) {
1240 revs->abbrev = DEFAULT_ABBREV;
1241 } else if (!prefixcmp(arg, "--abbrev=")) {
1242 revs->abbrev = strtoul(arg + 9, NULL, 10);
1243 if (revs->abbrev < MINIMUM_ABBREV)
1244 revs->abbrev = MINIMUM_ABBREV;
1245 else if (revs->abbrev > 40)
1247 } else if (!strcmp(arg, "--abbrev-commit")) {
1248 revs->abbrev_commit = 1;
1249 } else if (!strcmp(arg, "--full-diff")) {
1251 revs->full_diff = 1;
1252 } else if (!strcmp(arg, "--full-history")) {
1253 revs->simplify_history = 0;
1254 } else if (!strcmp(arg, "--relative-date")) {
1255 revs->date_mode = DATE_RELATIVE;
1256 revs->date_mode_explicit = 1;
1257 } else if (!strncmp(arg, "--date=", 7)) {
1258 revs->date_mode = parse_date_format(arg + 7);
1259 revs->date_mode_explicit = 1;
1260 } else if (!strcmp(arg, "--log-size")) {
1261 revs->show_log_size = 1;
1264 * Grepping the commit log
1266 else if (!prefixcmp(arg, "--author=")) {
1267 add_header_grep(revs, GREP_HEADER_AUTHOR, arg+9);
1268 } else if (!prefixcmp(arg, "--committer=")) {
1269 add_header_grep(revs, GREP_HEADER_COMMITTER, arg+12);
1270 } else if (!prefixcmp(arg, "--grep=")) {
1271 add_message_grep(revs, arg+7);
1272 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1273 revs->grep_filter.regflags |= REG_EXTENDED;
1274 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1275 revs->grep_filter.regflags |= REG_ICASE;
1276 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1277 revs->grep_filter.fixed = 1;
1278 } else if (!strcmp(arg, "--all-match")) {
1279 revs->grep_filter.all_match = 1;
1280 } else if (!prefixcmp(arg, "--encoding=")) {
1282 if (strcmp(arg, "none"))
1283 git_log_output_encoding = xstrdup(arg);
1285 git_log_output_encoding = "";
1286 } else if (!strcmp(arg, "--reverse")) {
1288 } else if (!strcmp(arg, "--children")) {
1289 revs->children.name = "children";
1292 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1294 unkv[(*unkc)++] = arg;
1301 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1302 const struct option *options,
1303 const char * const usagestr[])
1305 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1306 &ctx->cpidx, ctx->out);
1308 error("unknown option `%s'", ctx->argv[0]);
1309 usage_with_options(usagestr, options);
1315 static int for_each_bad_bisect_ref(each_ref_fn fn, void *cb_data)
1317 return for_each_ref_in("refs/bisect/bad", fn, cb_data);
1320 static int for_each_good_bisect_ref(each_ref_fn fn, void *cb_data)
1322 return for_each_ref_in("refs/bisect/good", fn, cb_data);
1325 static void append_prune_data(const char ***prune_data, const char **av)
1327 const char **prune = *prune_data;
1336 /* count existing ones */
1337 for (prune_nr = 0; prune[prune_nr]; prune_nr++)
1339 prune_alloc = prune_nr; /* not really, but we do not know */
1342 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1343 prune[prune_nr++] = *av;
1347 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1348 prune[prune_nr] = NULL;
1350 *prune_data = prune;
1354 * Parse revision information, filling in the "rev_info" structure,
1355 * and removing the used arguments from the argument list.
1357 * Returns the number of arguments left that weren't recognized
1358 * (which are also moved to the head of the argument list)
1360 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
1362 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
1363 const char **prune_data = NULL;
1365 /* First, search for "--" */
1367 for (i = 1; i < argc; i++) {
1368 const char *arg = argv[i];
1369 if (strcmp(arg, "--"))
1374 prune_data = argv + i + 1;
1379 /* Second, deal with arguments and options */
1381 read_from_stdin = 0;
1382 for (left = i = 1; i < argc; i++) {
1383 const char *arg = argv[i];
1387 if (!strcmp(arg, "--all")) {
1388 handle_refs(revs, flags, for_each_ref);
1389 handle_refs(revs, flags, head_ref);
1392 if (!strcmp(arg, "--branches")) {
1393 handle_refs(revs, flags, for_each_branch_ref);
1396 if (!strcmp(arg, "--bisect")) {
1397 handle_refs(revs, flags, for_each_bad_bisect_ref);
1398 handle_refs(revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);
1402 if (!strcmp(arg, "--tags")) {
1403 handle_refs(revs, flags, for_each_tag_ref);
1406 if (!strcmp(arg, "--remotes")) {
1407 handle_refs(revs, flags, for_each_remote_ref);
1410 if (!prefixcmp(arg, "--glob=")) {
1411 struct all_refs_cb cb;
1412 init_all_refs_cb(&cb, revs, flags);
1413 for_each_glob_ref(handle_one_ref, arg + 7, &cb);
1416 if (!prefixcmp(arg, "--branches=")) {
1417 struct all_refs_cb cb;
1418 init_all_refs_cb(&cb, revs, flags);
1419 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
1422 if (!prefixcmp(arg, "--tags=")) {
1423 struct all_refs_cb cb;
1424 init_all_refs_cb(&cb, revs, flags);
1425 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
1428 if (!prefixcmp(arg, "--remotes=")) {
1429 struct all_refs_cb cb;
1430 init_all_refs_cb(&cb, revs, flags);
1431 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
1434 if (!strcmp(arg, "--reflog")) {
1435 handle_reflog(revs, flags);
1438 if (!strcmp(arg, "--not")) {
1439 flags ^= UNINTERESTING;
1442 if (!strcmp(arg, "--no-walk")) {
1446 if (!strcmp(arg, "--do-walk")) {
1450 if (!strcmp(arg, "--stdin")) {
1451 if (revs->disable_stdin) {
1455 if (read_from_stdin++)
1456 die("--stdin given twice?");
1457 read_revisions_from_stdin(revs, &prune_data);
1461 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1471 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1473 if (seen_dashdash || *arg == '^')
1474 die("bad revision '%s'", arg);
1476 /* If we didn't have a "--":
1477 * (1) all filenames must exist;
1478 * (2) all rev-args must not be interpretable
1479 * as a valid filename.
1480 * but the latter we have checked in the main loop.
1482 for (j = i; j < argc; j++)
1483 verify_filename(revs->prefix, argv[j]);
1485 append_prune_data(&prune_data, argv + i);
1493 revs->prune_data = get_pathspec(revs->prefix, prune_data);
1495 if (revs->def == NULL)
1496 revs->def = opt ? opt->def : NULL;
1497 if (opt && opt->tweak)
1498 opt->tweak(revs, opt);
1499 if (revs->show_merge)
1500 prepare_show_merge(revs);
1501 if (revs->def && !revs->pending.nr && !got_rev_arg) {
1502 unsigned char sha1[20];
1503 struct object *object;
1505 if (get_sha1_with_mode(revs->def, sha1, &mode))
1506 die("bad default revision '%s'", revs->def);
1507 object = get_reference(revs, revs->def, sha1, 0);
1508 add_pending_object_with_mode(revs, object, revs->def, mode);
1511 /* Did the user ask for any diff output? Run the diff! */
1512 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1515 /* Pickaxe, diff-filter and rename following need diffs */
1516 if (revs->diffopt.pickaxe ||
1517 revs->diffopt.filter ||
1518 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1521 if (revs->topo_order)
1524 if (revs->prune_data) {
1525 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1526 /* Can't prune commits with rename following: the paths change.. */
1527 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1529 if (!revs->full_diff)
1530 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1532 if (revs->combine_merges)
1533 revs->ignore_merges = 0;
1534 revs->diffopt.abbrev = revs->abbrev;
1535 if (diff_setup_done(&revs->diffopt) < 0)
1536 die("diff_setup_done failed");
1538 compile_grep_patterns(&revs->grep_filter);
1540 if (revs->reverse && revs->reflog_info)
1541 die("cannot combine --reverse with --walk-reflogs");
1542 if (revs->rewrite_parents && revs->children.name)
1543 die("cannot combine --parents and --children");
1546 * Limitations on the graph functionality
1548 if (revs->reverse && revs->graph)
1549 die("cannot combine --reverse with --graph");
1551 if (revs->reflog_info && revs->graph)
1552 die("cannot combine --walk-reflogs with --graph");
1557 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1559 struct commit_list *l = xcalloc(1, sizeof(*l));
1562 l->next = add_decoration(&revs->children, &parent->object, l);
1565 static int remove_duplicate_parents(struct commit *commit)
1567 struct commit_list **pp, *p;
1568 int surviving_parents;
1570 /* Examine existing parents while marking ones we have seen... */
1571 pp = &commit->parents;
1572 while ((p = *pp) != NULL) {
1573 struct commit *parent = p->item;
1574 if (parent->object.flags & TMP_MARK) {
1578 parent->object.flags |= TMP_MARK;
1581 /* count them while clearing the temporary mark */
1582 surviving_parents = 0;
1583 for (p = commit->parents; p; p = p->next) {
1584 p->item->object.flags &= ~TMP_MARK;
1585 surviving_parents++;
1587 return surviving_parents;
1590 struct merge_simplify_state {
1591 struct commit *simplified;
1594 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1596 struct merge_simplify_state *st;
1598 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1600 st = xcalloc(1, sizeof(*st));
1601 add_decoration(&revs->merge_simplification, &commit->object, st);
1606 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1608 struct commit_list *p;
1609 struct merge_simplify_state *st, *pst;
1612 st = locate_simplify_state(revs, commit);
1615 * Have we handled this one?
1621 * An UNINTERESTING commit simplifies to itself, so does a
1622 * root commit. We do not rewrite parents of such commit
1625 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
1626 st->simplified = commit;
1631 * Do we know what commit all of our parents should be rewritten to?
1632 * Otherwise we are not ready to rewrite this one yet.
1634 for (cnt = 0, p = commit->parents; p; p = p->next) {
1635 pst = locate_simplify_state(revs, p->item);
1636 if (!pst->simplified) {
1637 tail = &commit_list_insert(p->item, tail)->next;
1642 tail = &commit_list_insert(commit, tail)->next;
1647 * Rewrite our list of parents.
1649 for (p = commit->parents; p; p = p->next) {
1650 pst = locate_simplify_state(revs, p->item);
1651 p->item = pst->simplified;
1653 cnt = remove_duplicate_parents(commit);
1656 * It is possible that we are a merge and one side branch
1657 * does not have any commit that touches the given paths;
1658 * in such a case, the immediate parents will be rewritten
1659 * to different commits.
1661 * o----X X: the commit we are looking at;
1662 * / / o: a commit that touches the paths;
1665 * Further reduce the parents by removing redundant parents.
1668 struct commit_list *h = reduce_heads(commit->parents);
1669 cnt = commit_list_count(h);
1670 free_commit_list(commit->parents);
1671 commit->parents = h;
1675 * A commit simplifies to itself if it is a root, if it is
1676 * UNINTERESTING, if it touches the given paths, or if it is a
1677 * merge and its parents simplifies to more than one commits
1678 * (the first two cases are already handled at the beginning of
1681 * Otherwise, it simplifies to what its sole parent simplifies to.
1684 (commit->object.flags & UNINTERESTING) ||
1685 !(commit->object.flags & TREESAME) ||
1687 st->simplified = commit;
1689 pst = locate_simplify_state(revs, commit->parents->item);
1690 st->simplified = pst->simplified;
1695 static void simplify_merges(struct rev_info *revs)
1697 struct commit_list *list;
1698 struct commit_list *yet_to_do, **tail;
1700 if (!revs->topo_order)
1701 sort_in_topological_order(&revs->commits, revs->lifo);
1705 /* feed the list reversed */
1707 for (list = revs->commits; list; list = list->next)
1708 commit_list_insert(list->item, &yet_to_do);
1714 struct commit *commit = list->item;
1715 struct commit_list *next = list->next;
1718 tail = simplify_one(revs, commit, tail);
1722 /* clean up the result, removing the simplified ones */
1723 list = revs->commits;
1724 revs->commits = NULL;
1725 tail = &revs->commits;
1727 struct commit *commit = list->item;
1728 struct commit_list *next = list->next;
1729 struct merge_simplify_state *st;
1732 st = locate_simplify_state(revs, commit);
1733 if (st->simplified == commit)
1734 tail = &commit_list_insert(commit, tail)->next;
1738 static void set_children(struct rev_info *revs)
1740 struct commit_list *l;
1741 for (l = revs->commits; l; l = l->next) {
1742 struct commit *commit = l->item;
1743 struct commit_list *p;
1745 for (p = commit->parents; p; p = p->next)
1746 add_child(revs, p->item, commit);
1750 int prepare_revision_walk(struct rev_info *revs)
1752 int nr = revs->pending.nr;
1753 struct object_array_entry *e, *list;
1755 e = list = revs->pending.objects;
1756 revs->pending.nr = 0;
1757 revs->pending.alloc = 0;
1758 revs->pending.objects = NULL;
1760 struct commit *commit = handle_commit(revs, e->item, e->name);
1762 if (!(commit->object.flags & SEEN)) {
1763 commit->object.flags |= SEEN;
1764 insert_by_date(commit, &revs->commits);
1774 if (limit_list(revs) < 0)
1776 if (revs->topo_order)
1777 sort_in_topological_order(&revs->commits, revs->lifo);
1778 if (revs->simplify_merges)
1779 simplify_merges(revs);
1780 if (revs->children.name)
1785 enum rewrite_result {
1787 rewrite_one_noparents,
1791 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
1793 struct commit_list *cache = NULL;
1796 struct commit *p = *pp;
1798 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
1799 return rewrite_one_error;
1800 if (p->parents && p->parents->next)
1801 return rewrite_one_ok;
1802 if (p->object.flags & UNINTERESTING)
1803 return rewrite_one_ok;
1804 if (!(p->object.flags & TREESAME))
1805 return rewrite_one_ok;
1807 return rewrite_one_noparents;
1808 *pp = p->parents->item;
1812 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
1814 struct commit_list **pp = &commit->parents;
1816 struct commit_list *parent = *pp;
1817 switch (rewrite_one(revs, &parent->item)) {
1818 case rewrite_one_ok:
1820 case rewrite_one_noparents:
1823 case rewrite_one_error:
1828 remove_duplicate_parents(commit);
1832 static int commit_match(struct commit *commit, struct rev_info *opt)
1834 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
1836 return grep_buffer(&opt->grep_filter,
1837 NULL, /* we say nothing, not even filename */
1838 commit->buffer, strlen(commit->buffer));
1841 static inline int want_ancestry(struct rev_info *revs)
1843 return (revs->rewrite_parents || revs->children.name);
1846 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
1848 if (commit->object.flags & SHOWN)
1849 return commit_ignore;
1850 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
1851 return commit_ignore;
1854 if (commit->object.flags & UNINTERESTING)
1855 return commit_ignore;
1856 if (revs->min_age != -1 && (commit->date > revs->min_age))
1857 return commit_ignore;
1858 if (revs->no_merges && commit->parents && commit->parents->next)
1859 return commit_ignore;
1860 if (revs->merges_only && !(commit->parents && commit->parents->next))
1861 return commit_ignore;
1862 if (!commit_match(commit, revs))
1863 return commit_ignore;
1864 if (revs->prune && revs->dense) {
1865 /* Commit without changes? */
1866 if (commit->object.flags & TREESAME) {
1867 /* drop merges unless we want parenthood */
1868 if (!want_ancestry(revs))
1869 return commit_ignore;
1870 /* non-merge - always ignore it */
1871 if (!commit->parents || !commit->parents->next)
1872 return commit_ignore;
1878 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1880 enum commit_action action = get_commit_action(revs, commit);
1882 if (action == commit_show &&
1884 revs->prune && revs->dense && want_ancestry(revs)) {
1885 if (rewrite_parents(revs, commit) < 0)
1886 return commit_error;
1891 static struct commit *get_revision_1(struct rev_info *revs)
1897 struct commit_list *entry = revs->commits;
1898 struct commit *commit = entry->item;
1900 revs->commits = entry->next;
1903 if (revs->reflog_info)
1904 fake_reflog_parent(revs->reflog_info, commit);
1907 * If we haven't done the list limiting, we need to look at
1908 * the parents here. We also need to do the date-based limiting
1909 * that we'd otherwise have done in limit_list().
1911 if (!revs->limited) {
1912 if (revs->max_age != -1 &&
1913 (commit->date < revs->max_age))
1915 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
1916 die("Failed to traverse parents of commit %s",
1917 sha1_to_hex(commit->object.sha1));
1920 switch (simplify_commit(revs, commit)) {
1924 die("Failed to simplify parents of commit %s",
1925 sha1_to_hex(commit->object.sha1));
1929 } while (revs->commits);
1933 static void gc_boundary(struct object_array *array)
1935 unsigned nr = array->nr;
1936 unsigned alloc = array->alloc;
1937 struct object_array_entry *objects = array->objects;
1941 for (i = j = 0; i < nr; i++) {
1942 if (objects[i].item->flags & SHOWN)
1945 objects[j] = objects[i];
1948 for (i = j; i < nr; i++)
1949 objects[i].item = NULL;
1954 static void create_boundary_commit_list(struct rev_info *revs)
1958 struct object_array *array = &revs->boundary_commits;
1959 struct object_array_entry *objects = array->objects;
1962 * If revs->commits is non-NULL at this point, an error occurred in
1963 * get_revision_1(). Ignore the error and continue printing the
1964 * boundary commits anyway. (This is what the code has always
1967 if (revs->commits) {
1968 free_commit_list(revs->commits);
1969 revs->commits = NULL;
1973 * Put all of the actual boundary commits from revs->boundary_commits
1974 * into revs->commits
1976 for (i = 0; i < array->nr; i++) {
1977 c = (struct commit *)(objects[i].item);
1980 if (!(c->object.flags & CHILD_SHOWN))
1982 if (c->object.flags & (SHOWN | BOUNDARY))
1984 c->object.flags |= BOUNDARY;
1985 commit_list_insert(c, &revs->commits);
1989 * If revs->topo_order is set, sort the boundary commits
1990 * in topological order
1992 sort_in_topological_order(&revs->commits, revs->lifo);
1995 static struct commit *get_revision_internal(struct rev_info *revs)
1997 struct commit *c = NULL;
1998 struct commit_list *l;
2000 if (revs->boundary == 2) {
2002 * All of the normal commits have already been returned,
2003 * and we are now returning boundary commits.
2004 * create_boundary_commit_list() has populated
2005 * revs->commits with the remaining commits to return.
2007 c = pop_commit(&revs->commits);
2009 c->object.flags |= SHOWN;
2014 * Now pick up what they want to give us
2016 c = get_revision_1(revs);
2018 while (0 < revs->skip_count) {
2020 c = get_revision_1(revs);
2027 * Check the max_count.
2029 switch (revs->max_count) {
2040 c->object.flags |= SHOWN;
2042 if (!revs->boundary) {
2048 * get_revision_1() runs out the commits, and
2049 * we are done computing the boundaries.
2050 * switch to boundary commits output mode.
2055 * Update revs->commits to contain the list of
2058 create_boundary_commit_list(revs);
2060 return get_revision_internal(revs);
2064 * boundary commits are the commits that are parents of the
2065 * ones we got from get_revision_1() but they themselves are
2066 * not returned from get_revision_1(). Before returning
2067 * 'c', we need to mark its parents that they could be boundaries.
2070 for (l = c->parents; l; l = l->next) {
2072 p = &(l->item->object);
2073 if (p->flags & (CHILD_SHOWN | SHOWN))
2075 p->flags |= CHILD_SHOWN;
2076 gc_boundary(&revs->boundary_commits);
2077 add_object_array(p, NULL, &revs->boundary_commits);
2083 struct commit *get_revision(struct rev_info *revs)
2086 struct commit_list *reversed;
2088 if (revs->reverse) {
2090 while ((c = get_revision_internal(revs))) {
2091 commit_list_insert(c, &reversed);
2093 revs->commits = reversed;
2095 revs->reverse_output_stage = 1;
2098 if (revs->reverse_output_stage)
2099 return pop_commit(&revs->commits);
2101 c = get_revision_internal(revs);
2102 if (c && revs->graph)
2103 graph_update(revs->graph, c);