git-multimail: update to release 1.2.0
[git.git] / revision.c
blobaf2a18ed7485ea83170409ce55f81473ee606221
1 #include "cache.h"
2 #include "tag.h"
3 #include "blob.h"
4 #include "tree.h"
5 #include "commit.h"
6 #include "diff.h"
7 #include "refs.h"
8 #include "revision.h"
9 #include "graph.h"
10 #include "grep.h"
11 #include "reflog-walk.h"
12 #include "patch-ids.h"
13 #include "decorate.h"
14 #include "log-tree.h"
15 #include "string-list.h"
16 #include "line-log.h"
17 #include "mailmap.h"
18 #include "commit-slab.h"
19 #include "dir.h"
20 #include "cache-tree.h"
21 #include "bisect.h"
23 volatile show_early_output_fn_t show_early_output;
25 static const char *term_bad;
26 static const char *term_good;
28 char *path_name(const struct name_path *path, const char *name)
30 const struct name_path *p;
31 char *n, *m;
32 int nlen = strlen(name);
33 int len = nlen + 1;
35 for (p = path; p; p = p->up) {
36 if (p->elem_len)
37 len += p->elem_len + 1;
39 n = xmalloc(len);
40 m = n + len - (nlen + 1);
41 strcpy(m, name);
42 for (p = path; p; p = p->up) {
43 if (p->elem_len) {
44 m -= p->elem_len + 1;
45 memcpy(m, p->elem, p->elem_len);
46 m[p->elem_len] = '/';
49 return n;
52 static int show_path_component_truncated(FILE *out, const char *name, int len)
54 int cnt;
55 for (cnt = 0; cnt < len; cnt++) {
56 int ch = name[cnt];
57 if (!ch || ch == '\n')
58 return -1;
59 fputc(ch, out);
61 return len;
64 static int show_path_truncated(FILE *out, const struct name_path *path)
66 int emitted, ours;
68 if (!path)
69 return 0;
70 emitted = show_path_truncated(out, path->up);
71 if (emitted < 0)
72 return emitted;
73 if (emitted)
74 fputc('/', out);
75 ours = show_path_component_truncated(out, path->elem, path->elem_len);
76 if (ours < 0)
77 return ours;
78 return ours || emitted;
81 void show_object_with_name(FILE *out, struct object *obj,
82 const struct name_path *path, const char *component)
84 struct name_path leaf;
85 leaf.up = (struct name_path *)path;
86 leaf.elem = component;
87 leaf.elem_len = strlen(component);
89 fprintf(out, "%s ", sha1_to_hex(obj->sha1));
90 show_path_truncated(out, &leaf);
91 fputc('\n', out);
94 static void mark_blob_uninteresting(struct blob *blob)
96 if (!blob)
97 return;
98 if (blob->object.flags & UNINTERESTING)
99 return;
100 blob->object.flags |= UNINTERESTING;
103 static void mark_tree_contents_uninteresting(struct tree *tree)
105 struct tree_desc desc;
106 struct name_entry entry;
107 struct object *obj = &tree->object;
109 if (!has_sha1_file(obj->sha1))
110 return;
111 if (parse_tree(tree) < 0)
112 die("bad tree %s", sha1_to_hex(obj->sha1));
114 init_tree_desc(&desc, tree->buffer, tree->size);
115 while (tree_entry(&desc, &entry)) {
116 switch (object_type(entry.mode)) {
117 case OBJ_TREE:
118 mark_tree_uninteresting(lookup_tree(entry.sha1));
119 break;
120 case OBJ_BLOB:
121 mark_blob_uninteresting(lookup_blob(entry.sha1));
122 break;
123 default:
124 /* Subproject commit - not in this repository */
125 break;
130 * We don't care about the tree any more
131 * after it has been marked uninteresting.
133 free_tree_buffer(tree);
136 void mark_tree_uninteresting(struct tree *tree)
138 struct object *obj = &tree->object;
140 if (!tree)
141 return;
142 if (obj->flags & UNINTERESTING)
143 return;
144 obj->flags |= UNINTERESTING;
145 mark_tree_contents_uninteresting(tree);
148 void mark_parents_uninteresting(struct commit *commit)
150 struct commit_list *parents = NULL, *l;
152 for (l = commit->parents; l; l = l->next)
153 commit_list_insert(l->item, &parents);
155 while (parents) {
156 struct commit *commit = parents->item;
157 l = parents;
158 parents = parents->next;
159 free(l);
161 while (commit) {
163 * A missing commit is ok iff its parent is marked
164 * uninteresting.
166 * We just mark such a thing parsed, so that when
167 * it is popped next time around, we won't be trying
168 * to parse it and get an error.
170 if (!has_sha1_file(commit->object.sha1))
171 commit->object.parsed = 1;
173 if (commit->object.flags & UNINTERESTING)
174 break;
176 commit->object.flags |= UNINTERESTING;
179 * Normally we haven't parsed the parent
180 * yet, so we won't have a parent of a parent
181 * here. However, it may turn out that we've
182 * reached this commit some other way (where it
183 * wasn't uninteresting), in which case we need
184 * to mark its parents recursively too..
186 if (!commit->parents)
187 break;
189 for (l = commit->parents->next; l; l = l->next)
190 commit_list_insert(l->item, &parents);
191 commit = commit->parents->item;
196 static void add_pending_object_with_path(struct rev_info *revs,
197 struct object *obj,
198 const char *name, unsigned mode,
199 const char *path)
201 if (!obj)
202 return;
203 if (revs->no_walk && (obj->flags & UNINTERESTING))
204 revs->no_walk = 0;
205 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
206 struct strbuf buf = STRBUF_INIT;
207 int len = interpret_branch_name(name, 0, &buf);
208 int st;
210 if (0 < len && name[len] && buf.len)
211 strbuf_addstr(&buf, name + len);
212 st = add_reflog_for_walk(revs->reflog_info,
213 (struct commit *)obj,
214 buf.buf[0] ? buf.buf: name);
215 strbuf_release(&buf);
216 if (st)
217 return;
219 add_object_array_with_path(obj, name, &revs->pending, mode, path);
222 static void add_pending_object_with_mode(struct rev_info *revs,
223 struct object *obj,
224 const char *name, unsigned mode)
226 add_pending_object_with_path(revs, obj, name, mode, NULL);
229 void add_pending_object(struct rev_info *revs,
230 struct object *obj, const char *name)
232 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
235 void add_head_to_pending(struct rev_info *revs)
237 unsigned char sha1[20];
238 struct object *obj;
239 if (get_sha1("HEAD", sha1))
240 return;
241 obj = parse_object(sha1);
242 if (!obj)
243 return;
244 add_pending_object(revs, obj, "HEAD");
247 static struct object *get_reference(struct rev_info *revs, const char *name,
248 const unsigned char *sha1,
249 unsigned int flags)
251 struct object *object;
253 object = parse_object(sha1);
254 if (!object) {
255 if (revs->ignore_missing)
256 return object;
257 die("bad object %s", name);
259 object->flags |= flags;
260 return object;
263 void add_pending_sha1(struct rev_info *revs, const char *name,
264 const unsigned char *sha1, unsigned int flags)
266 struct object *object = get_reference(revs, name, sha1, flags);
267 add_pending_object(revs, object, name);
270 static struct commit *handle_commit(struct rev_info *revs,
271 struct object_array_entry *entry)
273 struct object *object = entry->item;
274 const char *name = entry->name;
275 const char *path = entry->path;
276 unsigned int mode = entry->mode;
277 unsigned long flags = object->flags;
280 * Tag object? Look what it points to..
282 while (object->type == OBJ_TAG) {
283 struct tag *tag = (struct tag *) object;
284 if (revs->tag_objects && !(flags & UNINTERESTING))
285 add_pending_object(revs, object, tag->tag);
286 if (!tag->tagged)
287 die("bad tag");
288 object = parse_object(tag->tagged->sha1);
289 if (!object) {
290 if (flags & UNINTERESTING)
291 return NULL;
292 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
294 object->flags |= flags;
296 * We'll handle the tagged object by looping or dropping
297 * through to the non-tag handlers below. Do not
298 * propagate data from the tag's pending entry.
300 name = "";
301 path = NULL;
302 mode = 0;
306 * Commit object? Just return it, we'll do all the complex
307 * reachability crud.
309 if (object->type == OBJ_COMMIT) {
310 struct commit *commit = (struct commit *)object;
311 if (parse_commit(commit) < 0)
312 die("unable to parse commit %s", name);
313 if (flags & UNINTERESTING) {
314 mark_parents_uninteresting(commit);
315 revs->limited = 1;
317 if (revs->show_source && !commit->util)
318 commit->util = xstrdup(name);
319 return commit;
323 * Tree object? Either mark it uninteresting, or add it
324 * to the list of objects to look at later..
326 if (object->type == OBJ_TREE) {
327 struct tree *tree = (struct tree *)object;
328 if (!revs->tree_objects)
329 return NULL;
330 if (flags & UNINTERESTING) {
331 mark_tree_contents_uninteresting(tree);
332 return NULL;
334 add_pending_object_with_path(revs, object, name, mode, path);
335 return NULL;
339 * Blob object? You know the drill by now..
341 if (object->type == OBJ_BLOB) {
342 if (!revs->blob_objects)
343 return NULL;
344 if (flags & UNINTERESTING)
345 return NULL;
346 add_pending_object_with_path(revs, object, name, mode, path);
347 return NULL;
349 die("%s is unknown object", name);
352 static int everybody_uninteresting(struct commit_list *orig,
353 struct commit **interesting_cache)
355 struct commit_list *list = orig;
357 if (*interesting_cache) {
358 struct commit *commit = *interesting_cache;
359 if (!(commit->object.flags & UNINTERESTING))
360 return 0;
363 while (list) {
364 struct commit *commit = list->item;
365 list = list->next;
366 if (commit->object.flags & UNINTERESTING)
367 continue;
369 *interesting_cache = commit;
370 return 0;
372 return 1;
376 * A definition of "relevant" commit that we can use to simplify limited graphs
377 * by eliminating side branches.
379 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
380 * in our list), or that is a specified BOTTOM commit. Then after computing
381 * a limited list, during processing we can generally ignore boundary merges
382 * coming from outside the graph, (ie from irrelevant parents), and treat
383 * those merges as if they were single-parent. TREESAME is defined to consider
384 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
385 * we don't care if we were !TREESAME to non-graph parents.
387 * Treating bottom commits as relevant ensures that a limited graph's
388 * connection to the actual bottom commit is not viewed as a side branch, but
389 * treated as part of the graph. For example:
391 * ....Z...A---X---o---o---B
392 * . /
393 * W---Y
395 * When computing "A..B", the A-X connection is at least as important as
396 * Y-X, despite A being flagged UNINTERESTING.
398 * And when computing --ancestry-path "A..B", the A-X connection is more
399 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
401 static inline int relevant_commit(struct commit *commit)
403 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
407 * Return a single relevant commit from a parent list. If we are a TREESAME
408 * commit, and this selects one of our parents, then we can safely simplify to
409 * that parent.
411 static struct commit *one_relevant_parent(const struct rev_info *revs,
412 struct commit_list *orig)
414 struct commit_list *list = orig;
415 struct commit *relevant = NULL;
417 if (!orig)
418 return NULL;
421 * For 1-parent commits, or if first-parent-only, then return that
422 * first parent (even if not "relevant" by the above definition).
423 * TREESAME will have been set purely on that parent.
425 if (revs->first_parent_only || !orig->next)
426 return orig->item;
429 * For multi-parent commits, identify a sole relevant parent, if any.
430 * If we have only one relevant parent, then TREESAME will be set purely
431 * with regard to that parent, and we can simplify accordingly.
433 * If we have more than one relevant parent, or no relevant parents
434 * (and multiple irrelevant ones), then we can't select a parent here
435 * and return NULL.
437 while (list) {
438 struct commit *commit = list->item;
439 list = list->next;
440 if (relevant_commit(commit)) {
441 if (relevant)
442 return NULL;
443 relevant = commit;
446 return relevant;
450 * The goal is to get REV_TREE_NEW as the result only if the
451 * diff consists of all '+' (and no other changes), REV_TREE_OLD
452 * if the whole diff is removal of old data, and otherwise
453 * REV_TREE_DIFFERENT (of course if the trees are the same we
454 * want REV_TREE_SAME).
455 * That means that once we get to REV_TREE_DIFFERENT, we do not
456 * have to look any further.
458 static int tree_difference = REV_TREE_SAME;
460 static void file_add_remove(struct diff_options *options,
461 int addremove, unsigned mode,
462 const unsigned char *sha1,
463 int sha1_valid,
464 const char *fullpath, unsigned dirty_submodule)
466 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
468 tree_difference |= diff;
469 if (tree_difference == REV_TREE_DIFFERENT)
470 DIFF_OPT_SET(options, HAS_CHANGES);
473 static void file_change(struct diff_options *options,
474 unsigned old_mode, unsigned new_mode,
475 const unsigned char *old_sha1,
476 const unsigned char *new_sha1,
477 int old_sha1_valid, int new_sha1_valid,
478 const char *fullpath,
479 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
481 tree_difference = REV_TREE_DIFFERENT;
482 DIFF_OPT_SET(options, HAS_CHANGES);
485 static int rev_compare_tree(struct rev_info *revs,
486 struct commit *parent, struct commit *commit)
488 struct tree *t1 = parent->tree;
489 struct tree *t2 = commit->tree;
491 if (!t1)
492 return REV_TREE_NEW;
493 if (!t2)
494 return REV_TREE_OLD;
496 if (revs->simplify_by_decoration) {
498 * If we are simplifying by decoration, then the commit
499 * is worth showing if it has a tag pointing at it.
501 if (get_name_decoration(&commit->object))
502 return REV_TREE_DIFFERENT;
504 * A commit that is not pointed by a tag is uninteresting
505 * if we are not limited by path. This means that you will
506 * see the usual "commits that touch the paths" plus any
507 * tagged commit by specifying both --simplify-by-decoration
508 * and pathspec.
510 if (!revs->prune_data.nr)
511 return REV_TREE_SAME;
514 tree_difference = REV_TREE_SAME;
515 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
516 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
517 &revs->pruning) < 0)
518 return REV_TREE_DIFFERENT;
519 return tree_difference;
522 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
524 int retval;
525 struct tree *t1 = commit->tree;
527 if (!t1)
528 return 0;
530 tree_difference = REV_TREE_SAME;
531 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
532 retval = diff_tree_sha1(NULL, t1->object.sha1, "", &revs->pruning);
534 return retval >= 0 && (tree_difference == REV_TREE_SAME);
537 struct treesame_state {
538 unsigned int nparents;
539 unsigned char treesame[FLEX_ARRAY];
542 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
544 unsigned n = commit_list_count(commit->parents);
545 struct treesame_state *st = xcalloc(1, sizeof(*st) + n);
546 st->nparents = n;
547 add_decoration(&revs->treesame, &commit->object, st);
548 return st;
552 * Must be called immediately after removing the nth_parent from a commit's
553 * parent list, if we are maintaining the per-parent treesame[] decoration.
554 * This does not recalculate the master TREESAME flag - update_treesame()
555 * should be called to update it after a sequence of treesame[] modifications
556 * that may have affected it.
558 static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
560 struct treesame_state *st;
561 int old_same;
563 if (!commit->parents) {
565 * Have just removed the only parent from a non-merge.
566 * Different handling, as we lack decoration.
568 if (nth_parent != 0)
569 die("compact_treesame %u", nth_parent);
570 old_same = !!(commit->object.flags & TREESAME);
571 if (rev_same_tree_as_empty(revs, commit))
572 commit->object.flags |= TREESAME;
573 else
574 commit->object.flags &= ~TREESAME;
575 return old_same;
578 st = lookup_decoration(&revs->treesame, &commit->object);
579 if (!st || nth_parent >= st->nparents)
580 die("compact_treesame %u", nth_parent);
582 old_same = st->treesame[nth_parent];
583 memmove(st->treesame + nth_parent,
584 st->treesame + nth_parent + 1,
585 st->nparents - nth_parent - 1);
588 * If we've just become a non-merge commit, update TREESAME
589 * immediately, and remove the no-longer-needed decoration.
590 * If still a merge, defer update until update_treesame().
592 if (--st->nparents == 1) {
593 if (commit->parents->next)
594 die("compact_treesame parents mismatch");
595 if (st->treesame[0] && revs->dense)
596 commit->object.flags |= TREESAME;
597 else
598 commit->object.flags &= ~TREESAME;
599 free(add_decoration(&revs->treesame, &commit->object, NULL));
602 return old_same;
605 static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
607 if (commit->parents && commit->parents->next) {
608 unsigned n;
609 struct treesame_state *st;
610 struct commit_list *p;
611 unsigned relevant_parents;
612 unsigned relevant_change, irrelevant_change;
614 st = lookup_decoration(&revs->treesame, &commit->object);
615 if (!st)
616 die("update_treesame %s", sha1_to_hex(commit->object.sha1));
617 relevant_parents = 0;
618 relevant_change = irrelevant_change = 0;
619 for (p = commit->parents, n = 0; p; n++, p = p->next) {
620 if (relevant_commit(p->item)) {
621 relevant_change |= !st->treesame[n];
622 relevant_parents++;
623 } else
624 irrelevant_change |= !st->treesame[n];
626 if (relevant_parents ? relevant_change : irrelevant_change)
627 commit->object.flags &= ~TREESAME;
628 else
629 commit->object.flags |= TREESAME;
632 return commit->object.flags & TREESAME;
635 static inline int limiting_can_increase_treesame(const struct rev_info *revs)
638 * TREESAME is irrelevant unless prune && dense;
639 * if simplify_history is set, we can't have a mixture of TREESAME and
640 * !TREESAME INTERESTING parents (and we don't have treesame[]
641 * decoration anyway);
642 * if first_parent_only is set, then the TREESAME flag is locked
643 * against the first parent (and again we lack treesame[] decoration).
645 return revs->prune && revs->dense &&
646 !revs->simplify_history &&
647 !revs->first_parent_only;
650 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
652 struct commit_list **pp, *parent;
653 struct treesame_state *ts = NULL;
654 int relevant_change = 0, irrelevant_change = 0;
655 int relevant_parents, nth_parent;
658 * If we don't do pruning, everything is interesting
660 if (!revs->prune)
661 return;
663 if (!commit->tree)
664 return;
666 if (!commit->parents) {
667 if (rev_same_tree_as_empty(revs, commit))
668 commit->object.flags |= TREESAME;
669 return;
673 * Normal non-merge commit? If we don't want to make the
674 * history dense, we consider it always to be a change..
676 if (!revs->dense && !commit->parents->next)
677 return;
679 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
680 (parent = *pp) != NULL;
681 pp = &parent->next, nth_parent++) {
682 struct commit *p = parent->item;
683 if (relevant_commit(p))
684 relevant_parents++;
686 if (nth_parent == 1) {
688 * This our second loop iteration - so we now know
689 * we're dealing with a merge.
691 * Do not compare with later parents when we care only about
692 * the first parent chain, in order to avoid derailing the
693 * traversal to follow a side branch that brought everything
694 * in the path we are limited to by the pathspec.
696 if (revs->first_parent_only)
697 break;
699 * If this will remain a potentially-simplifiable
700 * merge, remember per-parent treesame if needed.
701 * Initialise the array with the comparison from our
702 * first iteration.
704 if (revs->treesame.name &&
705 !revs->simplify_history &&
706 !(commit->object.flags & UNINTERESTING)) {
707 ts = initialise_treesame(revs, commit);
708 if (!(irrelevant_change || relevant_change))
709 ts->treesame[0] = 1;
712 if (parse_commit(p) < 0)
713 die("cannot simplify commit %s (because of %s)",
714 sha1_to_hex(commit->object.sha1),
715 sha1_to_hex(p->object.sha1));
716 switch (rev_compare_tree(revs, p, commit)) {
717 case REV_TREE_SAME:
718 if (!revs->simplify_history || !relevant_commit(p)) {
719 /* Even if a merge with an uninteresting
720 * side branch brought the entire change
721 * we are interested in, we do not want
722 * to lose the other branches of this
723 * merge, so we just keep going.
725 if (ts)
726 ts->treesame[nth_parent] = 1;
727 continue;
729 parent->next = NULL;
730 commit->parents = parent;
731 commit->object.flags |= TREESAME;
732 return;
734 case REV_TREE_NEW:
735 if (revs->remove_empty_trees &&
736 rev_same_tree_as_empty(revs, p)) {
737 /* We are adding all the specified
738 * paths from this parent, so the
739 * history beyond this parent is not
740 * interesting. Remove its parents
741 * (they are grandparents for us).
742 * IOW, we pretend this parent is a
743 * "root" commit.
745 if (parse_commit(p) < 0)
746 die("cannot simplify commit %s (invalid %s)",
747 sha1_to_hex(commit->object.sha1),
748 sha1_to_hex(p->object.sha1));
749 p->parents = NULL;
751 /* fallthrough */
752 case REV_TREE_OLD:
753 case REV_TREE_DIFFERENT:
754 if (relevant_commit(p))
755 relevant_change = 1;
756 else
757 irrelevant_change = 1;
758 continue;
760 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
764 * TREESAME is straightforward for single-parent commits. For merge
765 * commits, it is most useful to define it so that "irrelevant"
766 * parents cannot make us !TREESAME - if we have any relevant
767 * parents, then we only consider TREESAMEness with respect to them,
768 * allowing irrelevant merges from uninteresting branches to be
769 * simplified away. Only if we have only irrelevant parents do we
770 * base TREESAME on them. Note that this logic is replicated in
771 * update_treesame, which should be kept in sync.
773 if (relevant_parents ? !relevant_change : !irrelevant_change)
774 commit->object.flags |= TREESAME;
777 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
778 struct commit_list *cached_base, struct commit_list **cache)
780 struct commit_list *new_entry;
782 if (cached_base && p->date < cached_base->item->date)
783 new_entry = commit_list_insert_by_date(p, &cached_base->next);
784 else
785 new_entry = commit_list_insert_by_date(p, head);
787 if (cache && (!*cache || p->date < (*cache)->item->date))
788 *cache = new_entry;
791 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
792 struct commit_list **list, struct commit_list **cache_ptr)
794 struct commit_list *parent = commit->parents;
795 unsigned left_flag;
796 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
798 if (commit->object.flags & ADDED)
799 return 0;
800 commit->object.flags |= ADDED;
802 if (revs->include_check &&
803 !revs->include_check(commit, revs->include_check_data))
804 return 0;
807 * If the commit is uninteresting, don't try to
808 * prune parents - we want the maximal uninteresting
809 * set.
811 * Normally we haven't parsed the parent
812 * yet, so we won't have a parent of a parent
813 * here. However, it may turn out that we've
814 * reached this commit some other way (where it
815 * wasn't uninteresting), in which case we need
816 * to mark its parents recursively too..
818 if (commit->object.flags & UNINTERESTING) {
819 while (parent) {
820 struct commit *p = parent->item;
821 parent = parent->next;
822 if (p)
823 p->object.flags |= UNINTERESTING;
824 if (parse_commit_gently(p, 1) < 0)
825 continue;
826 if (p->parents)
827 mark_parents_uninteresting(p);
828 if (p->object.flags & SEEN)
829 continue;
830 p->object.flags |= SEEN;
831 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
833 return 0;
837 * Ok, the commit wasn't uninteresting. Try to
838 * simplify the commit history and find the parent
839 * that has no differences in the path set if one exists.
841 try_to_simplify_commit(revs, commit);
843 if (revs->no_walk)
844 return 0;
846 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
848 for (parent = commit->parents; parent; parent = parent->next) {
849 struct commit *p = parent->item;
851 if (parse_commit_gently(p, revs->ignore_missing_links) < 0)
852 return -1;
853 if (revs->show_source && !p->util)
854 p->util = commit->util;
855 p->object.flags |= left_flag;
856 if (!(p->object.flags & SEEN)) {
857 p->object.flags |= SEEN;
858 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
860 if (revs->first_parent_only)
861 break;
863 return 0;
866 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
868 struct commit_list *p;
869 int left_count = 0, right_count = 0;
870 int left_first;
871 struct patch_ids ids;
872 unsigned cherry_flag;
874 /* First count the commits on the left and on the right */
875 for (p = list; p; p = p->next) {
876 struct commit *commit = p->item;
877 unsigned flags = commit->object.flags;
878 if (flags & BOUNDARY)
880 else if (flags & SYMMETRIC_LEFT)
881 left_count++;
882 else
883 right_count++;
886 if (!left_count || !right_count)
887 return;
889 left_first = left_count < right_count;
890 init_patch_ids(&ids);
891 ids.diffopts.pathspec = revs->diffopt.pathspec;
893 /* Compute patch-ids for one side */
894 for (p = list; p; p = p->next) {
895 struct commit *commit = p->item;
896 unsigned flags = commit->object.flags;
898 if (flags & BOUNDARY)
899 continue;
901 * If we have fewer left, left_first is set and we omit
902 * commits on the right branch in this loop. If we have
903 * fewer right, we skip the left ones.
905 if (left_first != !!(flags & SYMMETRIC_LEFT))
906 continue;
907 commit->util = add_commit_patch_id(commit, &ids);
910 /* either cherry_mark or cherry_pick are true */
911 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
913 /* Check the other side */
914 for (p = list; p; p = p->next) {
915 struct commit *commit = p->item;
916 struct patch_id *id;
917 unsigned flags = commit->object.flags;
919 if (flags & BOUNDARY)
920 continue;
922 * If we have fewer left, left_first is set and we omit
923 * commits on the left branch in this loop.
925 if (left_first == !!(flags & SYMMETRIC_LEFT))
926 continue;
929 * Have we seen the same patch id?
931 id = has_commit_patch_id(commit, &ids);
932 if (!id)
933 continue;
934 id->seen = 1;
935 commit->object.flags |= cherry_flag;
938 /* Now check the original side for seen ones */
939 for (p = list; p; p = p->next) {
940 struct commit *commit = p->item;
941 struct patch_id *ent;
943 ent = commit->util;
944 if (!ent)
945 continue;
946 if (ent->seen)
947 commit->object.flags |= cherry_flag;
948 commit->util = NULL;
951 free_patch_ids(&ids);
954 /* How many extra uninteresting commits we want to see.. */
955 #define SLOP 5
957 static int still_interesting(struct commit_list *src, unsigned long date, int slop,
958 struct commit **interesting_cache)
961 * No source list at all? We're definitely done..
963 if (!src)
964 return 0;
967 * Does the destination list contain entries with a date
968 * before the source list? Definitely _not_ done.
970 if (date <= src->item->date)
971 return SLOP;
974 * Does the source list still have interesting commits in
975 * it? Definitely not done..
977 if (!everybody_uninteresting(src, interesting_cache))
978 return SLOP;
980 /* Ok, we're closing in.. */
981 return slop-1;
985 * "rev-list --ancestry-path A..B" computes commits that are ancestors
986 * of B but not ancestors of A but further limits the result to those
987 * that are descendants of A. This takes the list of bottom commits and
988 * the result of "A..B" without --ancestry-path, and limits the latter
989 * further to the ones that can reach one of the commits in "bottom".
991 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
993 struct commit_list *p;
994 struct commit_list *rlist = NULL;
995 int made_progress;
998 * Reverse the list so that it will be likely that we would
999 * process parents before children.
1001 for (p = list; p; p = p->next)
1002 commit_list_insert(p->item, &rlist);
1004 for (p = bottom; p; p = p->next)
1005 p->item->object.flags |= TMP_MARK;
1008 * Mark the ones that can reach bottom commits in "list",
1009 * in a bottom-up fashion.
1011 do {
1012 made_progress = 0;
1013 for (p = rlist; p; p = p->next) {
1014 struct commit *c = p->item;
1015 struct commit_list *parents;
1016 if (c->object.flags & (TMP_MARK | UNINTERESTING))
1017 continue;
1018 for (parents = c->parents;
1019 parents;
1020 parents = parents->next) {
1021 if (!(parents->item->object.flags & TMP_MARK))
1022 continue;
1023 c->object.flags |= TMP_MARK;
1024 made_progress = 1;
1025 break;
1028 } while (made_progress);
1031 * NEEDSWORK: decide if we want to remove parents that are
1032 * not marked with TMP_MARK from commit->parents for commits
1033 * in the resulting list. We may not want to do that, though.
1037 * The ones that are not marked with TMP_MARK are uninteresting
1039 for (p = list; p; p = p->next) {
1040 struct commit *c = p->item;
1041 if (c->object.flags & TMP_MARK)
1042 continue;
1043 c->object.flags |= UNINTERESTING;
1046 /* We are done with the TMP_MARK */
1047 for (p = list; p; p = p->next)
1048 p->item->object.flags &= ~TMP_MARK;
1049 for (p = bottom; p; p = p->next)
1050 p->item->object.flags &= ~TMP_MARK;
1051 free_commit_list(rlist);
1055 * Before walking the history, keep the set of "negative" refs the
1056 * caller has asked to exclude.
1058 * This is used to compute "rev-list --ancestry-path A..B", as we need
1059 * to filter the result of "A..B" further to the ones that can actually
1060 * reach A.
1062 static struct commit_list *collect_bottom_commits(struct commit_list *list)
1064 struct commit_list *elem, *bottom = NULL;
1065 for (elem = list; elem; elem = elem->next)
1066 if (elem->item->object.flags & BOTTOM)
1067 commit_list_insert(elem->item, &bottom);
1068 return bottom;
1071 /* Assumes either left_only or right_only is set */
1072 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1074 struct commit_list *p;
1076 for (p = list; p; p = p->next) {
1077 struct commit *commit = p->item;
1079 if (revs->right_only) {
1080 if (commit->object.flags & SYMMETRIC_LEFT)
1081 commit->object.flags |= SHOWN;
1082 } else /* revs->left_only is set */
1083 if (!(commit->object.flags & SYMMETRIC_LEFT))
1084 commit->object.flags |= SHOWN;
1088 static int limit_list(struct rev_info *revs)
1090 int slop = SLOP;
1091 unsigned long date = ~0ul;
1092 struct commit_list *list = revs->commits;
1093 struct commit_list *newlist = NULL;
1094 struct commit_list **p = &newlist;
1095 struct commit_list *bottom = NULL;
1096 struct commit *interesting_cache = NULL;
1098 if (revs->ancestry_path) {
1099 bottom = collect_bottom_commits(list);
1100 if (!bottom)
1101 die("--ancestry-path given but there are no bottom commits");
1104 while (list) {
1105 struct commit_list *entry = list;
1106 struct commit *commit = list->item;
1107 struct object *obj = &commit->object;
1108 show_early_output_fn_t show;
1110 list = list->next;
1111 free(entry);
1113 if (commit == interesting_cache)
1114 interesting_cache = NULL;
1116 if (revs->max_age != -1 && (commit->date < revs->max_age))
1117 obj->flags |= UNINTERESTING;
1118 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
1119 return -1;
1120 if (obj->flags & UNINTERESTING) {
1121 mark_parents_uninteresting(commit);
1122 if (revs->show_all)
1123 p = &commit_list_insert(commit, p)->next;
1124 slop = still_interesting(list, date, slop, &interesting_cache);
1125 if (slop)
1126 continue;
1127 /* If showing all, add the whole pending list to the end */
1128 if (revs->show_all)
1129 *p = list;
1130 break;
1132 if (revs->min_age != -1 && (commit->date > revs->min_age))
1133 continue;
1134 date = commit->date;
1135 p = &commit_list_insert(commit, p)->next;
1137 show = show_early_output;
1138 if (!show)
1139 continue;
1141 show(revs, newlist);
1142 show_early_output = NULL;
1144 if (revs->cherry_pick || revs->cherry_mark)
1145 cherry_pick_list(newlist, revs);
1147 if (revs->left_only || revs->right_only)
1148 limit_left_right(newlist, revs);
1150 if (bottom) {
1151 limit_to_ancestry(bottom, newlist);
1152 free_commit_list(bottom);
1156 * Check if any commits have become TREESAME by some of their parents
1157 * becoming UNINTERESTING.
1159 if (limiting_can_increase_treesame(revs))
1160 for (list = newlist; list; list = list->next) {
1161 struct commit *c = list->item;
1162 if (c->object.flags & (UNINTERESTING | TREESAME))
1163 continue;
1164 update_treesame(revs, c);
1167 revs->commits = newlist;
1168 return 0;
1172 * Add an entry to refs->cmdline with the specified information.
1173 * *name is copied.
1175 static void add_rev_cmdline(struct rev_info *revs,
1176 struct object *item,
1177 const char *name,
1178 int whence,
1179 unsigned flags)
1181 struct rev_cmdline_info *info = &revs->cmdline;
1182 int nr = info->nr;
1184 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1185 info->rev[nr].item = item;
1186 info->rev[nr].name = xstrdup(name);
1187 info->rev[nr].whence = whence;
1188 info->rev[nr].flags = flags;
1189 info->nr++;
1192 static void add_rev_cmdline_list(struct rev_info *revs,
1193 struct commit_list *commit_list,
1194 int whence,
1195 unsigned flags)
1197 while (commit_list) {
1198 struct object *object = &commit_list->item->object;
1199 add_rev_cmdline(revs, object, sha1_to_hex(object->sha1),
1200 whence, flags);
1201 commit_list = commit_list->next;
1205 struct all_refs_cb {
1206 int all_flags;
1207 int warned_bad_reflog;
1208 struct rev_info *all_revs;
1209 const char *name_for_errormsg;
1212 int ref_excluded(struct string_list *ref_excludes, const char *path)
1214 struct string_list_item *item;
1216 if (!ref_excludes)
1217 return 0;
1218 for_each_string_list_item(item, ref_excludes) {
1219 if (!wildmatch(item->string, path, 0, NULL))
1220 return 1;
1222 return 0;
1225 static int handle_one_ref(const char *path, const struct object_id *oid,
1226 int flag, void *cb_data)
1228 struct all_refs_cb *cb = cb_data;
1229 struct object *object;
1231 if (ref_excluded(cb->all_revs->ref_excludes, path))
1232 return 0;
1234 object = get_reference(cb->all_revs, path, oid->hash, cb->all_flags);
1235 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1236 add_pending_sha1(cb->all_revs, path, oid->hash, cb->all_flags);
1237 return 0;
1240 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1241 unsigned flags)
1243 cb->all_revs = revs;
1244 cb->all_flags = flags;
1247 void clear_ref_exclusion(struct string_list **ref_excludes_p)
1249 if (*ref_excludes_p) {
1250 string_list_clear(*ref_excludes_p, 0);
1251 free(*ref_excludes_p);
1253 *ref_excludes_p = NULL;
1256 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1258 if (!*ref_excludes_p) {
1259 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1260 (*ref_excludes_p)->strdup_strings = 1;
1262 string_list_append(*ref_excludes_p, exclude);
1265 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1266 int (*for_each)(const char *, each_ref_fn, void *))
1268 struct all_refs_cb cb;
1269 init_all_refs_cb(&cb, revs, flags);
1270 for_each(submodule, handle_one_ref, &cb);
1273 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
1275 struct all_refs_cb *cb = cb_data;
1276 if (!is_null_sha1(sha1)) {
1277 struct object *o = parse_object(sha1);
1278 if (o) {
1279 o->flags |= cb->all_flags;
1280 /* ??? CMDLINEFLAGS ??? */
1281 add_pending_object(cb->all_revs, o, "");
1283 else if (!cb->warned_bad_reflog) {
1284 warning("reflog of '%s' references pruned commits",
1285 cb->name_for_errormsg);
1286 cb->warned_bad_reflog = 1;
1291 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
1292 const char *email, unsigned long timestamp, int tz,
1293 const char *message, void *cb_data)
1295 handle_one_reflog_commit(osha1, cb_data);
1296 handle_one_reflog_commit(nsha1, cb_data);
1297 return 0;
1300 static int handle_one_reflog(const char *path, const struct object_id *oid,
1301 int flag, void *cb_data)
1303 struct all_refs_cb *cb = cb_data;
1304 cb->warned_bad_reflog = 0;
1305 cb->name_for_errormsg = path;
1306 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1307 return 0;
1310 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1312 struct all_refs_cb cb;
1314 cb.all_revs = revs;
1315 cb.all_flags = flags;
1316 for_each_reflog(handle_one_reflog, &cb);
1319 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1320 struct strbuf *path)
1322 size_t baselen = path->len;
1323 int i;
1325 if (it->entry_count >= 0) {
1326 struct tree *tree = lookup_tree(it->sha1);
1327 add_pending_object_with_path(revs, &tree->object, "",
1328 040000, path->buf);
1331 for (i = 0; i < it->subtree_nr; i++) {
1332 struct cache_tree_sub *sub = it->down[i];
1333 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1334 add_cache_tree(sub->cache_tree, revs, path);
1335 strbuf_setlen(path, baselen);
1340 void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
1342 int i;
1344 read_cache();
1345 for (i = 0; i < active_nr; i++) {
1346 struct cache_entry *ce = active_cache[i];
1347 struct blob *blob;
1349 if (S_ISGITLINK(ce->ce_mode))
1350 continue;
1352 blob = lookup_blob(ce->sha1);
1353 if (!blob)
1354 die("unable to add index blob to traversal");
1355 add_pending_object_with_path(revs, &blob->object, "",
1356 ce->ce_mode, ce->name);
1359 if (active_cache_tree) {
1360 struct strbuf path = STRBUF_INIT;
1361 add_cache_tree(active_cache_tree, revs, &path);
1362 strbuf_release(&path);
1366 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
1368 unsigned char sha1[20];
1369 struct object *it;
1370 struct commit *commit;
1371 struct commit_list *parents;
1372 const char *arg = arg_;
1374 if (*arg == '^') {
1375 flags ^= UNINTERESTING | BOTTOM;
1376 arg++;
1378 if (get_sha1_committish(arg, sha1))
1379 return 0;
1380 while (1) {
1381 it = get_reference(revs, arg, sha1, 0);
1382 if (!it && revs->ignore_missing)
1383 return 0;
1384 if (it->type != OBJ_TAG)
1385 break;
1386 if (!((struct tag*)it)->tagged)
1387 return 0;
1388 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
1390 if (it->type != OBJ_COMMIT)
1391 return 0;
1392 commit = (struct commit *)it;
1393 for (parents = commit->parents; parents; parents = parents->next) {
1394 it = &parents->item->object;
1395 it->flags |= flags;
1396 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1397 add_pending_object(revs, it, arg);
1399 return 1;
1402 void init_revisions(struct rev_info *revs, const char *prefix)
1404 memset(revs, 0, sizeof(*revs));
1406 revs->abbrev = DEFAULT_ABBREV;
1407 revs->ignore_merges = 1;
1408 revs->simplify_history = 1;
1409 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1410 DIFF_OPT_SET(&revs->pruning, QUICK);
1411 revs->pruning.add_remove = file_add_remove;
1412 revs->pruning.change = file_change;
1413 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1414 revs->dense = 1;
1415 revs->prefix = prefix;
1416 revs->max_age = -1;
1417 revs->min_age = -1;
1418 revs->skip_count = -1;
1419 revs->max_count = -1;
1420 revs->max_parents = -1;
1422 revs->commit_format = CMIT_FMT_DEFAULT;
1424 init_grep_defaults();
1425 grep_init(&revs->grep_filter, prefix);
1426 revs->grep_filter.status_only = 1;
1427 revs->grep_filter.regflags = REG_NEWLINE;
1429 diff_setup(&revs->diffopt);
1430 if (prefix && !revs->diffopt.prefix) {
1431 revs->diffopt.prefix = prefix;
1432 revs->diffopt.prefix_length = strlen(prefix);
1435 revs->notes_opt.use_default_notes = -1;
1438 static void add_pending_commit_list(struct rev_info *revs,
1439 struct commit_list *commit_list,
1440 unsigned int flags)
1442 while (commit_list) {
1443 struct object *object = &commit_list->item->object;
1444 object->flags |= flags;
1445 add_pending_object(revs, object, sha1_to_hex(object->sha1));
1446 commit_list = commit_list->next;
1450 static void prepare_show_merge(struct rev_info *revs)
1452 struct commit_list *bases;
1453 struct commit *head, *other;
1454 unsigned char sha1[20];
1455 const char **prune = NULL;
1456 int i, prune_num = 1; /* counting terminating NULL */
1458 if (get_sha1("HEAD", sha1))
1459 die("--merge without HEAD?");
1460 head = lookup_commit_or_die(sha1, "HEAD");
1461 if (get_sha1("MERGE_HEAD", sha1))
1462 die("--merge without MERGE_HEAD?");
1463 other = lookup_commit_or_die(sha1, "MERGE_HEAD");
1464 add_pending_object(revs, &head->object, "HEAD");
1465 add_pending_object(revs, &other->object, "MERGE_HEAD");
1466 bases = get_merge_bases(head, other);
1467 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1468 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1469 free_commit_list(bases);
1470 head->object.flags |= SYMMETRIC_LEFT;
1472 if (!active_nr)
1473 read_cache();
1474 for (i = 0; i < active_nr; i++) {
1475 const struct cache_entry *ce = active_cache[i];
1476 if (!ce_stage(ce))
1477 continue;
1478 if (ce_path_match(ce, &revs->prune_data, NULL)) {
1479 prune_num++;
1480 REALLOC_ARRAY(prune, prune_num);
1481 prune[prune_num-2] = ce->name;
1482 prune[prune_num-1] = NULL;
1484 while ((i+1 < active_nr) &&
1485 ce_same_name(ce, active_cache[i+1]))
1486 i++;
1488 free_pathspec(&revs->prune_data);
1489 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1490 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1491 revs->limited = 1;
1494 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1496 struct object_context oc;
1497 char *dotdot;
1498 struct object *object;
1499 unsigned char sha1[20];
1500 int local_flags;
1501 const char *arg = arg_;
1502 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1503 unsigned get_sha1_flags = 0;
1505 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1507 dotdot = strstr(arg, "..");
1508 if (dotdot) {
1509 unsigned char from_sha1[20];
1510 const char *next = dotdot + 2;
1511 const char *this = arg;
1512 int symmetric = *next == '.';
1513 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1514 static const char head_by_default[] = "HEAD";
1515 unsigned int a_flags;
1517 *dotdot = 0;
1518 next += symmetric;
1520 if (!*next)
1521 next = head_by_default;
1522 if (dotdot == arg)
1523 this = head_by_default;
1524 if (this == head_by_default && next == head_by_default &&
1525 !symmetric) {
1527 * Just ".."? That is not a range but the
1528 * pathspec for the parent directory.
1530 if (!cant_be_filename) {
1531 *dotdot = '.';
1532 return -1;
1535 if (!get_sha1_committish(this, from_sha1) &&
1536 !get_sha1_committish(next, sha1)) {
1537 struct object *a_obj, *b_obj;
1539 if (!cant_be_filename) {
1540 *dotdot = '.';
1541 verify_non_filename(revs->prefix, arg);
1544 a_obj = parse_object(from_sha1);
1545 b_obj = parse_object(sha1);
1546 if (!a_obj || !b_obj) {
1547 missing:
1548 if (revs->ignore_missing)
1549 return 0;
1550 die(symmetric
1551 ? "Invalid symmetric difference expression %s"
1552 : "Invalid revision range %s", arg);
1555 if (!symmetric) {
1556 /* just A..B */
1557 a_flags = flags_exclude;
1558 } else {
1559 /* A...B -- find merge bases between the two */
1560 struct commit *a, *b;
1561 struct commit_list *exclude;
1563 a = (a_obj->type == OBJ_COMMIT
1564 ? (struct commit *)a_obj
1565 : lookup_commit_reference(a_obj->sha1));
1566 b = (b_obj->type == OBJ_COMMIT
1567 ? (struct commit *)b_obj
1568 : lookup_commit_reference(b_obj->sha1));
1569 if (!a || !b)
1570 goto missing;
1571 exclude = get_merge_bases(a, b);
1572 add_rev_cmdline_list(revs, exclude,
1573 REV_CMD_MERGE_BASE,
1574 flags_exclude);
1575 add_pending_commit_list(revs, exclude,
1576 flags_exclude);
1577 free_commit_list(exclude);
1579 a_flags = flags | SYMMETRIC_LEFT;
1582 a_obj->flags |= a_flags;
1583 b_obj->flags |= flags;
1584 add_rev_cmdline(revs, a_obj, this,
1585 REV_CMD_LEFT, a_flags);
1586 add_rev_cmdline(revs, b_obj, next,
1587 REV_CMD_RIGHT, flags);
1588 add_pending_object(revs, a_obj, this);
1589 add_pending_object(revs, b_obj, next);
1590 return 0;
1592 *dotdot = '.';
1594 dotdot = strstr(arg, "^@");
1595 if (dotdot && !dotdot[2]) {
1596 *dotdot = 0;
1597 if (add_parents_only(revs, arg, flags))
1598 return 0;
1599 *dotdot = '^';
1601 dotdot = strstr(arg, "^!");
1602 if (dotdot && !dotdot[2]) {
1603 *dotdot = 0;
1604 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM)))
1605 *dotdot = '^';
1608 local_flags = 0;
1609 if (*arg == '^') {
1610 local_flags = UNINTERESTING | BOTTOM;
1611 arg++;
1614 if (revarg_opt & REVARG_COMMITTISH)
1615 get_sha1_flags = GET_SHA1_COMMITTISH;
1617 if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
1618 return revs->ignore_missing ? 0 : -1;
1619 if (!cant_be_filename)
1620 verify_non_filename(revs->prefix, arg);
1621 object = get_reference(revs, arg, sha1, flags ^ local_flags);
1622 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1623 add_pending_object_with_mode(revs, object, arg, oc.mode);
1624 return 0;
1627 struct cmdline_pathspec {
1628 int alloc;
1629 int nr;
1630 const char **path;
1633 static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1635 while (*av) {
1636 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1637 prune->path[prune->nr++] = *(av++);
1641 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1642 struct cmdline_pathspec *prune)
1644 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1645 int len = sb->len;
1646 if (len && sb->buf[len - 1] == '\n')
1647 sb->buf[--len] = '\0';
1648 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1649 prune->path[prune->nr++] = xstrdup(sb->buf);
1653 static void read_revisions_from_stdin(struct rev_info *revs,
1654 struct cmdline_pathspec *prune)
1656 struct strbuf sb;
1657 int seen_dashdash = 0;
1658 int save_warning;
1660 save_warning = warn_on_object_refname_ambiguity;
1661 warn_on_object_refname_ambiguity = 0;
1663 strbuf_init(&sb, 1000);
1664 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1665 int len = sb.len;
1666 if (len && sb.buf[len - 1] == '\n')
1667 sb.buf[--len] = '\0';
1668 if (!len)
1669 break;
1670 if (sb.buf[0] == '-') {
1671 if (len == 2 && sb.buf[1] == '-') {
1672 seen_dashdash = 1;
1673 break;
1675 die("options not supported in --stdin mode");
1677 if (handle_revision_arg(sb.buf, revs, 0,
1678 REVARG_CANNOT_BE_FILENAME))
1679 die("bad revision '%s'", sb.buf);
1681 if (seen_dashdash)
1682 read_pathspec_from_stdin(revs, &sb, prune);
1684 strbuf_release(&sb);
1685 warn_on_object_refname_ambiguity = save_warning;
1688 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1690 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1693 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1695 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1698 static void add_message_grep(struct rev_info *revs, const char *pattern)
1700 add_grep(revs, pattern, GREP_PATTERN_BODY);
1703 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1704 int *unkc, const char **unkv)
1706 const char *arg = argv[0];
1707 const char *optarg;
1708 int argcount;
1710 /* pseudo revision arguments */
1711 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1712 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1713 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1714 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1715 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
1716 !strcmp(arg, "--indexed-objects") ||
1717 starts_with(arg, "--exclude=") ||
1718 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1719 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
1721 unkv[(*unkc)++] = arg;
1722 return 1;
1725 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1726 revs->max_count = atoi(optarg);
1727 revs->no_walk = 0;
1728 return argcount;
1729 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1730 revs->skip_count = atoi(optarg);
1731 return argcount;
1732 } else if ((*arg == '-') && isdigit(arg[1])) {
1733 /* accept -<digit>, like traditional "head" */
1734 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1735 revs->max_count < 0)
1736 die("'%s': not a non-negative integer", arg + 1);
1737 revs->no_walk = 0;
1738 } else if (!strcmp(arg, "-n")) {
1739 if (argc <= 1)
1740 return error("-n requires an argument");
1741 revs->max_count = atoi(argv[1]);
1742 revs->no_walk = 0;
1743 return 2;
1744 } else if (starts_with(arg, "-n")) {
1745 revs->max_count = atoi(arg + 2);
1746 revs->no_walk = 0;
1747 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1748 revs->max_age = atoi(optarg);
1749 return argcount;
1750 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1751 revs->max_age = approxidate(optarg);
1752 return argcount;
1753 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1754 revs->max_age = approxidate(optarg);
1755 return argcount;
1756 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1757 revs->min_age = atoi(optarg);
1758 return argcount;
1759 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1760 revs->min_age = approxidate(optarg);
1761 return argcount;
1762 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1763 revs->min_age = approxidate(optarg);
1764 return argcount;
1765 } else if (!strcmp(arg, "--first-parent")) {
1766 revs->first_parent_only = 1;
1767 } else if (!strcmp(arg, "--ancestry-path")) {
1768 revs->ancestry_path = 1;
1769 revs->simplify_history = 0;
1770 revs->limited = 1;
1771 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1772 init_reflog_walk(&revs->reflog_info);
1773 } else if (!strcmp(arg, "--default")) {
1774 if (argc <= 1)
1775 return error("bad --default argument");
1776 revs->def = argv[1];
1777 return 2;
1778 } else if (!strcmp(arg, "--merge")) {
1779 revs->show_merge = 1;
1780 } else if (!strcmp(arg, "--topo-order")) {
1781 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1782 revs->topo_order = 1;
1783 } else if (!strcmp(arg, "--simplify-merges")) {
1784 revs->simplify_merges = 1;
1785 revs->topo_order = 1;
1786 revs->rewrite_parents = 1;
1787 revs->simplify_history = 0;
1788 revs->limited = 1;
1789 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1790 revs->simplify_merges = 1;
1791 revs->topo_order = 1;
1792 revs->rewrite_parents = 1;
1793 revs->simplify_history = 0;
1794 revs->simplify_by_decoration = 1;
1795 revs->limited = 1;
1796 revs->prune = 1;
1797 load_ref_decorations(DECORATE_SHORT_REFS);
1798 } else if (!strcmp(arg, "--date-order")) {
1799 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
1800 revs->topo_order = 1;
1801 } else if (!strcmp(arg, "--author-date-order")) {
1802 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
1803 revs->topo_order = 1;
1804 } else if (starts_with(arg, "--early-output")) {
1805 int count = 100;
1806 switch (arg[14]) {
1807 case '=':
1808 count = atoi(arg+15);
1809 /* Fallthrough */
1810 case 0:
1811 revs->topo_order = 1;
1812 revs->early_output = count;
1814 } else if (!strcmp(arg, "--parents")) {
1815 revs->rewrite_parents = 1;
1816 revs->print_parents = 1;
1817 } else if (!strcmp(arg, "--dense")) {
1818 revs->dense = 1;
1819 } else if (!strcmp(arg, "--sparse")) {
1820 revs->dense = 0;
1821 } else if (!strcmp(arg, "--show-all")) {
1822 revs->show_all = 1;
1823 } else if (!strcmp(arg, "--remove-empty")) {
1824 revs->remove_empty_trees = 1;
1825 } else if (!strcmp(arg, "--merges")) {
1826 revs->min_parents = 2;
1827 } else if (!strcmp(arg, "--no-merges")) {
1828 revs->max_parents = 1;
1829 } else if (starts_with(arg, "--min-parents=")) {
1830 revs->min_parents = atoi(arg+14);
1831 } else if (starts_with(arg, "--no-min-parents")) {
1832 revs->min_parents = 0;
1833 } else if (starts_with(arg, "--max-parents=")) {
1834 revs->max_parents = atoi(arg+14);
1835 } else if (starts_with(arg, "--no-max-parents")) {
1836 revs->max_parents = -1;
1837 } else if (!strcmp(arg, "--boundary")) {
1838 revs->boundary = 1;
1839 } else if (!strcmp(arg, "--left-right")) {
1840 revs->left_right = 1;
1841 } else if (!strcmp(arg, "--left-only")) {
1842 if (revs->right_only)
1843 die("--left-only is incompatible with --right-only"
1844 " or --cherry");
1845 revs->left_only = 1;
1846 } else if (!strcmp(arg, "--right-only")) {
1847 if (revs->left_only)
1848 die("--right-only is incompatible with --left-only");
1849 revs->right_only = 1;
1850 } else if (!strcmp(arg, "--cherry")) {
1851 if (revs->left_only)
1852 die("--cherry is incompatible with --left-only");
1853 revs->cherry_mark = 1;
1854 revs->right_only = 1;
1855 revs->max_parents = 1;
1856 revs->limited = 1;
1857 } else if (!strcmp(arg, "--count")) {
1858 revs->count = 1;
1859 } else if (!strcmp(arg, "--cherry-mark")) {
1860 if (revs->cherry_pick)
1861 die("--cherry-mark is incompatible with --cherry-pick");
1862 revs->cherry_mark = 1;
1863 revs->limited = 1; /* needs limit_list() */
1864 } else if (!strcmp(arg, "--cherry-pick")) {
1865 if (revs->cherry_mark)
1866 die("--cherry-pick is incompatible with --cherry-mark");
1867 revs->cherry_pick = 1;
1868 revs->limited = 1;
1869 } else if (!strcmp(arg, "--objects")) {
1870 revs->tag_objects = 1;
1871 revs->tree_objects = 1;
1872 revs->blob_objects = 1;
1873 } else if (!strcmp(arg, "--objects-edge")) {
1874 revs->tag_objects = 1;
1875 revs->tree_objects = 1;
1876 revs->blob_objects = 1;
1877 revs->edge_hint = 1;
1878 } else if (!strcmp(arg, "--objects-edge-aggressive")) {
1879 revs->tag_objects = 1;
1880 revs->tree_objects = 1;
1881 revs->blob_objects = 1;
1882 revs->edge_hint = 1;
1883 revs->edge_hint_aggressive = 1;
1884 } else if (!strcmp(arg, "--verify-objects")) {
1885 revs->tag_objects = 1;
1886 revs->tree_objects = 1;
1887 revs->blob_objects = 1;
1888 revs->verify_objects = 1;
1889 } else if (!strcmp(arg, "--unpacked")) {
1890 revs->unpacked = 1;
1891 } else if (starts_with(arg, "--unpacked=")) {
1892 die("--unpacked=<packfile> no longer supported.");
1893 } else if (!strcmp(arg, "-r")) {
1894 revs->diff = 1;
1895 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1896 } else if (!strcmp(arg, "-t")) {
1897 revs->diff = 1;
1898 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1899 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1900 } else if (!strcmp(arg, "-m")) {
1901 revs->ignore_merges = 0;
1902 } else if (!strcmp(arg, "-c")) {
1903 revs->diff = 1;
1904 revs->dense_combined_merges = 0;
1905 revs->combine_merges = 1;
1906 } else if (!strcmp(arg, "--cc")) {
1907 revs->diff = 1;
1908 revs->dense_combined_merges = 1;
1909 revs->combine_merges = 1;
1910 } else if (!strcmp(arg, "-v")) {
1911 revs->verbose_header = 1;
1912 } else if (!strcmp(arg, "--pretty")) {
1913 revs->verbose_header = 1;
1914 revs->pretty_given = 1;
1915 get_commit_format(NULL, revs);
1916 } else if (starts_with(arg, "--pretty=") || starts_with(arg, "--format=")) {
1918 * Detached form ("--pretty X" as opposed to "--pretty=X")
1919 * not allowed, since the argument is optional.
1921 revs->verbose_header = 1;
1922 revs->pretty_given = 1;
1923 get_commit_format(arg+9, revs);
1924 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1925 revs->show_notes = 1;
1926 revs->show_notes_given = 1;
1927 revs->notes_opt.use_default_notes = 1;
1928 } else if (!strcmp(arg, "--show-signature")) {
1929 revs->show_signature = 1;
1930 } else if (!strcmp(arg, "--show-linear-break") ||
1931 starts_with(arg, "--show-linear-break=")) {
1932 if (starts_with(arg, "--show-linear-break="))
1933 revs->break_bar = xstrdup(arg + 20);
1934 else
1935 revs->break_bar = " ..........";
1936 revs->track_linear = 1;
1937 revs->track_first_time = 1;
1938 } else if (starts_with(arg, "--show-notes=") ||
1939 starts_with(arg, "--notes=")) {
1940 struct strbuf buf = STRBUF_INIT;
1941 revs->show_notes = 1;
1942 revs->show_notes_given = 1;
1943 if (starts_with(arg, "--show-notes")) {
1944 if (revs->notes_opt.use_default_notes < 0)
1945 revs->notes_opt.use_default_notes = 1;
1946 strbuf_addstr(&buf, arg+13);
1948 else
1949 strbuf_addstr(&buf, arg+8);
1950 expand_notes_ref(&buf);
1951 string_list_append(&revs->notes_opt.extra_notes_refs,
1952 strbuf_detach(&buf, NULL));
1953 } else if (!strcmp(arg, "--no-notes")) {
1954 revs->show_notes = 0;
1955 revs->show_notes_given = 1;
1956 revs->notes_opt.use_default_notes = -1;
1957 /* we have been strdup'ing ourselves, so trick
1958 * string_list into free()ing strings */
1959 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1960 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1961 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1962 } else if (!strcmp(arg, "--standard-notes")) {
1963 revs->show_notes_given = 1;
1964 revs->notes_opt.use_default_notes = 1;
1965 } else if (!strcmp(arg, "--no-standard-notes")) {
1966 revs->notes_opt.use_default_notes = 0;
1967 } else if (!strcmp(arg, "--oneline")) {
1968 revs->verbose_header = 1;
1969 get_commit_format("oneline", revs);
1970 revs->pretty_given = 1;
1971 revs->abbrev_commit = 1;
1972 } else if (!strcmp(arg, "--graph")) {
1973 revs->topo_order = 1;
1974 revs->rewrite_parents = 1;
1975 revs->graph = graph_init(revs);
1976 } else if (!strcmp(arg, "--root")) {
1977 revs->show_root_diff = 1;
1978 } else if (!strcmp(arg, "--no-commit-id")) {
1979 revs->no_commit_id = 1;
1980 } else if (!strcmp(arg, "--always")) {
1981 revs->always_show_header = 1;
1982 } else if (!strcmp(arg, "--no-abbrev")) {
1983 revs->abbrev = 0;
1984 } else if (!strcmp(arg, "--abbrev")) {
1985 revs->abbrev = DEFAULT_ABBREV;
1986 } else if (starts_with(arg, "--abbrev=")) {
1987 revs->abbrev = strtoul(arg + 9, NULL, 10);
1988 if (revs->abbrev < MINIMUM_ABBREV)
1989 revs->abbrev = MINIMUM_ABBREV;
1990 else if (revs->abbrev > 40)
1991 revs->abbrev = 40;
1992 } else if (!strcmp(arg, "--abbrev-commit")) {
1993 revs->abbrev_commit = 1;
1994 revs->abbrev_commit_given = 1;
1995 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1996 revs->abbrev_commit = 0;
1997 } else if (!strcmp(arg, "--full-diff")) {
1998 revs->diff = 1;
1999 revs->full_diff = 1;
2000 } else if (!strcmp(arg, "--full-history")) {
2001 revs->simplify_history = 0;
2002 } else if (!strcmp(arg, "--relative-date")) {
2003 revs->date_mode.type = DATE_RELATIVE;
2004 revs->date_mode_explicit = 1;
2005 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
2006 parse_date_format(optarg, &revs->date_mode);
2007 revs->date_mode_explicit = 1;
2008 return argcount;
2009 } else if (!strcmp(arg, "--log-size")) {
2010 revs->show_log_size = 1;
2013 * Grepping the commit log
2015 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2016 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2017 return argcount;
2018 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2019 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2020 return argcount;
2021 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2022 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2023 return argcount;
2024 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2025 add_message_grep(revs, optarg);
2026 return argcount;
2027 } else if (!strcmp(arg, "--grep-debug")) {
2028 revs->grep_filter.debug = 1;
2029 } else if (!strcmp(arg, "--basic-regexp")) {
2030 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE, &revs->grep_filter);
2031 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2032 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter);
2033 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2034 revs->grep_filter.regflags |= REG_ICASE;
2035 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
2036 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2037 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter);
2038 } else if (!strcmp(arg, "--perl-regexp")) {
2039 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE, &revs->grep_filter);
2040 } else if (!strcmp(arg, "--all-match")) {
2041 revs->grep_filter.all_match = 1;
2042 } else if (!strcmp(arg, "--invert-grep")) {
2043 revs->invert_grep = 1;
2044 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2045 if (strcmp(optarg, "none"))
2046 git_log_output_encoding = xstrdup(optarg);
2047 else
2048 git_log_output_encoding = "";
2049 return argcount;
2050 } else if (!strcmp(arg, "--reverse")) {
2051 revs->reverse ^= 1;
2052 } else if (!strcmp(arg, "--children")) {
2053 revs->children.name = "children";
2054 revs->limited = 1;
2055 } else if (!strcmp(arg, "--ignore-missing")) {
2056 revs->ignore_missing = 1;
2057 } else {
2058 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
2059 if (!opts)
2060 unkv[(*unkc)++] = arg;
2061 return opts;
2063 if (revs->graph && revs->track_linear)
2064 die("--show-linear-break and --graph are incompatible");
2066 return 1;
2069 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2070 const struct option *options,
2071 const char * const usagestr[])
2073 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2074 &ctx->cpidx, ctx->out);
2075 if (n <= 0) {
2076 error("unknown option `%s'", ctx->argv[0]);
2077 usage_with_options(usagestr, options);
2079 ctx->argv += n;
2080 ctx->argc -= n;
2083 static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
2084 struct strbuf bisect_refs = STRBUF_INIT;
2085 int status;
2086 strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2087 status = for_each_ref_in_submodule(submodule, bisect_refs.buf, fn, cb_data);
2088 strbuf_release(&bisect_refs);
2089 return status;
2092 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2094 return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
2097 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2099 return for_each_bisect_ref(submodule, fn, cb_data, term_good);
2102 static int handle_revision_pseudo_opt(const char *submodule,
2103 struct rev_info *revs,
2104 int argc, const char **argv, int *flags)
2106 const char *arg = argv[0];
2107 const char *optarg;
2108 int argcount;
2111 * NOTE!
2113 * Commands like "git shortlog" will not accept the options below
2114 * unless parse_revision_opt queues them (as opposed to erroring
2115 * out).
2117 * When implementing your new pseudo-option, remember to
2118 * register it in the list at the top of handle_revision_opt.
2120 if (!strcmp(arg, "--all")) {
2121 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2122 handle_refs(submodule, revs, *flags, head_ref_submodule);
2123 clear_ref_exclusion(&revs->ref_excludes);
2124 } else if (!strcmp(arg, "--branches")) {
2125 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
2126 clear_ref_exclusion(&revs->ref_excludes);
2127 } else if (!strcmp(arg, "--bisect")) {
2128 read_bisect_terms(&term_bad, &term_good);
2129 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
2130 handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
2131 revs->bisect = 1;
2132 } else if (!strcmp(arg, "--tags")) {
2133 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
2134 clear_ref_exclusion(&revs->ref_excludes);
2135 } else if (!strcmp(arg, "--remotes")) {
2136 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
2137 clear_ref_exclusion(&revs->ref_excludes);
2138 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2139 struct all_refs_cb cb;
2140 init_all_refs_cb(&cb, revs, *flags);
2141 for_each_glob_ref(handle_one_ref, optarg, &cb);
2142 clear_ref_exclusion(&revs->ref_excludes);
2143 return argcount;
2144 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2145 add_ref_exclusion(&revs->ref_excludes, optarg);
2146 return argcount;
2147 } else if (starts_with(arg, "--branches=")) {
2148 struct all_refs_cb cb;
2149 init_all_refs_cb(&cb, revs, *flags);
2150 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
2151 clear_ref_exclusion(&revs->ref_excludes);
2152 } else if (starts_with(arg, "--tags=")) {
2153 struct all_refs_cb cb;
2154 init_all_refs_cb(&cb, revs, *flags);
2155 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
2156 clear_ref_exclusion(&revs->ref_excludes);
2157 } else if (starts_with(arg, "--remotes=")) {
2158 struct all_refs_cb cb;
2159 init_all_refs_cb(&cb, revs, *flags);
2160 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
2161 clear_ref_exclusion(&revs->ref_excludes);
2162 } else if (!strcmp(arg, "--reflog")) {
2163 add_reflogs_to_pending(revs, *flags);
2164 } else if (!strcmp(arg, "--indexed-objects")) {
2165 add_index_objects_to_pending(revs, *flags);
2166 } else if (!strcmp(arg, "--not")) {
2167 *flags ^= UNINTERESTING | BOTTOM;
2168 } else if (!strcmp(arg, "--no-walk")) {
2169 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2170 } else if (starts_with(arg, "--no-walk=")) {
2172 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2173 * not allowed, since the argument is optional.
2175 if (!strcmp(arg + 10, "sorted"))
2176 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2177 else if (!strcmp(arg + 10, "unsorted"))
2178 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2179 else
2180 return error("invalid argument to --no-walk");
2181 } else if (!strcmp(arg, "--do-walk")) {
2182 revs->no_walk = 0;
2183 } else {
2184 return 0;
2187 return 1;
2190 static void NORETURN diagnose_missing_default(const char *def)
2192 unsigned char sha1[20];
2193 int flags;
2194 const char *refname;
2196 refname = resolve_ref_unsafe(def, 0, sha1, &flags);
2197 if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2198 die(_("your current branch appears to be broken"));
2200 skip_prefix(refname, "refs/heads/", &refname);
2201 die(_("your current branch '%s' does not have any commits yet"),
2202 refname);
2206 * Parse revision information, filling in the "rev_info" structure,
2207 * and removing the used arguments from the argument list.
2209 * Returns the number of arguments left that weren't recognized
2210 * (which are also moved to the head of the argument list)
2212 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2214 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
2215 struct cmdline_pathspec prune_data;
2216 const char *submodule = NULL;
2218 memset(&prune_data, 0, sizeof(prune_data));
2219 if (opt)
2220 submodule = opt->submodule;
2222 /* First, search for "--" */
2223 if (opt && opt->assume_dashdash) {
2224 seen_dashdash = 1;
2225 } else {
2226 seen_dashdash = 0;
2227 for (i = 1; i < argc; i++) {
2228 const char *arg = argv[i];
2229 if (strcmp(arg, "--"))
2230 continue;
2231 argv[i] = NULL;
2232 argc = i;
2233 if (argv[i + 1])
2234 append_prune_data(&prune_data, argv + i + 1);
2235 seen_dashdash = 1;
2236 break;
2240 /* Second, deal with arguments and options */
2241 flags = 0;
2242 revarg_opt = opt ? opt->revarg_opt : 0;
2243 if (seen_dashdash)
2244 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2245 read_from_stdin = 0;
2246 for (left = i = 1; i < argc; i++) {
2247 const char *arg = argv[i];
2248 if (*arg == '-') {
2249 int opts;
2251 opts = handle_revision_pseudo_opt(submodule,
2252 revs, argc - i, argv + i,
2253 &flags);
2254 if (opts > 0) {
2255 i += opts - 1;
2256 continue;
2259 if (!strcmp(arg, "--stdin")) {
2260 if (revs->disable_stdin) {
2261 argv[left++] = arg;
2262 continue;
2264 if (read_from_stdin++)
2265 die("--stdin given twice?");
2266 read_revisions_from_stdin(revs, &prune_data);
2267 continue;
2270 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
2271 if (opts > 0) {
2272 i += opts - 1;
2273 continue;
2275 if (opts < 0)
2276 exit(128);
2277 continue;
2281 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2282 int j;
2283 if (seen_dashdash || *arg == '^')
2284 die("bad revision '%s'", arg);
2286 /* If we didn't have a "--":
2287 * (1) all filenames must exist;
2288 * (2) all rev-args must not be interpretable
2289 * as a valid filename.
2290 * but the latter we have checked in the main loop.
2292 for (j = i; j < argc; j++)
2293 verify_filename(revs->prefix, argv[j], j == i);
2295 append_prune_data(&prune_data, argv + i);
2296 break;
2298 else
2299 got_rev_arg = 1;
2302 if (prune_data.nr) {
2304 * If we need to introduce the magic "a lone ':' means no
2305 * pathspec whatsoever", here is the place to do so.
2307 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2308 * prune_data.nr = 0;
2309 * prune_data.alloc = 0;
2310 * free(prune_data.path);
2311 * prune_data.path = NULL;
2312 * } else {
2313 * terminate prune_data.alloc with NULL and
2314 * call init_pathspec() to set revs->prune_data here.
2317 ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
2318 prune_data.path[prune_data.nr++] = NULL;
2319 parse_pathspec(&revs->prune_data, 0, 0,
2320 revs->prefix, prune_data.path);
2323 if (revs->def == NULL)
2324 revs->def = opt ? opt->def : NULL;
2325 if (opt && opt->tweak)
2326 opt->tweak(revs, opt);
2327 if (revs->show_merge)
2328 prepare_show_merge(revs);
2329 if (revs->def && !revs->pending.nr && !got_rev_arg) {
2330 unsigned char sha1[20];
2331 struct object *object;
2332 struct object_context oc;
2333 if (get_sha1_with_context(revs->def, 0, sha1, &oc))
2334 diagnose_missing_default(revs->def);
2335 object = get_reference(revs, revs->def, sha1, 0);
2336 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2339 /* Did the user ask for any diff output? Run the diff! */
2340 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2341 revs->diff = 1;
2343 /* Pickaxe, diff-filter and rename following need diffs */
2344 if (revs->diffopt.pickaxe ||
2345 revs->diffopt.filter ||
2346 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2347 revs->diff = 1;
2349 if (revs->topo_order)
2350 revs->limited = 1;
2352 if (revs->prune_data.nr) {
2353 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2354 /* Can't prune commits with rename following: the paths change.. */
2355 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2356 revs->prune = 1;
2357 if (!revs->full_diff)
2358 copy_pathspec(&revs->diffopt.pathspec,
2359 &revs->prune_data);
2361 if (revs->combine_merges)
2362 revs->ignore_merges = 0;
2363 revs->diffopt.abbrev = revs->abbrev;
2365 if (revs->line_level_traverse) {
2366 revs->limited = 1;
2367 revs->topo_order = 1;
2370 diff_setup_done(&revs->diffopt);
2372 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2373 &revs->grep_filter);
2374 compile_grep_patterns(&revs->grep_filter);
2376 if (revs->reverse && revs->reflog_info)
2377 die("cannot combine --reverse with --walk-reflogs");
2378 if (revs->rewrite_parents && revs->children.name)
2379 die("cannot combine --parents and --children");
2382 * Limitations on the graph functionality
2384 if (revs->reverse && revs->graph)
2385 die("cannot combine --reverse with --graph");
2387 if (revs->reflog_info && revs->graph)
2388 die("cannot combine --walk-reflogs with --graph");
2389 if (revs->no_walk && revs->graph)
2390 die("cannot combine --no-walk with --graph");
2391 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2392 die("cannot use --grep-reflog without --walk-reflogs");
2394 if (revs->first_parent_only && revs->bisect)
2395 die(_("--first-parent is incompatible with --bisect"));
2397 return left;
2400 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2402 struct commit_list *l = xcalloc(1, sizeof(*l));
2404 l->item = child;
2405 l->next = add_decoration(&revs->children, &parent->object, l);
2408 static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2410 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2411 struct commit_list **pp, *p;
2412 int surviving_parents;
2414 /* Examine existing parents while marking ones we have seen... */
2415 pp = &commit->parents;
2416 surviving_parents = 0;
2417 while ((p = *pp) != NULL) {
2418 struct commit *parent = p->item;
2419 if (parent->object.flags & TMP_MARK) {
2420 *pp = p->next;
2421 if (ts)
2422 compact_treesame(revs, commit, surviving_parents);
2423 continue;
2425 parent->object.flags |= TMP_MARK;
2426 surviving_parents++;
2427 pp = &p->next;
2429 /* clear the temporary mark */
2430 for (p = commit->parents; p; p = p->next) {
2431 p->item->object.flags &= ~TMP_MARK;
2433 /* no update_treesame() - removing duplicates can't affect TREESAME */
2434 return surviving_parents;
2437 struct merge_simplify_state {
2438 struct commit *simplified;
2441 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2443 struct merge_simplify_state *st;
2445 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2446 if (!st) {
2447 st = xcalloc(1, sizeof(*st));
2448 add_decoration(&revs->merge_simplification, &commit->object, st);
2450 return st;
2453 static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2455 struct commit_list *h = reduce_heads(commit->parents);
2456 int i = 0, marked = 0;
2457 struct commit_list *po, *pn;
2459 /* Want these for sanity-checking only */
2460 int orig_cnt = commit_list_count(commit->parents);
2461 int cnt = commit_list_count(h);
2464 * Not ready to remove items yet, just mark them for now, based
2465 * on the output of reduce_heads(). reduce_heads outputs the reduced
2466 * set in its original order, so this isn't too hard.
2468 po = commit->parents;
2469 pn = h;
2470 while (po) {
2471 if (pn && po->item == pn->item) {
2472 pn = pn->next;
2473 i++;
2474 } else {
2475 po->item->object.flags |= TMP_MARK;
2476 marked++;
2478 po=po->next;
2481 if (i != cnt || cnt+marked != orig_cnt)
2482 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2484 free_commit_list(h);
2486 return marked;
2489 static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2491 struct commit_list *p;
2492 int marked = 0;
2494 for (p = commit->parents; p; p = p->next) {
2495 struct commit *parent = p->item;
2496 if (!parent->parents && (parent->object.flags & TREESAME)) {
2497 parent->object.flags |= TMP_MARK;
2498 marked++;
2502 return marked;
2506 * Awkward naming - this means one parent we are TREESAME to.
2507 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2508 * empty tree). Better name suggestions?
2510 static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2512 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2513 struct commit *unmarked = NULL, *marked = NULL;
2514 struct commit_list *p;
2515 unsigned n;
2517 for (p = commit->parents, n = 0; p; p = p->next, n++) {
2518 if (ts->treesame[n]) {
2519 if (p->item->object.flags & TMP_MARK) {
2520 if (!marked)
2521 marked = p->item;
2522 } else {
2523 if (!unmarked) {
2524 unmarked = p->item;
2525 break;
2532 * If we are TREESAME to a marked-for-deletion parent, but not to any
2533 * unmarked parents, unmark the first TREESAME parent. This is the
2534 * parent that the default simplify_history==1 scan would have followed,
2535 * and it doesn't make sense to omit that path when asking for a
2536 * simplified full history. Retaining it improves the chances of
2537 * understanding odd missed merges that took an old version of a file.
2539 * Example:
2541 * I--------*X A modified the file, but mainline merge X used
2542 * \ / "-s ours", so took the version from I. X is
2543 * `-*A--' TREESAME to I and !TREESAME to A.
2545 * Default log from X would produce "I". Without this check,
2546 * --full-history --simplify-merges would produce "I-A-X", showing
2547 * the merge commit X and that it changed A, but not making clear that
2548 * it had just taken the I version. With this check, the topology above
2549 * is retained.
2551 * Note that it is possible that the simplification chooses a different
2552 * TREESAME parent from the default, in which case this test doesn't
2553 * activate, and we _do_ drop the default parent. Example:
2555 * I------X A modified the file, but it was reverted in B,
2556 * \ / meaning mainline merge X is TREESAME to both
2557 * *A-*B parents.
2559 * Default log would produce "I" by following the first parent;
2560 * --full-history --simplify-merges will produce "I-A-B". But this is a
2561 * reasonable result - it presents a logical full history leading from
2562 * I to X, and X is not an important merge.
2564 if (!unmarked && marked) {
2565 marked->object.flags &= ~TMP_MARK;
2566 return 1;
2569 return 0;
2572 static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2574 struct commit_list **pp, *p;
2575 int nth_parent, removed = 0;
2577 pp = &commit->parents;
2578 nth_parent = 0;
2579 while ((p = *pp) != NULL) {
2580 struct commit *parent = p->item;
2581 if (parent->object.flags & TMP_MARK) {
2582 parent->object.flags &= ~TMP_MARK;
2583 *pp = p->next;
2584 free(p);
2585 removed++;
2586 compact_treesame(revs, commit, nth_parent);
2587 continue;
2589 pp = &p->next;
2590 nth_parent++;
2593 /* Removing parents can only increase TREESAMEness */
2594 if (removed && !(commit->object.flags & TREESAME))
2595 update_treesame(revs, commit);
2597 return nth_parent;
2600 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
2602 struct commit_list *p;
2603 struct commit *parent;
2604 struct merge_simplify_state *st, *pst;
2605 int cnt;
2607 st = locate_simplify_state(revs, commit);
2610 * Have we handled this one?
2612 if (st->simplified)
2613 return tail;
2616 * An UNINTERESTING commit simplifies to itself, so does a
2617 * root commit. We do not rewrite parents of such commit
2618 * anyway.
2620 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
2621 st->simplified = commit;
2622 return tail;
2626 * Do we know what commit all of our parents that matter
2627 * should be rewritten to? Otherwise we are not ready to
2628 * rewrite this one yet.
2630 for (cnt = 0, p = commit->parents; p; p = p->next) {
2631 pst = locate_simplify_state(revs, p->item);
2632 if (!pst->simplified) {
2633 tail = &commit_list_insert(p->item, tail)->next;
2634 cnt++;
2636 if (revs->first_parent_only)
2637 break;
2639 if (cnt) {
2640 tail = &commit_list_insert(commit, tail)->next;
2641 return tail;
2645 * Rewrite our list of parents. Note that this cannot
2646 * affect our TREESAME flags in any way - a commit is
2647 * always TREESAME to its simplification.
2649 for (p = commit->parents; p; p = p->next) {
2650 pst = locate_simplify_state(revs, p->item);
2651 p->item = pst->simplified;
2652 if (revs->first_parent_only)
2653 break;
2656 if (revs->first_parent_only)
2657 cnt = 1;
2658 else
2659 cnt = remove_duplicate_parents(revs, commit);
2662 * It is possible that we are a merge and one side branch
2663 * does not have any commit that touches the given paths;
2664 * in such a case, the immediate parent from that branch
2665 * will be rewritten to be the merge base.
2667 * o----X X: the commit we are looking at;
2668 * / / o: a commit that touches the paths;
2669 * ---o----'
2671 * Further, a merge of an independent branch that doesn't
2672 * touch the path will reduce to a treesame root parent:
2674 * ----o----X X: the commit we are looking at;
2675 * / o: a commit that touches the paths;
2676 * r r: a root commit not touching the paths
2678 * Detect and simplify both cases.
2680 if (1 < cnt) {
2681 int marked = mark_redundant_parents(revs, commit);
2682 marked += mark_treesame_root_parents(revs, commit);
2683 if (marked)
2684 marked -= leave_one_treesame_to_parent(revs, commit);
2685 if (marked)
2686 cnt = remove_marked_parents(revs, commit);
2690 * A commit simplifies to itself if it is a root, if it is
2691 * UNINTERESTING, if it touches the given paths, or if it is a
2692 * merge and its parents don't simplify to one relevant commit
2693 * (the first two cases are already handled at the beginning of
2694 * this function).
2696 * Otherwise, it simplifies to what its sole relevant parent
2697 * simplifies to.
2699 if (!cnt ||
2700 (commit->object.flags & UNINTERESTING) ||
2701 !(commit->object.flags & TREESAME) ||
2702 (parent = one_relevant_parent(revs, commit->parents)) == NULL)
2703 st->simplified = commit;
2704 else {
2705 pst = locate_simplify_state(revs, parent);
2706 st->simplified = pst->simplified;
2708 return tail;
2711 static void simplify_merges(struct rev_info *revs)
2713 struct commit_list *list, *next;
2714 struct commit_list *yet_to_do, **tail;
2715 struct commit *commit;
2717 if (!revs->prune)
2718 return;
2720 /* feed the list reversed */
2721 yet_to_do = NULL;
2722 for (list = revs->commits; list; list = next) {
2723 commit = list->item;
2724 next = list->next;
2726 * Do not free(list) here yet; the original list
2727 * is used later in this function.
2729 commit_list_insert(commit, &yet_to_do);
2731 while (yet_to_do) {
2732 list = yet_to_do;
2733 yet_to_do = NULL;
2734 tail = &yet_to_do;
2735 while (list) {
2736 commit = list->item;
2737 next = list->next;
2738 free(list);
2739 list = next;
2740 tail = simplify_one(revs, commit, tail);
2744 /* clean up the result, removing the simplified ones */
2745 list = revs->commits;
2746 revs->commits = NULL;
2747 tail = &revs->commits;
2748 while (list) {
2749 struct merge_simplify_state *st;
2751 commit = list->item;
2752 next = list->next;
2753 free(list);
2754 list = next;
2755 st = locate_simplify_state(revs, commit);
2756 if (st->simplified == commit)
2757 tail = &commit_list_insert(commit, tail)->next;
2761 static void set_children(struct rev_info *revs)
2763 struct commit_list *l;
2764 for (l = revs->commits; l; l = l->next) {
2765 struct commit *commit = l->item;
2766 struct commit_list *p;
2768 for (p = commit->parents; p; p = p->next)
2769 add_child(revs, p->item, commit);
2773 void reset_revision_walk(void)
2775 clear_object_flags(SEEN | ADDED | SHOWN);
2778 int prepare_revision_walk(struct rev_info *revs)
2780 int i;
2781 struct object_array old_pending;
2782 struct commit_list **next = &revs->commits;
2784 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
2785 revs->pending.nr = 0;
2786 revs->pending.alloc = 0;
2787 revs->pending.objects = NULL;
2788 for (i = 0; i < old_pending.nr; i++) {
2789 struct object_array_entry *e = old_pending.objects + i;
2790 struct commit *commit = handle_commit(revs, e);
2791 if (commit) {
2792 if (!(commit->object.flags & SEEN)) {
2793 commit->object.flags |= SEEN;
2794 next = commit_list_append(commit, next);
2798 if (!revs->leak_pending)
2799 object_array_clear(&old_pending);
2801 /* Signal whether we need per-parent treesame decoration */
2802 if (revs->simplify_merges ||
2803 (revs->limited && limiting_can_increase_treesame(revs)))
2804 revs->treesame.name = "treesame";
2806 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2807 commit_list_sort_by_date(&revs->commits);
2808 if (revs->no_walk)
2809 return 0;
2810 if (revs->limited)
2811 if (limit_list(revs) < 0)
2812 return -1;
2813 if (revs->topo_order)
2814 sort_in_topological_order(&revs->commits, revs->sort_order);
2815 if (revs->line_level_traverse)
2816 line_log_filter(revs);
2817 if (revs->simplify_merges)
2818 simplify_merges(revs);
2819 if (revs->children.name)
2820 set_children(revs);
2821 return 0;
2824 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2826 struct commit_list *cache = NULL;
2828 for (;;) {
2829 struct commit *p = *pp;
2830 if (!revs->limited)
2831 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2832 return rewrite_one_error;
2833 if (p->object.flags & UNINTERESTING)
2834 return rewrite_one_ok;
2835 if (!(p->object.flags & TREESAME))
2836 return rewrite_one_ok;
2837 if (!p->parents)
2838 return rewrite_one_noparents;
2839 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2840 return rewrite_one_ok;
2841 *pp = p;
2845 int rewrite_parents(struct rev_info *revs, struct commit *commit,
2846 rewrite_parent_fn_t rewrite_parent)
2848 struct commit_list **pp = &commit->parents;
2849 while (*pp) {
2850 struct commit_list *parent = *pp;
2851 switch (rewrite_parent(revs, &parent->item)) {
2852 case rewrite_one_ok:
2853 break;
2854 case rewrite_one_noparents:
2855 *pp = parent->next;
2856 continue;
2857 case rewrite_one_error:
2858 return -1;
2860 pp = &parent->next;
2862 remove_duplicate_parents(revs, commit);
2863 return 0;
2866 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2868 char *person, *endp;
2869 size_t len, namelen, maillen;
2870 const char *name;
2871 const char *mail;
2872 struct ident_split ident;
2874 person = strstr(buf->buf, what);
2875 if (!person)
2876 return 0;
2878 person += strlen(what);
2879 endp = strchr(person, '\n');
2880 if (!endp)
2881 return 0;
2883 len = endp - person;
2885 if (split_ident_line(&ident, person, len))
2886 return 0;
2888 mail = ident.mail_begin;
2889 maillen = ident.mail_end - ident.mail_begin;
2890 name = ident.name_begin;
2891 namelen = ident.name_end - ident.name_begin;
2893 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2894 struct strbuf namemail = STRBUF_INIT;
2896 strbuf_addf(&namemail, "%.*s <%.*s>",
2897 (int)namelen, name, (int)maillen, mail);
2899 strbuf_splice(buf, ident.name_begin - buf->buf,
2900 ident.mail_end - ident.name_begin + 1,
2901 namemail.buf, namemail.len);
2903 strbuf_release(&namemail);
2905 return 1;
2908 return 0;
2911 static int commit_match(struct commit *commit, struct rev_info *opt)
2913 int retval;
2914 const char *encoding;
2915 const char *message;
2916 struct strbuf buf = STRBUF_INIT;
2918 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2919 return 1;
2921 /* Prepend "fake" headers as needed */
2922 if (opt->grep_filter.use_reflog_filter) {
2923 strbuf_addstr(&buf, "reflog ");
2924 get_reflog_message(&buf, opt->reflog_info);
2925 strbuf_addch(&buf, '\n');
2929 * We grep in the user's output encoding, under the assumption that it
2930 * is the encoding they are most likely to write their grep pattern
2931 * for. In addition, it means we will match the "notes" encoding below,
2932 * so we will not end up with a buffer that has two different encodings
2933 * in it.
2935 encoding = get_log_output_encoding();
2936 message = logmsg_reencode(commit, NULL, encoding);
2938 /* Copy the commit to temporary if we are using "fake" headers */
2939 if (buf.len)
2940 strbuf_addstr(&buf, message);
2942 if (opt->grep_filter.header_list && opt->mailmap) {
2943 if (!buf.len)
2944 strbuf_addstr(&buf, message);
2946 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2947 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2950 /* Append "fake" message parts as needed */
2951 if (opt->show_notes) {
2952 if (!buf.len)
2953 strbuf_addstr(&buf, message);
2954 format_display_notes(commit->object.sha1, &buf, encoding, 1);
2958 * Find either in the original commit message, or in the temporary.
2959 * Note that we cast away the constness of "message" here. It is
2960 * const because it may come from the cached commit buffer. That's OK,
2961 * because we know that it is modifiable heap memory, and that while
2962 * grep_buffer may modify it for speed, it will restore any
2963 * changes before returning.
2965 if (buf.len)
2966 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2967 else
2968 retval = grep_buffer(&opt->grep_filter,
2969 (char *)message, strlen(message));
2970 strbuf_release(&buf);
2971 unuse_commit_buffer(commit, message);
2972 return opt->invert_grep ? !retval : retval;
2975 static inline int want_ancestry(const struct rev_info *revs)
2977 return (revs->rewrite_parents || revs->children.name);
2980 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2982 if (commit->object.flags & SHOWN)
2983 return commit_ignore;
2984 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
2985 return commit_ignore;
2986 if (revs->show_all)
2987 return commit_show;
2988 if (commit->object.flags & UNINTERESTING)
2989 return commit_ignore;
2990 if (revs->min_age != -1 && (commit->date > revs->min_age))
2991 return commit_ignore;
2992 if (revs->min_parents || (revs->max_parents >= 0)) {
2993 int n = commit_list_count(commit->parents);
2994 if ((n < revs->min_parents) ||
2995 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2996 return commit_ignore;
2998 if (!commit_match(commit, revs))
2999 return commit_ignore;
3000 if (revs->prune && revs->dense) {
3001 /* Commit without changes? */
3002 if (commit->object.flags & TREESAME) {
3003 int n;
3004 struct commit_list *p;
3005 /* drop merges unless we want parenthood */
3006 if (!want_ancestry(revs))
3007 return commit_ignore;
3009 * If we want ancestry, then need to keep any merges
3010 * between relevant commits to tie together topology.
3011 * For consistency with TREESAME and simplification
3012 * use "relevant" here rather than just INTERESTING,
3013 * to treat bottom commit(s) as part of the topology.
3015 for (n = 0, p = commit->parents; p; p = p->next)
3016 if (relevant_commit(p->item))
3017 if (++n >= 2)
3018 return commit_show;
3019 return commit_ignore;
3022 return commit_show;
3025 define_commit_slab(saved_parents, struct commit_list *);
3027 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3030 * You may only call save_parents() once per commit (this is checked
3031 * for non-root commits).
3033 static void save_parents(struct rev_info *revs, struct commit *commit)
3035 struct commit_list **pp;
3037 if (!revs->saved_parents_slab) {
3038 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3039 init_saved_parents(revs->saved_parents_slab);
3042 pp = saved_parents_at(revs->saved_parents_slab, commit);
3045 * When walking with reflogs, we may visit the same commit
3046 * several times: once for each appearance in the reflog.
3048 * In this case, save_parents() will be called multiple times.
3049 * We want to keep only the first set of parents. We need to
3050 * store a sentinel value for an empty (i.e., NULL) parent
3051 * list to distinguish it from a not-yet-saved list, however.
3053 if (*pp)
3054 return;
3055 if (commit->parents)
3056 *pp = copy_commit_list(commit->parents);
3057 else
3058 *pp = EMPTY_PARENT_LIST;
3061 static void free_saved_parents(struct rev_info *revs)
3063 if (revs->saved_parents_slab)
3064 clear_saved_parents(revs->saved_parents_slab);
3067 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3069 struct commit_list *parents;
3071 if (!revs->saved_parents_slab)
3072 return commit->parents;
3074 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3075 if (parents == EMPTY_PARENT_LIST)
3076 return NULL;
3077 return parents;
3080 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3082 enum commit_action action = get_commit_action(revs, commit);
3084 if (action == commit_show &&
3085 !revs->show_all &&
3086 revs->prune && revs->dense && want_ancestry(revs)) {
3088 * --full-diff on simplified parents is no good: it
3089 * will show spurious changes from the commits that
3090 * were elided. So we save the parents on the side
3091 * when --full-diff is in effect.
3093 if (revs->full_diff)
3094 save_parents(revs, commit);
3095 if (rewrite_parents(revs, commit, rewrite_one) < 0)
3096 return commit_error;
3098 return action;
3101 static void track_linear(struct rev_info *revs, struct commit *commit)
3103 if (revs->track_first_time) {
3104 revs->linear = 1;
3105 revs->track_first_time = 0;
3106 } else {
3107 struct commit_list *p;
3108 for (p = revs->previous_parents; p; p = p->next)
3109 if (p->item == NULL || /* first commit */
3110 !hashcmp(p->item->object.sha1, commit->object.sha1))
3111 break;
3112 revs->linear = p != NULL;
3114 if (revs->reverse) {
3115 if (revs->linear)
3116 commit->object.flags |= TRACK_LINEAR;
3118 free_commit_list(revs->previous_parents);
3119 revs->previous_parents = copy_commit_list(commit->parents);
3122 static struct commit *get_revision_1(struct rev_info *revs)
3124 if (!revs->commits)
3125 return NULL;
3127 do {
3128 struct commit_list *entry = revs->commits;
3129 struct commit *commit = entry->item;
3131 revs->commits = entry->next;
3132 free(entry);
3134 if (revs->reflog_info) {
3135 save_parents(revs, commit);
3136 fake_reflog_parent(revs->reflog_info, commit);
3137 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3141 * If we haven't done the list limiting, we need to look at
3142 * the parents here. We also need to do the date-based limiting
3143 * that we'd otherwise have done in limit_list().
3145 if (!revs->limited) {
3146 if (revs->max_age != -1 &&
3147 (commit->date < revs->max_age))
3148 continue;
3149 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3150 if (!revs->ignore_missing_links)
3151 die("Failed to traverse parents of commit %s",
3152 sha1_to_hex(commit->object.sha1));
3156 switch (simplify_commit(revs, commit)) {
3157 case commit_ignore:
3158 continue;
3159 case commit_error:
3160 die("Failed to simplify parents of commit %s",
3161 sha1_to_hex(commit->object.sha1));
3162 default:
3163 if (revs->track_linear)
3164 track_linear(revs, commit);
3165 return commit;
3167 } while (revs->commits);
3168 return NULL;
3172 * Return true for entries that have not yet been shown. (This is an
3173 * object_array_each_func_t.)
3175 static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3177 return !(entry->item->flags & SHOWN);
3181 * If array is on the verge of a realloc, garbage-collect any entries
3182 * that have already been shown to try to free up some space.
3184 static void gc_boundary(struct object_array *array)
3186 if (array->nr == array->alloc)
3187 object_array_filter(array, entry_unshown, NULL);
3190 static void create_boundary_commit_list(struct rev_info *revs)
3192 unsigned i;
3193 struct commit *c;
3194 struct object_array *array = &revs->boundary_commits;
3195 struct object_array_entry *objects = array->objects;
3198 * If revs->commits is non-NULL at this point, an error occurred in
3199 * get_revision_1(). Ignore the error and continue printing the
3200 * boundary commits anyway. (This is what the code has always
3201 * done.)
3203 if (revs->commits) {
3204 free_commit_list(revs->commits);
3205 revs->commits = NULL;
3209 * Put all of the actual boundary commits from revs->boundary_commits
3210 * into revs->commits
3212 for (i = 0; i < array->nr; i++) {
3213 c = (struct commit *)(objects[i].item);
3214 if (!c)
3215 continue;
3216 if (!(c->object.flags & CHILD_SHOWN))
3217 continue;
3218 if (c->object.flags & (SHOWN | BOUNDARY))
3219 continue;
3220 c->object.flags |= BOUNDARY;
3221 commit_list_insert(c, &revs->commits);
3225 * If revs->topo_order is set, sort the boundary commits
3226 * in topological order
3228 sort_in_topological_order(&revs->commits, revs->sort_order);
3231 static struct commit *get_revision_internal(struct rev_info *revs)
3233 struct commit *c = NULL;
3234 struct commit_list *l;
3236 if (revs->boundary == 2) {
3238 * All of the normal commits have already been returned,
3239 * and we are now returning boundary commits.
3240 * create_boundary_commit_list() has populated
3241 * revs->commits with the remaining commits to return.
3243 c = pop_commit(&revs->commits);
3244 if (c)
3245 c->object.flags |= SHOWN;
3246 return c;
3250 * If our max_count counter has reached zero, then we are done. We
3251 * don't simply return NULL because we still might need to show
3252 * boundary commits. But we want to avoid calling get_revision_1, which
3253 * might do a considerable amount of work finding the next commit only
3254 * for us to throw it away.
3256 * If it is non-zero, then either we don't have a max_count at all
3257 * (-1), or it is still counting, in which case we decrement.
3259 if (revs->max_count) {
3260 c = get_revision_1(revs);
3261 if (c) {
3262 while (revs->skip_count > 0) {
3263 revs->skip_count--;
3264 c = get_revision_1(revs);
3265 if (!c)
3266 break;
3270 if (revs->max_count > 0)
3271 revs->max_count--;
3274 if (c)
3275 c->object.flags |= SHOWN;
3277 if (!revs->boundary)
3278 return c;
3280 if (!c) {
3282 * get_revision_1() runs out the commits, and
3283 * we are done computing the boundaries.
3284 * switch to boundary commits output mode.
3286 revs->boundary = 2;
3289 * Update revs->commits to contain the list of
3290 * boundary commits.
3292 create_boundary_commit_list(revs);
3294 return get_revision_internal(revs);
3298 * boundary commits are the commits that are parents of the
3299 * ones we got from get_revision_1() but they themselves are
3300 * not returned from get_revision_1(). Before returning
3301 * 'c', we need to mark its parents that they could be boundaries.
3304 for (l = c->parents; l; l = l->next) {
3305 struct object *p;
3306 p = &(l->item->object);
3307 if (p->flags & (CHILD_SHOWN | SHOWN))
3308 continue;
3309 p->flags |= CHILD_SHOWN;
3310 gc_boundary(&revs->boundary_commits);
3311 add_object_array(p, NULL, &revs->boundary_commits);
3314 return c;
3317 struct commit *get_revision(struct rev_info *revs)
3319 struct commit *c;
3320 struct commit_list *reversed;
3322 if (revs->reverse) {
3323 reversed = NULL;
3324 while ((c = get_revision_internal(revs)))
3325 commit_list_insert(c, &reversed);
3326 revs->commits = reversed;
3327 revs->reverse = 0;
3328 revs->reverse_output_stage = 1;
3331 if (revs->reverse_output_stage) {
3332 c = pop_commit(&revs->commits);
3333 if (revs->track_linear)
3334 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3335 return c;
3338 c = get_revision_internal(revs);
3339 if (c && revs->graph)
3340 graph_update(revs->graph, c);
3341 if (!c) {
3342 free_saved_parents(revs);
3343 if (revs->previous_parents) {
3344 free_commit_list(revs->previous_parents);
3345 revs->previous_parents = NULL;
3348 return c;
3351 char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3353 if (commit->object.flags & BOUNDARY)
3354 return "-";
3355 else if (commit->object.flags & UNINTERESTING)
3356 return "^";
3357 else if (commit->object.flags & PATCHSAME)
3358 return "=";
3359 else if (!revs || revs->left_right) {
3360 if (commit->object.flags & SYMMETRIC_LEFT)
3361 return "<";
3362 else
3363 return ">";
3364 } else if (revs->graph)
3365 return "*";
3366 else if (revs->cherry_mark)
3367 return "+";
3368 return "";
3371 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3373 char *mark = get_revision_mark(revs, commit);
3374 if (!strlen(mark))
3375 return;
3376 fputs(mark, stdout);
3377 putchar(' ');