11 #include "reflog-walk.h"
12 #include "patch-ids.h"
15 #include "string-list.h"
18 #include "commit-slab.h"
20 volatile show_early_output_fn_t show_early_output;
22 char *path_name(const struct name_path *path, const char *name)
24 const struct name_path *p;
26 int nlen = strlen(name);
29 for (p = path; p; p = p->up) {
31 len += p->elem_len + 1;
34 m = n + len - (nlen + 1);
36 for (p = path; p; p = p->up) {
39 memcpy(m, p->elem, p->elem_len);
46 static int show_path_component_truncated(FILE *out, const char *name, int len)
49 for (cnt = 0; cnt < len; cnt++) {
51 if (!ch || ch == '\n')
58 static int show_path_truncated(FILE *out, const struct name_path *path)
64 emitted = show_path_truncated(out, path->up);
69 ours = show_path_component_truncated(out, path->elem, path->elem_len);
72 return ours || emitted;
75 void show_object_with_name(FILE *out, struct object *obj,
76 const struct name_path *path, const char *component)
78 struct name_path leaf;
79 leaf.up = (struct name_path *)path;
80 leaf.elem = component;
81 leaf.elem_len = strlen(component);
83 fprintf(out, "%s ", sha1_to_hex(obj->sha1));
84 show_path_truncated(out, &leaf);
88 void add_object(struct object *obj,
89 struct object_array *p,
90 struct name_path *path,
93 char *pn = path_name(path, name);
94 add_object_array(obj, pn, p);
98 static void mark_blob_uninteresting(struct blob *blob)
102 if (blob->object.flags & UNINTERESTING)
104 blob->object.flags |= UNINTERESTING;
107 void mark_tree_uninteresting(struct tree *tree)
109 struct tree_desc desc;
110 struct name_entry entry;
111 struct object *obj = &tree->object;
115 if (obj->flags & UNINTERESTING)
117 obj->flags |= UNINTERESTING;
118 if (!has_sha1_file(obj->sha1))
120 if (parse_tree(tree) < 0)
121 die("bad tree %s", sha1_to_hex(obj->sha1));
123 init_tree_desc(&desc, tree->buffer, tree->size);
124 while (tree_entry(&desc, &entry)) {
125 switch (object_type(entry.mode)) {
127 mark_tree_uninteresting(lookup_tree(entry.sha1));
130 mark_blob_uninteresting(lookup_blob(entry.sha1));
133 /* Subproject commit - not in this repository */
139 * We don't care about the tree any more
140 * after it has been marked uninteresting.
142 free_tree_buffer(tree);
145 void mark_parents_uninteresting(struct commit *commit)
147 struct commit_list *parents = NULL, *l;
149 for (l = commit->parents; l; l = l->next)
150 commit_list_insert(l->item, &parents);
153 struct commit *commit = parents->item;
155 parents = parents->next;
160 * A missing commit is ok iff its parent is marked
163 * We just mark such a thing parsed, so that when
164 * it is popped next time around, we won't be trying
165 * to parse it and get an error.
167 if (!has_sha1_file(commit->object.sha1))
168 commit->object.parsed = 1;
170 if (commit->object.flags & UNINTERESTING)
173 commit->object.flags |= UNINTERESTING;
176 * Normally we haven't parsed the parent
177 * yet, so we won't have a parent of a parent
178 * here. However, it may turn out that we've
179 * reached this commit some other way (where it
180 * wasn't uninteresting), in which case we need
181 * to mark its parents recursively too..
183 if (!commit->parents)
186 for (l = commit->parents->next; l; l = l->next)
187 commit_list_insert(l->item, &parents);
188 commit = commit->parents->item;
193 static void add_pending_object_with_mode(struct rev_info *revs,
195 const char *name, unsigned mode)
199 if (revs->no_walk && (obj->flags & UNINTERESTING))
201 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
202 struct strbuf buf = STRBUF_INIT;
203 int len = interpret_branch_name(name, 0, &buf);
206 if (0 < len && name[len] && buf.len)
207 strbuf_addstr(&buf, name + len);
208 st = add_reflog_for_walk(revs->reflog_info,
209 (struct commit *)obj,
210 buf.buf[0] ? buf.buf: name);
211 strbuf_release(&buf);
215 add_object_array_with_mode(obj, name, &revs->pending, mode);
218 void add_pending_object(struct rev_info *revs,
219 struct object *obj, const char *name)
221 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
224 void add_head_to_pending(struct rev_info *revs)
226 unsigned char sha1[20];
228 if (get_sha1("HEAD", sha1))
230 obj = parse_object(sha1);
233 add_pending_object(revs, obj, "HEAD");
236 static struct object *get_reference(struct rev_info *revs, const char *name,
237 const unsigned char *sha1,
240 struct object *object;
242 object = parse_object(sha1);
244 if (revs->ignore_missing)
246 die("bad object %s", name);
248 object->flags |= flags;
252 void add_pending_sha1(struct rev_info *revs, const char *name,
253 const unsigned char *sha1, unsigned int flags)
255 struct object *object = get_reference(revs, name, sha1, flags);
256 add_pending_object(revs, object, name);
259 static struct commit *handle_commit(struct rev_info *revs,
260 struct object *object, const char *name)
262 unsigned long flags = object->flags;
265 * Tag object? Look what it points to..
267 while (object->type == OBJ_TAG) {
268 struct tag *tag = (struct tag *) object;
269 if (revs->tag_objects && !(flags & UNINTERESTING))
270 add_pending_object(revs, object, tag->tag);
273 object = parse_object(tag->tagged->sha1);
275 if (flags & UNINTERESTING)
277 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
282 * Commit object? Just return it, we'll do all the complex
285 if (object->type == OBJ_COMMIT) {
286 struct commit *commit = (struct commit *)object;
287 if (parse_commit(commit) < 0)
288 die("unable to parse commit %s", name);
289 if (flags & UNINTERESTING) {
290 commit->object.flags |= UNINTERESTING;
291 mark_parents_uninteresting(commit);
294 if (revs->show_source && !commit->util)
295 commit->util = (void *) name;
300 * Tree object? Either mark it uninteresting, or add it
301 * to the list of objects to look at later..
303 if (object->type == OBJ_TREE) {
304 struct tree *tree = (struct tree *)object;
305 if (!revs->tree_objects)
307 if (flags & UNINTERESTING) {
308 mark_tree_uninteresting(tree);
311 add_pending_object(revs, object, "");
316 * Blob object? You know the drill by now..
318 if (object->type == OBJ_BLOB) {
319 struct blob *blob = (struct blob *)object;
320 if (!revs->blob_objects)
322 if (flags & UNINTERESTING) {
323 mark_blob_uninteresting(blob);
326 add_pending_object(revs, object, "");
329 die("%s is unknown object", name);
332 static int everybody_uninteresting(struct commit_list *orig)
334 struct commit_list *list = orig;
336 struct commit *commit = list->item;
338 if (commit->object.flags & UNINTERESTING)
346 * A definition of "relevant" commit that we can use to simplify limited graphs
347 * by eliminating side branches.
349 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
350 * in our list), or that is a specified BOTTOM commit. Then after computing
351 * a limited list, during processing we can generally ignore boundary merges
352 * coming from outside the graph, (ie from irrelevant parents), and treat
353 * those merges as if they were single-parent. TREESAME is defined to consider
354 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
355 * we don't care if we were !TREESAME to non-graph parents.
357 * Treating bottom commits as relevant ensures that a limited graph's
358 * connection to the actual bottom commit is not viewed as a side branch, but
359 * treated as part of the graph. For example:
361 * ....Z...A---X---o---o---B
365 * When computing "A..B", the A-X connection is at least as important as
366 * Y-X, despite A being flagged UNINTERESTING.
368 * And when computing --ancestry-path "A..B", the A-X connection is more
369 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
371 static inline int relevant_commit(struct commit *commit)
373 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
377 * Return a single relevant commit from a parent list. If we are a TREESAME
378 * commit, and this selects one of our parents, then we can safely simplify to
381 static struct commit *one_relevant_parent(const struct rev_info *revs,
382 struct commit_list *orig)
384 struct commit_list *list = orig;
385 struct commit *relevant = NULL;
391 * For 1-parent commits, or if first-parent-only, then return that
392 * first parent (even if not "relevant" by the above definition).
393 * TREESAME will have been set purely on that parent.
395 if (revs->first_parent_only || !orig->next)
399 * For multi-parent commits, identify a sole relevant parent, if any.
400 * If we have only one relevant parent, then TREESAME will be set purely
401 * with regard to that parent, and we can simplify accordingly.
403 * If we have more than one relevant parent, or no relevant parents
404 * (and multiple irrelevant ones), then we can't select a parent here
408 struct commit *commit = list->item;
410 if (relevant_commit(commit)) {
420 * The goal is to get REV_TREE_NEW as the result only if the
421 * diff consists of all '+' (and no other changes), REV_TREE_OLD
422 * if the whole diff is removal of old data, and otherwise
423 * REV_TREE_DIFFERENT (of course if the trees are the same we
424 * want REV_TREE_SAME).
425 * That means that once we get to REV_TREE_DIFFERENT, we do not
426 * have to look any further.
428 static int tree_difference = REV_TREE_SAME;
430 static void file_add_remove(struct diff_options *options,
431 int addremove, unsigned mode,
432 const unsigned char *sha1,
434 const char *fullpath, unsigned dirty_submodule)
436 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
438 tree_difference |= diff;
439 if (tree_difference == REV_TREE_DIFFERENT)
440 DIFF_OPT_SET(options, HAS_CHANGES);
443 static void file_change(struct diff_options *options,
444 unsigned old_mode, unsigned new_mode,
445 const unsigned char *old_sha1,
446 const unsigned char *new_sha1,
447 int old_sha1_valid, int new_sha1_valid,
448 const char *fullpath,
449 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
451 tree_difference = REV_TREE_DIFFERENT;
452 DIFF_OPT_SET(options, HAS_CHANGES);
455 static int rev_compare_tree(struct rev_info *revs,
456 struct commit *parent, struct commit *commit)
458 struct tree *t1 = parent->tree;
459 struct tree *t2 = commit->tree;
466 if (revs->simplify_by_decoration) {
468 * If we are simplifying by decoration, then the commit
469 * is worth showing if it has a tag pointing at it.
471 if (lookup_decoration(&name_decoration, &commit->object))
472 return REV_TREE_DIFFERENT;
474 * A commit that is not pointed by a tag is uninteresting
475 * if we are not limited by path. This means that you will
476 * see the usual "commits that touch the paths" plus any
477 * tagged commit by specifying both --simplify-by-decoration
480 if (!revs->prune_data.nr)
481 return REV_TREE_SAME;
484 tree_difference = REV_TREE_SAME;
485 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
486 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
488 return REV_TREE_DIFFERENT;
489 return tree_difference;
492 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
497 struct tree_desc empty, real;
498 struct tree *t1 = commit->tree;
503 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
506 init_tree_desc(&real, tree, size);
507 init_tree_desc(&empty, "", 0);
509 tree_difference = REV_TREE_SAME;
510 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
511 retval = diff_tree(&empty, &real, "", &revs->pruning);
514 return retval >= 0 && (tree_difference == REV_TREE_SAME);
517 struct treesame_state {
518 unsigned int nparents;
519 unsigned char treesame[FLEX_ARRAY];
522 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
524 unsigned n = commit_list_count(commit->parents);
525 struct treesame_state *st = xcalloc(1, sizeof(*st) + n);
527 add_decoration(&revs->treesame, &commit->object, st);
532 * Must be called immediately after removing the nth_parent from a commit's
533 * parent list, if we are maintaining the per-parent treesame[] decoration.
534 * This does not recalculate the master TREESAME flag - update_treesame()
535 * should be called to update it after a sequence of treesame[] modifications
536 * that may have affected it.
538 static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
540 struct treesame_state *st;
543 if (!commit->parents) {
545 * Have just removed the only parent from a non-merge.
546 * Different handling, as we lack decoration.
549 die("compact_treesame %u", nth_parent);
550 old_same = !!(commit->object.flags & TREESAME);
551 if (rev_same_tree_as_empty(revs, commit))
552 commit->object.flags |= TREESAME;
554 commit->object.flags &= ~TREESAME;
558 st = lookup_decoration(&revs->treesame, &commit->object);
559 if (!st || nth_parent >= st->nparents)
560 die("compact_treesame %u", nth_parent);
562 old_same = st->treesame[nth_parent];
563 memmove(st->treesame + nth_parent,
564 st->treesame + nth_parent + 1,
565 st->nparents - nth_parent - 1);
568 * If we've just become a non-merge commit, update TREESAME
569 * immediately, and remove the no-longer-needed decoration.
570 * If still a merge, defer update until update_treesame().
572 if (--st->nparents == 1) {
573 if (commit->parents->next)
574 die("compact_treesame parents mismatch");
575 if (st->treesame[0] && revs->dense)
576 commit->object.flags |= TREESAME;
578 commit->object.flags &= ~TREESAME;
579 free(add_decoration(&revs->treesame, &commit->object, NULL));
585 static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
587 if (commit->parents && commit->parents->next) {
589 struct treesame_state *st;
590 struct commit_list *p;
591 unsigned relevant_parents;
592 unsigned relevant_change, irrelevant_change;
594 st = lookup_decoration(&revs->treesame, &commit->object);
596 die("update_treesame %s", sha1_to_hex(commit->object.sha1));
597 relevant_parents = 0;
598 relevant_change = irrelevant_change = 0;
599 for (p = commit->parents, n = 0; p; n++, p = p->next) {
600 if (relevant_commit(p->item)) {
601 relevant_change |= !st->treesame[n];
604 irrelevant_change |= !st->treesame[n];
606 if (relevant_parents ? relevant_change : irrelevant_change)
607 commit->object.flags &= ~TREESAME;
609 commit->object.flags |= TREESAME;
612 return commit->object.flags & TREESAME;
615 static inline int limiting_can_increase_treesame(const struct rev_info *revs)
618 * TREESAME is irrelevant unless prune && dense;
619 * if simplify_history is set, we can't have a mixture of TREESAME and
620 * !TREESAME INTERESTING parents (and we don't have treesame[]
621 * decoration anyway);
622 * if first_parent_only is set, then the TREESAME flag is locked
623 * against the first parent (and again we lack treesame[] decoration).
625 return revs->prune && revs->dense &&
626 !revs->simplify_history &&
627 !revs->first_parent_only;
630 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
632 struct commit_list **pp, *parent;
633 struct treesame_state *ts = NULL;
634 int relevant_change = 0, irrelevant_change = 0;
635 int relevant_parents, nth_parent;
638 * If we don't do pruning, everything is interesting
646 if (!commit->parents) {
647 if (rev_same_tree_as_empty(revs, commit))
648 commit->object.flags |= TREESAME;
653 * Normal non-merge commit? If we don't want to make the
654 * history dense, we consider it always to be a change..
656 if (!revs->dense && !commit->parents->next)
659 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
660 (parent = *pp) != NULL;
661 pp = &parent->next, nth_parent++) {
662 struct commit *p = parent->item;
663 if (relevant_commit(p))
666 if (nth_parent == 1) {
668 * This our second loop iteration - so we now know
669 * we're dealing with a merge.
671 * Do not compare with later parents when we care only about
672 * the first parent chain, in order to avoid derailing the
673 * traversal to follow a side branch that brought everything
674 * in the path we are limited to by the pathspec.
676 if (revs->first_parent_only)
679 * If this will remain a potentially-simplifiable
680 * merge, remember per-parent treesame if needed.
681 * Initialise the array with the comparison from our
684 if (revs->treesame.name &&
685 !revs->simplify_history &&
686 !(commit->object.flags & UNINTERESTING)) {
687 ts = initialise_treesame(revs, commit);
688 if (!(irrelevant_change || relevant_change))
692 if (parse_commit(p) < 0)
693 die("cannot simplify commit %s (because of %s)",
694 sha1_to_hex(commit->object.sha1),
695 sha1_to_hex(p->object.sha1));
696 switch (rev_compare_tree(revs, p, commit)) {
698 if (!revs->simplify_history || !relevant_commit(p)) {
699 /* Even if a merge with an uninteresting
700 * side branch brought the entire change
701 * we are interested in, we do not want
702 * to lose the other branches of this
703 * merge, so we just keep going.
706 ts->treesame[nth_parent] = 1;
710 commit->parents = parent;
711 commit->object.flags |= TREESAME;
715 if (revs->remove_empty_trees &&
716 rev_same_tree_as_empty(revs, p)) {
717 /* We are adding all the specified
718 * paths from this parent, so the
719 * history beyond this parent is not
720 * interesting. Remove its parents
721 * (they are grandparents for us).
722 * IOW, we pretend this parent is a
725 if (parse_commit(p) < 0)
726 die("cannot simplify commit %s (invalid %s)",
727 sha1_to_hex(commit->object.sha1),
728 sha1_to_hex(p->object.sha1));
733 case REV_TREE_DIFFERENT:
734 if (relevant_commit(p))
737 irrelevant_change = 1;
740 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
744 * TREESAME is straightforward for single-parent commits. For merge
745 * commits, it is most useful to define it so that "irrelevant"
746 * parents cannot make us !TREESAME - if we have any relevant
747 * parents, then we only consider TREESAMEness with respect to them,
748 * allowing irrelevant merges from uninteresting branches to be
749 * simplified away. Only if we have only irrelevant parents do we
750 * base TREESAME on them. Note that this logic is replicated in
751 * update_treesame, which should be kept in sync.
753 if (relevant_parents ? !relevant_change : !irrelevant_change)
754 commit->object.flags |= TREESAME;
757 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
758 struct commit_list *cached_base, struct commit_list **cache)
760 struct commit_list *new_entry;
762 if (cached_base && p->date < cached_base->item->date)
763 new_entry = commit_list_insert_by_date(p, &cached_base->next);
765 new_entry = commit_list_insert_by_date(p, head);
767 if (cache && (!*cache || p->date < (*cache)->item->date))
771 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
772 struct commit_list **list, struct commit_list **cache_ptr)
774 struct commit_list *parent = commit->parents;
776 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
778 if (commit->object.flags & ADDED)
780 commit->object.flags |= ADDED;
783 * If the commit is uninteresting, don't try to
784 * prune parents - we want the maximal uninteresting
787 * Normally we haven't parsed the parent
788 * yet, so we won't have a parent of a parent
789 * here. However, it may turn out that we've
790 * reached this commit some other way (where it
791 * wasn't uninteresting), in which case we need
792 * to mark its parents recursively too..
794 if (commit->object.flags & UNINTERESTING) {
796 struct commit *p = parent->item;
797 parent = parent->next;
799 p->object.flags |= UNINTERESTING;
800 if (parse_commit(p) < 0)
803 mark_parents_uninteresting(p);
804 if (p->object.flags & SEEN)
806 p->object.flags |= SEEN;
807 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
813 * Ok, the commit wasn't uninteresting. Try to
814 * simplify the commit history and find the parent
815 * that has no differences in the path set if one exists.
817 try_to_simplify_commit(revs, commit);
822 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
824 for (parent = commit->parents; parent; parent = parent->next) {
825 struct commit *p = parent->item;
827 if (parse_commit(p) < 0)
829 if (revs->show_source && !p->util)
830 p->util = commit->util;
831 p->object.flags |= left_flag;
832 if (!(p->object.flags & SEEN)) {
833 p->object.flags |= SEEN;
834 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
836 if (revs->first_parent_only)
842 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
844 struct commit_list *p;
845 int left_count = 0, right_count = 0;
847 struct patch_ids ids;
848 unsigned cherry_flag;
850 /* First count the commits on the left and on the right */
851 for (p = list; p; p = p->next) {
852 struct commit *commit = p->item;
853 unsigned flags = commit->object.flags;
854 if (flags & BOUNDARY)
856 else if (flags & SYMMETRIC_LEFT)
862 if (!left_count || !right_count)
865 left_first = left_count < right_count;
866 init_patch_ids(&ids);
867 ids.diffopts.pathspec = revs->diffopt.pathspec;
869 /* Compute patch-ids for one side */
870 for (p = list; p; p = p->next) {
871 struct commit *commit = p->item;
872 unsigned flags = commit->object.flags;
874 if (flags & BOUNDARY)
877 * If we have fewer left, left_first is set and we omit
878 * commits on the right branch in this loop. If we have
879 * fewer right, we skip the left ones.
881 if (left_first != !!(flags & SYMMETRIC_LEFT))
883 commit->util = add_commit_patch_id(commit, &ids);
886 /* either cherry_mark or cherry_pick are true */
887 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
889 /* Check the other side */
890 for (p = list; p; p = p->next) {
891 struct commit *commit = p->item;
893 unsigned flags = commit->object.flags;
895 if (flags & BOUNDARY)
898 * If we have fewer left, left_first is set and we omit
899 * commits on the left branch in this loop.
901 if (left_first == !!(flags & SYMMETRIC_LEFT))
905 * Have we seen the same patch id?
907 id = has_commit_patch_id(commit, &ids);
911 commit->object.flags |= cherry_flag;
914 /* Now check the original side for seen ones */
915 for (p = list; p; p = p->next) {
916 struct commit *commit = p->item;
917 struct patch_id *ent;
923 commit->object.flags |= cherry_flag;
927 free_patch_ids(&ids);
930 /* How many extra uninteresting commits we want to see.. */
933 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
936 * No source list at all? We're definitely done..
942 * Does the destination list contain entries with a date
943 * before the source list? Definitely _not_ done.
945 if (date <= src->item->date)
949 * Does the source list still have interesting commits in
950 * it? Definitely not done..
952 if (!everybody_uninteresting(src))
955 /* Ok, we're closing in.. */
960 * "rev-list --ancestry-path A..B" computes commits that are ancestors
961 * of B but not ancestors of A but further limits the result to those
962 * that are descendants of A. This takes the list of bottom commits and
963 * the result of "A..B" without --ancestry-path, and limits the latter
964 * further to the ones that can reach one of the commits in "bottom".
966 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
968 struct commit_list *p;
969 struct commit_list *rlist = NULL;
973 * Reverse the list so that it will be likely that we would
974 * process parents before children.
976 for (p = list; p; p = p->next)
977 commit_list_insert(p->item, &rlist);
979 for (p = bottom; p; p = p->next)
980 p->item->object.flags |= TMP_MARK;
983 * Mark the ones that can reach bottom commits in "list",
984 * in a bottom-up fashion.
988 for (p = rlist; p; p = p->next) {
989 struct commit *c = p->item;
990 struct commit_list *parents;
991 if (c->object.flags & (TMP_MARK | UNINTERESTING))
993 for (parents = c->parents;
995 parents = parents->next) {
996 if (!(parents->item->object.flags & TMP_MARK))
998 c->object.flags |= TMP_MARK;
1003 } while (made_progress);
1006 * NEEDSWORK: decide if we want to remove parents that are
1007 * not marked with TMP_MARK from commit->parents for commits
1008 * in the resulting list. We may not want to do that, though.
1012 * The ones that are not marked with TMP_MARK are uninteresting
1014 for (p = list; p; p = p->next) {
1015 struct commit *c = p->item;
1016 if (c->object.flags & TMP_MARK)
1018 c->object.flags |= UNINTERESTING;
1021 /* We are done with the TMP_MARK */
1022 for (p = list; p; p = p->next)
1023 p->item->object.flags &= ~TMP_MARK;
1024 for (p = bottom; p; p = p->next)
1025 p->item->object.flags &= ~TMP_MARK;
1026 free_commit_list(rlist);
1030 * Before walking the history, keep the set of "negative" refs the
1031 * caller has asked to exclude.
1033 * This is used to compute "rev-list --ancestry-path A..B", as we need
1034 * to filter the result of "A..B" further to the ones that can actually
1037 static struct commit_list *collect_bottom_commits(struct commit_list *list)
1039 struct commit_list *elem, *bottom = NULL;
1040 for (elem = list; elem; elem = elem->next)
1041 if (elem->item->object.flags & BOTTOM)
1042 commit_list_insert(elem->item, &bottom);
1046 /* Assumes either left_only or right_only is set */
1047 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1049 struct commit_list *p;
1051 for (p = list; p; p = p->next) {
1052 struct commit *commit = p->item;
1054 if (revs->right_only) {
1055 if (commit->object.flags & SYMMETRIC_LEFT)
1056 commit->object.flags |= SHOWN;
1057 } else /* revs->left_only is set */
1058 if (!(commit->object.flags & SYMMETRIC_LEFT))
1059 commit->object.flags |= SHOWN;
1063 static int limit_list(struct rev_info *revs)
1066 unsigned long date = ~0ul;
1067 struct commit_list *list = revs->commits;
1068 struct commit_list *newlist = NULL;
1069 struct commit_list **p = &newlist;
1070 struct commit_list *bottom = NULL;
1072 if (revs->ancestry_path) {
1073 bottom = collect_bottom_commits(list);
1075 die("--ancestry-path given but there are no bottom commits");
1079 struct commit_list *entry = list;
1080 struct commit *commit = list->item;
1081 struct object *obj = &commit->object;
1082 show_early_output_fn_t show;
1087 if (revs->max_age != -1 && (commit->date < revs->max_age))
1088 obj->flags |= UNINTERESTING;
1089 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
1091 if (obj->flags & UNINTERESTING) {
1092 mark_parents_uninteresting(commit);
1094 p = &commit_list_insert(commit, p)->next;
1095 slop = still_interesting(list, date, slop);
1098 /* If showing all, add the whole pending list to the end */
1103 if (revs->min_age != -1 && (commit->date > revs->min_age))
1105 date = commit->date;
1106 p = &commit_list_insert(commit, p)->next;
1108 show = show_early_output;
1112 show(revs, newlist);
1113 show_early_output = NULL;
1115 if (revs->cherry_pick || revs->cherry_mark)
1116 cherry_pick_list(newlist, revs);
1118 if (revs->left_only || revs->right_only)
1119 limit_left_right(newlist, revs);
1122 limit_to_ancestry(bottom, newlist);
1123 free_commit_list(bottom);
1127 * Check if any commits have become TREESAME by some of their parents
1128 * becoming UNINTERESTING.
1130 if (limiting_can_increase_treesame(revs))
1131 for (list = newlist; list; list = list->next) {
1132 struct commit *c = list->item;
1133 if (c->object.flags & (UNINTERESTING | TREESAME))
1135 update_treesame(revs, c);
1138 revs->commits = newlist;
1143 * Add an entry to refs->cmdline with the specified information.
1146 static void add_rev_cmdline(struct rev_info *revs,
1147 struct object *item,
1152 struct rev_cmdline_info *info = &revs->cmdline;
1155 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1156 info->rev[nr].item = item;
1157 info->rev[nr].name = xstrdup(name);
1158 info->rev[nr].whence = whence;
1159 info->rev[nr].flags = flags;
1163 static void add_rev_cmdline_list(struct rev_info *revs,
1164 struct commit_list *commit_list,
1168 while (commit_list) {
1169 struct object *object = &commit_list->item->object;
1170 add_rev_cmdline(revs, object, sha1_to_hex(object->sha1),
1172 commit_list = commit_list->next;
1176 struct all_refs_cb {
1178 int warned_bad_reflog;
1179 struct rev_info *all_revs;
1180 const char *name_for_errormsg;
1183 int ref_excluded(struct string_list *ref_excludes, const char *path)
1185 struct string_list_item *item;
1189 for_each_string_list_item(item, ref_excludes) {
1190 if (!fnmatch(item->string, path, 0))
1196 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
1198 struct all_refs_cb *cb = cb_data;
1199 struct object *object;
1201 if (ref_excluded(cb->all_revs->ref_excludes, path))
1204 object = get_reference(cb->all_revs, path, sha1, cb->all_flags);
1205 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1206 add_pending_sha1(cb->all_revs, path, sha1, cb->all_flags);
1210 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1213 cb->all_revs = revs;
1214 cb->all_flags = flags;
1217 void clear_ref_exclusion(struct string_list **ref_excludes_p)
1219 if (*ref_excludes_p) {
1220 string_list_clear(*ref_excludes_p, 0);
1221 free(*ref_excludes_p);
1223 *ref_excludes_p = NULL;
1226 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1228 if (!*ref_excludes_p) {
1229 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1230 (*ref_excludes_p)->strdup_strings = 1;
1232 string_list_append(*ref_excludes_p, exclude);
1235 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1236 int (*for_each)(const char *, each_ref_fn, void *))
1238 struct all_refs_cb cb;
1239 init_all_refs_cb(&cb, revs, flags);
1240 for_each(submodule, handle_one_ref, &cb);
1243 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
1245 struct all_refs_cb *cb = cb_data;
1246 if (!is_null_sha1(sha1)) {
1247 struct object *o = parse_object(sha1);
1249 o->flags |= cb->all_flags;
1250 /* ??? CMDLINEFLAGS ??? */
1251 add_pending_object(cb->all_revs, o, "");
1253 else if (!cb->warned_bad_reflog) {
1254 warning("reflog of '%s' references pruned commits",
1255 cb->name_for_errormsg);
1256 cb->warned_bad_reflog = 1;
1261 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
1262 const char *email, unsigned long timestamp, int tz,
1263 const char *message, void *cb_data)
1265 handle_one_reflog_commit(osha1, cb_data);
1266 handle_one_reflog_commit(nsha1, cb_data);
1270 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
1272 struct all_refs_cb *cb = cb_data;
1273 cb->warned_bad_reflog = 0;
1274 cb->name_for_errormsg = path;
1275 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1279 static void handle_reflog(struct rev_info *revs, unsigned flags)
1281 struct all_refs_cb cb;
1283 cb.all_flags = flags;
1284 for_each_reflog(handle_one_reflog, &cb);
1287 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
1289 unsigned char sha1[20];
1291 struct commit *commit;
1292 struct commit_list *parents;
1293 const char *arg = arg_;
1296 flags ^= UNINTERESTING | BOTTOM;
1299 if (get_sha1_committish(arg, sha1))
1302 it = get_reference(revs, arg, sha1, 0);
1303 if (!it && revs->ignore_missing)
1305 if (it->type != OBJ_TAG)
1307 if (!((struct tag*)it)->tagged)
1309 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
1311 if (it->type != OBJ_COMMIT)
1313 commit = (struct commit *)it;
1314 for (parents = commit->parents; parents; parents = parents->next) {
1315 it = &parents->item->object;
1317 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1318 add_pending_object(revs, it, arg);
1323 void init_revisions(struct rev_info *revs, const char *prefix)
1325 memset(revs, 0, sizeof(*revs));
1327 revs->abbrev = DEFAULT_ABBREV;
1328 revs->ignore_merges = 1;
1329 revs->simplify_history = 1;
1330 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1331 DIFF_OPT_SET(&revs->pruning, QUICK);
1332 revs->pruning.add_remove = file_add_remove;
1333 revs->pruning.change = file_change;
1334 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1336 revs->prefix = prefix;
1339 revs->skip_count = -1;
1340 revs->max_count = -1;
1341 revs->max_parents = -1;
1343 revs->commit_format = CMIT_FMT_DEFAULT;
1345 init_grep_defaults();
1346 grep_init(&revs->grep_filter, prefix);
1347 revs->grep_filter.status_only = 1;
1348 revs->grep_filter.regflags = REG_NEWLINE;
1350 diff_setup(&revs->diffopt);
1351 if (prefix && !revs->diffopt.prefix) {
1352 revs->diffopt.prefix = prefix;
1353 revs->diffopt.prefix_length = strlen(prefix);
1356 revs->notes_opt.use_default_notes = -1;
1359 static void add_pending_commit_list(struct rev_info *revs,
1360 struct commit_list *commit_list,
1363 while (commit_list) {
1364 struct object *object = &commit_list->item->object;
1365 object->flags |= flags;
1366 add_pending_object(revs, object, sha1_to_hex(object->sha1));
1367 commit_list = commit_list->next;
1371 static void prepare_show_merge(struct rev_info *revs)
1373 struct commit_list *bases;
1374 struct commit *head, *other;
1375 unsigned char sha1[20];
1376 const char **prune = NULL;
1377 int i, prune_num = 1; /* counting terminating NULL */
1379 if (get_sha1("HEAD", sha1))
1380 die("--merge without HEAD?");
1381 head = lookup_commit_or_die(sha1, "HEAD");
1382 if (get_sha1("MERGE_HEAD", sha1))
1383 die("--merge without MERGE_HEAD?");
1384 other = lookup_commit_or_die(sha1, "MERGE_HEAD");
1385 add_pending_object(revs, &head->object, "HEAD");
1386 add_pending_object(revs, &other->object, "MERGE_HEAD");
1387 bases = get_merge_bases(head, other, 1);
1388 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1389 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1390 free_commit_list(bases);
1391 head->object.flags |= SYMMETRIC_LEFT;
1395 for (i = 0; i < active_nr; i++) {
1396 const struct cache_entry *ce = active_cache[i];
1399 if (ce_path_match(ce, &revs->prune_data)) {
1401 prune = xrealloc(prune, sizeof(*prune) * prune_num);
1402 prune[prune_num-2] = ce->name;
1403 prune[prune_num-1] = NULL;
1405 while ((i+1 < active_nr) &&
1406 ce_same_name(ce, active_cache[i+1]))
1409 free_pathspec(&revs->prune_data);
1410 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1411 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1415 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1417 struct object_context oc;
1419 struct object *object;
1420 unsigned char sha1[20];
1422 const char *arg = arg_;
1423 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1424 unsigned get_sha1_flags = 0;
1426 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1428 dotdot = strstr(arg, "..");
1430 unsigned char from_sha1[20];
1431 const char *next = dotdot + 2;
1432 const char *this = arg;
1433 int symmetric = *next == '.';
1434 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1435 static const char head_by_default[] = "HEAD";
1436 unsigned int a_flags;
1442 next = head_by_default;
1444 this = head_by_default;
1445 if (this == head_by_default && next == head_by_default &&
1448 * Just ".."? That is not a range but the
1449 * pathspec for the parent directory.
1451 if (!cant_be_filename) {
1456 if (!get_sha1_committish(this, from_sha1) &&
1457 !get_sha1_committish(next, sha1)) {
1458 struct object *a_obj, *b_obj;
1460 if (!cant_be_filename) {
1462 verify_non_filename(revs->prefix, arg);
1465 a_obj = parse_object(from_sha1);
1466 b_obj = parse_object(sha1);
1467 if (!a_obj || !b_obj) {
1469 if (revs->ignore_missing)
1472 ? "Invalid symmetric difference expression %s"
1473 : "Invalid revision range %s", arg);
1478 a_flags = flags_exclude;
1480 /* A...B -- find merge bases between the two */
1481 struct commit *a, *b;
1482 struct commit_list *exclude;
1484 a = (a_obj->type == OBJ_COMMIT
1485 ? (struct commit *)a_obj
1486 : lookup_commit_reference(a_obj->sha1));
1487 b = (b_obj->type == OBJ_COMMIT
1488 ? (struct commit *)b_obj
1489 : lookup_commit_reference(b_obj->sha1));
1492 exclude = get_merge_bases(a, b, 1);
1493 add_rev_cmdline_list(revs, exclude,
1496 add_pending_commit_list(revs, exclude,
1498 free_commit_list(exclude);
1500 a_flags = flags | SYMMETRIC_LEFT;
1503 a_obj->flags |= a_flags;
1504 b_obj->flags |= flags;
1505 add_rev_cmdline(revs, a_obj, this,
1506 REV_CMD_LEFT, a_flags);
1507 add_rev_cmdline(revs, b_obj, next,
1508 REV_CMD_RIGHT, flags);
1509 add_pending_object(revs, a_obj, this);
1510 add_pending_object(revs, b_obj, next);
1515 dotdot = strstr(arg, "^@");
1516 if (dotdot && !dotdot[2]) {
1518 if (add_parents_only(revs, arg, flags))
1522 dotdot = strstr(arg, "^!");
1523 if (dotdot && !dotdot[2]) {
1525 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM)))
1531 local_flags = UNINTERESTING | BOTTOM;
1535 if (revarg_opt & REVARG_COMMITTISH)
1536 get_sha1_flags = GET_SHA1_COMMITTISH;
1538 if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
1539 return revs->ignore_missing ? 0 : -1;
1540 if (!cant_be_filename)
1541 verify_non_filename(revs->prefix, arg);
1542 object = get_reference(revs, arg, sha1, flags ^ local_flags);
1543 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1544 add_pending_object_with_mode(revs, object, arg, oc.mode);
1548 struct cmdline_pathspec {
1554 static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1557 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1558 prune->path[prune->nr++] = *(av++);
1562 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1563 struct cmdline_pathspec *prune)
1565 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1567 if (len && sb->buf[len - 1] == '\n')
1568 sb->buf[--len] = '\0';
1569 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1570 prune->path[prune->nr++] = xstrdup(sb->buf);
1574 static void read_revisions_from_stdin(struct rev_info *revs,
1575 struct cmdline_pathspec *prune)
1578 int seen_dashdash = 0;
1580 strbuf_init(&sb, 1000);
1581 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1583 if (len && sb.buf[len - 1] == '\n')
1584 sb.buf[--len] = '\0';
1587 if (sb.buf[0] == '-') {
1588 if (len == 2 && sb.buf[1] == '-') {
1592 die("options not supported in --stdin mode");
1594 if (handle_revision_arg(sb.buf, revs, 0,
1595 REVARG_CANNOT_BE_FILENAME))
1596 die("bad revision '%s'", sb.buf);
1599 read_pathspec_from_stdin(revs, &sb, prune);
1600 strbuf_release(&sb);
1603 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1605 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1608 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1610 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1613 static void add_message_grep(struct rev_info *revs, const char *pattern)
1615 add_grep(revs, pattern, GREP_PATTERN_BODY);
1618 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1619 int *unkc, const char **unkv)
1621 const char *arg = argv[0];
1625 /* pseudo revision arguments */
1626 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1627 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1628 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1629 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1630 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
1631 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1632 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
1634 unkv[(*unkc)++] = arg;
1638 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1639 revs->max_count = atoi(optarg);
1642 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1643 revs->skip_count = atoi(optarg);
1645 } else if ((*arg == '-') && isdigit(arg[1])) {
1646 /* accept -<digit>, like traditional "head" */
1647 revs->max_count = atoi(arg + 1);
1649 } else if (!strcmp(arg, "-n")) {
1651 return error("-n requires an argument");
1652 revs->max_count = atoi(argv[1]);
1655 } else if (starts_with(arg, "-n")) {
1656 revs->max_count = atoi(arg + 2);
1658 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1659 revs->max_age = atoi(optarg);
1661 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1662 revs->max_age = approxidate(optarg);
1664 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1665 revs->max_age = approxidate(optarg);
1667 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1668 revs->min_age = atoi(optarg);
1670 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1671 revs->min_age = approxidate(optarg);
1673 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1674 revs->min_age = approxidate(optarg);
1676 } else if (!strcmp(arg, "--first-parent")) {
1677 revs->first_parent_only = 1;
1678 } else if (!strcmp(arg, "--ancestry-path")) {
1679 revs->ancestry_path = 1;
1680 revs->simplify_history = 0;
1682 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1683 init_reflog_walk(&revs->reflog_info);
1684 } else if (!strcmp(arg, "--default")) {
1686 return error("bad --default argument");
1687 revs->def = argv[1];
1689 } else if (!strcmp(arg, "--merge")) {
1690 revs->show_merge = 1;
1691 } else if (!strcmp(arg, "--topo-order")) {
1692 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1693 revs->topo_order = 1;
1694 } else if (!strcmp(arg, "--simplify-merges")) {
1695 revs->simplify_merges = 1;
1696 revs->topo_order = 1;
1697 revs->rewrite_parents = 1;
1698 revs->simplify_history = 0;
1700 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1701 revs->simplify_merges = 1;
1702 revs->topo_order = 1;
1703 revs->rewrite_parents = 1;
1704 revs->simplify_history = 0;
1705 revs->simplify_by_decoration = 1;
1708 load_ref_decorations(DECORATE_SHORT_REFS);
1709 } else if (!strcmp(arg, "--date-order")) {
1710 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
1711 revs->topo_order = 1;
1712 } else if (!strcmp(arg, "--author-date-order")) {
1713 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
1714 revs->topo_order = 1;
1715 } else if (starts_with(arg, "--early-output")) {
1719 count = atoi(arg+15);
1722 revs->topo_order = 1;
1723 revs->early_output = count;
1725 } else if (!strcmp(arg, "--parents")) {
1726 revs->rewrite_parents = 1;
1727 revs->print_parents = 1;
1728 } else if (!strcmp(arg, "--dense")) {
1730 } else if (!strcmp(arg, "--sparse")) {
1732 } else if (!strcmp(arg, "--show-all")) {
1734 } else if (!strcmp(arg, "--remove-empty")) {
1735 revs->remove_empty_trees = 1;
1736 } else if (!strcmp(arg, "--merges")) {
1737 revs->min_parents = 2;
1738 } else if (!strcmp(arg, "--no-merges")) {
1739 revs->max_parents = 1;
1740 } else if (starts_with(arg, "--min-parents=")) {
1741 revs->min_parents = atoi(arg+14);
1742 } else if (starts_with(arg, "--no-min-parents")) {
1743 revs->min_parents = 0;
1744 } else if (starts_with(arg, "--max-parents=")) {
1745 revs->max_parents = atoi(arg+14);
1746 } else if (starts_with(arg, "--no-max-parents")) {
1747 revs->max_parents = -1;
1748 } else if (!strcmp(arg, "--boundary")) {
1750 } else if (!strcmp(arg, "--left-right")) {
1751 revs->left_right = 1;
1752 } else if (!strcmp(arg, "--left-only")) {
1753 if (revs->right_only)
1754 die("--left-only is incompatible with --right-only"
1756 revs->left_only = 1;
1757 } else if (!strcmp(arg, "--right-only")) {
1758 if (revs->left_only)
1759 die("--right-only is incompatible with --left-only");
1760 revs->right_only = 1;
1761 } else if (!strcmp(arg, "--cherry")) {
1762 if (revs->left_only)
1763 die("--cherry is incompatible with --left-only");
1764 revs->cherry_mark = 1;
1765 revs->right_only = 1;
1766 revs->max_parents = 1;
1768 } else if (!strcmp(arg, "--count")) {
1770 } else if (!strcmp(arg, "--cherry-mark")) {
1771 if (revs->cherry_pick)
1772 die("--cherry-mark is incompatible with --cherry-pick");
1773 revs->cherry_mark = 1;
1774 revs->limited = 1; /* needs limit_list() */
1775 } else if (!strcmp(arg, "--cherry-pick")) {
1776 if (revs->cherry_mark)
1777 die("--cherry-pick is incompatible with --cherry-mark");
1778 revs->cherry_pick = 1;
1780 } else if (!strcmp(arg, "--objects")) {
1781 revs->tag_objects = 1;
1782 revs->tree_objects = 1;
1783 revs->blob_objects = 1;
1784 } else if (!strcmp(arg, "--objects-edge")) {
1785 revs->tag_objects = 1;
1786 revs->tree_objects = 1;
1787 revs->blob_objects = 1;
1788 revs->edge_hint = 1;
1789 } else if (!strcmp(arg, "--verify-objects")) {
1790 revs->tag_objects = 1;
1791 revs->tree_objects = 1;
1792 revs->blob_objects = 1;
1793 revs->verify_objects = 1;
1794 } else if (!strcmp(arg, "--unpacked")) {
1796 } else if (starts_with(arg, "--unpacked=")) {
1797 die("--unpacked=<packfile> no longer supported.");
1798 } else if (!strcmp(arg, "-r")) {
1800 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1801 } else if (!strcmp(arg, "-t")) {
1803 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1804 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1805 } else if (!strcmp(arg, "-m")) {
1806 revs->ignore_merges = 0;
1807 } else if (!strcmp(arg, "-c")) {
1809 revs->dense_combined_merges = 0;
1810 revs->combine_merges = 1;
1811 } else if (!strcmp(arg, "--cc")) {
1813 revs->dense_combined_merges = 1;
1814 revs->combine_merges = 1;
1815 } else if (!strcmp(arg, "-v")) {
1816 revs->verbose_header = 1;
1817 } else if (!strcmp(arg, "--pretty")) {
1818 revs->verbose_header = 1;
1819 revs->pretty_given = 1;
1820 get_commit_format(arg+8, revs);
1821 } else if (starts_with(arg, "--pretty=") || starts_with(arg, "--format=")) {
1823 * Detached form ("--pretty X" as opposed to "--pretty=X")
1824 * not allowed, since the argument is optional.
1826 revs->verbose_header = 1;
1827 revs->pretty_given = 1;
1828 get_commit_format(arg+9, revs);
1829 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1830 revs->show_notes = 1;
1831 revs->show_notes_given = 1;
1832 revs->notes_opt.use_default_notes = 1;
1833 } else if (!strcmp(arg, "--show-signature")) {
1834 revs->show_signature = 1;
1835 } else if (!strcmp(arg, "--show-linear-break") ||
1836 starts_with(arg, "--show-linear-break=")) {
1837 if (starts_with(arg, "--show-linear-break="))
1838 revs->break_bar = xstrdup(arg + 20);
1840 revs->break_bar = " ..........";
1841 revs->track_linear = 1;
1842 revs->track_first_time = 1;
1843 } else if (starts_with(arg, "--show-notes=") ||
1844 starts_with(arg, "--notes=")) {
1845 struct strbuf buf = STRBUF_INIT;
1846 revs->show_notes = 1;
1847 revs->show_notes_given = 1;
1848 if (starts_with(arg, "--show-notes")) {
1849 if (revs->notes_opt.use_default_notes < 0)
1850 revs->notes_opt.use_default_notes = 1;
1851 strbuf_addstr(&buf, arg+13);
1854 strbuf_addstr(&buf, arg+8);
1855 expand_notes_ref(&buf);
1856 string_list_append(&revs->notes_opt.extra_notes_refs,
1857 strbuf_detach(&buf, NULL));
1858 } else if (!strcmp(arg, "--no-notes")) {
1859 revs->show_notes = 0;
1860 revs->show_notes_given = 1;
1861 revs->notes_opt.use_default_notes = -1;
1862 /* we have been strdup'ing ourselves, so trick
1863 * string_list into free()ing strings */
1864 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1865 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1866 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1867 } else if (!strcmp(arg, "--standard-notes")) {
1868 revs->show_notes_given = 1;
1869 revs->notes_opt.use_default_notes = 1;
1870 } else if (!strcmp(arg, "--no-standard-notes")) {
1871 revs->notes_opt.use_default_notes = 0;
1872 } else if (!strcmp(arg, "--oneline")) {
1873 revs->verbose_header = 1;
1874 get_commit_format("oneline", revs);
1875 revs->pretty_given = 1;
1876 revs->abbrev_commit = 1;
1877 } else if (!strcmp(arg, "--graph")) {
1878 revs->topo_order = 1;
1879 revs->rewrite_parents = 1;
1880 revs->graph = graph_init(revs);
1881 } else if (!strcmp(arg, "--root")) {
1882 revs->show_root_diff = 1;
1883 } else if (!strcmp(arg, "--no-commit-id")) {
1884 revs->no_commit_id = 1;
1885 } else if (!strcmp(arg, "--always")) {
1886 revs->always_show_header = 1;
1887 } else if (!strcmp(arg, "--no-abbrev")) {
1889 } else if (!strcmp(arg, "--abbrev")) {
1890 revs->abbrev = DEFAULT_ABBREV;
1891 } else if (starts_with(arg, "--abbrev=")) {
1892 revs->abbrev = strtoul(arg + 9, NULL, 10);
1893 if (revs->abbrev < MINIMUM_ABBREV)
1894 revs->abbrev = MINIMUM_ABBREV;
1895 else if (revs->abbrev > 40)
1897 } else if (!strcmp(arg, "--abbrev-commit")) {
1898 revs->abbrev_commit = 1;
1899 revs->abbrev_commit_given = 1;
1900 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1901 revs->abbrev_commit = 0;
1902 } else if (!strcmp(arg, "--full-diff")) {
1904 revs->full_diff = 1;
1905 } else if (!strcmp(arg, "--full-history")) {
1906 revs->simplify_history = 0;
1907 } else if (!strcmp(arg, "--relative-date")) {
1908 revs->date_mode = DATE_RELATIVE;
1909 revs->date_mode_explicit = 1;
1910 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1911 revs->date_mode = parse_date_format(optarg);
1912 revs->date_mode_explicit = 1;
1914 } else if (!strcmp(arg, "--log-size")) {
1915 revs->show_log_size = 1;
1918 * Grepping the commit log
1920 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1921 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1923 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1924 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1926 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
1927 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
1929 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1930 add_message_grep(revs, optarg);
1932 } else if (!strcmp(arg, "--grep-debug")) {
1933 revs->grep_filter.debug = 1;
1934 } else if (!strcmp(arg, "--basic-regexp")) {
1935 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE, &revs->grep_filter);
1936 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1937 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter);
1938 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1939 revs->grep_filter.regflags |= REG_ICASE;
1940 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
1941 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1942 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter);
1943 } else if (!strcmp(arg, "--perl-regexp")) {
1944 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE, &revs->grep_filter);
1945 } else if (!strcmp(arg, "--all-match")) {
1946 revs->grep_filter.all_match = 1;
1947 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
1948 if (strcmp(optarg, "none"))
1949 git_log_output_encoding = xstrdup(optarg);
1951 git_log_output_encoding = "";
1953 } else if (!strcmp(arg, "--reverse")) {
1955 } else if (!strcmp(arg, "--children")) {
1956 revs->children.name = "children";
1958 } else if (!strcmp(arg, "--ignore-missing")) {
1959 revs->ignore_missing = 1;
1961 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1963 unkv[(*unkc)++] = arg;
1966 if (revs->graph && revs->track_linear)
1967 die("--show-linear-break and --graph are incompatible");
1972 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1973 const struct option *options,
1974 const char * const usagestr[])
1976 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1977 &ctx->cpidx, ctx->out);
1979 error("unknown option `%s'", ctx->argv[0]);
1980 usage_with_options(usagestr, options);
1986 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1988 return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
1991 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1993 return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
1996 static int handle_revision_pseudo_opt(const char *submodule,
1997 struct rev_info *revs,
1998 int argc, const char **argv, int *flags)
2000 const char *arg = argv[0];
2007 * Commands like "git shortlog" will not accept the options below
2008 * unless parse_revision_opt queues them (as opposed to erroring
2011 * When implementing your new pseudo-option, remember to
2012 * register it in the list at the top of handle_revision_opt.
2014 if (!strcmp(arg, "--all")) {
2015 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2016 handle_refs(submodule, revs, *flags, head_ref_submodule);
2017 clear_ref_exclusion(&revs->ref_excludes);
2018 } else if (!strcmp(arg, "--branches")) {
2019 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
2020 clear_ref_exclusion(&revs->ref_excludes);
2021 } else if (!strcmp(arg, "--bisect")) {
2022 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
2023 handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
2025 } else if (!strcmp(arg, "--tags")) {
2026 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
2027 clear_ref_exclusion(&revs->ref_excludes);
2028 } else if (!strcmp(arg, "--remotes")) {
2029 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
2030 clear_ref_exclusion(&revs->ref_excludes);
2031 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2032 struct all_refs_cb cb;
2033 init_all_refs_cb(&cb, revs, *flags);
2034 for_each_glob_ref(handle_one_ref, optarg, &cb);
2035 clear_ref_exclusion(&revs->ref_excludes);
2037 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2038 add_ref_exclusion(&revs->ref_excludes, optarg);
2040 } else if (starts_with(arg, "--branches=")) {
2041 struct all_refs_cb cb;
2042 init_all_refs_cb(&cb, revs, *flags);
2043 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
2044 clear_ref_exclusion(&revs->ref_excludes);
2045 } else if (starts_with(arg, "--tags=")) {
2046 struct all_refs_cb cb;
2047 init_all_refs_cb(&cb, revs, *flags);
2048 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
2049 clear_ref_exclusion(&revs->ref_excludes);
2050 } else if (starts_with(arg, "--remotes=")) {
2051 struct all_refs_cb cb;
2052 init_all_refs_cb(&cb, revs, *flags);
2053 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
2054 clear_ref_exclusion(&revs->ref_excludes);
2055 } else if (!strcmp(arg, "--reflog")) {
2056 handle_reflog(revs, *flags);
2057 } else if (!strcmp(arg, "--not")) {
2058 *flags ^= UNINTERESTING | BOTTOM;
2059 } else if (!strcmp(arg, "--no-walk")) {
2060 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2061 } else if (starts_with(arg, "--no-walk=")) {
2063 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2064 * not allowed, since the argument is optional.
2066 if (!strcmp(arg + 10, "sorted"))
2067 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2068 else if (!strcmp(arg + 10, "unsorted"))
2069 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2071 return error("invalid argument to --no-walk");
2072 } else if (!strcmp(arg, "--do-walk")) {
2082 * Parse revision information, filling in the "rev_info" structure,
2083 * and removing the used arguments from the argument list.
2085 * Returns the number of arguments left that weren't recognized
2086 * (which are also moved to the head of the argument list)
2088 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2090 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
2091 struct cmdline_pathspec prune_data;
2092 const char *submodule = NULL;
2094 memset(&prune_data, 0, sizeof(prune_data));
2096 submodule = opt->submodule;
2098 /* First, search for "--" */
2099 if (opt && opt->assume_dashdash) {
2103 for (i = 1; i < argc; i++) {
2104 const char *arg = argv[i];
2105 if (strcmp(arg, "--"))
2110 append_prune_data(&prune_data, argv + i + 1);
2116 /* Second, deal with arguments and options */
2118 revarg_opt = opt ? opt->revarg_opt : 0;
2120 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2121 read_from_stdin = 0;
2122 for (left = i = 1; i < argc; i++) {
2123 const char *arg = argv[i];
2127 opts = handle_revision_pseudo_opt(submodule,
2128 revs, argc - i, argv + i,
2135 if (!strcmp(arg, "--stdin")) {
2136 if (revs->disable_stdin) {
2140 if (read_from_stdin++)
2141 die("--stdin given twice?");
2142 read_revisions_from_stdin(revs, &prune_data);
2146 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
2157 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2159 if (seen_dashdash || *arg == '^')
2160 die("bad revision '%s'", arg);
2162 /* If we didn't have a "--":
2163 * (1) all filenames must exist;
2164 * (2) all rev-args must not be interpretable
2165 * as a valid filename.
2166 * but the latter we have checked in the main loop.
2168 for (j = i; j < argc; j++)
2169 verify_filename(revs->prefix, argv[j], j == i);
2171 append_prune_data(&prune_data, argv + i);
2178 if (prune_data.nr) {
2180 * If we need to introduce the magic "a lone ':' means no
2181 * pathspec whatsoever", here is the place to do so.
2183 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2184 * prune_data.nr = 0;
2185 * prune_data.alloc = 0;
2186 * free(prune_data.path);
2187 * prune_data.path = NULL;
2189 * terminate prune_data.alloc with NULL and
2190 * call init_pathspec() to set revs->prune_data here.
2193 ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
2194 prune_data.path[prune_data.nr++] = NULL;
2195 parse_pathspec(&revs->prune_data, 0, 0,
2196 revs->prefix, prune_data.path);
2199 if (revs->def == NULL)
2200 revs->def = opt ? opt->def : NULL;
2201 if (opt && opt->tweak)
2202 opt->tweak(revs, opt);
2203 if (revs->show_merge)
2204 prepare_show_merge(revs);
2205 if (revs->def && !revs->pending.nr && !got_rev_arg) {
2206 unsigned char sha1[20];
2207 struct object *object;
2208 struct object_context oc;
2209 if (get_sha1_with_context(revs->def, 0, sha1, &oc))
2210 die("bad default revision '%s'", revs->def);
2211 object = get_reference(revs, revs->def, sha1, 0);
2212 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2215 /* Did the user ask for any diff output? Run the diff! */
2216 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2219 /* Pickaxe, diff-filter and rename following need diffs */
2220 if (revs->diffopt.pickaxe ||
2221 revs->diffopt.filter ||
2222 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2225 if (revs->topo_order)
2228 if (revs->prune_data.nr) {
2229 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2230 /* Can't prune commits with rename following: the paths change.. */
2231 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2233 if (!revs->full_diff)
2234 copy_pathspec(&revs->diffopt.pathspec,
2237 if (revs->combine_merges)
2238 revs->ignore_merges = 0;
2239 revs->diffopt.abbrev = revs->abbrev;
2241 if (revs->line_level_traverse) {
2243 revs->topo_order = 1;
2246 diff_setup_done(&revs->diffopt);
2248 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2249 &revs->grep_filter);
2250 compile_grep_patterns(&revs->grep_filter);
2252 if (revs->reverse && revs->reflog_info)
2253 die("cannot combine --reverse with --walk-reflogs");
2254 if (revs->rewrite_parents && revs->children.name)
2255 die("cannot combine --parents and --children");
2258 * Limitations on the graph functionality
2260 if (revs->reverse && revs->graph)
2261 die("cannot combine --reverse with --graph");
2263 if (revs->reflog_info && revs->graph)
2264 die("cannot combine --walk-reflogs with --graph");
2265 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2266 die("cannot use --grep-reflog without --walk-reflogs");
2271 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2273 struct commit_list *l = xcalloc(1, sizeof(*l));
2276 l->next = add_decoration(&revs->children, &parent->object, l);
2279 static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2281 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2282 struct commit_list **pp, *p;
2283 int surviving_parents;
2285 /* Examine existing parents while marking ones we have seen... */
2286 pp = &commit->parents;
2287 surviving_parents = 0;
2288 while ((p = *pp) != NULL) {
2289 struct commit *parent = p->item;
2290 if (parent->object.flags & TMP_MARK) {
2293 compact_treesame(revs, commit, surviving_parents);
2296 parent->object.flags |= TMP_MARK;
2297 surviving_parents++;
2300 /* clear the temporary mark */
2301 for (p = commit->parents; p; p = p->next) {
2302 p->item->object.flags &= ~TMP_MARK;
2304 /* no update_treesame() - removing duplicates can't affect TREESAME */
2305 return surviving_parents;
2308 struct merge_simplify_state {
2309 struct commit *simplified;
2312 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2314 struct merge_simplify_state *st;
2316 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2318 st = xcalloc(1, sizeof(*st));
2319 add_decoration(&revs->merge_simplification, &commit->object, st);
2324 static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2326 struct commit_list *h = reduce_heads(commit->parents);
2327 int i = 0, marked = 0;
2328 struct commit_list *po, *pn;
2330 /* Want these for sanity-checking only */
2331 int orig_cnt = commit_list_count(commit->parents);
2332 int cnt = commit_list_count(h);
2335 * Not ready to remove items yet, just mark them for now, based
2336 * on the output of reduce_heads(). reduce_heads outputs the reduced
2337 * set in its original order, so this isn't too hard.
2339 po = commit->parents;
2342 if (pn && po->item == pn->item) {
2346 po->item->object.flags |= TMP_MARK;
2352 if (i != cnt || cnt+marked != orig_cnt)
2353 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2355 free_commit_list(h);
2360 static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2362 struct commit_list *p;
2365 for (p = commit->parents; p; p = p->next) {
2366 struct commit *parent = p->item;
2367 if (!parent->parents && (parent->object.flags & TREESAME)) {
2368 parent->object.flags |= TMP_MARK;
2377 * Awkward naming - this means one parent we are TREESAME to.
2378 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2379 * empty tree). Better name suggestions?
2381 static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2383 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2384 struct commit *unmarked = NULL, *marked = NULL;
2385 struct commit_list *p;
2388 for (p = commit->parents, n = 0; p; p = p->next, n++) {
2389 if (ts->treesame[n]) {
2390 if (p->item->object.flags & TMP_MARK) {
2403 * If we are TREESAME to a marked-for-deletion parent, but not to any
2404 * unmarked parents, unmark the first TREESAME parent. This is the
2405 * parent that the default simplify_history==1 scan would have followed,
2406 * and it doesn't make sense to omit that path when asking for a
2407 * simplified full history. Retaining it improves the chances of
2408 * understanding odd missed merges that took an old version of a file.
2412 * I--------*X A modified the file, but mainline merge X used
2413 * \ / "-s ours", so took the version from I. X is
2414 * `-*A--' TREESAME to I and !TREESAME to A.
2416 * Default log from X would produce "I". Without this check,
2417 * --full-history --simplify-merges would produce "I-A-X", showing
2418 * the merge commit X and that it changed A, but not making clear that
2419 * it had just taken the I version. With this check, the topology above
2422 * Note that it is possible that the simplification chooses a different
2423 * TREESAME parent from the default, in which case this test doesn't
2424 * activate, and we _do_ drop the default parent. Example:
2426 * I------X A modified the file, but it was reverted in B,
2427 * \ / meaning mainline merge X is TREESAME to both
2430 * Default log would produce "I" by following the first parent;
2431 * --full-history --simplify-merges will produce "I-A-B". But this is a
2432 * reasonable result - it presents a logical full history leading from
2433 * I to X, and X is not an important merge.
2435 if (!unmarked && marked) {
2436 marked->object.flags &= ~TMP_MARK;
2443 static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2445 struct commit_list **pp, *p;
2446 int nth_parent, removed = 0;
2448 pp = &commit->parents;
2450 while ((p = *pp) != NULL) {
2451 struct commit *parent = p->item;
2452 if (parent->object.flags & TMP_MARK) {
2453 parent->object.flags &= ~TMP_MARK;
2457 compact_treesame(revs, commit, nth_parent);
2464 /* Removing parents can only increase TREESAMEness */
2465 if (removed && !(commit->object.flags & TREESAME))
2466 update_treesame(revs, commit);
2471 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
2473 struct commit_list *p;
2474 struct commit *parent;
2475 struct merge_simplify_state *st, *pst;
2478 st = locate_simplify_state(revs, commit);
2481 * Have we handled this one?
2487 * An UNINTERESTING commit simplifies to itself, so does a
2488 * root commit. We do not rewrite parents of such commit
2491 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
2492 st->simplified = commit;
2497 * Do we know what commit all of our parents that matter
2498 * should be rewritten to? Otherwise we are not ready to
2499 * rewrite this one yet.
2501 for (cnt = 0, p = commit->parents; p; p = p->next) {
2502 pst = locate_simplify_state(revs, p->item);
2503 if (!pst->simplified) {
2504 tail = &commit_list_insert(p->item, tail)->next;
2507 if (revs->first_parent_only)
2511 tail = &commit_list_insert(commit, tail)->next;
2516 * Rewrite our list of parents. Note that this cannot
2517 * affect our TREESAME flags in any way - a commit is
2518 * always TREESAME to its simplification.
2520 for (p = commit->parents; p; p = p->next) {
2521 pst = locate_simplify_state(revs, p->item);
2522 p->item = pst->simplified;
2523 if (revs->first_parent_only)
2527 if (revs->first_parent_only)
2530 cnt = remove_duplicate_parents(revs, commit);
2533 * It is possible that we are a merge and one side branch
2534 * does not have any commit that touches the given paths;
2535 * in such a case, the immediate parent from that branch
2536 * will be rewritten to be the merge base.
2538 * o----X X: the commit we are looking at;
2539 * / / o: a commit that touches the paths;
2542 * Further, a merge of an independent branch that doesn't
2543 * touch the path will reduce to a treesame root parent:
2545 * ----o----X X: the commit we are looking at;
2546 * / o: a commit that touches the paths;
2547 * r r: a root commit not touching the paths
2549 * Detect and simplify both cases.
2552 int marked = mark_redundant_parents(revs, commit);
2553 marked += mark_treesame_root_parents(revs, commit);
2555 marked -= leave_one_treesame_to_parent(revs, commit);
2557 cnt = remove_marked_parents(revs, commit);
2561 * A commit simplifies to itself if it is a root, if it is
2562 * UNINTERESTING, if it touches the given paths, or if it is a
2563 * merge and its parents don't simplify to one relevant commit
2564 * (the first two cases are already handled at the beginning of
2567 * Otherwise, it simplifies to what its sole relevant parent
2571 (commit->object.flags & UNINTERESTING) ||
2572 !(commit->object.flags & TREESAME) ||
2573 (parent = one_relevant_parent(revs, commit->parents)) == NULL)
2574 st->simplified = commit;
2576 pst = locate_simplify_state(revs, parent);
2577 st->simplified = pst->simplified;
2582 static void simplify_merges(struct rev_info *revs)
2584 struct commit_list *list, *next;
2585 struct commit_list *yet_to_do, **tail;
2586 struct commit *commit;
2591 /* feed the list reversed */
2593 for (list = revs->commits; list; list = next) {
2594 commit = list->item;
2597 * Do not free(list) here yet; the original list
2598 * is used later in this function.
2600 commit_list_insert(commit, &yet_to_do);
2607 commit = list->item;
2611 tail = simplify_one(revs, commit, tail);
2615 /* clean up the result, removing the simplified ones */
2616 list = revs->commits;
2617 revs->commits = NULL;
2618 tail = &revs->commits;
2620 struct merge_simplify_state *st;
2622 commit = list->item;
2626 st = locate_simplify_state(revs, commit);
2627 if (st->simplified == commit)
2628 tail = &commit_list_insert(commit, tail)->next;
2632 static void set_children(struct rev_info *revs)
2634 struct commit_list *l;
2635 for (l = revs->commits; l; l = l->next) {
2636 struct commit *commit = l->item;
2637 struct commit_list *p;
2639 for (p = commit->parents; p; p = p->next)
2640 add_child(revs, p->item, commit);
2644 void reset_revision_walk(void)
2646 clear_object_flags(SEEN | ADDED | SHOWN);
2649 int prepare_revision_walk(struct rev_info *revs)
2651 int nr = revs->pending.nr;
2652 struct object_array_entry *e, *list;
2653 struct commit_list **next = &revs->commits;
2655 e = list = revs->pending.objects;
2656 revs->pending.nr = 0;
2657 revs->pending.alloc = 0;
2658 revs->pending.objects = NULL;
2660 struct commit *commit = handle_commit(revs, e->item, e->name);
2662 if (!(commit->object.flags & SEEN)) {
2663 commit->object.flags |= SEEN;
2664 next = commit_list_append(commit, next);
2669 if (!revs->leak_pending)
2672 /* Signal whether we need per-parent treesame decoration */
2673 if (revs->simplify_merges ||
2674 (revs->limited && limiting_can_increase_treesame(revs)))
2675 revs->treesame.name = "treesame";
2677 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2678 commit_list_sort_by_date(&revs->commits);
2682 if (limit_list(revs) < 0)
2684 if (revs->topo_order)
2685 sort_in_topological_order(&revs->commits, revs->sort_order);
2686 if (revs->line_level_traverse)
2687 line_log_filter(revs);
2688 if (revs->simplify_merges)
2689 simplify_merges(revs);
2690 if (revs->children.name)
2695 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2697 struct commit_list *cache = NULL;
2700 struct commit *p = *pp;
2702 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2703 return rewrite_one_error;
2704 if (p->object.flags & UNINTERESTING)
2705 return rewrite_one_ok;
2706 if (!(p->object.flags & TREESAME))
2707 return rewrite_one_ok;
2709 return rewrite_one_noparents;
2710 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2711 return rewrite_one_ok;
2716 int rewrite_parents(struct rev_info *revs, struct commit *commit,
2717 rewrite_parent_fn_t rewrite_parent)
2719 struct commit_list **pp = &commit->parents;
2721 struct commit_list *parent = *pp;
2722 switch (rewrite_parent(revs, &parent->item)) {
2723 case rewrite_one_ok:
2725 case rewrite_one_noparents:
2728 case rewrite_one_error:
2733 remove_duplicate_parents(revs, commit);
2737 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2739 char *person, *endp;
2740 size_t len, namelen, maillen;
2743 struct ident_split ident;
2745 person = strstr(buf->buf, what);
2749 person += strlen(what);
2750 endp = strchr(person, '\n');
2754 len = endp - person;
2756 if (split_ident_line(&ident, person, len))
2759 mail = ident.mail_begin;
2760 maillen = ident.mail_end - ident.mail_begin;
2761 name = ident.name_begin;
2762 namelen = ident.name_end - ident.name_begin;
2764 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2765 struct strbuf namemail = STRBUF_INIT;
2767 strbuf_addf(&namemail, "%.*s <%.*s>",
2768 (int)namelen, name, (int)maillen, mail);
2770 strbuf_splice(buf, ident.name_begin - buf->buf,
2771 ident.mail_end - ident.name_begin + 1,
2772 namemail.buf, namemail.len);
2774 strbuf_release(&namemail);
2782 static int commit_match(struct commit *commit, struct rev_info *opt)
2785 const char *encoding;
2787 struct strbuf buf = STRBUF_INIT;
2789 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2792 /* Prepend "fake" headers as needed */
2793 if (opt->grep_filter.use_reflog_filter) {
2794 strbuf_addstr(&buf, "reflog ");
2795 get_reflog_message(&buf, opt->reflog_info);
2796 strbuf_addch(&buf, '\n');
2800 * We grep in the user's output encoding, under the assumption that it
2801 * is the encoding they are most likely to write their grep pattern
2802 * for. In addition, it means we will match the "notes" encoding below,
2803 * so we will not end up with a buffer that has two different encodings
2806 encoding = get_log_output_encoding();
2807 message = logmsg_reencode(commit, NULL, encoding);
2809 /* Copy the commit to temporary if we are using "fake" headers */
2811 strbuf_addstr(&buf, message);
2813 if (opt->grep_filter.header_list && opt->mailmap) {
2815 strbuf_addstr(&buf, message);
2817 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2818 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2821 /* Append "fake" message parts as needed */
2822 if (opt->show_notes) {
2824 strbuf_addstr(&buf, message);
2825 format_display_notes(commit->object.sha1, &buf, encoding, 1);
2828 /* Find either in the original commit message, or in the temporary */
2830 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2832 retval = grep_buffer(&opt->grep_filter,
2833 message, strlen(message));
2834 strbuf_release(&buf);
2835 logmsg_free(message, commit);
2839 static inline int want_ancestry(const struct rev_info *revs)
2841 return (revs->rewrite_parents || revs->children.name);
2844 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2846 if (commit->object.flags & SHOWN)
2847 return commit_ignore;
2848 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
2849 return commit_ignore;
2852 if (commit->object.flags & UNINTERESTING)
2853 return commit_ignore;
2854 if (revs->min_age != -1 && (commit->date > revs->min_age))
2855 return commit_ignore;
2856 if (revs->min_parents || (revs->max_parents >= 0)) {
2857 int n = commit_list_count(commit->parents);
2858 if ((n < revs->min_parents) ||
2859 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2860 return commit_ignore;
2862 if (!commit_match(commit, revs))
2863 return commit_ignore;
2864 if (revs->prune && revs->dense) {
2865 /* Commit without changes? */
2866 if (commit->object.flags & TREESAME) {
2868 struct commit_list *p;
2869 /* drop merges unless we want parenthood */
2870 if (!want_ancestry(revs))
2871 return commit_ignore;
2873 * If we want ancestry, then need to keep any merges
2874 * between relevant commits to tie together topology.
2875 * For consistency with TREESAME and simplification
2876 * use "relevant" here rather than just INTERESTING,
2877 * to treat bottom commit(s) as part of the topology.
2879 for (n = 0, p = commit->parents; p; p = p->next)
2880 if (relevant_commit(p->item))
2883 return commit_ignore;
2889 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
2891 enum commit_action action = get_commit_action(revs, commit);
2893 if (action == commit_show &&
2895 revs->prune && revs->dense && want_ancestry(revs)) {
2897 * --full-diff on simplified parents is no good: it
2898 * will show spurious changes from the commits that
2899 * were elided. So we save the parents on the side
2900 * when --full-diff is in effect.
2902 if (revs->full_diff)
2903 save_parents(revs, commit);
2904 if (rewrite_parents(revs, commit, rewrite_one) < 0)
2905 return commit_error;
2910 static void track_linear(struct rev_info *revs, struct commit *commit)
2912 if (revs->track_first_time) {
2914 revs->track_first_time = 0;
2916 struct commit_list *p;
2917 for (p = revs->previous_parents; p; p = p->next)
2918 if (p->item == NULL || /* first commit */
2919 !hashcmp(p->item->object.sha1, commit->object.sha1))
2921 revs->linear = p != NULL;
2923 if (revs->reverse) {
2925 commit->object.flags |= TRACK_LINEAR;
2927 free_commit_list(revs->previous_parents);
2928 revs->previous_parents = copy_commit_list(commit->parents);
2931 static struct commit *get_revision_1(struct rev_info *revs)
2937 struct commit_list *entry = revs->commits;
2938 struct commit *commit = entry->item;
2940 revs->commits = entry->next;
2943 if (revs->reflog_info) {
2944 save_parents(revs, commit);
2945 fake_reflog_parent(revs->reflog_info, commit);
2946 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
2950 * If we haven't done the list limiting, we need to look at
2951 * the parents here. We also need to do the date-based limiting
2952 * that we'd otherwise have done in limit_list().
2954 if (!revs->limited) {
2955 if (revs->max_age != -1 &&
2956 (commit->date < revs->max_age))
2958 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
2959 die("Failed to traverse parents of commit %s",
2960 sha1_to_hex(commit->object.sha1));
2963 switch (simplify_commit(revs, commit)) {
2967 die("Failed to simplify parents of commit %s",
2968 sha1_to_hex(commit->object.sha1));
2970 if (revs->track_linear)
2971 track_linear(revs, commit);
2974 } while (revs->commits);
2979 * Return true for entries that have not yet been shown. (This is an
2980 * object_array_each_func_t.)
2982 static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
2984 return !(entry->item->flags & SHOWN);
2988 * If array is on the verge of a realloc, garbage-collect any entries
2989 * that have already been shown to try to free up some space.
2991 static void gc_boundary(struct object_array *array)
2993 if (array->nr == array->alloc)
2994 object_array_filter(array, entry_unshown, NULL);
2997 static void create_boundary_commit_list(struct rev_info *revs)
3001 struct object_array *array = &revs->boundary_commits;
3002 struct object_array_entry *objects = array->objects;
3005 * If revs->commits is non-NULL at this point, an error occurred in
3006 * get_revision_1(). Ignore the error and continue printing the
3007 * boundary commits anyway. (This is what the code has always
3010 if (revs->commits) {
3011 free_commit_list(revs->commits);
3012 revs->commits = NULL;
3016 * Put all of the actual boundary commits from revs->boundary_commits
3017 * into revs->commits
3019 for (i = 0; i < array->nr; i++) {
3020 c = (struct commit *)(objects[i].item);
3023 if (!(c->object.flags & CHILD_SHOWN))
3025 if (c->object.flags & (SHOWN | BOUNDARY))
3027 c->object.flags |= BOUNDARY;
3028 commit_list_insert(c, &revs->commits);
3032 * If revs->topo_order is set, sort the boundary commits
3033 * in topological order
3035 sort_in_topological_order(&revs->commits, revs->sort_order);
3038 static struct commit *get_revision_internal(struct rev_info *revs)
3040 struct commit *c = NULL;
3041 struct commit_list *l;
3043 if (revs->boundary == 2) {
3045 * All of the normal commits have already been returned,
3046 * and we are now returning boundary commits.
3047 * create_boundary_commit_list() has populated
3048 * revs->commits with the remaining commits to return.
3050 c = pop_commit(&revs->commits);
3052 c->object.flags |= SHOWN;
3057 * If our max_count counter has reached zero, then we are done. We
3058 * don't simply return NULL because we still might need to show
3059 * boundary commits. But we want to avoid calling get_revision_1, which
3060 * might do a considerable amount of work finding the next commit only
3061 * for us to throw it away.
3063 * If it is non-zero, then either we don't have a max_count at all
3064 * (-1), or it is still counting, in which case we decrement.
3066 if (revs->max_count) {
3067 c = get_revision_1(revs);
3069 while (revs->skip_count > 0) {
3071 c = get_revision_1(revs);
3077 if (revs->max_count > 0)
3082 c->object.flags |= SHOWN;
3084 if (!revs->boundary)
3089 * get_revision_1() runs out the commits, and
3090 * we are done computing the boundaries.
3091 * switch to boundary commits output mode.
3096 * Update revs->commits to contain the list of
3099 create_boundary_commit_list(revs);
3101 return get_revision_internal(revs);
3105 * boundary commits are the commits that are parents of the
3106 * ones we got from get_revision_1() but they themselves are
3107 * not returned from get_revision_1(). Before returning
3108 * 'c', we need to mark its parents that they could be boundaries.
3111 for (l = c->parents; l; l = l->next) {
3113 p = &(l->item->object);
3114 if (p->flags & (CHILD_SHOWN | SHOWN))
3116 p->flags |= CHILD_SHOWN;
3117 gc_boundary(&revs->boundary_commits);
3118 add_object_array(p, NULL, &revs->boundary_commits);
3124 struct commit *get_revision(struct rev_info *revs)
3127 struct commit_list *reversed;
3129 if (revs->reverse) {
3131 while ((c = get_revision_internal(revs)))
3132 commit_list_insert(c, &reversed);
3133 revs->commits = reversed;
3135 revs->reverse_output_stage = 1;
3138 if (revs->reverse_output_stage) {
3139 c = pop_commit(&revs->commits);
3140 if (revs->track_linear)
3141 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3145 c = get_revision_internal(revs);
3146 if (c && revs->graph)
3147 graph_update(revs->graph, c);
3149 free_saved_parents(revs);
3150 if (revs->previous_parents) {
3151 free_commit_list(revs->previous_parents);
3152 revs->previous_parents = NULL;
3158 char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3160 if (commit->object.flags & BOUNDARY)
3162 else if (commit->object.flags & UNINTERESTING)
3164 else if (commit->object.flags & PATCHSAME)
3166 else if (!revs || revs->left_right) {
3167 if (commit->object.flags & SYMMETRIC_LEFT)
3171 } else if (revs->graph)
3173 else if (revs->cherry_mark)
3178 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3180 char *mark = get_revision_mark(revs, commit);
3183 fputs(mark, stdout);
3187 define_commit_slab(saved_parents, struct commit_list *);
3189 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3191 void save_parents(struct rev_info *revs, struct commit *commit)
3193 struct commit_list **pp;
3195 if (!revs->saved_parents_slab) {
3196 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3197 init_saved_parents(revs->saved_parents_slab);
3200 pp = saved_parents_at(revs->saved_parents_slab, commit);
3203 * When walking with reflogs, we may visit the same commit
3204 * several times: once for each appearance in the reflog.
3206 * In this case, save_parents() will be called multiple times.
3207 * We want to keep only the first set of parents. We need to
3208 * store a sentinel value for an empty (i.e., NULL) parent
3209 * list to distinguish it from a not-yet-saved list, however.
3213 if (commit->parents)
3214 *pp = copy_commit_list(commit->parents);
3216 *pp = EMPTY_PARENT_LIST;
3219 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3221 struct commit_list *parents;
3223 if (!revs->saved_parents_slab)
3224 return commit->parents;
3226 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3227 if (parents == EMPTY_PARENT_LIST)
3232 void free_saved_parents(struct rev_info *revs)
3234 if (revs->saved_parents_slab)
3235 clear_saved_parents(revs->saved_parents_slab);