Merge branch 'mg/mingw-test-fix'
[git/debian.git] / revision.c
blobf24ead53d537b05d7819ce53b45b05a15ec60a96
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 memcpy(m, name, nlen + 1);
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 ", oid_to_hex(&obj->oid));
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_object_file(&obj->oid))
110 return;
111 if (parse_tree(tree) < 0)
112 die("bad tree %s", oid_to_hex(&obj->oid));
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;
140 if (!tree)
141 return;
143 obj = &tree->object;
144 if (obj->flags & UNINTERESTING)
145 return;
146 obj->flags |= UNINTERESTING;
147 mark_tree_contents_uninteresting(tree);
150 void mark_parents_uninteresting(struct commit *commit)
152 struct commit_list *parents = NULL, *l;
154 for (l = commit->parents; l; l = l->next)
155 commit_list_insert(l->item, &parents);
157 while (parents) {
158 struct commit *commit = pop_commit(&parents);
160 while (commit) {
162 * A missing commit is ok iff its parent is marked
163 * uninteresting.
165 * We just mark such a thing parsed, so that when
166 * it is popped next time around, we won't be trying
167 * to parse it and get an error.
169 if (!has_object_file(&commit->object.oid))
170 commit->object.parsed = 1;
172 if (commit->object.flags & UNINTERESTING)
173 break;
175 commit->object.flags |= UNINTERESTING;
178 * Normally we haven't parsed the parent
179 * yet, so we won't have a parent of a parent
180 * here. However, it may turn out that we've
181 * reached this commit some other way (where it
182 * wasn't uninteresting), in which case we need
183 * to mark its parents recursively too..
185 if (!commit->parents)
186 break;
188 for (l = commit->parents->next; l; l = l->next)
189 commit_list_insert(l->item, &parents);
190 commit = commit->parents->item;
195 static void add_pending_object_with_path(struct rev_info *revs,
196 struct object *obj,
197 const char *name, unsigned mode,
198 const char *path)
200 if (!obj)
201 return;
202 if (revs->no_walk && (obj->flags & UNINTERESTING))
203 revs->no_walk = 0;
204 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
205 struct strbuf buf = STRBUF_INIT;
206 int len = interpret_branch_name(name, 0, &buf);
207 int st;
209 if (0 < len && name[len] && buf.len)
210 strbuf_addstr(&buf, name + len);
211 st = add_reflog_for_walk(revs->reflog_info,
212 (struct commit *)obj,
213 buf.buf[0] ? buf.buf: name);
214 strbuf_release(&buf);
215 if (st)
216 return;
218 add_object_array_with_path(obj, name, &revs->pending, mode, path);
221 static void add_pending_object_with_mode(struct rev_info *revs,
222 struct object *obj,
223 const char *name, unsigned mode)
225 add_pending_object_with_path(revs, obj, name, mode, NULL);
228 void add_pending_object(struct rev_info *revs,
229 struct object *obj, const char *name)
231 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
234 void add_head_to_pending(struct rev_info *revs)
236 unsigned char sha1[20];
237 struct object *obj;
238 if (get_sha1("HEAD", sha1))
239 return;
240 obj = parse_object(sha1);
241 if (!obj)
242 return;
243 add_pending_object(revs, obj, "HEAD");
246 static struct object *get_reference(struct rev_info *revs, const char *name,
247 const unsigned char *sha1,
248 unsigned int flags)
250 struct object *object;
252 object = parse_object(sha1);
253 if (!object) {
254 if (revs->ignore_missing)
255 return object;
256 die("bad object %s", name);
258 object->flags |= flags;
259 return object;
262 void add_pending_sha1(struct rev_info *revs, const char *name,
263 const unsigned char *sha1, unsigned int flags)
265 struct object *object = get_reference(revs, name, sha1, flags);
266 add_pending_object(revs, object, name);
269 static struct commit *handle_commit(struct rev_info *revs,
270 struct object_array_entry *entry)
272 struct object *object = entry->item;
273 const char *name = entry->name;
274 const char *path = entry->path;
275 unsigned int mode = entry->mode;
276 unsigned long flags = object->flags;
279 * Tag object? Look what it points to..
281 while (object->type == OBJ_TAG) {
282 struct tag *tag = (struct tag *) object;
283 if (revs->tag_objects && !(flags & UNINTERESTING))
284 add_pending_object(revs, object, tag->tag);
285 if (!tag->tagged)
286 die("bad tag");
287 object = parse_object(tag->tagged->oid.hash);
288 if (!object) {
289 if (flags & UNINTERESTING)
290 return NULL;
291 die("bad object %s", oid_to_hex(&tag->tagged->oid));
293 object->flags |= flags;
295 * We'll handle the tagged object by looping or dropping
296 * through to the non-tag handlers below. Do not
297 * propagate path data from the tag's pending entry.
299 path = NULL;
300 mode = 0;
304 * Commit object? Just return it, we'll do all the complex
305 * reachability crud.
307 if (object->type == OBJ_COMMIT) {
308 struct commit *commit = (struct commit *)object;
309 if (parse_commit(commit) < 0)
310 die("unable to parse commit %s", name);
311 if (flags & UNINTERESTING) {
312 mark_parents_uninteresting(commit);
313 revs->limited = 1;
315 if (revs->show_source && !commit->util)
316 commit->util = xstrdup(name);
317 return commit;
321 * Tree object? Either mark it uninteresting, or add it
322 * to the list of objects to look at later..
324 if (object->type == OBJ_TREE) {
325 struct tree *tree = (struct tree *)object;
326 if (!revs->tree_objects)
327 return NULL;
328 if (flags & UNINTERESTING) {
329 mark_tree_contents_uninteresting(tree);
330 return NULL;
332 add_pending_object_with_path(revs, object, name, mode, path);
333 return NULL;
337 * Blob object? You know the drill by now..
339 if (object->type == OBJ_BLOB) {
340 if (!revs->blob_objects)
341 return NULL;
342 if (flags & UNINTERESTING)
343 return NULL;
344 add_pending_object_with_path(revs, object, name, mode, path);
345 return NULL;
347 die("%s is unknown object", name);
350 static int everybody_uninteresting(struct commit_list *orig,
351 struct commit **interesting_cache)
353 struct commit_list *list = orig;
355 if (*interesting_cache) {
356 struct commit *commit = *interesting_cache;
357 if (!(commit->object.flags & UNINTERESTING))
358 return 0;
361 while (list) {
362 struct commit *commit = list->item;
363 list = list->next;
364 if (commit->object.flags & UNINTERESTING)
365 continue;
367 *interesting_cache = commit;
368 return 0;
370 return 1;
374 * A definition of "relevant" commit that we can use to simplify limited graphs
375 * by eliminating side branches.
377 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
378 * in our list), or that is a specified BOTTOM commit. Then after computing
379 * a limited list, during processing we can generally ignore boundary merges
380 * coming from outside the graph, (ie from irrelevant parents), and treat
381 * those merges as if they were single-parent. TREESAME is defined to consider
382 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
383 * we don't care if we were !TREESAME to non-graph parents.
385 * Treating bottom commits as relevant ensures that a limited graph's
386 * connection to the actual bottom commit is not viewed as a side branch, but
387 * treated as part of the graph. For example:
389 * ....Z...A---X---o---o---B
390 * . /
391 * W---Y
393 * When computing "A..B", the A-X connection is at least as important as
394 * Y-X, despite A being flagged UNINTERESTING.
396 * And when computing --ancestry-path "A..B", the A-X connection is more
397 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
399 static inline int relevant_commit(struct commit *commit)
401 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
405 * Return a single relevant commit from a parent list. If we are a TREESAME
406 * commit, and this selects one of our parents, then we can safely simplify to
407 * that parent.
409 static struct commit *one_relevant_parent(const struct rev_info *revs,
410 struct commit_list *orig)
412 struct commit_list *list = orig;
413 struct commit *relevant = NULL;
415 if (!orig)
416 return NULL;
419 * For 1-parent commits, or if first-parent-only, then return that
420 * first parent (even if not "relevant" by the above definition).
421 * TREESAME will have been set purely on that parent.
423 if (revs->first_parent_only || !orig->next)
424 return orig->item;
427 * For multi-parent commits, identify a sole relevant parent, if any.
428 * If we have only one relevant parent, then TREESAME will be set purely
429 * with regard to that parent, and we can simplify accordingly.
431 * If we have more than one relevant parent, or no relevant parents
432 * (and multiple irrelevant ones), then we can't select a parent here
433 * and return NULL.
435 while (list) {
436 struct commit *commit = list->item;
437 list = list->next;
438 if (relevant_commit(commit)) {
439 if (relevant)
440 return NULL;
441 relevant = commit;
444 return relevant;
448 * The goal is to get REV_TREE_NEW as the result only if the
449 * diff consists of all '+' (and no other changes), REV_TREE_OLD
450 * if the whole diff is removal of old data, and otherwise
451 * REV_TREE_DIFFERENT (of course if the trees are the same we
452 * want REV_TREE_SAME).
453 * That means that once we get to REV_TREE_DIFFERENT, we do not
454 * have to look any further.
456 static int tree_difference = REV_TREE_SAME;
458 static void file_add_remove(struct diff_options *options,
459 int addremove, unsigned mode,
460 const unsigned char *sha1,
461 int sha1_valid,
462 const char *fullpath, unsigned dirty_submodule)
464 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
466 tree_difference |= diff;
467 if (tree_difference == REV_TREE_DIFFERENT)
468 DIFF_OPT_SET(options, HAS_CHANGES);
471 static void file_change(struct diff_options *options,
472 unsigned old_mode, unsigned new_mode,
473 const unsigned char *old_sha1,
474 const unsigned char *new_sha1,
475 int old_sha1_valid, int new_sha1_valid,
476 const char *fullpath,
477 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
479 tree_difference = REV_TREE_DIFFERENT;
480 DIFF_OPT_SET(options, HAS_CHANGES);
483 static int rev_compare_tree(struct rev_info *revs,
484 struct commit *parent, struct commit *commit)
486 struct tree *t1 = parent->tree;
487 struct tree *t2 = commit->tree;
489 if (!t1)
490 return REV_TREE_NEW;
491 if (!t2)
492 return REV_TREE_OLD;
494 if (revs->simplify_by_decoration) {
496 * If we are simplifying by decoration, then the commit
497 * is worth showing if it has a tag pointing at it.
499 if (get_name_decoration(&commit->object))
500 return REV_TREE_DIFFERENT;
502 * A commit that is not pointed by a tag is uninteresting
503 * if we are not limited by path. This means that you will
504 * see the usual "commits that touch the paths" plus any
505 * tagged commit by specifying both --simplify-by-decoration
506 * and pathspec.
508 if (!revs->prune_data.nr)
509 return REV_TREE_SAME;
512 tree_difference = REV_TREE_SAME;
513 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
514 if (diff_tree_sha1(t1->object.oid.hash, t2->object.oid.hash, "",
515 &revs->pruning) < 0)
516 return REV_TREE_DIFFERENT;
517 return tree_difference;
520 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
522 int retval;
523 struct tree *t1 = commit->tree;
525 if (!t1)
526 return 0;
528 tree_difference = REV_TREE_SAME;
529 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
530 retval = diff_tree_sha1(NULL, t1->object.oid.hash, "", &revs->pruning);
532 return retval >= 0 && (tree_difference == REV_TREE_SAME);
535 struct treesame_state {
536 unsigned int nparents;
537 unsigned char treesame[FLEX_ARRAY];
540 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
542 unsigned n = commit_list_count(commit->parents);
543 struct treesame_state *st = xcalloc(1, sizeof(*st) + n);
544 st->nparents = n;
545 add_decoration(&revs->treesame, &commit->object, st);
546 return st;
550 * Must be called immediately after removing the nth_parent from a commit's
551 * parent list, if we are maintaining the per-parent treesame[] decoration.
552 * This does not recalculate the master TREESAME flag - update_treesame()
553 * should be called to update it after a sequence of treesame[] modifications
554 * that may have affected it.
556 static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
558 struct treesame_state *st;
559 int old_same;
561 if (!commit->parents) {
563 * Have just removed the only parent from a non-merge.
564 * Different handling, as we lack decoration.
566 if (nth_parent != 0)
567 die("compact_treesame %u", nth_parent);
568 old_same = !!(commit->object.flags & TREESAME);
569 if (rev_same_tree_as_empty(revs, commit))
570 commit->object.flags |= TREESAME;
571 else
572 commit->object.flags &= ~TREESAME;
573 return old_same;
576 st = lookup_decoration(&revs->treesame, &commit->object);
577 if (!st || nth_parent >= st->nparents)
578 die("compact_treesame %u", nth_parent);
580 old_same = st->treesame[nth_parent];
581 memmove(st->treesame + nth_parent,
582 st->treesame + nth_parent + 1,
583 st->nparents - nth_parent - 1);
586 * If we've just become a non-merge commit, update TREESAME
587 * immediately, and remove the no-longer-needed decoration.
588 * If still a merge, defer update until update_treesame().
590 if (--st->nparents == 1) {
591 if (commit->parents->next)
592 die("compact_treesame parents mismatch");
593 if (st->treesame[0] && revs->dense)
594 commit->object.flags |= TREESAME;
595 else
596 commit->object.flags &= ~TREESAME;
597 free(add_decoration(&revs->treesame, &commit->object, NULL));
600 return old_same;
603 static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
605 if (commit->parents && commit->parents->next) {
606 unsigned n;
607 struct treesame_state *st;
608 struct commit_list *p;
609 unsigned relevant_parents;
610 unsigned relevant_change, irrelevant_change;
612 st = lookup_decoration(&revs->treesame, &commit->object);
613 if (!st)
614 die("update_treesame %s", oid_to_hex(&commit->object.oid));
615 relevant_parents = 0;
616 relevant_change = irrelevant_change = 0;
617 for (p = commit->parents, n = 0; p; n++, p = p->next) {
618 if (relevant_commit(p->item)) {
619 relevant_change |= !st->treesame[n];
620 relevant_parents++;
621 } else
622 irrelevant_change |= !st->treesame[n];
624 if (relevant_parents ? relevant_change : irrelevant_change)
625 commit->object.flags &= ~TREESAME;
626 else
627 commit->object.flags |= TREESAME;
630 return commit->object.flags & TREESAME;
633 static inline int limiting_can_increase_treesame(const struct rev_info *revs)
636 * TREESAME is irrelevant unless prune && dense;
637 * if simplify_history is set, we can't have a mixture of TREESAME and
638 * !TREESAME INTERESTING parents (and we don't have treesame[]
639 * decoration anyway);
640 * if first_parent_only is set, then the TREESAME flag is locked
641 * against the first parent (and again we lack treesame[] decoration).
643 return revs->prune && revs->dense &&
644 !revs->simplify_history &&
645 !revs->first_parent_only;
648 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
650 struct commit_list **pp, *parent;
651 struct treesame_state *ts = NULL;
652 int relevant_change = 0, irrelevant_change = 0;
653 int relevant_parents, nth_parent;
656 * If we don't do pruning, everything is interesting
658 if (!revs->prune)
659 return;
661 if (!commit->tree)
662 return;
664 if (!commit->parents) {
665 if (rev_same_tree_as_empty(revs, commit))
666 commit->object.flags |= TREESAME;
667 return;
671 * Normal non-merge commit? If we don't want to make the
672 * history dense, we consider it always to be a change..
674 if (!revs->dense && !commit->parents->next)
675 return;
677 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
678 (parent = *pp) != NULL;
679 pp = &parent->next, nth_parent++) {
680 struct commit *p = parent->item;
681 if (relevant_commit(p))
682 relevant_parents++;
684 if (nth_parent == 1) {
686 * This our second loop iteration - so we now know
687 * we're dealing with a merge.
689 * Do not compare with later parents when we care only about
690 * the first parent chain, in order to avoid derailing the
691 * traversal to follow a side branch that brought everything
692 * in the path we are limited to by the pathspec.
694 if (revs->first_parent_only)
695 break;
697 * If this will remain a potentially-simplifiable
698 * merge, remember per-parent treesame if needed.
699 * Initialise the array with the comparison from our
700 * first iteration.
702 if (revs->treesame.name &&
703 !revs->simplify_history &&
704 !(commit->object.flags & UNINTERESTING)) {
705 ts = initialise_treesame(revs, commit);
706 if (!(irrelevant_change || relevant_change))
707 ts->treesame[0] = 1;
710 if (parse_commit(p) < 0)
711 die("cannot simplify commit %s (because of %s)",
712 oid_to_hex(&commit->object.oid),
713 oid_to_hex(&p->object.oid));
714 switch (rev_compare_tree(revs, p, commit)) {
715 case REV_TREE_SAME:
716 if (!revs->simplify_history || !relevant_commit(p)) {
717 /* Even if a merge with an uninteresting
718 * side branch brought the entire change
719 * we are interested in, we do not want
720 * to lose the other branches of this
721 * merge, so we just keep going.
723 if (ts)
724 ts->treesame[nth_parent] = 1;
725 continue;
727 parent->next = NULL;
728 commit->parents = parent;
729 commit->object.flags |= TREESAME;
730 return;
732 case REV_TREE_NEW:
733 if (revs->remove_empty_trees &&
734 rev_same_tree_as_empty(revs, p)) {
735 /* We are adding all the specified
736 * paths from this parent, so the
737 * history beyond this parent is not
738 * interesting. Remove its parents
739 * (they are grandparents for us).
740 * IOW, we pretend this parent is a
741 * "root" commit.
743 if (parse_commit(p) < 0)
744 die("cannot simplify commit %s (invalid %s)",
745 oid_to_hex(&commit->object.oid),
746 oid_to_hex(&p->object.oid));
747 p->parents = NULL;
749 /* fallthrough */
750 case REV_TREE_OLD:
751 case REV_TREE_DIFFERENT:
752 if (relevant_commit(p))
753 relevant_change = 1;
754 else
755 irrelevant_change = 1;
756 continue;
758 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
762 * TREESAME is straightforward for single-parent commits. For merge
763 * commits, it is most useful to define it so that "irrelevant"
764 * parents cannot make us !TREESAME - if we have any relevant
765 * parents, then we only consider TREESAMEness with respect to them,
766 * allowing irrelevant merges from uninteresting branches to be
767 * simplified away. Only if we have only irrelevant parents do we
768 * base TREESAME on them. Note that this logic is replicated in
769 * update_treesame, which should be kept in sync.
771 if (relevant_parents ? !relevant_change : !irrelevant_change)
772 commit->object.flags |= TREESAME;
775 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
776 struct commit_list *cached_base, struct commit_list **cache)
778 struct commit_list *new_entry;
780 if (cached_base && p->date < cached_base->item->date)
781 new_entry = commit_list_insert_by_date(p, &cached_base->next);
782 else
783 new_entry = commit_list_insert_by_date(p, head);
785 if (cache && (!*cache || p->date < (*cache)->item->date))
786 *cache = new_entry;
789 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
790 struct commit_list **list, struct commit_list **cache_ptr)
792 struct commit_list *parent = commit->parents;
793 unsigned left_flag;
794 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
796 if (commit->object.flags & ADDED)
797 return 0;
798 commit->object.flags |= ADDED;
800 if (revs->include_check &&
801 !revs->include_check(commit, revs->include_check_data))
802 return 0;
805 * If the commit is uninteresting, don't try to
806 * prune parents - we want the maximal uninteresting
807 * set.
809 * Normally we haven't parsed the parent
810 * yet, so we won't have a parent of a parent
811 * here. However, it may turn out that we've
812 * reached this commit some other way (where it
813 * wasn't uninteresting), in which case we need
814 * to mark its parents recursively too..
816 if (commit->object.flags & UNINTERESTING) {
817 while (parent) {
818 struct commit *p = parent->item;
819 parent = parent->next;
820 if (p)
821 p->object.flags |= UNINTERESTING;
822 if (parse_commit_gently(p, 1) < 0)
823 continue;
824 if (p->parents)
825 mark_parents_uninteresting(p);
826 if (p->object.flags & SEEN)
827 continue;
828 p->object.flags |= SEEN;
829 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
831 return 0;
835 * Ok, the commit wasn't uninteresting. Try to
836 * simplify the commit history and find the parent
837 * that has no differences in the path set if one exists.
839 try_to_simplify_commit(revs, commit);
841 if (revs->no_walk)
842 return 0;
844 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
846 for (parent = commit->parents; parent; parent = parent->next) {
847 struct commit *p = parent->item;
849 if (parse_commit_gently(p, revs->ignore_missing_links) < 0)
850 return -1;
851 if (revs->show_source && !p->util)
852 p->util = commit->util;
853 p->object.flags |= left_flag;
854 if (!(p->object.flags & SEEN)) {
855 p->object.flags |= SEEN;
856 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
858 if (revs->first_parent_only)
859 break;
861 return 0;
864 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
866 struct commit_list *p;
867 int left_count = 0, right_count = 0;
868 int left_first;
869 struct patch_ids ids;
870 unsigned cherry_flag;
872 /* First count the commits on the left and on the right */
873 for (p = list; p; p = p->next) {
874 struct commit *commit = p->item;
875 unsigned flags = commit->object.flags;
876 if (flags & BOUNDARY)
878 else if (flags & SYMMETRIC_LEFT)
879 left_count++;
880 else
881 right_count++;
884 if (!left_count || !right_count)
885 return;
887 left_first = left_count < right_count;
888 init_patch_ids(&ids);
889 ids.diffopts.pathspec = revs->diffopt.pathspec;
891 /* Compute patch-ids for one side */
892 for (p = list; p; p = p->next) {
893 struct commit *commit = p->item;
894 unsigned flags = commit->object.flags;
896 if (flags & BOUNDARY)
897 continue;
899 * If we have fewer left, left_first is set and we omit
900 * commits on the right branch in this loop. If we have
901 * fewer right, we skip the left ones.
903 if (left_first != !!(flags & SYMMETRIC_LEFT))
904 continue;
905 commit->util = add_commit_patch_id(commit, &ids);
908 /* either cherry_mark or cherry_pick are true */
909 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
911 /* Check the other side */
912 for (p = list; p; p = p->next) {
913 struct commit *commit = p->item;
914 struct patch_id *id;
915 unsigned flags = commit->object.flags;
917 if (flags & BOUNDARY)
918 continue;
920 * If we have fewer left, left_first is set and we omit
921 * commits on the left branch in this loop.
923 if (left_first == !!(flags & SYMMETRIC_LEFT))
924 continue;
927 * Have we seen the same patch id?
929 id = has_commit_patch_id(commit, &ids);
930 if (!id)
931 continue;
932 id->seen = 1;
933 commit->object.flags |= cherry_flag;
936 /* Now check the original side for seen ones */
937 for (p = list; p; p = p->next) {
938 struct commit *commit = p->item;
939 struct patch_id *ent;
941 ent = commit->util;
942 if (!ent)
943 continue;
944 if (ent->seen)
945 commit->object.flags |= cherry_flag;
946 commit->util = NULL;
949 free_patch_ids(&ids);
952 /* How many extra uninteresting commits we want to see.. */
953 #define SLOP 5
955 static int still_interesting(struct commit_list *src, unsigned long date, int slop,
956 struct commit **interesting_cache)
959 * No source list at all? We're definitely done..
961 if (!src)
962 return 0;
965 * Does the destination list contain entries with a date
966 * before the source list? Definitely _not_ done.
968 if (date <= src->item->date)
969 return SLOP;
972 * Does the source list still have interesting commits in
973 * it? Definitely not done..
975 if (!everybody_uninteresting(src, interesting_cache))
976 return SLOP;
978 /* Ok, we're closing in.. */
979 return slop-1;
983 * "rev-list --ancestry-path A..B" computes commits that are ancestors
984 * of B but not ancestors of A but further limits the result to those
985 * that are descendants of A. This takes the list of bottom commits and
986 * the result of "A..B" without --ancestry-path, and limits the latter
987 * further to the ones that can reach one of the commits in "bottom".
989 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
991 struct commit_list *p;
992 struct commit_list *rlist = NULL;
993 int made_progress;
996 * Reverse the list so that it will be likely that we would
997 * process parents before children.
999 for (p = list; p; p = p->next)
1000 commit_list_insert(p->item, &rlist);
1002 for (p = bottom; p; p = p->next)
1003 p->item->object.flags |= TMP_MARK;
1006 * Mark the ones that can reach bottom commits in "list",
1007 * in a bottom-up fashion.
1009 do {
1010 made_progress = 0;
1011 for (p = rlist; p; p = p->next) {
1012 struct commit *c = p->item;
1013 struct commit_list *parents;
1014 if (c->object.flags & (TMP_MARK | UNINTERESTING))
1015 continue;
1016 for (parents = c->parents;
1017 parents;
1018 parents = parents->next) {
1019 if (!(parents->item->object.flags & TMP_MARK))
1020 continue;
1021 c->object.flags |= TMP_MARK;
1022 made_progress = 1;
1023 break;
1026 } while (made_progress);
1029 * NEEDSWORK: decide if we want to remove parents that are
1030 * not marked with TMP_MARK from commit->parents for commits
1031 * in the resulting list. We may not want to do that, though.
1035 * The ones that are not marked with TMP_MARK are uninteresting
1037 for (p = list; p; p = p->next) {
1038 struct commit *c = p->item;
1039 if (c->object.flags & TMP_MARK)
1040 continue;
1041 c->object.flags |= UNINTERESTING;
1044 /* We are done with the TMP_MARK */
1045 for (p = list; p; p = p->next)
1046 p->item->object.flags &= ~TMP_MARK;
1047 for (p = bottom; p; p = p->next)
1048 p->item->object.flags &= ~TMP_MARK;
1049 free_commit_list(rlist);
1053 * Before walking the history, keep the set of "negative" refs the
1054 * caller has asked to exclude.
1056 * This is used to compute "rev-list --ancestry-path A..B", as we need
1057 * to filter the result of "A..B" further to the ones that can actually
1058 * reach A.
1060 static struct commit_list *collect_bottom_commits(struct commit_list *list)
1062 struct commit_list *elem, *bottom = NULL;
1063 for (elem = list; elem; elem = elem->next)
1064 if (elem->item->object.flags & BOTTOM)
1065 commit_list_insert(elem->item, &bottom);
1066 return bottom;
1069 /* Assumes either left_only or right_only is set */
1070 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1072 struct commit_list *p;
1074 for (p = list; p; p = p->next) {
1075 struct commit *commit = p->item;
1077 if (revs->right_only) {
1078 if (commit->object.flags & SYMMETRIC_LEFT)
1079 commit->object.flags |= SHOWN;
1080 } else /* revs->left_only is set */
1081 if (!(commit->object.flags & SYMMETRIC_LEFT))
1082 commit->object.flags |= SHOWN;
1086 static int limit_list(struct rev_info *revs)
1088 int slop = SLOP;
1089 unsigned long date = ~0ul;
1090 struct commit_list *list = revs->commits;
1091 struct commit_list *newlist = NULL;
1092 struct commit_list **p = &newlist;
1093 struct commit_list *bottom = NULL;
1094 struct commit *interesting_cache = NULL;
1096 if (revs->ancestry_path) {
1097 bottom = collect_bottom_commits(list);
1098 if (!bottom)
1099 die("--ancestry-path given but there are no bottom commits");
1102 while (list) {
1103 struct commit *commit = pop_commit(&list);
1104 struct object *obj = &commit->object;
1105 show_early_output_fn_t show;
1107 if (commit == interesting_cache)
1108 interesting_cache = NULL;
1110 if (revs->max_age != -1 && (commit->date < revs->max_age))
1111 obj->flags |= UNINTERESTING;
1112 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
1113 return -1;
1114 if (obj->flags & UNINTERESTING) {
1115 mark_parents_uninteresting(commit);
1116 if (revs->show_all)
1117 p = &commit_list_insert(commit, p)->next;
1118 slop = still_interesting(list, date, slop, &interesting_cache);
1119 if (slop)
1120 continue;
1121 /* If showing all, add the whole pending list to the end */
1122 if (revs->show_all)
1123 *p = list;
1124 break;
1126 if (revs->min_age != -1 && (commit->date > revs->min_age))
1127 continue;
1128 date = commit->date;
1129 p = &commit_list_insert(commit, p)->next;
1131 show = show_early_output;
1132 if (!show)
1133 continue;
1135 show(revs, newlist);
1136 show_early_output = NULL;
1138 if (revs->cherry_pick || revs->cherry_mark)
1139 cherry_pick_list(newlist, revs);
1141 if (revs->left_only || revs->right_only)
1142 limit_left_right(newlist, revs);
1144 if (bottom) {
1145 limit_to_ancestry(bottom, newlist);
1146 free_commit_list(bottom);
1150 * Check if any commits have become TREESAME by some of their parents
1151 * becoming UNINTERESTING.
1153 if (limiting_can_increase_treesame(revs))
1154 for (list = newlist; list; list = list->next) {
1155 struct commit *c = list->item;
1156 if (c->object.flags & (UNINTERESTING | TREESAME))
1157 continue;
1158 update_treesame(revs, c);
1161 revs->commits = newlist;
1162 return 0;
1166 * Add an entry to refs->cmdline with the specified information.
1167 * *name is copied.
1169 static void add_rev_cmdline(struct rev_info *revs,
1170 struct object *item,
1171 const char *name,
1172 int whence,
1173 unsigned flags)
1175 struct rev_cmdline_info *info = &revs->cmdline;
1176 int nr = info->nr;
1178 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1179 info->rev[nr].item = item;
1180 info->rev[nr].name = xstrdup(name);
1181 info->rev[nr].whence = whence;
1182 info->rev[nr].flags = flags;
1183 info->nr++;
1186 static void add_rev_cmdline_list(struct rev_info *revs,
1187 struct commit_list *commit_list,
1188 int whence,
1189 unsigned flags)
1191 while (commit_list) {
1192 struct object *object = &commit_list->item->object;
1193 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1194 whence, flags);
1195 commit_list = commit_list->next;
1199 struct all_refs_cb {
1200 int all_flags;
1201 int warned_bad_reflog;
1202 struct rev_info *all_revs;
1203 const char *name_for_errormsg;
1206 int ref_excluded(struct string_list *ref_excludes, const char *path)
1208 struct string_list_item *item;
1210 if (!ref_excludes)
1211 return 0;
1212 for_each_string_list_item(item, ref_excludes) {
1213 if (!wildmatch(item->string, path, 0, NULL))
1214 return 1;
1216 return 0;
1219 static int handle_one_ref(const char *path, const struct object_id *oid,
1220 int flag, void *cb_data)
1222 struct all_refs_cb *cb = cb_data;
1223 struct object *object;
1225 if (ref_excluded(cb->all_revs->ref_excludes, path))
1226 return 0;
1228 object = get_reference(cb->all_revs, path, oid->hash, cb->all_flags);
1229 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1230 add_pending_sha1(cb->all_revs, path, oid->hash, cb->all_flags);
1231 return 0;
1234 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1235 unsigned flags)
1237 cb->all_revs = revs;
1238 cb->all_flags = flags;
1241 void clear_ref_exclusion(struct string_list **ref_excludes_p)
1243 if (*ref_excludes_p) {
1244 string_list_clear(*ref_excludes_p, 0);
1245 free(*ref_excludes_p);
1247 *ref_excludes_p = NULL;
1250 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1252 if (!*ref_excludes_p) {
1253 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1254 (*ref_excludes_p)->strdup_strings = 1;
1256 string_list_append(*ref_excludes_p, exclude);
1259 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1260 int (*for_each)(const char *, each_ref_fn, void *))
1262 struct all_refs_cb cb;
1263 init_all_refs_cb(&cb, revs, flags);
1264 for_each(submodule, handle_one_ref, &cb);
1267 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
1269 struct all_refs_cb *cb = cb_data;
1270 if (!is_null_sha1(sha1)) {
1271 struct object *o = parse_object(sha1);
1272 if (o) {
1273 o->flags |= cb->all_flags;
1274 /* ??? CMDLINEFLAGS ??? */
1275 add_pending_object(cb->all_revs, o, "");
1277 else if (!cb->warned_bad_reflog) {
1278 warning("reflog of '%s' references pruned commits",
1279 cb->name_for_errormsg);
1280 cb->warned_bad_reflog = 1;
1285 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
1286 const char *email, unsigned long timestamp, int tz,
1287 const char *message, void *cb_data)
1289 handle_one_reflog_commit(osha1, cb_data);
1290 handle_one_reflog_commit(nsha1, cb_data);
1291 return 0;
1294 static int handle_one_reflog(const char *path, const struct object_id *oid,
1295 int flag, void *cb_data)
1297 struct all_refs_cb *cb = cb_data;
1298 cb->warned_bad_reflog = 0;
1299 cb->name_for_errormsg = path;
1300 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1301 return 0;
1304 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1306 struct all_refs_cb cb;
1308 cb.all_revs = revs;
1309 cb.all_flags = flags;
1310 for_each_reflog(handle_one_reflog, &cb);
1313 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1314 struct strbuf *path)
1316 size_t baselen = path->len;
1317 int i;
1319 if (it->entry_count >= 0) {
1320 struct tree *tree = lookup_tree(it->sha1);
1321 add_pending_object_with_path(revs, &tree->object, "",
1322 040000, path->buf);
1325 for (i = 0; i < it->subtree_nr; i++) {
1326 struct cache_tree_sub *sub = it->down[i];
1327 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1328 add_cache_tree(sub->cache_tree, revs, path);
1329 strbuf_setlen(path, baselen);
1334 void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
1336 int i;
1338 read_cache();
1339 for (i = 0; i < active_nr; i++) {
1340 struct cache_entry *ce = active_cache[i];
1341 struct blob *blob;
1343 if (S_ISGITLINK(ce->ce_mode))
1344 continue;
1346 blob = lookup_blob(ce->sha1);
1347 if (!blob)
1348 die("unable to add index blob to traversal");
1349 add_pending_object_with_path(revs, &blob->object, "",
1350 ce->ce_mode, ce->name);
1353 if (active_cache_tree) {
1354 struct strbuf path = STRBUF_INIT;
1355 add_cache_tree(active_cache_tree, revs, &path);
1356 strbuf_release(&path);
1360 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
1362 unsigned char sha1[20];
1363 struct object *it;
1364 struct commit *commit;
1365 struct commit_list *parents;
1366 const char *arg = arg_;
1368 if (*arg == '^') {
1369 flags ^= UNINTERESTING | BOTTOM;
1370 arg++;
1372 if (get_sha1_committish(arg, sha1))
1373 return 0;
1374 while (1) {
1375 it = get_reference(revs, arg, sha1, 0);
1376 if (!it && revs->ignore_missing)
1377 return 0;
1378 if (it->type != OBJ_TAG)
1379 break;
1380 if (!((struct tag*)it)->tagged)
1381 return 0;
1382 hashcpy(sha1, ((struct tag*)it)->tagged->oid.hash);
1384 if (it->type != OBJ_COMMIT)
1385 return 0;
1386 commit = (struct commit *)it;
1387 for (parents = commit->parents; parents; parents = parents->next) {
1388 it = &parents->item->object;
1389 it->flags |= flags;
1390 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1391 add_pending_object(revs, it, arg);
1393 return 1;
1396 void init_revisions(struct rev_info *revs, const char *prefix)
1398 memset(revs, 0, sizeof(*revs));
1400 revs->abbrev = DEFAULT_ABBREV;
1401 revs->ignore_merges = 1;
1402 revs->simplify_history = 1;
1403 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1404 DIFF_OPT_SET(&revs->pruning, QUICK);
1405 revs->pruning.add_remove = file_add_remove;
1406 revs->pruning.change = file_change;
1407 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1408 revs->dense = 1;
1409 revs->prefix = prefix;
1410 revs->max_age = -1;
1411 revs->min_age = -1;
1412 revs->skip_count = -1;
1413 revs->max_count = -1;
1414 revs->max_parents = -1;
1416 revs->commit_format = CMIT_FMT_DEFAULT;
1418 init_grep_defaults();
1419 grep_init(&revs->grep_filter, prefix);
1420 revs->grep_filter.status_only = 1;
1421 revs->grep_filter.regflags = REG_NEWLINE;
1423 diff_setup(&revs->diffopt);
1424 if (prefix && !revs->diffopt.prefix) {
1425 revs->diffopt.prefix = prefix;
1426 revs->diffopt.prefix_length = strlen(prefix);
1429 revs->notes_opt.use_default_notes = -1;
1432 static void add_pending_commit_list(struct rev_info *revs,
1433 struct commit_list *commit_list,
1434 unsigned int flags)
1436 while (commit_list) {
1437 struct object *object = &commit_list->item->object;
1438 object->flags |= flags;
1439 add_pending_object(revs, object, oid_to_hex(&object->oid));
1440 commit_list = commit_list->next;
1444 static void prepare_show_merge(struct rev_info *revs)
1446 struct commit_list *bases;
1447 struct commit *head, *other;
1448 unsigned char sha1[20];
1449 const char **prune = NULL;
1450 int i, prune_num = 1; /* counting terminating NULL */
1452 if (get_sha1("HEAD", sha1))
1453 die("--merge without HEAD?");
1454 head = lookup_commit_or_die(sha1, "HEAD");
1455 if (get_sha1("MERGE_HEAD", sha1))
1456 die("--merge without MERGE_HEAD?");
1457 other = lookup_commit_or_die(sha1, "MERGE_HEAD");
1458 add_pending_object(revs, &head->object, "HEAD");
1459 add_pending_object(revs, &other->object, "MERGE_HEAD");
1460 bases = get_merge_bases(head, other);
1461 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1462 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1463 free_commit_list(bases);
1464 head->object.flags |= SYMMETRIC_LEFT;
1466 if (!active_nr)
1467 read_cache();
1468 for (i = 0; i < active_nr; i++) {
1469 const struct cache_entry *ce = active_cache[i];
1470 if (!ce_stage(ce))
1471 continue;
1472 if (ce_path_match(ce, &revs->prune_data, NULL)) {
1473 prune_num++;
1474 REALLOC_ARRAY(prune, prune_num);
1475 prune[prune_num-2] = ce->name;
1476 prune[prune_num-1] = NULL;
1478 while ((i+1 < active_nr) &&
1479 ce_same_name(ce, active_cache[i+1]))
1480 i++;
1482 free_pathspec(&revs->prune_data);
1483 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1484 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1485 revs->limited = 1;
1488 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1490 struct object_context oc;
1491 char *dotdot;
1492 struct object *object;
1493 unsigned char sha1[20];
1494 int local_flags;
1495 const char *arg = arg_;
1496 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1497 unsigned get_sha1_flags = 0;
1499 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1501 dotdot = strstr(arg, "..");
1502 if (dotdot) {
1503 unsigned char from_sha1[20];
1504 const char *next = dotdot + 2;
1505 const char *this = arg;
1506 int symmetric = *next == '.';
1507 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1508 static const char head_by_default[] = "HEAD";
1509 unsigned int a_flags;
1511 *dotdot = 0;
1512 next += symmetric;
1514 if (!*next)
1515 next = head_by_default;
1516 if (dotdot == arg)
1517 this = head_by_default;
1518 if (this == head_by_default && next == head_by_default &&
1519 !symmetric) {
1521 * Just ".."? That is not a range but the
1522 * pathspec for the parent directory.
1524 if (!cant_be_filename) {
1525 *dotdot = '.';
1526 return -1;
1529 if (!get_sha1_committish(this, from_sha1) &&
1530 !get_sha1_committish(next, sha1)) {
1531 struct object *a_obj, *b_obj;
1533 if (!cant_be_filename) {
1534 *dotdot = '.';
1535 verify_non_filename(revs->prefix, arg);
1538 a_obj = parse_object(from_sha1);
1539 b_obj = parse_object(sha1);
1540 if (!a_obj || !b_obj) {
1541 missing:
1542 if (revs->ignore_missing)
1543 return 0;
1544 die(symmetric
1545 ? "Invalid symmetric difference expression %s"
1546 : "Invalid revision range %s", arg);
1549 if (!symmetric) {
1550 /* just A..B */
1551 a_flags = flags_exclude;
1552 } else {
1553 /* A...B -- find merge bases between the two */
1554 struct commit *a, *b;
1555 struct commit_list *exclude;
1557 a = (a_obj->type == OBJ_COMMIT
1558 ? (struct commit *)a_obj
1559 : lookup_commit_reference(a_obj->oid.hash));
1560 b = (b_obj->type == OBJ_COMMIT
1561 ? (struct commit *)b_obj
1562 : lookup_commit_reference(b_obj->oid.hash));
1563 if (!a || !b)
1564 goto missing;
1565 exclude = get_merge_bases(a, b);
1566 add_rev_cmdline_list(revs, exclude,
1567 REV_CMD_MERGE_BASE,
1568 flags_exclude);
1569 add_pending_commit_list(revs, exclude,
1570 flags_exclude);
1571 free_commit_list(exclude);
1573 a_flags = flags | SYMMETRIC_LEFT;
1576 a_obj->flags |= a_flags;
1577 b_obj->flags |= flags;
1578 add_rev_cmdline(revs, a_obj, this,
1579 REV_CMD_LEFT, a_flags);
1580 add_rev_cmdline(revs, b_obj, next,
1581 REV_CMD_RIGHT, flags);
1582 add_pending_object(revs, a_obj, this);
1583 add_pending_object(revs, b_obj, next);
1584 return 0;
1586 *dotdot = '.';
1588 dotdot = strstr(arg, "^@");
1589 if (dotdot && !dotdot[2]) {
1590 *dotdot = 0;
1591 if (add_parents_only(revs, arg, flags))
1592 return 0;
1593 *dotdot = '^';
1595 dotdot = strstr(arg, "^!");
1596 if (dotdot && !dotdot[2]) {
1597 *dotdot = 0;
1598 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM)))
1599 *dotdot = '^';
1602 local_flags = 0;
1603 if (*arg == '^') {
1604 local_flags = UNINTERESTING | BOTTOM;
1605 arg++;
1608 if (revarg_opt & REVARG_COMMITTISH)
1609 get_sha1_flags = GET_SHA1_COMMITTISH;
1611 if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
1612 return revs->ignore_missing ? 0 : -1;
1613 if (!cant_be_filename)
1614 verify_non_filename(revs->prefix, arg);
1615 object = get_reference(revs, arg, sha1, flags ^ local_flags);
1616 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1617 add_pending_object_with_mode(revs, object, arg, oc.mode);
1618 return 0;
1621 struct cmdline_pathspec {
1622 int alloc;
1623 int nr;
1624 const char **path;
1627 static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1629 while (*av) {
1630 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1631 prune->path[prune->nr++] = *(av++);
1635 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1636 struct cmdline_pathspec *prune)
1638 while (strbuf_getline(sb, stdin) != EOF) {
1639 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1640 prune->path[prune->nr++] = xstrdup(sb->buf);
1644 static void read_revisions_from_stdin(struct rev_info *revs,
1645 struct cmdline_pathspec *prune)
1647 struct strbuf sb;
1648 int seen_dashdash = 0;
1649 int save_warning;
1651 save_warning = warn_on_object_refname_ambiguity;
1652 warn_on_object_refname_ambiguity = 0;
1654 strbuf_init(&sb, 1000);
1655 while (strbuf_getline(&sb, stdin) != EOF) {
1656 int len = sb.len;
1657 if (!len)
1658 break;
1659 if (sb.buf[0] == '-') {
1660 if (len == 2 && sb.buf[1] == '-') {
1661 seen_dashdash = 1;
1662 break;
1664 die("options not supported in --stdin mode");
1666 if (handle_revision_arg(sb.buf, revs, 0,
1667 REVARG_CANNOT_BE_FILENAME))
1668 die("bad revision '%s'", sb.buf);
1670 if (seen_dashdash)
1671 read_pathspec_from_stdin(revs, &sb, prune);
1673 strbuf_release(&sb);
1674 warn_on_object_refname_ambiguity = save_warning;
1677 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1679 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1682 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1684 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1687 static void add_message_grep(struct rev_info *revs, const char *pattern)
1689 add_grep(revs, pattern, GREP_PATTERN_BODY);
1692 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1693 int *unkc, const char **unkv)
1695 const char *arg = argv[0];
1696 const char *optarg;
1697 int argcount;
1699 /* pseudo revision arguments */
1700 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1701 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1702 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1703 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1704 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
1705 !strcmp(arg, "--indexed-objects") ||
1706 starts_with(arg, "--exclude=") ||
1707 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1708 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
1710 unkv[(*unkc)++] = arg;
1711 return 1;
1714 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1715 revs->max_count = atoi(optarg);
1716 revs->no_walk = 0;
1717 return argcount;
1718 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1719 revs->skip_count = atoi(optarg);
1720 return argcount;
1721 } else if ((*arg == '-') && isdigit(arg[1])) {
1722 /* accept -<digit>, like traditional "head" */
1723 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1724 revs->max_count < 0)
1725 die("'%s': not a non-negative integer", arg + 1);
1726 revs->no_walk = 0;
1727 } else if (!strcmp(arg, "-n")) {
1728 if (argc <= 1)
1729 return error("-n requires an argument");
1730 revs->max_count = atoi(argv[1]);
1731 revs->no_walk = 0;
1732 return 2;
1733 } else if (starts_with(arg, "-n")) {
1734 revs->max_count = atoi(arg + 2);
1735 revs->no_walk = 0;
1736 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1737 revs->max_age = atoi(optarg);
1738 return argcount;
1739 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1740 revs->max_age = approxidate(optarg);
1741 return argcount;
1742 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1743 revs->max_age = approxidate(optarg);
1744 return argcount;
1745 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1746 revs->min_age = atoi(optarg);
1747 return argcount;
1748 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1749 revs->min_age = approxidate(optarg);
1750 return argcount;
1751 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1752 revs->min_age = approxidate(optarg);
1753 return argcount;
1754 } else if (!strcmp(arg, "--first-parent")) {
1755 revs->first_parent_only = 1;
1756 } else if (!strcmp(arg, "--ancestry-path")) {
1757 revs->ancestry_path = 1;
1758 revs->simplify_history = 0;
1759 revs->limited = 1;
1760 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1761 init_reflog_walk(&revs->reflog_info);
1762 } else if (!strcmp(arg, "--default")) {
1763 if (argc <= 1)
1764 return error("bad --default argument");
1765 revs->def = argv[1];
1766 return 2;
1767 } else if (!strcmp(arg, "--merge")) {
1768 revs->show_merge = 1;
1769 } else if (!strcmp(arg, "--topo-order")) {
1770 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1771 revs->topo_order = 1;
1772 } else if (!strcmp(arg, "--simplify-merges")) {
1773 revs->simplify_merges = 1;
1774 revs->topo_order = 1;
1775 revs->rewrite_parents = 1;
1776 revs->simplify_history = 0;
1777 revs->limited = 1;
1778 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1779 revs->simplify_merges = 1;
1780 revs->topo_order = 1;
1781 revs->rewrite_parents = 1;
1782 revs->simplify_history = 0;
1783 revs->simplify_by_decoration = 1;
1784 revs->limited = 1;
1785 revs->prune = 1;
1786 load_ref_decorations(DECORATE_SHORT_REFS);
1787 } else if (!strcmp(arg, "--date-order")) {
1788 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
1789 revs->topo_order = 1;
1790 } else if (!strcmp(arg, "--author-date-order")) {
1791 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
1792 revs->topo_order = 1;
1793 } else if (starts_with(arg, "--early-output")) {
1794 int count = 100;
1795 switch (arg[14]) {
1796 case '=':
1797 count = atoi(arg+15);
1798 /* Fallthrough */
1799 case 0:
1800 revs->topo_order = 1;
1801 revs->early_output = count;
1803 } else if (!strcmp(arg, "--parents")) {
1804 revs->rewrite_parents = 1;
1805 revs->print_parents = 1;
1806 } else if (!strcmp(arg, "--dense")) {
1807 revs->dense = 1;
1808 } else if (!strcmp(arg, "--sparse")) {
1809 revs->dense = 0;
1810 } else if (!strcmp(arg, "--show-all")) {
1811 revs->show_all = 1;
1812 } else if (!strcmp(arg, "--remove-empty")) {
1813 revs->remove_empty_trees = 1;
1814 } else if (!strcmp(arg, "--merges")) {
1815 revs->min_parents = 2;
1816 } else if (!strcmp(arg, "--no-merges")) {
1817 revs->max_parents = 1;
1818 } else if (starts_with(arg, "--min-parents=")) {
1819 revs->min_parents = atoi(arg+14);
1820 } else if (starts_with(arg, "--no-min-parents")) {
1821 revs->min_parents = 0;
1822 } else if (starts_with(arg, "--max-parents=")) {
1823 revs->max_parents = atoi(arg+14);
1824 } else if (starts_with(arg, "--no-max-parents")) {
1825 revs->max_parents = -1;
1826 } else if (!strcmp(arg, "--boundary")) {
1827 revs->boundary = 1;
1828 } else if (!strcmp(arg, "--left-right")) {
1829 revs->left_right = 1;
1830 } else if (!strcmp(arg, "--left-only")) {
1831 if (revs->right_only)
1832 die("--left-only is incompatible with --right-only"
1833 " or --cherry");
1834 revs->left_only = 1;
1835 } else if (!strcmp(arg, "--right-only")) {
1836 if (revs->left_only)
1837 die("--right-only is incompatible with --left-only");
1838 revs->right_only = 1;
1839 } else if (!strcmp(arg, "--cherry")) {
1840 if (revs->left_only)
1841 die("--cherry is incompatible with --left-only");
1842 revs->cherry_mark = 1;
1843 revs->right_only = 1;
1844 revs->max_parents = 1;
1845 revs->limited = 1;
1846 } else if (!strcmp(arg, "--count")) {
1847 revs->count = 1;
1848 } else if (!strcmp(arg, "--cherry-mark")) {
1849 if (revs->cherry_pick)
1850 die("--cherry-mark is incompatible with --cherry-pick");
1851 revs->cherry_mark = 1;
1852 revs->limited = 1; /* needs limit_list() */
1853 } else if (!strcmp(arg, "--cherry-pick")) {
1854 if (revs->cherry_mark)
1855 die("--cherry-pick is incompatible with --cherry-mark");
1856 revs->cherry_pick = 1;
1857 revs->limited = 1;
1858 } else if (!strcmp(arg, "--objects")) {
1859 revs->tag_objects = 1;
1860 revs->tree_objects = 1;
1861 revs->blob_objects = 1;
1862 } else if (!strcmp(arg, "--objects-edge")) {
1863 revs->tag_objects = 1;
1864 revs->tree_objects = 1;
1865 revs->blob_objects = 1;
1866 revs->edge_hint = 1;
1867 } else if (!strcmp(arg, "--objects-edge-aggressive")) {
1868 revs->tag_objects = 1;
1869 revs->tree_objects = 1;
1870 revs->blob_objects = 1;
1871 revs->edge_hint = 1;
1872 revs->edge_hint_aggressive = 1;
1873 } else if (!strcmp(arg, "--verify-objects")) {
1874 revs->tag_objects = 1;
1875 revs->tree_objects = 1;
1876 revs->blob_objects = 1;
1877 revs->verify_objects = 1;
1878 } else if (!strcmp(arg, "--unpacked")) {
1879 revs->unpacked = 1;
1880 } else if (starts_with(arg, "--unpacked=")) {
1881 die("--unpacked=<packfile> no longer supported.");
1882 } else if (!strcmp(arg, "-r")) {
1883 revs->diff = 1;
1884 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1885 } else if (!strcmp(arg, "-t")) {
1886 revs->diff = 1;
1887 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1888 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1889 } else if (!strcmp(arg, "-m")) {
1890 revs->ignore_merges = 0;
1891 } else if (!strcmp(arg, "-c")) {
1892 revs->diff = 1;
1893 revs->dense_combined_merges = 0;
1894 revs->combine_merges = 1;
1895 } else if (!strcmp(arg, "--cc")) {
1896 revs->diff = 1;
1897 revs->dense_combined_merges = 1;
1898 revs->combine_merges = 1;
1899 } else if (!strcmp(arg, "-v")) {
1900 revs->verbose_header = 1;
1901 } else if (!strcmp(arg, "--pretty")) {
1902 revs->verbose_header = 1;
1903 revs->pretty_given = 1;
1904 get_commit_format(NULL, revs);
1905 } else if (starts_with(arg, "--pretty=") || starts_with(arg, "--format=")) {
1907 * Detached form ("--pretty X" as opposed to "--pretty=X")
1908 * not allowed, since the argument is optional.
1910 revs->verbose_header = 1;
1911 revs->pretty_given = 1;
1912 get_commit_format(arg+9, revs);
1913 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1914 revs->show_notes = 1;
1915 revs->show_notes_given = 1;
1916 revs->notes_opt.use_default_notes = 1;
1917 } else if (!strcmp(arg, "--show-signature")) {
1918 revs->show_signature = 1;
1919 } else if (!strcmp(arg, "--show-linear-break") ||
1920 starts_with(arg, "--show-linear-break=")) {
1921 if (starts_with(arg, "--show-linear-break="))
1922 revs->break_bar = xstrdup(arg + 20);
1923 else
1924 revs->break_bar = " ..........";
1925 revs->track_linear = 1;
1926 revs->track_first_time = 1;
1927 } else if (starts_with(arg, "--show-notes=") ||
1928 starts_with(arg, "--notes=")) {
1929 struct strbuf buf = STRBUF_INIT;
1930 revs->show_notes = 1;
1931 revs->show_notes_given = 1;
1932 if (starts_with(arg, "--show-notes")) {
1933 if (revs->notes_opt.use_default_notes < 0)
1934 revs->notes_opt.use_default_notes = 1;
1935 strbuf_addstr(&buf, arg+13);
1937 else
1938 strbuf_addstr(&buf, arg+8);
1939 expand_notes_ref(&buf);
1940 string_list_append(&revs->notes_opt.extra_notes_refs,
1941 strbuf_detach(&buf, NULL));
1942 } else if (!strcmp(arg, "--no-notes")) {
1943 revs->show_notes = 0;
1944 revs->show_notes_given = 1;
1945 revs->notes_opt.use_default_notes = -1;
1946 /* we have been strdup'ing ourselves, so trick
1947 * string_list into free()ing strings */
1948 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1949 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1950 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1951 } else if (!strcmp(arg, "--standard-notes")) {
1952 revs->show_notes_given = 1;
1953 revs->notes_opt.use_default_notes = 1;
1954 } else if (!strcmp(arg, "--no-standard-notes")) {
1955 revs->notes_opt.use_default_notes = 0;
1956 } else if (!strcmp(arg, "--oneline")) {
1957 revs->verbose_header = 1;
1958 get_commit_format("oneline", revs);
1959 revs->pretty_given = 1;
1960 revs->abbrev_commit = 1;
1961 } else if (!strcmp(arg, "--graph")) {
1962 revs->topo_order = 1;
1963 revs->rewrite_parents = 1;
1964 revs->graph = graph_init(revs);
1965 } else if (!strcmp(arg, "--root")) {
1966 revs->show_root_diff = 1;
1967 } else if (!strcmp(arg, "--no-commit-id")) {
1968 revs->no_commit_id = 1;
1969 } else if (!strcmp(arg, "--always")) {
1970 revs->always_show_header = 1;
1971 } else if (!strcmp(arg, "--no-abbrev")) {
1972 revs->abbrev = 0;
1973 } else if (!strcmp(arg, "--abbrev")) {
1974 revs->abbrev = DEFAULT_ABBREV;
1975 } else if (starts_with(arg, "--abbrev=")) {
1976 revs->abbrev = strtoul(arg + 9, NULL, 10);
1977 if (revs->abbrev < MINIMUM_ABBREV)
1978 revs->abbrev = MINIMUM_ABBREV;
1979 else if (revs->abbrev > 40)
1980 revs->abbrev = 40;
1981 } else if (!strcmp(arg, "--abbrev-commit")) {
1982 revs->abbrev_commit = 1;
1983 revs->abbrev_commit_given = 1;
1984 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1985 revs->abbrev_commit = 0;
1986 } else if (!strcmp(arg, "--full-diff")) {
1987 revs->diff = 1;
1988 revs->full_diff = 1;
1989 } else if (!strcmp(arg, "--full-history")) {
1990 revs->simplify_history = 0;
1991 } else if (!strcmp(arg, "--relative-date")) {
1992 revs->date_mode.type = DATE_RELATIVE;
1993 revs->date_mode_explicit = 1;
1994 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1995 parse_date_format(optarg, &revs->date_mode);
1996 revs->date_mode_explicit = 1;
1997 return argcount;
1998 } else if (!strcmp(arg, "--log-size")) {
1999 revs->show_log_size = 1;
2002 * Grepping the commit log
2004 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2005 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2006 return argcount;
2007 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2008 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2009 return argcount;
2010 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2011 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2012 return argcount;
2013 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2014 add_message_grep(revs, optarg);
2015 return argcount;
2016 } else if (!strcmp(arg, "--grep-debug")) {
2017 revs->grep_filter.debug = 1;
2018 } else if (!strcmp(arg, "--basic-regexp")) {
2019 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE, &revs->grep_filter);
2020 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2021 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter);
2022 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2023 revs->grep_filter.regflags |= REG_ICASE;
2024 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
2025 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2026 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter);
2027 } else if (!strcmp(arg, "--perl-regexp")) {
2028 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE, &revs->grep_filter);
2029 } else if (!strcmp(arg, "--all-match")) {
2030 revs->grep_filter.all_match = 1;
2031 } else if (!strcmp(arg, "--invert-grep")) {
2032 revs->invert_grep = 1;
2033 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2034 if (strcmp(optarg, "none"))
2035 git_log_output_encoding = xstrdup(optarg);
2036 else
2037 git_log_output_encoding = "";
2038 return argcount;
2039 } else if (!strcmp(arg, "--reverse")) {
2040 revs->reverse ^= 1;
2041 } else if (!strcmp(arg, "--children")) {
2042 revs->children.name = "children";
2043 revs->limited = 1;
2044 } else if (!strcmp(arg, "--ignore-missing")) {
2045 revs->ignore_missing = 1;
2046 } else {
2047 int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
2048 if (!opts)
2049 unkv[(*unkc)++] = arg;
2050 return opts;
2052 if (revs->graph && revs->track_linear)
2053 die("--show-linear-break and --graph are incompatible");
2055 return 1;
2058 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2059 const struct option *options,
2060 const char * const usagestr[])
2062 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2063 &ctx->cpidx, ctx->out);
2064 if (n <= 0) {
2065 error("unknown option `%s'", ctx->argv[0]);
2066 usage_with_options(usagestr, options);
2068 ctx->argv += n;
2069 ctx->argc -= n;
2072 static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
2073 struct strbuf bisect_refs = STRBUF_INIT;
2074 int status;
2075 strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2076 status = for_each_ref_in_submodule(submodule, bisect_refs.buf, fn, cb_data);
2077 strbuf_release(&bisect_refs);
2078 return status;
2081 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2083 return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
2086 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2088 return for_each_bisect_ref(submodule, fn, cb_data, term_good);
2091 static int handle_revision_pseudo_opt(const char *submodule,
2092 struct rev_info *revs,
2093 int argc, const char **argv, int *flags)
2095 const char *arg = argv[0];
2096 const char *optarg;
2097 int argcount;
2100 * NOTE!
2102 * Commands like "git shortlog" will not accept the options below
2103 * unless parse_revision_opt queues them (as opposed to erroring
2104 * out).
2106 * When implementing your new pseudo-option, remember to
2107 * register it in the list at the top of handle_revision_opt.
2109 if (!strcmp(arg, "--all")) {
2110 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2111 handle_refs(submodule, revs, *flags, head_ref_submodule);
2112 clear_ref_exclusion(&revs->ref_excludes);
2113 } else if (!strcmp(arg, "--branches")) {
2114 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
2115 clear_ref_exclusion(&revs->ref_excludes);
2116 } else if (!strcmp(arg, "--bisect")) {
2117 read_bisect_terms(&term_bad, &term_good);
2118 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
2119 handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
2120 revs->bisect = 1;
2121 } else if (!strcmp(arg, "--tags")) {
2122 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
2123 clear_ref_exclusion(&revs->ref_excludes);
2124 } else if (!strcmp(arg, "--remotes")) {
2125 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
2126 clear_ref_exclusion(&revs->ref_excludes);
2127 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2128 struct all_refs_cb cb;
2129 init_all_refs_cb(&cb, revs, *flags);
2130 for_each_glob_ref(handle_one_ref, optarg, &cb);
2131 clear_ref_exclusion(&revs->ref_excludes);
2132 return argcount;
2133 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2134 add_ref_exclusion(&revs->ref_excludes, optarg);
2135 return argcount;
2136 } else if (starts_with(arg, "--branches=")) {
2137 struct all_refs_cb cb;
2138 init_all_refs_cb(&cb, revs, *flags);
2139 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
2140 clear_ref_exclusion(&revs->ref_excludes);
2141 } else if (starts_with(arg, "--tags=")) {
2142 struct all_refs_cb cb;
2143 init_all_refs_cb(&cb, revs, *flags);
2144 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
2145 clear_ref_exclusion(&revs->ref_excludes);
2146 } else if (starts_with(arg, "--remotes=")) {
2147 struct all_refs_cb cb;
2148 init_all_refs_cb(&cb, revs, *flags);
2149 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
2150 clear_ref_exclusion(&revs->ref_excludes);
2151 } else if (!strcmp(arg, "--reflog")) {
2152 add_reflogs_to_pending(revs, *flags);
2153 } else if (!strcmp(arg, "--indexed-objects")) {
2154 add_index_objects_to_pending(revs, *flags);
2155 } else if (!strcmp(arg, "--not")) {
2156 *flags ^= UNINTERESTING | BOTTOM;
2157 } else if (!strcmp(arg, "--no-walk")) {
2158 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2159 } else if (starts_with(arg, "--no-walk=")) {
2161 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2162 * not allowed, since the argument is optional.
2164 if (!strcmp(arg + 10, "sorted"))
2165 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2166 else if (!strcmp(arg + 10, "unsorted"))
2167 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2168 else
2169 return error("invalid argument to --no-walk");
2170 } else if (!strcmp(arg, "--do-walk")) {
2171 revs->no_walk = 0;
2172 } else {
2173 return 0;
2176 return 1;
2179 static void NORETURN diagnose_missing_default(const char *def)
2181 unsigned char sha1[20];
2182 int flags;
2183 const char *refname;
2185 refname = resolve_ref_unsafe(def, 0, sha1, &flags);
2186 if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2187 die(_("your current branch appears to be broken"));
2189 skip_prefix(refname, "refs/heads/", &refname);
2190 die(_("your current branch '%s' does not have any commits yet"),
2191 refname);
2195 * Parse revision information, filling in the "rev_info" structure,
2196 * and removing the used arguments from the argument list.
2198 * Returns the number of arguments left that weren't recognized
2199 * (which are also moved to the head of the argument list)
2201 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2203 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
2204 struct cmdline_pathspec prune_data;
2205 const char *submodule = NULL;
2207 memset(&prune_data, 0, sizeof(prune_data));
2208 if (opt)
2209 submodule = opt->submodule;
2211 /* First, search for "--" */
2212 if (opt && opt->assume_dashdash) {
2213 seen_dashdash = 1;
2214 } else {
2215 seen_dashdash = 0;
2216 for (i = 1; i < argc; i++) {
2217 const char *arg = argv[i];
2218 if (strcmp(arg, "--"))
2219 continue;
2220 argv[i] = NULL;
2221 argc = i;
2222 if (argv[i + 1])
2223 append_prune_data(&prune_data, argv + i + 1);
2224 seen_dashdash = 1;
2225 break;
2229 /* Second, deal with arguments and options */
2230 flags = 0;
2231 revarg_opt = opt ? opt->revarg_opt : 0;
2232 if (seen_dashdash)
2233 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2234 read_from_stdin = 0;
2235 for (left = i = 1; i < argc; i++) {
2236 const char *arg = argv[i];
2237 if (*arg == '-') {
2238 int opts;
2240 opts = handle_revision_pseudo_opt(submodule,
2241 revs, argc - i, argv + i,
2242 &flags);
2243 if (opts > 0) {
2244 i += opts - 1;
2245 continue;
2248 if (!strcmp(arg, "--stdin")) {
2249 if (revs->disable_stdin) {
2250 argv[left++] = arg;
2251 continue;
2253 if (read_from_stdin++)
2254 die("--stdin given twice?");
2255 read_revisions_from_stdin(revs, &prune_data);
2256 continue;
2259 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
2260 if (opts > 0) {
2261 i += opts - 1;
2262 continue;
2264 if (opts < 0)
2265 exit(128);
2266 continue;
2270 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2271 int j;
2272 if (seen_dashdash || *arg == '^')
2273 die("bad revision '%s'", arg);
2275 /* If we didn't have a "--":
2276 * (1) all filenames must exist;
2277 * (2) all rev-args must not be interpretable
2278 * as a valid filename.
2279 * but the latter we have checked in the main loop.
2281 for (j = i; j < argc; j++)
2282 verify_filename(revs->prefix, argv[j], j == i);
2284 append_prune_data(&prune_data, argv + i);
2285 break;
2287 else
2288 got_rev_arg = 1;
2291 if (prune_data.nr) {
2293 * If we need to introduce the magic "a lone ':' means no
2294 * pathspec whatsoever", here is the place to do so.
2296 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2297 * prune_data.nr = 0;
2298 * prune_data.alloc = 0;
2299 * free(prune_data.path);
2300 * prune_data.path = NULL;
2301 * } else {
2302 * terminate prune_data.alloc with NULL and
2303 * call init_pathspec() to set revs->prune_data here.
2306 ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
2307 prune_data.path[prune_data.nr++] = NULL;
2308 parse_pathspec(&revs->prune_data, 0, 0,
2309 revs->prefix, prune_data.path);
2312 if (revs->def == NULL)
2313 revs->def = opt ? opt->def : NULL;
2314 if (opt && opt->tweak)
2315 opt->tweak(revs, opt);
2316 if (revs->show_merge)
2317 prepare_show_merge(revs);
2318 if (revs->def && !revs->pending.nr && !got_rev_arg) {
2319 unsigned char sha1[20];
2320 struct object *object;
2321 struct object_context oc;
2322 if (get_sha1_with_context(revs->def, 0, sha1, &oc))
2323 diagnose_missing_default(revs->def);
2324 object = get_reference(revs, revs->def, sha1, 0);
2325 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2328 /* Did the user ask for any diff output? Run the diff! */
2329 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2330 revs->diff = 1;
2332 /* Pickaxe, diff-filter and rename following need diffs */
2333 if (revs->diffopt.pickaxe ||
2334 revs->diffopt.filter ||
2335 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2336 revs->diff = 1;
2338 if (revs->topo_order)
2339 revs->limited = 1;
2341 if (revs->prune_data.nr) {
2342 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2343 /* Can't prune commits with rename following: the paths change.. */
2344 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2345 revs->prune = 1;
2346 if (!revs->full_diff)
2347 copy_pathspec(&revs->diffopt.pathspec,
2348 &revs->prune_data);
2350 if (revs->combine_merges)
2351 revs->ignore_merges = 0;
2352 revs->diffopt.abbrev = revs->abbrev;
2354 if (revs->line_level_traverse) {
2355 revs->limited = 1;
2356 revs->topo_order = 1;
2359 diff_setup_done(&revs->diffopt);
2361 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2362 &revs->grep_filter);
2363 compile_grep_patterns(&revs->grep_filter);
2365 if (revs->reverse && revs->reflog_info)
2366 die("cannot combine --reverse with --walk-reflogs");
2367 if (revs->rewrite_parents && revs->children.name)
2368 die("cannot combine --parents and --children");
2371 * Limitations on the graph functionality
2373 if (revs->reverse && revs->graph)
2374 die("cannot combine --reverse with --graph");
2376 if (revs->reflog_info && revs->graph)
2377 die("cannot combine --walk-reflogs with --graph");
2378 if (revs->no_walk && revs->graph)
2379 die("cannot combine --no-walk with --graph");
2380 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2381 die("cannot use --grep-reflog without --walk-reflogs");
2383 if (revs->first_parent_only && revs->bisect)
2384 die(_("--first-parent is incompatible with --bisect"));
2386 return left;
2389 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2391 struct commit_list *l = xcalloc(1, sizeof(*l));
2393 l->item = child;
2394 l->next = add_decoration(&revs->children, &parent->object, l);
2397 static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2399 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2400 struct commit_list **pp, *p;
2401 int surviving_parents;
2403 /* Examine existing parents while marking ones we have seen... */
2404 pp = &commit->parents;
2405 surviving_parents = 0;
2406 while ((p = *pp) != NULL) {
2407 struct commit *parent = p->item;
2408 if (parent->object.flags & TMP_MARK) {
2409 *pp = p->next;
2410 if (ts)
2411 compact_treesame(revs, commit, surviving_parents);
2412 continue;
2414 parent->object.flags |= TMP_MARK;
2415 surviving_parents++;
2416 pp = &p->next;
2418 /* clear the temporary mark */
2419 for (p = commit->parents; p; p = p->next) {
2420 p->item->object.flags &= ~TMP_MARK;
2422 /* no update_treesame() - removing duplicates can't affect TREESAME */
2423 return surviving_parents;
2426 struct merge_simplify_state {
2427 struct commit *simplified;
2430 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2432 struct merge_simplify_state *st;
2434 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2435 if (!st) {
2436 st = xcalloc(1, sizeof(*st));
2437 add_decoration(&revs->merge_simplification, &commit->object, st);
2439 return st;
2442 static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2444 struct commit_list *h = reduce_heads(commit->parents);
2445 int i = 0, marked = 0;
2446 struct commit_list *po, *pn;
2448 /* Want these for sanity-checking only */
2449 int orig_cnt = commit_list_count(commit->parents);
2450 int cnt = commit_list_count(h);
2453 * Not ready to remove items yet, just mark them for now, based
2454 * on the output of reduce_heads(). reduce_heads outputs the reduced
2455 * set in its original order, so this isn't too hard.
2457 po = commit->parents;
2458 pn = h;
2459 while (po) {
2460 if (pn && po->item == pn->item) {
2461 pn = pn->next;
2462 i++;
2463 } else {
2464 po->item->object.flags |= TMP_MARK;
2465 marked++;
2467 po=po->next;
2470 if (i != cnt || cnt+marked != orig_cnt)
2471 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2473 free_commit_list(h);
2475 return marked;
2478 static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2480 struct commit_list *p;
2481 int marked = 0;
2483 for (p = commit->parents; p; p = p->next) {
2484 struct commit *parent = p->item;
2485 if (!parent->parents && (parent->object.flags & TREESAME)) {
2486 parent->object.flags |= TMP_MARK;
2487 marked++;
2491 return marked;
2495 * Awkward naming - this means one parent we are TREESAME to.
2496 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2497 * empty tree). Better name suggestions?
2499 static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2501 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2502 struct commit *unmarked = NULL, *marked = NULL;
2503 struct commit_list *p;
2504 unsigned n;
2506 for (p = commit->parents, n = 0; p; p = p->next, n++) {
2507 if (ts->treesame[n]) {
2508 if (p->item->object.flags & TMP_MARK) {
2509 if (!marked)
2510 marked = p->item;
2511 } else {
2512 if (!unmarked) {
2513 unmarked = p->item;
2514 break;
2521 * If we are TREESAME to a marked-for-deletion parent, but not to any
2522 * unmarked parents, unmark the first TREESAME parent. This is the
2523 * parent that the default simplify_history==1 scan would have followed,
2524 * and it doesn't make sense to omit that path when asking for a
2525 * simplified full history. Retaining it improves the chances of
2526 * understanding odd missed merges that took an old version of a file.
2528 * Example:
2530 * I--------*X A modified the file, but mainline merge X used
2531 * \ / "-s ours", so took the version from I. X is
2532 * `-*A--' TREESAME to I and !TREESAME to A.
2534 * Default log from X would produce "I". Without this check,
2535 * --full-history --simplify-merges would produce "I-A-X", showing
2536 * the merge commit X and that it changed A, but not making clear that
2537 * it had just taken the I version. With this check, the topology above
2538 * is retained.
2540 * Note that it is possible that the simplification chooses a different
2541 * TREESAME parent from the default, in which case this test doesn't
2542 * activate, and we _do_ drop the default parent. Example:
2544 * I------X A modified the file, but it was reverted in B,
2545 * \ / meaning mainline merge X is TREESAME to both
2546 * *A-*B parents.
2548 * Default log would produce "I" by following the first parent;
2549 * --full-history --simplify-merges will produce "I-A-B". But this is a
2550 * reasonable result - it presents a logical full history leading from
2551 * I to X, and X is not an important merge.
2553 if (!unmarked && marked) {
2554 marked->object.flags &= ~TMP_MARK;
2555 return 1;
2558 return 0;
2561 static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2563 struct commit_list **pp, *p;
2564 int nth_parent, removed = 0;
2566 pp = &commit->parents;
2567 nth_parent = 0;
2568 while ((p = *pp) != NULL) {
2569 struct commit *parent = p->item;
2570 if (parent->object.flags & TMP_MARK) {
2571 parent->object.flags &= ~TMP_MARK;
2572 *pp = p->next;
2573 free(p);
2574 removed++;
2575 compact_treesame(revs, commit, nth_parent);
2576 continue;
2578 pp = &p->next;
2579 nth_parent++;
2582 /* Removing parents can only increase TREESAMEness */
2583 if (removed && !(commit->object.flags & TREESAME))
2584 update_treesame(revs, commit);
2586 return nth_parent;
2589 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
2591 struct commit_list *p;
2592 struct commit *parent;
2593 struct merge_simplify_state *st, *pst;
2594 int cnt;
2596 st = locate_simplify_state(revs, commit);
2599 * Have we handled this one?
2601 if (st->simplified)
2602 return tail;
2605 * An UNINTERESTING commit simplifies to itself, so does a
2606 * root commit. We do not rewrite parents of such commit
2607 * anyway.
2609 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
2610 st->simplified = commit;
2611 return tail;
2615 * Do we know what commit all of our parents that matter
2616 * should be rewritten to? Otherwise we are not ready to
2617 * rewrite this one yet.
2619 for (cnt = 0, p = commit->parents; p; p = p->next) {
2620 pst = locate_simplify_state(revs, p->item);
2621 if (!pst->simplified) {
2622 tail = &commit_list_insert(p->item, tail)->next;
2623 cnt++;
2625 if (revs->first_parent_only)
2626 break;
2628 if (cnt) {
2629 tail = &commit_list_insert(commit, tail)->next;
2630 return tail;
2634 * Rewrite our list of parents. Note that this cannot
2635 * affect our TREESAME flags in any way - a commit is
2636 * always TREESAME to its simplification.
2638 for (p = commit->parents; p; p = p->next) {
2639 pst = locate_simplify_state(revs, p->item);
2640 p->item = pst->simplified;
2641 if (revs->first_parent_only)
2642 break;
2645 if (revs->first_parent_only)
2646 cnt = 1;
2647 else
2648 cnt = remove_duplicate_parents(revs, commit);
2651 * It is possible that we are a merge and one side branch
2652 * does not have any commit that touches the given paths;
2653 * in such a case, the immediate parent from that branch
2654 * will be rewritten to be the merge base.
2656 * o----X X: the commit we are looking at;
2657 * / / o: a commit that touches the paths;
2658 * ---o----'
2660 * Further, a merge of an independent branch that doesn't
2661 * touch the path will reduce to a treesame root parent:
2663 * ----o----X X: the commit we are looking at;
2664 * / o: a commit that touches the paths;
2665 * r r: a root commit not touching the paths
2667 * Detect and simplify both cases.
2669 if (1 < cnt) {
2670 int marked = mark_redundant_parents(revs, commit);
2671 marked += mark_treesame_root_parents(revs, commit);
2672 if (marked)
2673 marked -= leave_one_treesame_to_parent(revs, commit);
2674 if (marked)
2675 cnt = remove_marked_parents(revs, commit);
2679 * A commit simplifies to itself if it is a root, if it is
2680 * UNINTERESTING, if it touches the given paths, or if it is a
2681 * merge and its parents don't simplify to one relevant commit
2682 * (the first two cases are already handled at the beginning of
2683 * this function).
2685 * Otherwise, it simplifies to what its sole relevant parent
2686 * simplifies to.
2688 if (!cnt ||
2689 (commit->object.flags & UNINTERESTING) ||
2690 !(commit->object.flags & TREESAME) ||
2691 (parent = one_relevant_parent(revs, commit->parents)) == NULL)
2692 st->simplified = commit;
2693 else {
2694 pst = locate_simplify_state(revs, parent);
2695 st->simplified = pst->simplified;
2697 return tail;
2700 static void simplify_merges(struct rev_info *revs)
2702 struct commit_list *list, *next;
2703 struct commit_list *yet_to_do, **tail;
2704 struct commit *commit;
2706 if (!revs->prune)
2707 return;
2709 /* feed the list reversed */
2710 yet_to_do = NULL;
2711 for (list = revs->commits; list; list = next) {
2712 commit = list->item;
2713 next = list->next;
2715 * Do not free(list) here yet; the original list
2716 * is used later in this function.
2718 commit_list_insert(commit, &yet_to_do);
2720 while (yet_to_do) {
2721 list = yet_to_do;
2722 yet_to_do = NULL;
2723 tail = &yet_to_do;
2724 while (list) {
2725 commit = pop_commit(&list);
2726 tail = simplify_one(revs, commit, tail);
2730 /* clean up the result, removing the simplified ones */
2731 list = revs->commits;
2732 revs->commits = NULL;
2733 tail = &revs->commits;
2734 while (list) {
2735 struct merge_simplify_state *st;
2737 commit = pop_commit(&list);
2738 st = locate_simplify_state(revs, commit);
2739 if (st->simplified == commit)
2740 tail = &commit_list_insert(commit, tail)->next;
2744 static void set_children(struct rev_info *revs)
2746 struct commit_list *l;
2747 for (l = revs->commits; l; l = l->next) {
2748 struct commit *commit = l->item;
2749 struct commit_list *p;
2751 for (p = commit->parents; p; p = p->next)
2752 add_child(revs, p->item, commit);
2756 void reset_revision_walk(void)
2758 clear_object_flags(SEEN | ADDED | SHOWN);
2761 int prepare_revision_walk(struct rev_info *revs)
2763 int i;
2764 struct object_array old_pending;
2765 struct commit_list **next = &revs->commits;
2767 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
2768 revs->pending.nr = 0;
2769 revs->pending.alloc = 0;
2770 revs->pending.objects = NULL;
2771 for (i = 0; i < old_pending.nr; i++) {
2772 struct object_array_entry *e = old_pending.objects + i;
2773 struct commit *commit = handle_commit(revs, e);
2774 if (commit) {
2775 if (!(commit->object.flags & SEEN)) {
2776 commit->object.flags |= SEEN;
2777 next = commit_list_append(commit, next);
2781 if (!revs->leak_pending)
2782 object_array_clear(&old_pending);
2784 /* Signal whether we need per-parent treesame decoration */
2785 if (revs->simplify_merges ||
2786 (revs->limited && limiting_can_increase_treesame(revs)))
2787 revs->treesame.name = "treesame";
2789 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2790 commit_list_sort_by_date(&revs->commits);
2791 if (revs->no_walk)
2792 return 0;
2793 if (revs->limited)
2794 if (limit_list(revs) < 0)
2795 return -1;
2796 if (revs->topo_order)
2797 sort_in_topological_order(&revs->commits, revs->sort_order);
2798 if (revs->line_level_traverse)
2799 line_log_filter(revs);
2800 if (revs->simplify_merges)
2801 simplify_merges(revs);
2802 if (revs->children.name)
2803 set_children(revs);
2804 return 0;
2807 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2809 struct commit_list *cache = NULL;
2811 for (;;) {
2812 struct commit *p = *pp;
2813 if (!revs->limited)
2814 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2815 return rewrite_one_error;
2816 if (p->object.flags & UNINTERESTING)
2817 return rewrite_one_ok;
2818 if (!(p->object.flags & TREESAME))
2819 return rewrite_one_ok;
2820 if (!p->parents)
2821 return rewrite_one_noparents;
2822 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2823 return rewrite_one_ok;
2824 *pp = p;
2828 int rewrite_parents(struct rev_info *revs, struct commit *commit,
2829 rewrite_parent_fn_t rewrite_parent)
2831 struct commit_list **pp = &commit->parents;
2832 while (*pp) {
2833 struct commit_list *parent = *pp;
2834 switch (rewrite_parent(revs, &parent->item)) {
2835 case rewrite_one_ok:
2836 break;
2837 case rewrite_one_noparents:
2838 *pp = parent->next;
2839 continue;
2840 case rewrite_one_error:
2841 return -1;
2843 pp = &parent->next;
2845 remove_duplicate_parents(revs, commit);
2846 return 0;
2849 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2851 char *person, *endp;
2852 size_t len, namelen, maillen;
2853 const char *name;
2854 const char *mail;
2855 struct ident_split ident;
2857 person = strstr(buf->buf, what);
2858 if (!person)
2859 return 0;
2861 person += strlen(what);
2862 endp = strchr(person, '\n');
2863 if (!endp)
2864 return 0;
2866 len = endp - person;
2868 if (split_ident_line(&ident, person, len))
2869 return 0;
2871 mail = ident.mail_begin;
2872 maillen = ident.mail_end - ident.mail_begin;
2873 name = ident.name_begin;
2874 namelen = ident.name_end - ident.name_begin;
2876 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2877 struct strbuf namemail = STRBUF_INIT;
2879 strbuf_addf(&namemail, "%.*s <%.*s>",
2880 (int)namelen, name, (int)maillen, mail);
2882 strbuf_splice(buf, ident.name_begin - buf->buf,
2883 ident.mail_end - ident.name_begin + 1,
2884 namemail.buf, namemail.len);
2886 strbuf_release(&namemail);
2888 return 1;
2891 return 0;
2894 static int commit_match(struct commit *commit, struct rev_info *opt)
2896 int retval;
2897 const char *encoding;
2898 const char *message;
2899 struct strbuf buf = STRBUF_INIT;
2901 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2902 return 1;
2904 /* Prepend "fake" headers as needed */
2905 if (opt->grep_filter.use_reflog_filter) {
2906 strbuf_addstr(&buf, "reflog ");
2907 get_reflog_message(&buf, opt->reflog_info);
2908 strbuf_addch(&buf, '\n');
2912 * We grep in the user's output encoding, under the assumption that it
2913 * is the encoding they are most likely to write their grep pattern
2914 * for. In addition, it means we will match the "notes" encoding below,
2915 * so we will not end up with a buffer that has two different encodings
2916 * in it.
2918 encoding = get_log_output_encoding();
2919 message = logmsg_reencode(commit, NULL, encoding);
2921 /* Copy the commit to temporary if we are using "fake" headers */
2922 if (buf.len)
2923 strbuf_addstr(&buf, message);
2925 if (opt->grep_filter.header_list && opt->mailmap) {
2926 if (!buf.len)
2927 strbuf_addstr(&buf, message);
2929 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2930 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2933 /* Append "fake" message parts as needed */
2934 if (opt->show_notes) {
2935 if (!buf.len)
2936 strbuf_addstr(&buf, message);
2937 format_display_notes(commit->object.oid.hash, &buf, encoding, 1);
2941 * Find either in the original commit message, or in the temporary.
2942 * Note that we cast away the constness of "message" here. It is
2943 * const because it may come from the cached commit buffer. That's OK,
2944 * because we know that it is modifiable heap memory, and that while
2945 * grep_buffer may modify it for speed, it will restore any
2946 * changes before returning.
2948 if (buf.len)
2949 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2950 else
2951 retval = grep_buffer(&opt->grep_filter,
2952 (char *)message, strlen(message));
2953 strbuf_release(&buf);
2954 unuse_commit_buffer(commit, message);
2955 return opt->invert_grep ? !retval : retval;
2958 static inline int want_ancestry(const struct rev_info *revs)
2960 return (revs->rewrite_parents || revs->children.name);
2963 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2965 if (commit->object.flags & SHOWN)
2966 return commit_ignore;
2967 if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))
2968 return commit_ignore;
2969 if (revs->show_all)
2970 return commit_show;
2971 if (commit->object.flags & UNINTERESTING)
2972 return commit_ignore;
2973 if (revs->min_age != -1 && (commit->date > revs->min_age))
2974 return commit_ignore;
2975 if (revs->min_parents || (revs->max_parents >= 0)) {
2976 int n = commit_list_count(commit->parents);
2977 if ((n < revs->min_parents) ||
2978 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2979 return commit_ignore;
2981 if (!commit_match(commit, revs))
2982 return commit_ignore;
2983 if (revs->prune && revs->dense) {
2984 /* Commit without changes? */
2985 if (commit->object.flags & TREESAME) {
2986 int n;
2987 struct commit_list *p;
2988 /* drop merges unless we want parenthood */
2989 if (!want_ancestry(revs))
2990 return commit_ignore;
2992 * If we want ancestry, then need to keep any merges
2993 * between relevant commits to tie together topology.
2994 * For consistency with TREESAME and simplification
2995 * use "relevant" here rather than just INTERESTING,
2996 * to treat bottom commit(s) as part of the topology.
2998 for (n = 0, p = commit->parents; p; p = p->next)
2999 if (relevant_commit(p->item))
3000 if (++n >= 2)
3001 return commit_show;
3002 return commit_ignore;
3005 return commit_show;
3008 define_commit_slab(saved_parents, struct commit_list *);
3010 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3013 * You may only call save_parents() once per commit (this is checked
3014 * for non-root commits).
3016 static void save_parents(struct rev_info *revs, struct commit *commit)
3018 struct commit_list **pp;
3020 if (!revs->saved_parents_slab) {
3021 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3022 init_saved_parents(revs->saved_parents_slab);
3025 pp = saved_parents_at(revs->saved_parents_slab, commit);
3028 * When walking with reflogs, we may visit the same commit
3029 * several times: once for each appearance in the reflog.
3031 * In this case, save_parents() will be called multiple times.
3032 * We want to keep only the first set of parents. We need to
3033 * store a sentinel value for an empty (i.e., NULL) parent
3034 * list to distinguish it from a not-yet-saved list, however.
3036 if (*pp)
3037 return;
3038 if (commit->parents)
3039 *pp = copy_commit_list(commit->parents);
3040 else
3041 *pp = EMPTY_PARENT_LIST;
3044 static void free_saved_parents(struct rev_info *revs)
3046 if (revs->saved_parents_slab)
3047 clear_saved_parents(revs->saved_parents_slab);
3050 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3052 struct commit_list *parents;
3054 if (!revs->saved_parents_slab)
3055 return commit->parents;
3057 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3058 if (parents == EMPTY_PARENT_LIST)
3059 return NULL;
3060 return parents;
3063 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3065 enum commit_action action = get_commit_action(revs, commit);
3067 if (action == commit_show &&
3068 !revs->show_all &&
3069 revs->prune && revs->dense && want_ancestry(revs)) {
3071 * --full-diff on simplified parents is no good: it
3072 * will show spurious changes from the commits that
3073 * were elided. So we save the parents on the side
3074 * when --full-diff is in effect.
3076 if (revs->full_diff)
3077 save_parents(revs, commit);
3078 if (rewrite_parents(revs, commit, rewrite_one) < 0)
3079 return commit_error;
3081 return action;
3084 static void track_linear(struct rev_info *revs, struct commit *commit)
3086 if (revs->track_first_time) {
3087 revs->linear = 1;
3088 revs->track_first_time = 0;
3089 } else {
3090 struct commit_list *p;
3091 for (p = revs->previous_parents; p; p = p->next)
3092 if (p->item == NULL || /* first commit */
3093 !oidcmp(&p->item->object.oid, &commit->object.oid))
3094 break;
3095 revs->linear = p != NULL;
3097 if (revs->reverse) {
3098 if (revs->linear)
3099 commit->object.flags |= TRACK_LINEAR;
3101 free_commit_list(revs->previous_parents);
3102 revs->previous_parents = copy_commit_list(commit->parents);
3105 static struct commit *get_revision_1(struct rev_info *revs)
3107 if (!revs->commits)
3108 return NULL;
3110 do {
3111 struct commit *commit = pop_commit(&revs->commits);
3113 if (revs->reflog_info) {
3114 save_parents(revs, commit);
3115 fake_reflog_parent(revs->reflog_info, commit);
3116 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3120 * If we haven't done the list limiting, we need to look at
3121 * the parents here. We also need to do the date-based limiting
3122 * that we'd otherwise have done in limit_list().
3124 if (!revs->limited) {
3125 if (revs->max_age != -1 &&
3126 (commit->date < revs->max_age))
3127 continue;
3128 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3129 if (!revs->ignore_missing_links)
3130 die("Failed to traverse parents of commit %s",
3131 oid_to_hex(&commit->object.oid));
3135 switch (simplify_commit(revs, commit)) {
3136 case commit_ignore:
3137 continue;
3138 case commit_error:
3139 die("Failed to simplify parents of commit %s",
3140 oid_to_hex(&commit->object.oid));
3141 default:
3142 if (revs->track_linear)
3143 track_linear(revs, commit);
3144 return commit;
3146 } while (revs->commits);
3147 return NULL;
3151 * Return true for entries that have not yet been shown. (This is an
3152 * object_array_each_func_t.)
3154 static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3156 return !(entry->item->flags & SHOWN);
3160 * If array is on the verge of a realloc, garbage-collect any entries
3161 * that have already been shown to try to free up some space.
3163 static void gc_boundary(struct object_array *array)
3165 if (array->nr == array->alloc)
3166 object_array_filter(array, entry_unshown, NULL);
3169 static void create_boundary_commit_list(struct rev_info *revs)
3171 unsigned i;
3172 struct commit *c;
3173 struct object_array *array = &revs->boundary_commits;
3174 struct object_array_entry *objects = array->objects;
3177 * If revs->commits is non-NULL at this point, an error occurred in
3178 * get_revision_1(). Ignore the error and continue printing the
3179 * boundary commits anyway. (This is what the code has always
3180 * done.)
3182 if (revs->commits) {
3183 free_commit_list(revs->commits);
3184 revs->commits = NULL;
3188 * Put all of the actual boundary commits from revs->boundary_commits
3189 * into revs->commits
3191 for (i = 0; i < array->nr; i++) {
3192 c = (struct commit *)(objects[i].item);
3193 if (!c)
3194 continue;
3195 if (!(c->object.flags & CHILD_SHOWN))
3196 continue;
3197 if (c->object.flags & (SHOWN | BOUNDARY))
3198 continue;
3199 c->object.flags |= BOUNDARY;
3200 commit_list_insert(c, &revs->commits);
3204 * If revs->topo_order is set, sort the boundary commits
3205 * in topological order
3207 sort_in_topological_order(&revs->commits, revs->sort_order);
3210 static struct commit *get_revision_internal(struct rev_info *revs)
3212 struct commit *c = NULL;
3213 struct commit_list *l;
3215 if (revs->boundary == 2) {
3217 * All of the normal commits have already been returned,
3218 * and we are now returning boundary commits.
3219 * create_boundary_commit_list() has populated
3220 * revs->commits with the remaining commits to return.
3222 c = pop_commit(&revs->commits);
3223 if (c)
3224 c->object.flags |= SHOWN;
3225 return c;
3229 * If our max_count counter has reached zero, then we are done. We
3230 * don't simply return NULL because we still might need to show
3231 * boundary commits. But we want to avoid calling get_revision_1, which
3232 * might do a considerable amount of work finding the next commit only
3233 * for us to throw it away.
3235 * If it is non-zero, then either we don't have a max_count at all
3236 * (-1), or it is still counting, in which case we decrement.
3238 if (revs->max_count) {
3239 c = get_revision_1(revs);
3240 if (c) {
3241 while (revs->skip_count > 0) {
3242 revs->skip_count--;
3243 c = get_revision_1(revs);
3244 if (!c)
3245 break;
3249 if (revs->max_count > 0)
3250 revs->max_count--;
3253 if (c)
3254 c->object.flags |= SHOWN;
3256 if (!revs->boundary)
3257 return c;
3259 if (!c) {
3261 * get_revision_1() runs out the commits, and
3262 * we are done computing the boundaries.
3263 * switch to boundary commits output mode.
3265 revs->boundary = 2;
3268 * Update revs->commits to contain the list of
3269 * boundary commits.
3271 create_boundary_commit_list(revs);
3273 return get_revision_internal(revs);
3277 * boundary commits are the commits that are parents of the
3278 * ones we got from get_revision_1() but they themselves are
3279 * not returned from get_revision_1(). Before returning
3280 * 'c', we need to mark its parents that they could be boundaries.
3283 for (l = c->parents; l; l = l->next) {
3284 struct object *p;
3285 p = &(l->item->object);
3286 if (p->flags & (CHILD_SHOWN | SHOWN))
3287 continue;
3288 p->flags |= CHILD_SHOWN;
3289 gc_boundary(&revs->boundary_commits);
3290 add_object_array(p, NULL, &revs->boundary_commits);
3293 return c;
3296 struct commit *get_revision(struct rev_info *revs)
3298 struct commit *c;
3299 struct commit_list *reversed;
3301 if (revs->reverse) {
3302 reversed = NULL;
3303 while ((c = get_revision_internal(revs)))
3304 commit_list_insert(c, &reversed);
3305 revs->commits = reversed;
3306 revs->reverse = 0;
3307 revs->reverse_output_stage = 1;
3310 if (revs->reverse_output_stage) {
3311 c = pop_commit(&revs->commits);
3312 if (revs->track_linear)
3313 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3314 return c;
3317 c = get_revision_internal(revs);
3318 if (c && revs->graph)
3319 graph_update(revs->graph, c);
3320 if (!c) {
3321 free_saved_parents(revs);
3322 if (revs->previous_parents) {
3323 free_commit_list(revs->previous_parents);
3324 revs->previous_parents = NULL;
3327 return c;
3330 char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3332 if (commit->object.flags & BOUNDARY)
3333 return "-";
3334 else if (commit->object.flags & UNINTERESTING)
3335 return "^";
3336 else if (commit->object.flags & PATCHSAME)
3337 return "=";
3338 else if (!revs || revs->left_right) {
3339 if (commit->object.flags & SYMMETRIC_LEFT)
3340 return "<";
3341 else
3342 return ">";
3343 } else if (revs->graph)
3344 return "*";
3345 else if (revs->cherry_mark)
3346 return "+";
3347 return "";
3350 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3352 char *mark = get_revision_mark(revs, commit);
3353 if (!strlen(mark))
3354 return;
3355 fputs(mark, stdout);
3356 putchar(' ');