Merge branch 'mg/timestamp-t-fix' into maint
[git/debian.git] / revision.c
blobf032ab2e5c5c73c691338cdaf99d5b3b3d16b674
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 void show_object_with_name(FILE *out, struct object *obj, const char *name)
30 const char *p;
32 fprintf(out, "%s ", oid_to_hex(&obj->oid));
33 for (p = name; *p && *p != '\n'; p++)
34 fputc(*p, out);
35 fputc('\n', out);
38 static void mark_blob_uninteresting(struct blob *blob)
40 if (!blob)
41 return;
42 if (blob->object.flags & UNINTERESTING)
43 return;
44 blob->object.flags |= UNINTERESTING;
47 static void mark_tree_contents_uninteresting(struct tree *tree)
49 struct tree_desc desc;
50 struct name_entry entry;
51 struct object *obj = &tree->object;
53 if (!has_object_file(&obj->oid))
54 return;
55 if (parse_tree(tree) < 0)
56 die("bad tree %s", oid_to_hex(&obj->oid));
58 init_tree_desc(&desc, tree->buffer, tree->size);
59 while (tree_entry(&desc, &entry)) {
60 switch (object_type(entry.mode)) {
61 case OBJ_TREE:
62 mark_tree_uninteresting(lookup_tree(entry.oid));
63 break;
64 case OBJ_BLOB:
65 mark_blob_uninteresting(lookup_blob(entry.oid));
66 break;
67 default:
68 /* Subproject commit - not in this repository */
69 break;
74 * We don't care about the tree any more
75 * after it has been marked uninteresting.
77 free_tree_buffer(tree);
80 void mark_tree_uninteresting(struct tree *tree)
82 struct object *obj;
84 if (!tree)
85 return;
87 obj = &tree->object;
88 if (obj->flags & UNINTERESTING)
89 return;
90 obj->flags |= UNINTERESTING;
91 mark_tree_contents_uninteresting(tree);
94 void mark_parents_uninteresting(struct commit *commit)
96 struct commit_list *parents = NULL, *l;
98 for (l = commit->parents; l; l = l->next)
99 commit_list_insert(l->item, &parents);
101 while (parents) {
102 struct commit *commit = pop_commit(&parents);
104 while (commit) {
106 * A missing commit is ok iff its parent is marked
107 * uninteresting.
109 * We just mark such a thing parsed, so that when
110 * it is popped next time around, we won't be trying
111 * to parse it and get an error.
113 if (!has_object_file(&commit->object.oid))
114 commit->object.parsed = 1;
116 if (commit->object.flags & UNINTERESTING)
117 break;
119 commit->object.flags |= UNINTERESTING;
122 * Normally we haven't parsed the parent
123 * yet, so we won't have a parent of a parent
124 * here. However, it may turn out that we've
125 * reached this commit some other way (where it
126 * wasn't uninteresting), in which case we need
127 * to mark its parents recursively too..
129 if (!commit->parents)
130 break;
132 for (l = commit->parents->next; l; l = l->next)
133 commit_list_insert(l->item, &parents);
134 commit = commit->parents->item;
139 static void add_pending_object_with_path(struct rev_info *revs,
140 struct object *obj,
141 const char *name, unsigned mode,
142 const char *path)
144 if (!obj)
145 return;
146 if (revs->no_walk && (obj->flags & UNINTERESTING))
147 revs->no_walk = 0;
148 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
149 struct strbuf buf = STRBUF_INIT;
150 int len = interpret_branch_name(name, 0, &buf, 0);
152 if (0 < len && name[len] && buf.len)
153 strbuf_addstr(&buf, name + len);
154 add_reflog_for_walk(revs->reflog_info,
155 (struct commit *)obj,
156 buf.buf[0] ? buf.buf: name);
157 strbuf_release(&buf);
158 return; /* do not add the commit itself */
160 add_object_array_with_path(obj, name, &revs->pending, mode, path);
163 static void add_pending_object_with_mode(struct rev_info *revs,
164 struct object *obj,
165 const char *name, unsigned mode)
167 add_pending_object_with_path(revs, obj, name, mode, NULL);
170 void add_pending_object(struct rev_info *revs,
171 struct object *obj, const char *name)
173 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
176 void add_head_to_pending(struct rev_info *revs)
178 struct object_id oid;
179 struct object *obj;
180 if (get_oid("HEAD", &oid))
181 return;
182 obj = parse_object(&oid);
183 if (!obj)
184 return;
185 add_pending_object(revs, obj, "HEAD");
188 static struct object *get_reference(struct rev_info *revs, const char *name,
189 const struct object_id *oid,
190 unsigned int flags)
192 struct object *object;
194 object = parse_object(oid);
195 if (!object) {
196 if (revs->ignore_missing)
197 return object;
198 die("bad object %s", name);
200 object->flags |= flags;
201 return object;
204 void add_pending_oid(struct rev_info *revs, const char *name,
205 const struct object_id *oid, unsigned int flags)
207 struct object *object = get_reference(revs, name, oid, flags);
208 add_pending_object(revs, object, name);
211 static struct commit *handle_commit(struct rev_info *revs,
212 struct object_array_entry *entry)
214 struct object *object = entry->item;
215 const char *name = entry->name;
216 const char *path = entry->path;
217 unsigned int mode = entry->mode;
218 unsigned long flags = object->flags;
221 * Tag object? Look what it points to..
223 while (object->type == OBJ_TAG) {
224 struct tag *tag = (struct tag *) object;
225 if (revs->tag_objects && !(flags & UNINTERESTING))
226 add_pending_object(revs, object, tag->tag);
227 if (!tag->tagged)
228 die("bad tag");
229 object = parse_object(&tag->tagged->oid);
230 if (!object) {
231 if (revs->ignore_missing_links || (flags & UNINTERESTING))
232 return NULL;
233 die("bad object %s", oid_to_hex(&tag->tagged->oid));
235 object->flags |= flags;
237 * We'll handle the tagged object by looping or dropping
238 * through to the non-tag handlers below. Do not
239 * propagate path data from the tag's pending entry.
241 path = NULL;
242 mode = 0;
246 * Commit object? Just return it, we'll do all the complex
247 * reachability crud.
249 if (object->type == OBJ_COMMIT) {
250 struct commit *commit = (struct commit *)object;
251 if (parse_commit(commit) < 0)
252 die("unable to parse commit %s", name);
253 if (flags & UNINTERESTING) {
254 mark_parents_uninteresting(commit);
255 revs->limited = 1;
257 if (revs->show_source && !commit->util)
258 commit->util = xstrdup(name);
259 return commit;
263 * Tree object? Either mark it uninteresting, or add it
264 * to the list of objects to look at later..
266 if (object->type == OBJ_TREE) {
267 struct tree *tree = (struct tree *)object;
268 if (!revs->tree_objects)
269 return NULL;
270 if (flags & UNINTERESTING) {
271 mark_tree_contents_uninteresting(tree);
272 return NULL;
274 add_pending_object_with_path(revs, object, name, mode, path);
275 return NULL;
279 * Blob object? You know the drill by now..
281 if (object->type == OBJ_BLOB) {
282 if (!revs->blob_objects)
283 return NULL;
284 if (flags & UNINTERESTING)
285 return NULL;
286 add_pending_object_with_path(revs, object, name, mode, path);
287 return NULL;
289 die("%s is unknown object", name);
292 static int everybody_uninteresting(struct commit_list *orig,
293 struct commit **interesting_cache)
295 struct commit_list *list = orig;
297 if (*interesting_cache) {
298 struct commit *commit = *interesting_cache;
299 if (!(commit->object.flags & UNINTERESTING))
300 return 0;
303 while (list) {
304 struct commit *commit = list->item;
305 list = list->next;
306 if (commit->object.flags & UNINTERESTING)
307 continue;
309 *interesting_cache = commit;
310 return 0;
312 return 1;
316 * A definition of "relevant" commit that we can use to simplify limited graphs
317 * by eliminating side branches.
319 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
320 * in our list), or that is a specified BOTTOM commit. Then after computing
321 * a limited list, during processing we can generally ignore boundary merges
322 * coming from outside the graph, (ie from irrelevant parents), and treat
323 * those merges as if they were single-parent. TREESAME is defined to consider
324 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
325 * we don't care if we were !TREESAME to non-graph parents.
327 * Treating bottom commits as relevant ensures that a limited graph's
328 * connection to the actual bottom commit is not viewed as a side branch, but
329 * treated as part of the graph. For example:
331 * ....Z...A---X---o---o---B
332 * . /
333 * W---Y
335 * When computing "A..B", the A-X connection is at least as important as
336 * Y-X, despite A being flagged UNINTERESTING.
338 * And when computing --ancestry-path "A..B", the A-X connection is more
339 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
341 static inline int relevant_commit(struct commit *commit)
343 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
347 * Return a single relevant commit from a parent list. If we are a TREESAME
348 * commit, and this selects one of our parents, then we can safely simplify to
349 * that parent.
351 static struct commit *one_relevant_parent(const struct rev_info *revs,
352 struct commit_list *orig)
354 struct commit_list *list = orig;
355 struct commit *relevant = NULL;
357 if (!orig)
358 return NULL;
361 * For 1-parent commits, or if first-parent-only, then return that
362 * first parent (even if not "relevant" by the above definition).
363 * TREESAME will have been set purely on that parent.
365 if (revs->first_parent_only || !orig->next)
366 return orig->item;
369 * For multi-parent commits, identify a sole relevant parent, if any.
370 * If we have only one relevant parent, then TREESAME will be set purely
371 * with regard to that parent, and we can simplify accordingly.
373 * If we have more than one relevant parent, or no relevant parents
374 * (and multiple irrelevant ones), then we can't select a parent here
375 * and return NULL.
377 while (list) {
378 struct commit *commit = list->item;
379 list = list->next;
380 if (relevant_commit(commit)) {
381 if (relevant)
382 return NULL;
383 relevant = commit;
386 return relevant;
390 * The goal is to get REV_TREE_NEW as the result only if the
391 * diff consists of all '+' (and no other changes), REV_TREE_OLD
392 * if the whole diff is removal of old data, and otherwise
393 * REV_TREE_DIFFERENT (of course if the trees are the same we
394 * want REV_TREE_SAME).
395 * That means that once we get to REV_TREE_DIFFERENT, we do not
396 * have to look any further.
398 static int tree_difference = REV_TREE_SAME;
400 static void file_add_remove(struct diff_options *options,
401 int addremove, unsigned mode,
402 const struct object_id *oid,
403 int oid_valid,
404 const char *fullpath, unsigned dirty_submodule)
406 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
408 tree_difference |= diff;
409 if (tree_difference == REV_TREE_DIFFERENT)
410 DIFF_OPT_SET(options, HAS_CHANGES);
413 static void file_change(struct diff_options *options,
414 unsigned old_mode, unsigned new_mode,
415 const struct object_id *old_oid,
416 const struct object_id *new_oid,
417 int old_oid_valid, int new_oid_valid,
418 const char *fullpath,
419 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
421 tree_difference = REV_TREE_DIFFERENT;
422 DIFF_OPT_SET(options, HAS_CHANGES);
425 static int rev_compare_tree(struct rev_info *revs,
426 struct commit *parent, struct commit *commit)
428 struct tree *t1 = parent->tree;
429 struct tree *t2 = commit->tree;
431 if (!t1)
432 return REV_TREE_NEW;
433 if (!t2)
434 return REV_TREE_OLD;
436 if (revs->simplify_by_decoration) {
438 * If we are simplifying by decoration, then the commit
439 * is worth showing if it has a tag pointing at it.
441 if (get_name_decoration(&commit->object))
442 return REV_TREE_DIFFERENT;
444 * A commit that is not pointed by a tag is uninteresting
445 * if we are not limited by path. This means that you will
446 * see the usual "commits that touch the paths" plus any
447 * tagged commit by specifying both --simplify-by-decoration
448 * and pathspec.
450 if (!revs->prune_data.nr)
451 return REV_TREE_SAME;
454 tree_difference = REV_TREE_SAME;
455 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
456 if (diff_tree_oid(&t1->object.oid, &t2->object.oid, "",
457 &revs->pruning) < 0)
458 return REV_TREE_DIFFERENT;
459 return tree_difference;
462 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
464 int retval;
465 struct tree *t1 = commit->tree;
467 if (!t1)
468 return 0;
470 tree_difference = REV_TREE_SAME;
471 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
472 retval = diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
474 return retval >= 0 && (tree_difference == REV_TREE_SAME);
477 struct treesame_state {
478 unsigned int nparents;
479 unsigned char treesame[FLEX_ARRAY];
482 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
484 unsigned n = commit_list_count(commit->parents);
485 struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
486 st->nparents = n;
487 add_decoration(&revs->treesame, &commit->object, st);
488 return st;
492 * Must be called immediately after removing the nth_parent from a commit's
493 * parent list, if we are maintaining the per-parent treesame[] decoration.
494 * This does not recalculate the master TREESAME flag - update_treesame()
495 * should be called to update it after a sequence of treesame[] modifications
496 * that may have affected it.
498 static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
500 struct treesame_state *st;
501 int old_same;
503 if (!commit->parents) {
505 * Have just removed the only parent from a non-merge.
506 * Different handling, as we lack decoration.
508 if (nth_parent != 0)
509 die("compact_treesame %u", nth_parent);
510 old_same = !!(commit->object.flags & TREESAME);
511 if (rev_same_tree_as_empty(revs, commit))
512 commit->object.flags |= TREESAME;
513 else
514 commit->object.flags &= ~TREESAME;
515 return old_same;
518 st = lookup_decoration(&revs->treesame, &commit->object);
519 if (!st || nth_parent >= st->nparents)
520 die("compact_treesame %u", nth_parent);
522 old_same = st->treesame[nth_parent];
523 memmove(st->treesame + nth_parent,
524 st->treesame + nth_parent + 1,
525 st->nparents - nth_parent - 1);
528 * If we've just become a non-merge commit, update TREESAME
529 * immediately, and remove the no-longer-needed decoration.
530 * If still a merge, defer update until update_treesame().
532 if (--st->nparents == 1) {
533 if (commit->parents->next)
534 die("compact_treesame parents mismatch");
535 if (st->treesame[0] && revs->dense)
536 commit->object.flags |= TREESAME;
537 else
538 commit->object.flags &= ~TREESAME;
539 free(add_decoration(&revs->treesame, &commit->object, NULL));
542 return old_same;
545 static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
547 if (commit->parents && commit->parents->next) {
548 unsigned n;
549 struct treesame_state *st;
550 struct commit_list *p;
551 unsigned relevant_parents;
552 unsigned relevant_change, irrelevant_change;
554 st = lookup_decoration(&revs->treesame, &commit->object);
555 if (!st)
556 die("update_treesame %s", oid_to_hex(&commit->object.oid));
557 relevant_parents = 0;
558 relevant_change = irrelevant_change = 0;
559 for (p = commit->parents, n = 0; p; n++, p = p->next) {
560 if (relevant_commit(p->item)) {
561 relevant_change |= !st->treesame[n];
562 relevant_parents++;
563 } else
564 irrelevant_change |= !st->treesame[n];
566 if (relevant_parents ? relevant_change : irrelevant_change)
567 commit->object.flags &= ~TREESAME;
568 else
569 commit->object.flags |= TREESAME;
572 return commit->object.flags & TREESAME;
575 static inline int limiting_can_increase_treesame(const struct rev_info *revs)
578 * TREESAME is irrelevant unless prune && dense;
579 * if simplify_history is set, we can't have a mixture of TREESAME and
580 * !TREESAME INTERESTING parents (and we don't have treesame[]
581 * decoration anyway);
582 * if first_parent_only is set, then the TREESAME flag is locked
583 * against the first parent (and again we lack treesame[] decoration).
585 return revs->prune && revs->dense &&
586 !revs->simplify_history &&
587 !revs->first_parent_only;
590 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
592 struct commit_list **pp, *parent;
593 struct treesame_state *ts = NULL;
594 int relevant_change = 0, irrelevant_change = 0;
595 int relevant_parents, nth_parent;
598 * If we don't do pruning, everything is interesting
600 if (!revs->prune)
601 return;
603 if (!commit->tree)
604 return;
606 if (!commit->parents) {
607 if (rev_same_tree_as_empty(revs, commit))
608 commit->object.flags |= TREESAME;
609 return;
613 * Normal non-merge commit? If we don't want to make the
614 * history dense, we consider it always to be a change..
616 if (!revs->dense && !commit->parents->next)
617 return;
619 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
620 (parent = *pp) != NULL;
621 pp = &parent->next, nth_parent++) {
622 struct commit *p = parent->item;
623 if (relevant_commit(p))
624 relevant_parents++;
626 if (nth_parent == 1) {
628 * This our second loop iteration - so we now know
629 * we're dealing with a merge.
631 * Do not compare with later parents when we care only about
632 * the first parent chain, in order to avoid derailing the
633 * traversal to follow a side branch that brought everything
634 * in the path we are limited to by the pathspec.
636 if (revs->first_parent_only)
637 break;
639 * If this will remain a potentially-simplifiable
640 * merge, remember per-parent treesame if needed.
641 * Initialise the array with the comparison from our
642 * first iteration.
644 if (revs->treesame.name &&
645 !revs->simplify_history &&
646 !(commit->object.flags & UNINTERESTING)) {
647 ts = initialise_treesame(revs, commit);
648 if (!(irrelevant_change || relevant_change))
649 ts->treesame[0] = 1;
652 if (parse_commit(p) < 0)
653 die("cannot simplify commit %s (because of %s)",
654 oid_to_hex(&commit->object.oid),
655 oid_to_hex(&p->object.oid));
656 switch (rev_compare_tree(revs, p, commit)) {
657 case REV_TREE_SAME:
658 if (!revs->simplify_history || !relevant_commit(p)) {
659 /* Even if a merge with an uninteresting
660 * side branch brought the entire change
661 * we are interested in, we do not want
662 * to lose the other branches of this
663 * merge, so we just keep going.
665 if (ts)
666 ts->treesame[nth_parent] = 1;
667 continue;
669 parent->next = NULL;
670 commit->parents = parent;
671 commit->object.flags |= TREESAME;
672 return;
674 case REV_TREE_NEW:
675 if (revs->remove_empty_trees &&
676 rev_same_tree_as_empty(revs, p)) {
677 /* We are adding all the specified
678 * paths from this parent, so the
679 * history beyond this parent is not
680 * interesting. Remove its parents
681 * (they are grandparents for us).
682 * IOW, we pretend this parent is a
683 * "root" commit.
685 if (parse_commit(p) < 0)
686 die("cannot simplify commit %s (invalid %s)",
687 oid_to_hex(&commit->object.oid),
688 oid_to_hex(&p->object.oid));
689 p->parents = NULL;
691 /* fallthrough */
692 case REV_TREE_OLD:
693 case REV_TREE_DIFFERENT:
694 if (relevant_commit(p))
695 relevant_change = 1;
696 else
697 irrelevant_change = 1;
698 continue;
700 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
704 * TREESAME is straightforward for single-parent commits. For merge
705 * commits, it is most useful to define it so that "irrelevant"
706 * parents cannot make us !TREESAME - if we have any relevant
707 * parents, then we only consider TREESAMEness with respect to them,
708 * allowing irrelevant merges from uninteresting branches to be
709 * simplified away. Only if we have only irrelevant parents do we
710 * base TREESAME on them. Note that this logic is replicated in
711 * update_treesame, which should be kept in sync.
713 if (relevant_parents ? !relevant_change : !irrelevant_change)
714 commit->object.flags |= TREESAME;
717 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
718 struct commit_list *cached_base, struct commit_list **cache)
720 struct commit_list *new_entry;
722 if (cached_base && p->date < cached_base->item->date)
723 new_entry = commit_list_insert_by_date(p, &cached_base->next);
724 else
725 new_entry = commit_list_insert_by_date(p, head);
727 if (cache && (!*cache || p->date < (*cache)->item->date))
728 *cache = new_entry;
731 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
732 struct commit_list **list, struct commit_list **cache_ptr)
734 struct commit_list *parent = commit->parents;
735 unsigned left_flag;
736 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
738 if (commit->object.flags & ADDED)
739 return 0;
740 commit->object.flags |= ADDED;
742 if (revs->include_check &&
743 !revs->include_check(commit, revs->include_check_data))
744 return 0;
747 * If the commit is uninteresting, don't try to
748 * prune parents - we want the maximal uninteresting
749 * set.
751 * Normally we haven't parsed the parent
752 * yet, so we won't have a parent of a parent
753 * here. However, it may turn out that we've
754 * reached this commit some other way (where it
755 * wasn't uninteresting), in which case we need
756 * to mark its parents recursively too..
758 if (commit->object.flags & UNINTERESTING) {
759 while (parent) {
760 struct commit *p = parent->item;
761 parent = parent->next;
762 if (p)
763 p->object.flags |= UNINTERESTING;
764 if (parse_commit_gently(p, 1) < 0)
765 continue;
766 if (p->parents)
767 mark_parents_uninteresting(p);
768 if (p->object.flags & SEEN)
769 continue;
770 p->object.flags |= SEEN;
771 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
773 return 0;
777 * Ok, the commit wasn't uninteresting. Try to
778 * simplify the commit history and find the parent
779 * that has no differences in the path set if one exists.
781 try_to_simplify_commit(revs, commit);
783 if (revs->no_walk)
784 return 0;
786 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
788 for (parent = commit->parents; parent; parent = parent->next) {
789 struct commit *p = parent->item;
791 if (parse_commit_gently(p, revs->ignore_missing_links) < 0)
792 return -1;
793 if (revs->show_source && !p->util)
794 p->util = commit->util;
795 p->object.flags |= left_flag;
796 if (!(p->object.flags & SEEN)) {
797 p->object.flags |= SEEN;
798 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
800 if (revs->first_parent_only)
801 break;
803 return 0;
806 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
808 struct commit_list *p;
809 int left_count = 0, right_count = 0;
810 int left_first;
811 struct patch_ids ids;
812 unsigned cherry_flag;
814 /* First count the commits on the left and on the right */
815 for (p = list; p; p = p->next) {
816 struct commit *commit = p->item;
817 unsigned flags = commit->object.flags;
818 if (flags & BOUNDARY)
820 else if (flags & SYMMETRIC_LEFT)
821 left_count++;
822 else
823 right_count++;
826 if (!left_count || !right_count)
827 return;
829 left_first = left_count < right_count;
830 init_patch_ids(&ids);
831 ids.diffopts.pathspec = revs->diffopt.pathspec;
833 /* Compute patch-ids for one side */
834 for (p = list; p; p = p->next) {
835 struct commit *commit = p->item;
836 unsigned flags = commit->object.flags;
838 if (flags & BOUNDARY)
839 continue;
841 * If we have fewer left, left_first is set and we omit
842 * commits on the right branch in this loop. If we have
843 * fewer right, we skip the left ones.
845 if (left_first != !!(flags & SYMMETRIC_LEFT))
846 continue;
847 add_commit_patch_id(commit, &ids);
850 /* either cherry_mark or cherry_pick are true */
851 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
853 /* Check the other side */
854 for (p = list; p; p = p->next) {
855 struct commit *commit = p->item;
856 struct patch_id *id;
857 unsigned flags = commit->object.flags;
859 if (flags & BOUNDARY)
860 continue;
862 * If we have fewer left, left_first is set and we omit
863 * commits on the left branch in this loop.
865 if (left_first == !!(flags & SYMMETRIC_LEFT))
866 continue;
869 * Have we seen the same patch id?
871 id = has_commit_patch_id(commit, &ids);
872 if (!id)
873 continue;
875 commit->object.flags |= cherry_flag;
876 id->commit->object.flags |= cherry_flag;
879 free_patch_ids(&ids);
882 /* How many extra uninteresting commits we want to see.. */
883 #define SLOP 5
885 static int still_interesting(struct commit_list *src, timestamp_t date, int slop,
886 struct commit **interesting_cache)
889 * No source list at all? We're definitely done..
891 if (!src)
892 return 0;
895 * Does the destination list contain entries with a date
896 * before the source list? Definitely _not_ done.
898 if (date <= src->item->date)
899 return SLOP;
902 * Does the source list still have interesting commits in
903 * it? Definitely not done..
905 if (!everybody_uninteresting(src, interesting_cache))
906 return SLOP;
908 /* Ok, we're closing in.. */
909 return slop-1;
913 * "rev-list --ancestry-path A..B" computes commits that are ancestors
914 * of B but not ancestors of A but further limits the result to those
915 * that are descendants of A. This takes the list of bottom commits and
916 * the result of "A..B" without --ancestry-path, and limits the latter
917 * further to the ones that can reach one of the commits in "bottom".
919 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
921 struct commit_list *p;
922 struct commit_list *rlist = NULL;
923 int made_progress;
926 * Reverse the list so that it will be likely that we would
927 * process parents before children.
929 for (p = list; p; p = p->next)
930 commit_list_insert(p->item, &rlist);
932 for (p = bottom; p; p = p->next)
933 p->item->object.flags |= TMP_MARK;
936 * Mark the ones that can reach bottom commits in "list",
937 * in a bottom-up fashion.
939 do {
940 made_progress = 0;
941 for (p = rlist; p; p = p->next) {
942 struct commit *c = p->item;
943 struct commit_list *parents;
944 if (c->object.flags & (TMP_MARK | UNINTERESTING))
945 continue;
946 for (parents = c->parents;
947 parents;
948 parents = parents->next) {
949 if (!(parents->item->object.flags & TMP_MARK))
950 continue;
951 c->object.flags |= TMP_MARK;
952 made_progress = 1;
953 break;
956 } while (made_progress);
959 * NEEDSWORK: decide if we want to remove parents that are
960 * not marked with TMP_MARK from commit->parents for commits
961 * in the resulting list. We may not want to do that, though.
965 * The ones that are not marked with TMP_MARK are uninteresting
967 for (p = list; p; p = p->next) {
968 struct commit *c = p->item;
969 if (c->object.flags & TMP_MARK)
970 continue;
971 c->object.flags |= UNINTERESTING;
974 /* We are done with the TMP_MARK */
975 for (p = list; p; p = p->next)
976 p->item->object.flags &= ~TMP_MARK;
977 for (p = bottom; p; p = p->next)
978 p->item->object.flags &= ~TMP_MARK;
979 free_commit_list(rlist);
983 * Before walking the history, keep the set of "negative" refs the
984 * caller has asked to exclude.
986 * This is used to compute "rev-list --ancestry-path A..B", as we need
987 * to filter the result of "A..B" further to the ones that can actually
988 * reach A.
990 static struct commit_list *collect_bottom_commits(struct commit_list *list)
992 struct commit_list *elem, *bottom = NULL;
993 for (elem = list; elem; elem = elem->next)
994 if (elem->item->object.flags & BOTTOM)
995 commit_list_insert(elem->item, &bottom);
996 return bottom;
999 /* Assumes either left_only or right_only is set */
1000 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1002 struct commit_list *p;
1004 for (p = list; p; p = p->next) {
1005 struct commit *commit = p->item;
1007 if (revs->right_only) {
1008 if (commit->object.flags & SYMMETRIC_LEFT)
1009 commit->object.flags |= SHOWN;
1010 } else /* revs->left_only is set */
1011 if (!(commit->object.flags & SYMMETRIC_LEFT))
1012 commit->object.flags |= SHOWN;
1016 static int limit_list(struct rev_info *revs)
1018 int slop = SLOP;
1019 timestamp_t date = TIME_MAX;
1020 struct commit_list *list = revs->commits;
1021 struct commit_list *newlist = NULL;
1022 struct commit_list **p = &newlist;
1023 struct commit_list *bottom = NULL;
1024 struct commit *interesting_cache = NULL;
1026 if (revs->ancestry_path) {
1027 bottom = collect_bottom_commits(list);
1028 if (!bottom)
1029 die("--ancestry-path given but there are no bottom commits");
1032 while (list) {
1033 struct commit *commit = pop_commit(&list);
1034 struct object *obj = &commit->object;
1035 show_early_output_fn_t show;
1037 if (commit == interesting_cache)
1038 interesting_cache = NULL;
1040 if (revs->max_age != -1 && (commit->date < revs->max_age))
1041 obj->flags |= UNINTERESTING;
1042 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
1043 return -1;
1044 if (obj->flags & UNINTERESTING) {
1045 mark_parents_uninteresting(commit);
1046 if (revs->show_all)
1047 p = &commit_list_insert(commit, p)->next;
1048 slop = still_interesting(list, date, slop, &interesting_cache);
1049 if (slop)
1050 continue;
1051 /* If showing all, add the whole pending list to the end */
1052 if (revs->show_all)
1053 *p = list;
1054 break;
1056 if (revs->min_age != -1 && (commit->date > revs->min_age))
1057 continue;
1058 date = commit->date;
1059 p = &commit_list_insert(commit, p)->next;
1061 show = show_early_output;
1062 if (!show)
1063 continue;
1065 show(revs, newlist);
1066 show_early_output = NULL;
1068 if (revs->cherry_pick || revs->cherry_mark)
1069 cherry_pick_list(newlist, revs);
1071 if (revs->left_only || revs->right_only)
1072 limit_left_right(newlist, revs);
1074 if (bottom) {
1075 limit_to_ancestry(bottom, newlist);
1076 free_commit_list(bottom);
1080 * Check if any commits have become TREESAME by some of their parents
1081 * becoming UNINTERESTING.
1083 if (limiting_can_increase_treesame(revs))
1084 for (list = newlist; list; list = list->next) {
1085 struct commit *c = list->item;
1086 if (c->object.flags & (UNINTERESTING | TREESAME))
1087 continue;
1088 update_treesame(revs, c);
1091 revs->commits = newlist;
1092 return 0;
1096 * Add an entry to refs->cmdline with the specified information.
1097 * *name is copied.
1099 static void add_rev_cmdline(struct rev_info *revs,
1100 struct object *item,
1101 const char *name,
1102 int whence,
1103 unsigned flags)
1105 struct rev_cmdline_info *info = &revs->cmdline;
1106 int nr = info->nr;
1108 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1109 info->rev[nr].item = item;
1110 info->rev[nr].name = xstrdup(name);
1111 info->rev[nr].whence = whence;
1112 info->rev[nr].flags = flags;
1113 info->nr++;
1116 static void add_rev_cmdline_list(struct rev_info *revs,
1117 struct commit_list *commit_list,
1118 int whence,
1119 unsigned flags)
1121 while (commit_list) {
1122 struct object *object = &commit_list->item->object;
1123 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1124 whence, flags);
1125 commit_list = commit_list->next;
1129 struct all_refs_cb {
1130 int all_flags;
1131 int warned_bad_reflog;
1132 struct rev_info *all_revs;
1133 const char *name_for_errormsg;
1136 int ref_excluded(struct string_list *ref_excludes, const char *path)
1138 struct string_list_item *item;
1140 if (!ref_excludes)
1141 return 0;
1142 for_each_string_list_item(item, ref_excludes) {
1143 if (!wildmatch(item->string, path, 0))
1144 return 1;
1146 return 0;
1149 static int handle_one_ref(const char *path, const struct object_id *oid,
1150 int flag, void *cb_data)
1152 struct all_refs_cb *cb = cb_data;
1153 struct object *object;
1155 if (ref_excluded(cb->all_revs->ref_excludes, path))
1156 return 0;
1158 object = get_reference(cb->all_revs, path, oid, cb->all_flags);
1159 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1160 add_pending_oid(cb->all_revs, path, oid, cb->all_flags);
1161 return 0;
1164 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1165 unsigned flags)
1167 cb->all_revs = revs;
1168 cb->all_flags = flags;
1169 revs->rev_input_given = 1;
1172 void clear_ref_exclusion(struct string_list **ref_excludes_p)
1174 if (*ref_excludes_p) {
1175 string_list_clear(*ref_excludes_p, 0);
1176 free(*ref_excludes_p);
1178 *ref_excludes_p = NULL;
1181 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1183 if (!*ref_excludes_p) {
1184 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1185 (*ref_excludes_p)->strdup_strings = 1;
1187 string_list_append(*ref_excludes_p, exclude);
1190 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1191 int (*for_each)(const char *, each_ref_fn, void *))
1193 struct all_refs_cb cb;
1194 init_all_refs_cb(&cb, revs, flags);
1195 for_each(submodule, handle_one_ref, &cb);
1198 static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
1200 struct all_refs_cb *cb = cb_data;
1201 if (!is_null_oid(oid)) {
1202 struct object *o = parse_object(oid);
1203 if (o) {
1204 o->flags |= cb->all_flags;
1205 /* ??? CMDLINEFLAGS ??? */
1206 add_pending_object(cb->all_revs, o, "");
1208 else if (!cb->warned_bad_reflog) {
1209 warning("reflog of '%s' references pruned commits",
1210 cb->name_for_errormsg);
1211 cb->warned_bad_reflog = 1;
1216 static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
1217 const char *email, timestamp_t timestamp, int tz,
1218 const char *message, void *cb_data)
1220 handle_one_reflog_commit(ooid, cb_data);
1221 handle_one_reflog_commit(noid, cb_data);
1222 return 0;
1225 static int handle_one_reflog(const char *path, const struct object_id *oid,
1226 int flag, void *cb_data)
1228 struct all_refs_cb *cb = cb_data;
1229 cb->warned_bad_reflog = 0;
1230 cb->name_for_errormsg = path;
1231 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1232 return 0;
1235 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1237 struct all_refs_cb cb;
1239 cb.all_revs = revs;
1240 cb.all_flags = flags;
1241 for_each_reflog(handle_one_reflog, &cb);
1244 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1245 struct strbuf *path)
1247 size_t baselen = path->len;
1248 int i;
1250 if (it->entry_count >= 0) {
1251 struct tree *tree = lookup_tree(&it->oid);
1252 add_pending_object_with_path(revs, &tree->object, "",
1253 040000, path->buf);
1256 for (i = 0; i < it->subtree_nr; i++) {
1257 struct cache_tree_sub *sub = it->down[i];
1258 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1259 add_cache_tree(sub->cache_tree, revs, path);
1260 strbuf_setlen(path, baselen);
1265 void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
1267 int i;
1269 read_cache();
1270 for (i = 0; i < active_nr; i++) {
1271 struct cache_entry *ce = active_cache[i];
1272 struct blob *blob;
1274 if (S_ISGITLINK(ce->ce_mode))
1275 continue;
1277 blob = lookup_blob(&ce->oid);
1278 if (!blob)
1279 die("unable to add index blob to traversal");
1280 add_pending_object_with_path(revs, &blob->object, "",
1281 ce->ce_mode, ce->name);
1284 if (active_cache_tree) {
1285 struct strbuf path = STRBUF_INIT;
1286 add_cache_tree(active_cache_tree, revs, &path);
1287 strbuf_release(&path);
1291 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1292 int exclude_parent)
1294 struct object_id oid;
1295 struct object *it;
1296 struct commit *commit;
1297 struct commit_list *parents;
1298 int parent_number;
1299 const char *arg = arg_;
1301 if (*arg == '^') {
1302 flags ^= UNINTERESTING | BOTTOM;
1303 arg++;
1305 if (get_sha1_committish(arg, oid.hash))
1306 return 0;
1307 while (1) {
1308 it = get_reference(revs, arg, &oid, 0);
1309 if (!it && revs->ignore_missing)
1310 return 0;
1311 if (it->type != OBJ_TAG)
1312 break;
1313 if (!((struct tag*)it)->tagged)
1314 return 0;
1315 oidcpy(&oid, &((struct tag*)it)->tagged->oid);
1317 if (it->type != OBJ_COMMIT)
1318 return 0;
1319 commit = (struct commit *)it;
1320 if (exclude_parent &&
1321 exclude_parent > commit_list_count(commit->parents))
1322 return 0;
1323 for (parents = commit->parents, parent_number = 1;
1324 parents;
1325 parents = parents->next, parent_number++) {
1326 if (exclude_parent && parent_number != exclude_parent)
1327 continue;
1329 it = &parents->item->object;
1330 it->flags |= flags;
1331 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1332 add_pending_object(revs, it, arg);
1334 return 1;
1337 void init_revisions(struct rev_info *revs, const char *prefix)
1339 memset(revs, 0, sizeof(*revs));
1341 revs->abbrev = DEFAULT_ABBREV;
1342 revs->ignore_merges = 1;
1343 revs->simplify_history = 1;
1344 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1345 DIFF_OPT_SET(&revs->pruning, QUICK);
1346 revs->pruning.add_remove = file_add_remove;
1347 revs->pruning.change = file_change;
1348 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1349 revs->dense = 1;
1350 revs->prefix = prefix;
1351 revs->max_age = -1;
1352 revs->min_age = -1;
1353 revs->skip_count = -1;
1354 revs->max_count = -1;
1355 revs->max_parents = -1;
1356 revs->expand_tabs_in_log = -1;
1358 revs->commit_format = CMIT_FMT_DEFAULT;
1359 revs->expand_tabs_in_log_default = 8;
1361 init_grep_defaults();
1362 grep_init(&revs->grep_filter, prefix);
1363 revs->grep_filter.status_only = 1;
1365 diff_setup(&revs->diffopt);
1366 if (prefix && !revs->diffopt.prefix) {
1367 revs->diffopt.prefix = prefix;
1368 revs->diffopt.prefix_length = strlen(prefix);
1371 revs->notes_opt.use_default_notes = -1;
1374 static void add_pending_commit_list(struct rev_info *revs,
1375 struct commit_list *commit_list,
1376 unsigned int flags)
1378 while (commit_list) {
1379 struct object *object = &commit_list->item->object;
1380 object->flags |= flags;
1381 add_pending_object(revs, object, oid_to_hex(&object->oid));
1382 commit_list = commit_list->next;
1386 static void prepare_show_merge(struct rev_info *revs)
1388 struct commit_list *bases;
1389 struct commit *head, *other;
1390 struct object_id oid;
1391 const char **prune = NULL;
1392 int i, prune_num = 1; /* counting terminating NULL */
1394 if (get_oid("HEAD", &oid))
1395 die("--merge without HEAD?");
1396 head = lookup_commit_or_die(&oid, "HEAD");
1397 if (get_oid("MERGE_HEAD", &oid))
1398 die("--merge without MERGE_HEAD?");
1399 other = lookup_commit_or_die(&oid, "MERGE_HEAD");
1400 add_pending_object(revs, &head->object, "HEAD");
1401 add_pending_object(revs, &other->object, "MERGE_HEAD");
1402 bases = get_merge_bases(head, other);
1403 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1404 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1405 free_commit_list(bases);
1406 head->object.flags |= SYMMETRIC_LEFT;
1408 if (!active_nr)
1409 read_cache();
1410 for (i = 0; i < active_nr; i++) {
1411 const struct cache_entry *ce = active_cache[i];
1412 if (!ce_stage(ce))
1413 continue;
1414 if (ce_path_match(ce, &revs->prune_data, NULL)) {
1415 prune_num++;
1416 REALLOC_ARRAY(prune, prune_num);
1417 prune[prune_num-2] = ce->name;
1418 prune[prune_num-1] = NULL;
1420 while ((i+1 < active_nr) &&
1421 ce_same_name(ce, active_cache[i+1]))
1422 i++;
1424 clear_pathspec(&revs->prune_data);
1425 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1426 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1427 revs->limited = 1;
1430 static int dotdot_missing(const char *arg, char *dotdot,
1431 struct rev_info *revs, int symmetric)
1433 if (revs->ignore_missing)
1434 return 0;
1435 /* de-munge so we report the full argument */
1436 *dotdot = '.';
1437 die(symmetric
1438 ? "Invalid symmetric difference expression %s"
1439 : "Invalid revision range %s", arg);
1442 static int handle_dotdot_1(const char *arg, char *dotdot,
1443 struct rev_info *revs, int flags,
1444 int cant_be_filename,
1445 struct object_context *a_oc,
1446 struct object_context *b_oc)
1448 const char *a_name, *b_name;
1449 struct object_id a_oid, b_oid;
1450 struct object *a_obj, *b_obj;
1451 unsigned int a_flags, b_flags;
1452 int symmetric = 0;
1453 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1454 unsigned int oc_flags = GET_SHA1_COMMITTISH | GET_SHA1_RECORD_PATH;
1456 a_name = arg;
1457 if (!*a_name)
1458 a_name = "HEAD";
1460 b_name = dotdot + 2;
1461 if (*b_name == '.') {
1462 symmetric = 1;
1463 b_name++;
1465 if (!*b_name)
1466 b_name = "HEAD";
1468 if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, a_oc) ||
1469 get_sha1_with_context(b_name, oc_flags, b_oid.hash, b_oc))
1470 return -1;
1472 if (!cant_be_filename) {
1473 *dotdot = '.';
1474 verify_non_filename(revs->prefix, arg);
1475 *dotdot = '\0';
1478 a_obj = parse_object(&a_oid);
1479 b_obj = parse_object(&b_oid);
1480 if (!a_obj || !b_obj)
1481 return dotdot_missing(arg, dotdot, revs, symmetric);
1483 if (!symmetric) {
1484 /* just A..B */
1485 b_flags = flags;
1486 a_flags = flags_exclude;
1487 } else {
1488 /* A...B -- find merge bases between the two */
1489 struct commit *a, *b;
1490 struct commit_list *exclude;
1492 a = lookup_commit_reference(&a_obj->oid);
1493 b = lookup_commit_reference(&b_obj->oid);
1494 if (!a || !b)
1495 return dotdot_missing(arg, dotdot, revs, symmetric);
1497 exclude = get_merge_bases(a, b);
1498 add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE,
1499 flags_exclude);
1500 add_pending_commit_list(revs, exclude, flags_exclude);
1501 free_commit_list(exclude);
1503 b_flags = flags;
1504 a_flags = flags | SYMMETRIC_LEFT;
1507 a_obj->flags |= a_flags;
1508 b_obj->flags |= b_flags;
1509 add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
1510 add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
1511 add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path);
1512 add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path);
1513 return 0;
1516 static int handle_dotdot(const char *arg,
1517 struct rev_info *revs, int flags,
1518 int cant_be_filename)
1520 struct object_context a_oc, b_oc;
1521 char *dotdot = strstr(arg, "..");
1522 int ret;
1524 if (!dotdot)
1525 return -1;
1527 memset(&a_oc, 0, sizeof(a_oc));
1528 memset(&b_oc, 0, sizeof(b_oc));
1530 *dotdot = '\0';
1531 ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename,
1532 &a_oc, &b_oc);
1533 *dotdot = '.';
1535 free(a_oc.path);
1536 free(b_oc.path);
1538 return ret;
1541 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1543 struct object_context oc;
1544 char *mark;
1545 struct object *object;
1546 struct object_id oid;
1547 int local_flags;
1548 const char *arg = arg_;
1549 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1550 unsigned get_sha1_flags = GET_SHA1_RECORD_PATH;
1552 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1554 if (!cant_be_filename && !strcmp(arg, "..")) {
1556 * Just ".."? That is not a range but the
1557 * pathspec for the parent directory.
1559 return -1;
1562 if (!handle_dotdot(arg, revs, flags, revarg_opt))
1563 return 0;
1565 mark = strstr(arg, "^@");
1566 if (mark && !mark[2]) {
1567 *mark = 0;
1568 if (add_parents_only(revs, arg, flags, 0))
1569 return 0;
1570 *mark = '^';
1572 mark = strstr(arg, "^!");
1573 if (mark && !mark[2]) {
1574 *mark = 0;
1575 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0))
1576 *mark = '^';
1578 mark = strstr(arg, "^-");
1579 if (mark) {
1580 int exclude_parent = 1;
1582 if (mark[2]) {
1583 char *end;
1584 exclude_parent = strtoul(mark + 2, &end, 10);
1585 if (*end != '\0' || !exclude_parent)
1586 return -1;
1589 *mark = 0;
1590 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent))
1591 *mark = '^';
1594 local_flags = 0;
1595 if (*arg == '^') {
1596 local_flags = UNINTERESTING | BOTTOM;
1597 arg++;
1600 if (revarg_opt & REVARG_COMMITTISH)
1601 get_sha1_flags |= GET_SHA1_COMMITTISH;
1603 if (get_sha1_with_context(arg, get_sha1_flags, oid.hash, &oc))
1604 return revs->ignore_missing ? 0 : -1;
1605 if (!cant_be_filename)
1606 verify_non_filename(revs->prefix, arg);
1607 object = get_reference(revs, arg, &oid, flags ^ local_flags);
1608 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1609 add_pending_object_with_path(revs, object, arg, oc.mode, oc.path);
1610 free(oc.path);
1611 return 0;
1614 struct cmdline_pathspec {
1615 int alloc;
1616 int nr;
1617 const char **path;
1620 static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1622 while (*av) {
1623 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1624 prune->path[prune->nr++] = *(av++);
1628 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1629 struct cmdline_pathspec *prune)
1631 while (strbuf_getline(sb, stdin) != EOF) {
1632 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1633 prune->path[prune->nr++] = xstrdup(sb->buf);
1637 static void read_revisions_from_stdin(struct rev_info *revs,
1638 struct cmdline_pathspec *prune)
1640 struct strbuf sb;
1641 int seen_dashdash = 0;
1642 int save_warning;
1644 save_warning = warn_on_object_refname_ambiguity;
1645 warn_on_object_refname_ambiguity = 0;
1647 strbuf_init(&sb, 1000);
1648 while (strbuf_getline(&sb, stdin) != EOF) {
1649 int len = sb.len;
1650 if (!len)
1651 break;
1652 if (sb.buf[0] == '-') {
1653 if (len == 2 && sb.buf[1] == '-') {
1654 seen_dashdash = 1;
1655 break;
1657 die("options not supported in --stdin mode");
1659 if (handle_revision_arg(sb.buf, revs, 0,
1660 REVARG_CANNOT_BE_FILENAME))
1661 die("bad revision '%s'", sb.buf);
1663 if (seen_dashdash)
1664 read_pathspec_from_stdin(revs, &sb, prune);
1666 strbuf_release(&sb);
1667 warn_on_object_refname_ambiguity = save_warning;
1670 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1672 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1675 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1677 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1680 static void add_message_grep(struct rev_info *revs, const char *pattern)
1682 add_grep(revs, pattern, GREP_PATTERN_BODY);
1685 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1686 int *unkc, const char **unkv)
1688 const char *arg = argv[0];
1689 const char *optarg;
1690 int argcount;
1692 /* pseudo revision arguments */
1693 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1694 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1695 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1696 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1697 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
1698 !strcmp(arg, "--indexed-objects") ||
1699 starts_with(arg, "--exclude=") ||
1700 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1701 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
1703 unkv[(*unkc)++] = arg;
1704 return 1;
1707 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1708 revs->max_count = atoi(optarg);
1709 revs->no_walk = 0;
1710 return argcount;
1711 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1712 revs->skip_count = atoi(optarg);
1713 return argcount;
1714 } else if ((*arg == '-') && isdigit(arg[1])) {
1715 /* accept -<digit>, like traditional "head" */
1716 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1717 revs->max_count < 0)
1718 die("'%s': not a non-negative integer", arg + 1);
1719 revs->no_walk = 0;
1720 } else if (!strcmp(arg, "-n")) {
1721 if (argc <= 1)
1722 return error("-n requires an argument");
1723 revs->max_count = atoi(argv[1]);
1724 revs->no_walk = 0;
1725 return 2;
1726 } else if (skip_prefix(arg, "-n", &optarg)) {
1727 revs->max_count = atoi(optarg);
1728 revs->no_walk = 0;
1729 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1730 revs->max_age = atoi(optarg);
1731 return argcount;
1732 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1733 revs->max_age = approxidate(optarg);
1734 return argcount;
1735 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1736 revs->max_age = approxidate(optarg);
1737 return argcount;
1738 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1739 revs->min_age = atoi(optarg);
1740 return argcount;
1741 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1742 revs->min_age = approxidate(optarg);
1743 return argcount;
1744 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1745 revs->min_age = approxidate(optarg);
1746 return argcount;
1747 } else if (!strcmp(arg, "--first-parent")) {
1748 revs->first_parent_only = 1;
1749 } else if (!strcmp(arg, "--ancestry-path")) {
1750 revs->ancestry_path = 1;
1751 revs->simplify_history = 0;
1752 revs->limited = 1;
1753 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1754 init_reflog_walk(&revs->reflog_info);
1755 } else if (!strcmp(arg, "--default")) {
1756 if (argc <= 1)
1757 return error("bad --default argument");
1758 revs->def = argv[1];
1759 return 2;
1760 } else if (!strcmp(arg, "--merge")) {
1761 revs->show_merge = 1;
1762 } else if (!strcmp(arg, "--topo-order")) {
1763 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1764 revs->topo_order = 1;
1765 } else if (!strcmp(arg, "--simplify-merges")) {
1766 revs->simplify_merges = 1;
1767 revs->topo_order = 1;
1768 revs->rewrite_parents = 1;
1769 revs->simplify_history = 0;
1770 revs->limited = 1;
1771 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1772 revs->simplify_merges = 1;
1773 revs->topo_order = 1;
1774 revs->rewrite_parents = 1;
1775 revs->simplify_history = 0;
1776 revs->simplify_by_decoration = 1;
1777 revs->limited = 1;
1778 revs->prune = 1;
1779 load_ref_decorations(DECORATE_SHORT_REFS);
1780 } else if (!strcmp(arg, "--date-order")) {
1781 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
1782 revs->topo_order = 1;
1783 } else if (!strcmp(arg, "--author-date-order")) {
1784 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
1785 revs->topo_order = 1;
1786 } else if (!strcmp(arg, "--early-output")) {
1787 revs->early_output = 100;
1788 revs->topo_order = 1;
1789 } else if (skip_prefix(arg, "--early-output=", &optarg)) {
1790 if (strtoul_ui(optarg, 10, &revs->early_output) < 0)
1791 die("'%s': not a non-negative integer", optarg);
1792 revs->topo_order = 1;
1793 } else if (!strcmp(arg, "--parents")) {
1794 revs->rewrite_parents = 1;
1795 revs->print_parents = 1;
1796 } else if (!strcmp(arg, "--dense")) {
1797 revs->dense = 1;
1798 } else if (!strcmp(arg, "--sparse")) {
1799 revs->dense = 0;
1800 } else if (!strcmp(arg, "--show-all")) {
1801 revs->show_all = 1;
1802 } else if (!strcmp(arg, "--remove-empty")) {
1803 revs->remove_empty_trees = 1;
1804 } else if (!strcmp(arg, "--merges")) {
1805 revs->min_parents = 2;
1806 } else if (!strcmp(arg, "--no-merges")) {
1807 revs->max_parents = 1;
1808 } else if (skip_prefix(arg, "--min-parents=", &optarg)) {
1809 revs->min_parents = atoi(optarg);
1810 } else if (!strcmp(arg, "--no-min-parents")) {
1811 revs->min_parents = 0;
1812 } else if (skip_prefix(arg, "--max-parents=", &optarg)) {
1813 revs->max_parents = atoi(optarg);
1814 } else if (!strcmp(arg, "--no-max-parents")) {
1815 revs->max_parents = -1;
1816 } else if (!strcmp(arg, "--boundary")) {
1817 revs->boundary = 1;
1818 } else if (!strcmp(arg, "--left-right")) {
1819 revs->left_right = 1;
1820 } else if (!strcmp(arg, "--left-only")) {
1821 if (revs->right_only)
1822 die("--left-only is incompatible with --right-only"
1823 " or --cherry");
1824 revs->left_only = 1;
1825 } else if (!strcmp(arg, "--right-only")) {
1826 if (revs->left_only)
1827 die("--right-only is incompatible with --left-only");
1828 revs->right_only = 1;
1829 } else if (!strcmp(arg, "--cherry")) {
1830 if (revs->left_only)
1831 die("--cherry is incompatible with --left-only");
1832 revs->cherry_mark = 1;
1833 revs->right_only = 1;
1834 revs->max_parents = 1;
1835 revs->limited = 1;
1836 } else if (!strcmp(arg, "--count")) {
1837 revs->count = 1;
1838 } else if (!strcmp(arg, "--cherry-mark")) {
1839 if (revs->cherry_pick)
1840 die("--cherry-mark is incompatible with --cherry-pick");
1841 revs->cherry_mark = 1;
1842 revs->limited = 1; /* needs limit_list() */
1843 } else if (!strcmp(arg, "--cherry-pick")) {
1844 if (revs->cherry_mark)
1845 die("--cherry-pick is incompatible with --cherry-mark");
1846 revs->cherry_pick = 1;
1847 revs->limited = 1;
1848 } else if (!strcmp(arg, "--objects")) {
1849 revs->tag_objects = 1;
1850 revs->tree_objects = 1;
1851 revs->blob_objects = 1;
1852 } else if (!strcmp(arg, "--objects-edge")) {
1853 revs->tag_objects = 1;
1854 revs->tree_objects = 1;
1855 revs->blob_objects = 1;
1856 revs->edge_hint = 1;
1857 } else if (!strcmp(arg, "--objects-edge-aggressive")) {
1858 revs->tag_objects = 1;
1859 revs->tree_objects = 1;
1860 revs->blob_objects = 1;
1861 revs->edge_hint = 1;
1862 revs->edge_hint_aggressive = 1;
1863 } else if (!strcmp(arg, "--verify-objects")) {
1864 revs->tag_objects = 1;
1865 revs->tree_objects = 1;
1866 revs->blob_objects = 1;
1867 revs->verify_objects = 1;
1868 } else if (!strcmp(arg, "--unpacked")) {
1869 revs->unpacked = 1;
1870 } else if (starts_with(arg, "--unpacked=")) {
1871 die("--unpacked=<packfile> no longer supported.");
1872 } else if (!strcmp(arg, "-r")) {
1873 revs->diff = 1;
1874 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1875 } else if (!strcmp(arg, "-t")) {
1876 revs->diff = 1;
1877 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1878 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1879 } else if (!strcmp(arg, "-m")) {
1880 revs->ignore_merges = 0;
1881 } else if (!strcmp(arg, "-c")) {
1882 revs->diff = 1;
1883 revs->dense_combined_merges = 0;
1884 revs->combine_merges = 1;
1885 } else if (!strcmp(arg, "--cc")) {
1886 revs->diff = 1;
1887 revs->dense_combined_merges = 1;
1888 revs->combine_merges = 1;
1889 } else if (!strcmp(arg, "-v")) {
1890 revs->verbose_header = 1;
1891 } else if (!strcmp(arg, "--pretty")) {
1892 revs->verbose_header = 1;
1893 revs->pretty_given = 1;
1894 get_commit_format(NULL, revs);
1895 } else if (skip_prefix(arg, "--pretty=", &optarg) ||
1896 skip_prefix(arg, "--format=", &optarg)) {
1898 * Detached form ("--pretty X" as opposed to "--pretty=X")
1899 * not allowed, since the argument is optional.
1901 revs->verbose_header = 1;
1902 revs->pretty_given = 1;
1903 get_commit_format(optarg, revs);
1904 } else if (!strcmp(arg, "--expand-tabs")) {
1905 revs->expand_tabs_in_log = 8;
1906 } else if (!strcmp(arg, "--no-expand-tabs")) {
1907 revs->expand_tabs_in_log = 0;
1908 } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
1909 int val;
1910 if (strtol_i(arg, 10, &val) < 0 || val < 0)
1911 die("'%s': not a non-negative integer", arg);
1912 revs->expand_tabs_in_log = val;
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, "--no-show-signature")) {
1920 revs->show_signature = 0;
1921 } else if (!strcmp(arg, "--show-linear-break")) {
1922 revs->break_bar = " ..........";
1923 revs->track_linear = 1;
1924 revs->track_first_time = 1;
1925 } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) {
1926 revs->break_bar = xstrdup(optarg);
1927 revs->track_linear = 1;
1928 revs->track_first_time = 1;
1929 } else if (skip_prefix(arg, "--show-notes=", &optarg) ||
1930 skip_prefix(arg, "--notes=", &optarg)) {
1931 struct strbuf buf = STRBUF_INIT;
1932 revs->show_notes = 1;
1933 revs->show_notes_given = 1;
1934 if (starts_with(arg, "--show-notes=") &&
1935 revs->notes_opt.use_default_notes < 0)
1936 revs->notes_opt.use_default_notes = 1;
1937 strbuf_addstr(&buf, optarg);
1938 expand_notes_ref(&buf);
1939 string_list_append(&revs->notes_opt.extra_notes_refs,
1940 strbuf_detach(&buf, NULL));
1941 } else if (!strcmp(arg, "--no-notes")) {
1942 revs->show_notes = 0;
1943 revs->show_notes_given = 1;
1944 revs->notes_opt.use_default_notes = -1;
1945 /* we have been strdup'ing ourselves, so trick
1946 * string_list into free()ing strings */
1947 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1948 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1949 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1950 } else if (!strcmp(arg, "--standard-notes")) {
1951 revs->show_notes_given = 1;
1952 revs->notes_opt.use_default_notes = 1;
1953 } else if (!strcmp(arg, "--no-standard-notes")) {
1954 revs->notes_opt.use_default_notes = 0;
1955 } else if (!strcmp(arg, "--oneline")) {
1956 revs->verbose_header = 1;
1957 get_commit_format("oneline", revs);
1958 revs->pretty_given = 1;
1959 revs->abbrev_commit = 1;
1960 } else if (!strcmp(arg, "--graph")) {
1961 revs->topo_order = 1;
1962 revs->rewrite_parents = 1;
1963 revs->graph = graph_init(revs);
1964 } else if (!strcmp(arg, "--root")) {
1965 revs->show_root_diff = 1;
1966 } else if (!strcmp(arg, "--no-commit-id")) {
1967 revs->no_commit_id = 1;
1968 } else if (!strcmp(arg, "--always")) {
1969 revs->always_show_header = 1;
1970 } else if (!strcmp(arg, "--no-abbrev")) {
1971 revs->abbrev = 0;
1972 } else if (!strcmp(arg, "--abbrev")) {
1973 revs->abbrev = DEFAULT_ABBREV;
1974 } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
1975 revs->abbrev = strtoul(optarg, NULL, 10);
1976 if (revs->abbrev < MINIMUM_ABBREV)
1977 revs->abbrev = MINIMUM_ABBREV;
1978 else if (revs->abbrev > 40)
1979 revs->abbrev = 40;
1980 } else if (!strcmp(arg, "--abbrev-commit")) {
1981 revs->abbrev_commit = 1;
1982 revs->abbrev_commit_given = 1;
1983 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1984 revs->abbrev_commit = 0;
1985 } else if (!strcmp(arg, "--full-diff")) {
1986 revs->diff = 1;
1987 revs->full_diff = 1;
1988 } else if (!strcmp(arg, "--full-history")) {
1989 revs->simplify_history = 0;
1990 } else if (!strcmp(arg, "--relative-date")) {
1991 revs->date_mode.type = DATE_RELATIVE;
1992 revs->date_mode_explicit = 1;
1993 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1994 parse_date_format(optarg, &revs->date_mode);
1995 revs->date_mode_explicit = 1;
1996 return argcount;
1997 } else if (!strcmp(arg, "--log-size")) {
1998 revs->show_log_size = 1;
2001 * Grepping the commit log
2003 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2004 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2005 return argcount;
2006 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2007 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2008 return argcount;
2009 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2010 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2011 return argcount;
2012 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2013 add_message_grep(revs, optarg);
2014 return argcount;
2015 } else if (!strcmp(arg, "--grep-debug")) {
2016 revs->grep_filter.debug = 1;
2017 } else if (!strcmp(arg, "--basic-regexp")) {
2018 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
2019 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2020 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
2021 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2022 revs->grep_filter.ignore_case = 1;
2023 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
2024 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2025 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
2026 } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) {
2027 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
2028 } else if (!strcmp(arg, "--all-match")) {
2029 revs->grep_filter.all_match = 1;
2030 } else if (!strcmp(arg, "--invert-grep")) {
2031 revs->invert_grep = 1;
2032 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2033 if (strcmp(optarg, "none"))
2034 git_log_output_encoding = xstrdup(optarg);
2035 else
2036 git_log_output_encoding = "";
2037 return argcount;
2038 } else if (!strcmp(arg, "--reverse")) {
2039 revs->reverse ^= 1;
2040 } else if (!strcmp(arg, "--children")) {
2041 revs->children.name = "children";
2042 revs->limited = 1;
2043 } else if (!strcmp(arg, "--ignore-missing")) {
2044 revs->ignore_missing = 1;
2045 } else {
2046 int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
2047 if (!opts)
2048 unkv[(*unkc)++] = arg;
2049 return opts;
2051 if (revs->graph && revs->track_linear)
2052 die("--show-linear-break and --graph are incompatible");
2054 return 1;
2057 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2058 const struct option *options,
2059 const char * const usagestr[])
2061 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2062 &ctx->cpidx, ctx->out);
2063 if (n <= 0) {
2064 error("unknown option `%s'", ctx->argv[0]);
2065 usage_with_options(usagestr, options);
2067 ctx->argv += n;
2068 ctx->argc -= n;
2071 static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
2072 struct strbuf bisect_refs = STRBUF_INIT;
2073 int status;
2074 strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2075 status = for_each_fullref_in_submodule(submodule, bisect_refs.buf, fn, cb_data, 0);
2076 strbuf_release(&bisect_refs);
2077 return status;
2080 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2082 return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
2085 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2087 return for_each_bisect_ref(submodule, fn, cb_data, term_good);
2090 static int handle_revision_pseudo_opt(const char *submodule,
2091 struct rev_info *revs,
2092 int argc, const char **argv, int *flags)
2094 const char *arg = argv[0];
2095 const char *optarg;
2096 int argcount;
2099 * NOTE!
2101 * Commands like "git shortlog" will not accept the options below
2102 * unless parse_revision_opt queues them (as opposed to erroring
2103 * out).
2105 * When implementing your new pseudo-option, remember to
2106 * register it in the list at the top of handle_revision_opt.
2108 if (!strcmp(arg, "--all")) {
2109 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2110 handle_refs(submodule, revs, *flags, head_ref_submodule);
2111 clear_ref_exclusion(&revs->ref_excludes);
2112 } else if (!strcmp(arg, "--branches")) {
2113 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
2114 clear_ref_exclusion(&revs->ref_excludes);
2115 } else if (!strcmp(arg, "--bisect")) {
2116 read_bisect_terms(&term_bad, &term_good);
2117 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
2118 handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
2119 revs->bisect = 1;
2120 } else if (!strcmp(arg, "--tags")) {
2121 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
2122 clear_ref_exclusion(&revs->ref_excludes);
2123 } else if (!strcmp(arg, "--remotes")) {
2124 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
2125 clear_ref_exclusion(&revs->ref_excludes);
2126 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2127 struct all_refs_cb cb;
2128 init_all_refs_cb(&cb, revs, *flags);
2129 for_each_glob_ref(handle_one_ref, optarg, &cb);
2130 clear_ref_exclusion(&revs->ref_excludes);
2131 return argcount;
2132 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2133 add_ref_exclusion(&revs->ref_excludes, optarg);
2134 return argcount;
2135 } else if (skip_prefix(arg, "--branches=", &optarg)) {
2136 struct all_refs_cb cb;
2137 init_all_refs_cb(&cb, revs, *flags);
2138 for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb);
2139 clear_ref_exclusion(&revs->ref_excludes);
2140 } else if (skip_prefix(arg, "--tags=", &optarg)) {
2141 struct all_refs_cb cb;
2142 init_all_refs_cb(&cb, revs, *flags);
2143 for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb);
2144 clear_ref_exclusion(&revs->ref_excludes);
2145 } else if (skip_prefix(arg, "--remotes=", &optarg)) {
2146 struct all_refs_cb cb;
2147 init_all_refs_cb(&cb, revs, *flags);
2148 for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb);
2149 clear_ref_exclusion(&revs->ref_excludes);
2150 } else if (!strcmp(arg, "--reflog")) {
2151 add_reflogs_to_pending(revs, *flags);
2152 } else if (!strcmp(arg, "--indexed-objects")) {
2153 add_index_objects_to_pending(revs, *flags);
2154 } else if (!strcmp(arg, "--not")) {
2155 *flags ^= UNINTERESTING | BOTTOM;
2156 } else if (!strcmp(arg, "--no-walk")) {
2157 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2158 } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
2160 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2161 * not allowed, since the argument is optional.
2163 if (!strcmp(optarg, "sorted"))
2164 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2165 else if (!strcmp(optarg, "unsorted"))
2166 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2167 else
2168 return error("invalid argument to --no-walk");
2169 } else if (!strcmp(arg, "--do-walk")) {
2170 revs->no_walk = 0;
2171 } else {
2172 return 0;
2175 return 1;
2178 static void NORETURN diagnose_missing_default(const char *def)
2180 unsigned char sha1[20];
2181 int flags;
2182 const char *refname;
2184 refname = resolve_ref_unsafe(def, 0, sha1, &flags);
2185 if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2186 die(_("your current branch appears to be broken"));
2188 skip_prefix(refname, "refs/heads/", &refname);
2189 die(_("your current branch '%s' does not have any commits yet"),
2190 refname);
2194 * Parse revision information, filling in the "rev_info" structure,
2195 * and removing the used arguments from the argument list.
2197 * Returns the number of arguments left that weren't recognized
2198 * (which are also moved to the head of the argument list)
2200 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2202 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
2203 struct cmdline_pathspec prune_data;
2204 const char *submodule = NULL;
2206 memset(&prune_data, 0, sizeof(prune_data));
2207 if (opt)
2208 submodule = opt->submodule;
2210 /* First, search for "--" */
2211 if (opt && opt->assume_dashdash) {
2212 seen_dashdash = 1;
2213 } else {
2214 seen_dashdash = 0;
2215 for (i = 1; i < argc; i++) {
2216 const char *arg = argv[i];
2217 if (strcmp(arg, "--"))
2218 continue;
2219 argv[i] = NULL;
2220 argc = i;
2221 if (argv[i + 1])
2222 append_prune_data(&prune_data, argv + i + 1);
2223 seen_dashdash = 1;
2224 break;
2228 /* Second, deal with arguments and options */
2229 flags = 0;
2230 revarg_opt = opt ? opt->revarg_opt : 0;
2231 if (seen_dashdash)
2232 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2233 read_from_stdin = 0;
2234 for (left = i = 1; i < argc; i++) {
2235 const char *arg = argv[i];
2236 if (*arg == '-') {
2237 int opts;
2239 opts = handle_revision_pseudo_opt(submodule,
2240 revs, argc - i, argv + i,
2241 &flags);
2242 if (opts > 0) {
2243 i += opts - 1;
2244 continue;
2247 if (!strcmp(arg, "--stdin")) {
2248 if (revs->disable_stdin) {
2249 argv[left++] = arg;
2250 continue;
2252 if (read_from_stdin++)
2253 die("--stdin given twice?");
2254 read_revisions_from_stdin(revs, &prune_data);
2255 continue;
2258 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
2259 if (opts > 0) {
2260 i += opts - 1;
2261 continue;
2263 if (opts < 0)
2264 exit(128);
2265 continue;
2269 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2270 int j;
2271 if (seen_dashdash || *arg == '^')
2272 die("bad revision '%s'", arg);
2274 /* If we didn't have a "--":
2275 * (1) all filenames must exist;
2276 * (2) all rev-args must not be interpretable
2277 * as a valid filename.
2278 * but the latter we have checked in the main loop.
2280 for (j = i; j < argc; j++)
2281 verify_filename(revs->prefix, argv[j], j == i);
2283 append_prune_data(&prune_data, argv + i);
2284 break;
2286 else
2287 got_rev_arg = 1;
2290 if (prune_data.nr) {
2292 * If we need to introduce the magic "a lone ':' means no
2293 * pathspec whatsoever", here is the place to do so.
2295 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2296 * prune_data.nr = 0;
2297 * prune_data.alloc = 0;
2298 * free(prune_data.path);
2299 * prune_data.path = NULL;
2300 * } else {
2301 * terminate prune_data.alloc with NULL and
2302 * call init_pathspec() to set revs->prune_data here.
2305 ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
2306 prune_data.path[prune_data.nr++] = NULL;
2307 parse_pathspec(&revs->prune_data, 0, 0,
2308 revs->prefix, prune_data.path);
2311 if (revs->def == NULL)
2312 revs->def = opt ? opt->def : NULL;
2313 if (opt && opt->tweak)
2314 opt->tweak(revs, opt);
2315 if (revs->show_merge)
2316 prepare_show_merge(revs);
2317 if (revs->def && !revs->pending.nr && !revs->rev_input_given && !got_rev_arg) {
2318 struct object_id oid;
2319 struct object *object;
2320 struct object_context oc;
2321 if (get_sha1_with_context(revs->def, 0, oid.hash, &oc))
2322 diagnose_missing_default(revs->def);
2323 object = get_reference(revs, revs->def, &oid, 0);
2324 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2327 /* Did the user ask for any diff output? Run the diff! */
2328 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2329 revs->diff = 1;
2331 /* Pickaxe, diff-filter and rename following need diffs */
2332 if (revs->diffopt.pickaxe ||
2333 revs->diffopt.filter ||
2334 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2335 revs->diff = 1;
2337 if (revs->topo_order)
2338 revs->limited = 1;
2340 if (revs->prune_data.nr) {
2341 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2342 /* Can't prune commits with rename following: the paths change.. */
2343 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2344 revs->prune = 1;
2345 if (!revs->full_diff)
2346 copy_pathspec(&revs->diffopt.pathspec,
2347 &revs->prune_data);
2349 if (revs->combine_merges)
2350 revs->ignore_merges = 0;
2351 revs->diffopt.abbrev = revs->abbrev;
2353 if (revs->line_level_traverse) {
2354 revs->limited = 1;
2355 revs->topo_order = 1;
2358 diff_setup_done(&revs->diffopt);
2360 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2361 &revs->grep_filter);
2362 compile_grep_patterns(&revs->grep_filter);
2364 if (revs->reverse && revs->reflog_info)
2365 die("cannot combine --reverse with --walk-reflogs");
2366 if (revs->reflog_info && revs->limited)
2367 die("cannot combine --walk-reflogs with history-limiting options");
2368 if (revs->rewrite_parents && revs->children.name)
2369 die("cannot combine --parents and --children");
2372 * Limitations on the graph functionality
2374 if (revs->reverse && revs->graph)
2375 die("cannot combine --reverse with --graph");
2377 if (revs->reflog_info && revs->graph)
2378 die("cannot combine --walk-reflogs with --graph");
2379 if (revs->no_walk && revs->graph)
2380 die("cannot combine --no-walk with --graph");
2381 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2382 die("cannot use --grep-reflog without --walk-reflogs");
2384 if (revs->first_parent_only && revs->bisect)
2385 die(_("--first-parent is incompatible with --bisect"));
2387 if (revs->expand_tabs_in_log < 0)
2388 revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2390 return left;
2393 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2395 struct commit_list *l = xcalloc(1, sizeof(*l));
2397 l->item = child;
2398 l->next = add_decoration(&revs->children, &parent->object, l);
2401 static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2403 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2404 struct commit_list **pp, *p;
2405 int surviving_parents;
2407 /* Examine existing parents while marking ones we have seen... */
2408 pp = &commit->parents;
2409 surviving_parents = 0;
2410 while ((p = *pp) != NULL) {
2411 struct commit *parent = p->item;
2412 if (parent->object.flags & TMP_MARK) {
2413 *pp = p->next;
2414 if (ts)
2415 compact_treesame(revs, commit, surviving_parents);
2416 continue;
2418 parent->object.flags |= TMP_MARK;
2419 surviving_parents++;
2420 pp = &p->next;
2422 /* clear the temporary mark */
2423 for (p = commit->parents; p; p = p->next) {
2424 p->item->object.flags &= ~TMP_MARK;
2426 /* no update_treesame() - removing duplicates can't affect TREESAME */
2427 return surviving_parents;
2430 struct merge_simplify_state {
2431 struct commit *simplified;
2434 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2436 struct merge_simplify_state *st;
2438 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2439 if (!st) {
2440 st = xcalloc(1, sizeof(*st));
2441 add_decoration(&revs->merge_simplification, &commit->object, st);
2443 return st;
2446 static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2448 struct commit_list *h = reduce_heads(commit->parents);
2449 int i = 0, marked = 0;
2450 struct commit_list *po, *pn;
2452 /* Want these for sanity-checking only */
2453 int orig_cnt = commit_list_count(commit->parents);
2454 int cnt = commit_list_count(h);
2457 * Not ready to remove items yet, just mark them for now, based
2458 * on the output of reduce_heads(). reduce_heads outputs the reduced
2459 * set in its original order, so this isn't too hard.
2461 po = commit->parents;
2462 pn = h;
2463 while (po) {
2464 if (pn && po->item == pn->item) {
2465 pn = pn->next;
2466 i++;
2467 } else {
2468 po->item->object.flags |= TMP_MARK;
2469 marked++;
2471 po=po->next;
2474 if (i != cnt || cnt+marked != orig_cnt)
2475 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2477 free_commit_list(h);
2479 return marked;
2482 static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2484 struct commit_list *p;
2485 int marked = 0;
2487 for (p = commit->parents; p; p = p->next) {
2488 struct commit *parent = p->item;
2489 if (!parent->parents && (parent->object.flags & TREESAME)) {
2490 parent->object.flags |= TMP_MARK;
2491 marked++;
2495 return marked;
2499 * Awkward naming - this means one parent we are TREESAME to.
2500 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2501 * empty tree). Better name suggestions?
2503 static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2505 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2506 struct commit *unmarked = NULL, *marked = NULL;
2507 struct commit_list *p;
2508 unsigned n;
2510 for (p = commit->parents, n = 0; p; p = p->next, n++) {
2511 if (ts->treesame[n]) {
2512 if (p->item->object.flags & TMP_MARK) {
2513 if (!marked)
2514 marked = p->item;
2515 } else {
2516 if (!unmarked) {
2517 unmarked = p->item;
2518 break;
2525 * If we are TREESAME to a marked-for-deletion parent, but not to any
2526 * unmarked parents, unmark the first TREESAME parent. This is the
2527 * parent that the default simplify_history==1 scan would have followed,
2528 * and it doesn't make sense to omit that path when asking for a
2529 * simplified full history. Retaining it improves the chances of
2530 * understanding odd missed merges that took an old version of a file.
2532 * Example:
2534 * I--------*X A modified the file, but mainline merge X used
2535 * \ / "-s ours", so took the version from I. X is
2536 * `-*A--' TREESAME to I and !TREESAME to A.
2538 * Default log from X would produce "I". Without this check,
2539 * --full-history --simplify-merges would produce "I-A-X", showing
2540 * the merge commit X and that it changed A, but not making clear that
2541 * it had just taken the I version. With this check, the topology above
2542 * is retained.
2544 * Note that it is possible that the simplification chooses a different
2545 * TREESAME parent from the default, in which case this test doesn't
2546 * activate, and we _do_ drop the default parent. Example:
2548 * I------X A modified the file, but it was reverted in B,
2549 * \ / meaning mainline merge X is TREESAME to both
2550 * *A-*B parents.
2552 * Default log would produce "I" by following the first parent;
2553 * --full-history --simplify-merges will produce "I-A-B". But this is a
2554 * reasonable result - it presents a logical full history leading from
2555 * I to X, and X is not an important merge.
2557 if (!unmarked && marked) {
2558 marked->object.flags &= ~TMP_MARK;
2559 return 1;
2562 return 0;
2565 static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2567 struct commit_list **pp, *p;
2568 int nth_parent, removed = 0;
2570 pp = &commit->parents;
2571 nth_parent = 0;
2572 while ((p = *pp) != NULL) {
2573 struct commit *parent = p->item;
2574 if (parent->object.flags & TMP_MARK) {
2575 parent->object.flags &= ~TMP_MARK;
2576 *pp = p->next;
2577 free(p);
2578 removed++;
2579 compact_treesame(revs, commit, nth_parent);
2580 continue;
2582 pp = &p->next;
2583 nth_parent++;
2586 /* Removing parents can only increase TREESAMEness */
2587 if (removed && !(commit->object.flags & TREESAME))
2588 update_treesame(revs, commit);
2590 return nth_parent;
2593 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
2595 struct commit_list *p;
2596 struct commit *parent;
2597 struct merge_simplify_state *st, *pst;
2598 int cnt;
2600 st = locate_simplify_state(revs, commit);
2603 * Have we handled this one?
2605 if (st->simplified)
2606 return tail;
2609 * An UNINTERESTING commit simplifies to itself, so does a
2610 * root commit. We do not rewrite parents of such commit
2611 * anyway.
2613 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
2614 st->simplified = commit;
2615 return tail;
2619 * Do we know what commit all of our parents that matter
2620 * should be rewritten to? Otherwise we are not ready to
2621 * rewrite this one yet.
2623 for (cnt = 0, p = commit->parents; p; p = p->next) {
2624 pst = locate_simplify_state(revs, p->item);
2625 if (!pst->simplified) {
2626 tail = &commit_list_insert(p->item, tail)->next;
2627 cnt++;
2629 if (revs->first_parent_only)
2630 break;
2632 if (cnt) {
2633 tail = &commit_list_insert(commit, tail)->next;
2634 return tail;
2638 * Rewrite our list of parents. Note that this cannot
2639 * affect our TREESAME flags in any way - a commit is
2640 * always TREESAME to its simplification.
2642 for (p = commit->parents; p; p = p->next) {
2643 pst = locate_simplify_state(revs, p->item);
2644 p->item = pst->simplified;
2645 if (revs->first_parent_only)
2646 break;
2649 if (revs->first_parent_only)
2650 cnt = 1;
2651 else
2652 cnt = remove_duplicate_parents(revs, commit);
2655 * It is possible that we are a merge and one side branch
2656 * does not have any commit that touches the given paths;
2657 * in such a case, the immediate parent from that branch
2658 * will be rewritten to be the merge base.
2660 * o----X X: the commit we are looking at;
2661 * / / o: a commit that touches the paths;
2662 * ---o----'
2664 * Further, a merge of an independent branch that doesn't
2665 * touch the path will reduce to a treesame root parent:
2667 * ----o----X X: the commit we are looking at;
2668 * / o: a commit that touches the paths;
2669 * r r: a root commit not touching the paths
2671 * Detect and simplify both cases.
2673 if (1 < cnt) {
2674 int marked = mark_redundant_parents(revs, commit);
2675 marked += mark_treesame_root_parents(revs, commit);
2676 if (marked)
2677 marked -= leave_one_treesame_to_parent(revs, commit);
2678 if (marked)
2679 cnt = remove_marked_parents(revs, commit);
2683 * A commit simplifies to itself if it is a root, if it is
2684 * UNINTERESTING, if it touches the given paths, or if it is a
2685 * merge and its parents don't simplify to one relevant commit
2686 * (the first two cases are already handled at the beginning of
2687 * this function).
2689 * Otherwise, it simplifies to what its sole relevant parent
2690 * simplifies to.
2692 if (!cnt ||
2693 (commit->object.flags & UNINTERESTING) ||
2694 !(commit->object.flags & TREESAME) ||
2695 (parent = one_relevant_parent(revs, commit->parents)) == NULL)
2696 st->simplified = commit;
2697 else {
2698 pst = locate_simplify_state(revs, parent);
2699 st->simplified = pst->simplified;
2701 return tail;
2704 static void simplify_merges(struct rev_info *revs)
2706 struct commit_list *list, *next;
2707 struct commit_list *yet_to_do, **tail;
2708 struct commit *commit;
2710 if (!revs->prune)
2711 return;
2713 /* feed the list reversed */
2714 yet_to_do = NULL;
2715 for (list = revs->commits; list; list = next) {
2716 commit = list->item;
2717 next = list->next;
2719 * Do not free(list) here yet; the original list
2720 * is used later in this function.
2722 commit_list_insert(commit, &yet_to_do);
2724 while (yet_to_do) {
2725 list = yet_to_do;
2726 yet_to_do = NULL;
2727 tail = &yet_to_do;
2728 while (list) {
2729 commit = pop_commit(&list);
2730 tail = simplify_one(revs, commit, tail);
2734 /* clean up the result, removing the simplified ones */
2735 list = revs->commits;
2736 revs->commits = NULL;
2737 tail = &revs->commits;
2738 while (list) {
2739 struct merge_simplify_state *st;
2741 commit = pop_commit(&list);
2742 st = locate_simplify_state(revs, commit);
2743 if (st->simplified == commit)
2744 tail = &commit_list_insert(commit, tail)->next;
2748 static void set_children(struct rev_info *revs)
2750 struct commit_list *l;
2751 for (l = revs->commits; l; l = l->next) {
2752 struct commit *commit = l->item;
2753 struct commit_list *p;
2755 for (p = commit->parents; p; p = p->next)
2756 add_child(revs, p->item, commit);
2760 void reset_revision_walk(void)
2762 clear_object_flags(SEEN | ADDED | SHOWN);
2765 int prepare_revision_walk(struct rev_info *revs)
2767 int i;
2768 struct object_array old_pending;
2769 struct commit_list **next = &revs->commits;
2771 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
2772 revs->pending.nr = 0;
2773 revs->pending.alloc = 0;
2774 revs->pending.objects = NULL;
2775 for (i = 0; i < old_pending.nr; i++) {
2776 struct object_array_entry *e = old_pending.objects + i;
2777 struct commit *commit = handle_commit(revs, e);
2778 if (commit) {
2779 if (!(commit->object.flags & SEEN)) {
2780 commit->object.flags |= SEEN;
2781 next = commit_list_append(commit, next);
2785 if (!revs->leak_pending)
2786 object_array_clear(&old_pending);
2788 /* Signal whether we need per-parent treesame decoration */
2789 if (revs->simplify_merges ||
2790 (revs->limited && limiting_can_increase_treesame(revs)))
2791 revs->treesame.name = "treesame";
2793 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2794 commit_list_sort_by_date(&revs->commits);
2795 if (revs->no_walk)
2796 return 0;
2797 if (revs->limited)
2798 if (limit_list(revs) < 0)
2799 return -1;
2800 if (revs->topo_order)
2801 sort_in_topological_order(&revs->commits, revs->sort_order);
2802 if (revs->line_level_traverse)
2803 line_log_filter(revs);
2804 if (revs->simplify_merges)
2805 simplify_merges(revs);
2806 if (revs->children.name)
2807 set_children(revs);
2808 return 0;
2811 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2813 struct commit_list *cache = NULL;
2815 for (;;) {
2816 struct commit *p = *pp;
2817 if (!revs->limited)
2818 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2819 return rewrite_one_error;
2820 if (p->object.flags & UNINTERESTING)
2821 return rewrite_one_ok;
2822 if (!(p->object.flags & TREESAME))
2823 return rewrite_one_ok;
2824 if (!p->parents)
2825 return rewrite_one_noparents;
2826 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2827 return rewrite_one_ok;
2828 *pp = p;
2832 int rewrite_parents(struct rev_info *revs, struct commit *commit,
2833 rewrite_parent_fn_t rewrite_parent)
2835 struct commit_list **pp = &commit->parents;
2836 while (*pp) {
2837 struct commit_list *parent = *pp;
2838 switch (rewrite_parent(revs, &parent->item)) {
2839 case rewrite_one_ok:
2840 break;
2841 case rewrite_one_noparents:
2842 *pp = parent->next;
2843 continue;
2844 case rewrite_one_error:
2845 return -1;
2847 pp = &parent->next;
2849 remove_duplicate_parents(revs, commit);
2850 return 0;
2853 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2855 char *person, *endp;
2856 size_t len, namelen, maillen;
2857 const char *name;
2858 const char *mail;
2859 struct ident_split ident;
2861 person = strstr(buf->buf, what);
2862 if (!person)
2863 return 0;
2865 person += strlen(what);
2866 endp = strchr(person, '\n');
2867 if (!endp)
2868 return 0;
2870 len = endp - person;
2872 if (split_ident_line(&ident, person, len))
2873 return 0;
2875 mail = ident.mail_begin;
2876 maillen = ident.mail_end - ident.mail_begin;
2877 name = ident.name_begin;
2878 namelen = ident.name_end - ident.name_begin;
2880 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2881 struct strbuf namemail = STRBUF_INIT;
2883 strbuf_addf(&namemail, "%.*s <%.*s>",
2884 (int)namelen, name, (int)maillen, mail);
2886 strbuf_splice(buf, ident.name_begin - buf->buf,
2887 ident.mail_end - ident.name_begin + 1,
2888 namemail.buf, namemail.len);
2890 strbuf_release(&namemail);
2892 return 1;
2895 return 0;
2898 static int commit_match(struct commit *commit, struct rev_info *opt)
2900 int retval;
2901 const char *encoding;
2902 const char *message;
2903 struct strbuf buf = STRBUF_INIT;
2905 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2906 return 1;
2908 /* Prepend "fake" headers as needed */
2909 if (opt->grep_filter.use_reflog_filter) {
2910 strbuf_addstr(&buf, "reflog ");
2911 get_reflog_message(&buf, opt->reflog_info);
2912 strbuf_addch(&buf, '\n');
2916 * We grep in the user's output encoding, under the assumption that it
2917 * is the encoding they are most likely to write their grep pattern
2918 * for. In addition, it means we will match the "notes" encoding below,
2919 * so we will not end up with a buffer that has two different encodings
2920 * in it.
2922 encoding = get_log_output_encoding();
2923 message = logmsg_reencode(commit, NULL, encoding);
2925 /* Copy the commit to temporary if we are using "fake" headers */
2926 if (buf.len)
2927 strbuf_addstr(&buf, message);
2929 if (opt->grep_filter.header_list && opt->mailmap) {
2930 if (!buf.len)
2931 strbuf_addstr(&buf, message);
2933 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2934 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2937 /* Append "fake" message parts as needed */
2938 if (opt->show_notes) {
2939 if (!buf.len)
2940 strbuf_addstr(&buf, message);
2941 format_display_notes(&commit->object.oid, &buf, encoding, 1);
2945 * Find either in the original commit message, or in the temporary.
2946 * Note that we cast away the constness of "message" here. It is
2947 * const because it may come from the cached commit buffer. That's OK,
2948 * because we know that it is modifiable heap memory, and that while
2949 * grep_buffer may modify it for speed, it will restore any
2950 * changes before returning.
2952 if (buf.len)
2953 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2954 else
2955 retval = grep_buffer(&opt->grep_filter,
2956 (char *)message, strlen(message));
2957 strbuf_release(&buf);
2958 unuse_commit_buffer(commit, message);
2959 return opt->invert_grep ? !retval : retval;
2962 static inline int want_ancestry(const struct rev_info *revs)
2964 return (revs->rewrite_parents || revs->children.name);
2968 * Return a timestamp to be used for --since/--until comparisons for this
2969 * commit, based on the revision options.
2971 static timestamp_t comparison_date(const struct rev_info *revs,
2972 struct commit *commit)
2974 return revs->reflog_info ?
2975 get_reflog_timestamp(revs->reflog_info) :
2976 commit->date;
2979 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2981 if (commit->object.flags & SHOWN)
2982 return commit_ignore;
2983 if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))
2984 return commit_ignore;
2985 if (revs->show_all)
2986 return commit_show;
2987 if (commit->object.flags & UNINTERESTING)
2988 return commit_ignore;
2989 if (revs->min_age != -1 &&
2990 comparison_date(revs, commit) > revs->min_age)
2991 return commit_ignore;
2992 if (revs->min_parents || (revs->max_parents >= 0)) {
2993 int n = commit_list_count(commit->parents);
2994 if ((n < revs->min_parents) ||
2995 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2996 return commit_ignore;
2998 if (!commit_match(commit, revs))
2999 return commit_ignore;
3000 if (revs->prune && revs->dense) {
3001 /* Commit without changes? */
3002 if (commit->object.flags & TREESAME) {
3003 int n;
3004 struct commit_list *p;
3005 /* drop merges unless we want parenthood */
3006 if (!want_ancestry(revs))
3007 return commit_ignore;
3009 * If we want ancestry, then need to keep any merges
3010 * between relevant commits to tie together topology.
3011 * For consistency with TREESAME and simplification
3012 * use "relevant" here rather than just INTERESTING,
3013 * to treat bottom commit(s) as part of the topology.
3015 for (n = 0, p = commit->parents; p; p = p->next)
3016 if (relevant_commit(p->item))
3017 if (++n >= 2)
3018 return commit_show;
3019 return commit_ignore;
3022 return commit_show;
3025 define_commit_slab(saved_parents, struct commit_list *);
3027 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3030 * You may only call save_parents() once per commit (this is checked
3031 * for non-root commits).
3033 static void save_parents(struct rev_info *revs, struct commit *commit)
3035 struct commit_list **pp;
3037 if (!revs->saved_parents_slab) {
3038 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3039 init_saved_parents(revs->saved_parents_slab);
3042 pp = saved_parents_at(revs->saved_parents_slab, commit);
3045 * When walking with reflogs, we may visit the same commit
3046 * several times: once for each appearance in the reflog.
3048 * In this case, save_parents() will be called multiple times.
3049 * We want to keep only the first set of parents. We need to
3050 * store a sentinel value for an empty (i.e., NULL) parent
3051 * list to distinguish it from a not-yet-saved list, however.
3053 if (*pp)
3054 return;
3055 if (commit->parents)
3056 *pp = copy_commit_list(commit->parents);
3057 else
3058 *pp = EMPTY_PARENT_LIST;
3061 static void free_saved_parents(struct rev_info *revs)
3063 if (revs->saved_parents_slab)
3064 clear_saved_parents(revs->saved_parents_slab);
3067 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3069 struct commit_list *parents;
3071 if (!revs->saved_parents_slab)
3072 return commit->parents;
3074 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3075 if (parents == EMPTY_PARENT_LIST)
3076 return NULL;
3077 return parents;
3080 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3082 enum commit_action action = get_commit_action(revs, commit);
3084 if (action == commit_show &&
3085 !revs->show_all &&
3086 revs->prune && revs->dense && want_ancestry(revs)) {
3088 * --full-diff on simplified parents is no good: it
3089 * will show spurious changes from the commits that
3090 * were elided. So we save the parents on the side
3091 * when --full-diff is in effect.
3093 if (revs->full_diff)
3094 save_parents(revs, commit);
3095 if (rewrite_parents(revs, commit, rewrite_one) < 0)
3096 return commit_error;
3098 return action;
3101 static void track_linear(struct rev_info *revs, struct commit *commit)
3103 if (revs->track_first_time) {
3104 revs->linear = 1;
3105 revs->track_first_time = 0;
3106 } else {
3107 struct commit_list *p;
3108 for (p = revs->previous_parents; p; p = p->next)
3109 if (p->item == NULL || /* first commit */
3110 !oidcmp(&p->item->object.oid, &commit->object.oid))
3111 break;
3112 revs->linear = p != NULL;
3114 if (revs->reverse) {
3115 if (revs->linear)
3116 commit->object.flags |= TRACK_LINEAR;
3118 free_commit_list(revs->previous_parents);
3119 revs->previous_parents = copy_commit_list(commit->parents);
3122 static struct commit *get_revision_1(struct rev_info *revs)
3124 while (1) {
3125 struct commit *commit;
3127 if (revs->reflog_info)
3128 commit = next_reflog_entry(revs->reflog_info);
3129 else
3130 commit = pop_commit(&revs->commits);
3132 if (!commit)
3133 return NULL;
3135 if (revs->reflog_info)
3136 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3139 * If we haven't done the list limiting, we need to look at
3140 * the parents here. We also need to do the date-based limiting
3141 * that we'd otherwise have done in limit_list().
3143 if (!revs->limited) {
3144 if (revs->max_age != -1 &&
3145 comparison_date(revs, commit) < revs->max_age)
3146 continue;
3148 if (revs->reflog_info)
3149 try_to_simplify_commit(revs, commit);
3150 else if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3151 if (!revs->ignore_missing_links)
3152 die("Failed to traverse parents of commit %s",
3153 oid_to_hex(&commit->object.oid));
3157 switch (simplify_commit(revs, commit)) {
3158 case commit_ignore:
3159 continue;
3160 case commit_error:
3161 die("Failed to simplify parents of commit %s",
3162 oid_to_hex(&commit->object.oid));
3163 default:
3164 if (revs->track_linear)
3165 track_linear(revs, commit);
3166 return commit;
3172 * Return true for entries that have not yet been shown. (This is an
3173 * object_array_each_func_t.)
3175 static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3177 return !(entry->item->flags & SHOWN);
3181 * If array is on the verge of a realloc, garbage-collect any entries
3182 * that have already been shown to try to free up some space.
3184 static void gc_boundary(struct object_array *array)
3186 if (array->nr == array->alloc)
3187 object_array_filter(array, entry_unshown, NULL);
3190 static void create_boundary_commit_list(struct rev_info *revs)
3192 unsigned i;
3193 struct commit *c;
3194 struct object_array *array = &revs->boundary_commits;
3195 struct object_array_entry *objects = array->objects;
3198 * If revs->commits is non-NULL at this point, an error occurred in
3199 * get_revision_1(). Ignore the error and continue printing the
3200 * boundary commits anyway. (This is what the code has always
3201 * done.)
3203 if (revs->commits) {
3204 free_commit_list(revs->commits);
3205 revs->commits = NULL;
3209 * Put all of the actual boundary commits from revs->boundary_commits
3210 * into revs->commits
3212 for (i = 0; i < array->nr; i++) {
3213 c = (struct commit *)(objects[i].item);
3214 if (!c)
3215 continue;
3216 if (!(c->object.flags & CHILD_SHOWN))
3217 continue;
3218 if (c->object.flags & (SHOWN | BOUNDARY))
3219 continue;
3220 c->object.flags |= BOUNDARY;
3221 commit_list_insert(c, &revs->commits);
3225 * If revs->topo_order is set, sort the boundary commits
3226 * in topological order
3228 sort_in_topological_order(&revs->commits, revs->sort_order);
3231 static struct commit *get_revision_internal(struct rev_info *revs)
3233 struct commit *c = NULL;
3234 struct commit_list *l;
3236 if (revs->boundary == 2) {
3238 * All of the normal commits have already been returned,
3239 * and we are now returning boundary commits.
3240 * create_boundary_commit_list() has populated
3241 * revs->commits with the remaining commits to return.
3243 c = pop_commit(&revs->commits);
3244 if (c)
3245 c->object.flags |= SHOWN;
3246 return c;
3250 * If our max_count counter has reached zero, then we are done. We
3251 * don't simply return NULL because we still might need to show
3252 * boundary commits. But we want to avoid calling get_revision_1, which
3253 * might do a considerable amount of work finding the next commit only
3254 * for us to throw it away.
3256 * If it is non-zero, then either we don't have a max_count at all
3257 * (-1), or it is still counting, in which case we decrement.
3259 if (revs->max_count) {
3260 c = get_revision_1(revs);
3261 if (c) {
3262 while (revs->skip_count > 0) {
3263 revs->skip_count--;
3264 c = get_revision_1(revs);
3265 if (!c)
3266 break;
3270 if (revs->max_count > 0)
3271 revs->max_count--;
3274 if (c)
3275 c->object.flags |= SHOWN;
3277 if (!revs->boundary)
3278 return c;
3280 if (!c) {
3282 * get_revision_1() runs out the commits, and
3283 * we are done computing the boundaries.
3284 * switch to boundary commits output mode.
3286 revs->boundary = 2;
3289 * Update revs->commits to contain the list of
3290 * boundary commits.
3292 create_boundary_commit_list(revs);
3294 return get_revision_internal(revs);
3298 * boundary commits are the commits that are parents of the
3299 * ones we got from get_revision_1() but they themselves are
3300 * not returned from get_revision_1(). Before returning
3301 * 'c', we need to mark its parents that they could be boundaries.
3304 for (l = c->parents; l; l = l->next) {
3305 struct object *p;
3306 p = &(l->item->object);
3307 if (p->flags & (CHILD_SHOWN | SHOWN))
3308 continue;
3309 p->flags |= CHILD_SHOWN;
3310 gc_boundary(&revs->boundary_commits);
3311 add_object_array(p, NULL, &revs->boundary_commits);
3314 return c;
3317 struct commit *get_revision(struct rev_info *revs)
3319 struct commit *c;
3320 struct commit_list *reversed;
3322 if (revs->reverse) {
3323 reversed = NULL;
3324 while ((c = get_revision_internal(revs)))
3325 commit_list_insert(c, &reversed);
3326 revs->commits = reversed;
3327 revs->reverse = 0;
3328 revs->reverse_output_stage = 1;
3331 if (revs->reverse_output_stage) {
3332 c = pop_commit(&revs->commits);
3333 if (revs->track_linear)
3334 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3335 return c;
3338 c = get_revision_internal(revs);
3339 if (c && revs->graph)
3340 graph_update(revs->graph, c);
3341 if (!c) {
3342 free_saved_parents(revs);
3343 if (revs->previous_parents) {
3344 free_commit_list(revs->previous_parents);
3345 revs->previous_parents = NULL;
3348 return c;
3351 char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3353 if (commit->object.flags & BOUNDARY)
3354 return "-";
3355 else if (commit->object.flags & UNINTERESTING)
3356 return "^";
3357 else if (commit->object.flags & PATCHSAME)
3358 return "=";
3359 else if (!revs || revs->left_right) {
3360 if (commit->object.flags & SYMMETRIC_LEFT)
3361 return "<";
3362 else
3363 return ">";
3364 } else if (revs->graph)
3365 return "*";
3366 else if (revs->cherry_mark)
3367 return "+";
3368 return "";
3371 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3373 char *mark = get_revision_mark(revs, commit);
3374 if (!strlen(mark))
3375 return;
3376 fputs(mark, stdout);
3377 putchar(' ');