set_git_dir: handle feeding gitdir to itself
[git.git] / revision.c
blob94a5e98525187a2d7f1c6f4e9a22f4cb3bb0cf84
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"
22 #include "packfile.h"
24 volatile show_early_output_fn_t show_early_output;
26 static const char *term_bad;
27 static const char *term_good;
29 void show_object_with_name(FILE *out, struct object *obj, const char *name)
31 const char *p;
33 fprintf(out, "%s ", oid_to_hex(&obj->oid));
34 for (p = name; *p && *p != '\n'; p++)
35 fputc(*p, out);
36 fputc('\n', out);
39 static void mark_blob_uninteresting(struct blob *blob)
41 if (!blob)
42 return;
43 if (blob->object.flags & UNINTERESTING)
44 return;
45 blob->object.flags |= UNINTERESTING;
48 static void mark_tree_contents_uninteresting(struct tree *tree)
50 struct tree_desc desc;
51 struct name_entry entry;
52 struct object *obj = &tree->object;
54 if (!has_object_file(&obj->oid))
55 return;
56 if (parse_tree(tree) < 0)
57 die("bad tree %s", oid_to_hex(&obj->oid));
59 init_tree_desc(&desc, tree->buffer, tree->size);
60 while (tree_entry(&desc, &entry)) {
61 switch (object_type(entry.mode)) {
62 case OBJ_TREE:
63 mark_tree_uninteresting(lookup_tree(entry.oid));
64 break;
65 case OBJ_BLOB:
66 mark_blob_uninteresting(lookup_blob(entry.oid));
67 break;
68 default:
69 /* Subproject commit - not in this repository */
70 break;
75 * We don't care about the tree any more
76 * after it has been marked uninteresting.
78 free_tree_buffer(tree);
81 void mark_tree_uninteresting(struct tree *tree)
83 struct object *obj;
85 if (!tree)
86 return;
88 obj = &tree->object;
89 if (obj->flags & UNINTERESTING)
90 return;
91 obj->flags |= UNINTERESTING;
92 mark_tree_contents_uninteresting(tree);
95 void mark_parents_uninteresting(struct commit *commit)
97 struct commit_list *parents = NULL, *l;
99 for (l = commit->parents; l; l = l->next)
100 commit_list_insert(l->item, &parents);
102 while (parents) {
103 struct commit *commit = pop_commit(&parents);
105 while (commit) {
107 * A missing commit is ok iff its parent is marked
108 * uninteresting.
110 * We just mark such a thing parsed, so that when
111 * it is popped next time around, we won't be trying
112 * to parse it and get an error.
114 if (!has_object_file(&commit->object.oid))
115 commit->object.parsed = 1;
117 if (commit->object.flags & UNINTERESTING)
118 break;
120 commit->object.flags |= UNINTERESTING;
123 * Normally we haven't parsed the parent
124 * yet, so we won't have a parent of a parent
125 * here. However, it may turn out that we've
126 * reached this commit some other way (where it
127 * wasn't uninteresting), in which case we need
128 * to mark its parents recursively too..
130 if (!commit->parents)
131 break;
133 for (l = commit->parents->next; l; l = l->next)
134 commit_list_insert(l->item, &parents);
135 commit = commit->parents->item;
140 static void add_pending_object_with_path(struct rev_info *revs,
141 struct object *obj,
142 const char *name, unsigned mode,
143 const char *path)
145 if (!obj)
146 return;
147 if (revs->no_walk && (obj->flags & UNINTERESTING))
148 revs->no_walk = 0;
149 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
150 struct strbuf buf = STRBUF_INIT;
151 int len = interpret_branch_name(name, 0, &buf, 0);
153 if (0 < len && name[len] && buf.len)
154 strbuf_addstr(&buf, name + len);
155 add_reflog_for_walk(revs->reflog_info,
156 (struct commit *)obj,
157 buf.buf[0] ? buf.buf: name);
158 strbuf_release(&buf);
159 return; /* do not add the commit itself */
161 add_object_array_with_path(obj, name, &revs->pending, mode, path);
164 static void add_pending_object_with_mode(struct rev_info *revs,
165 struct object *obj,
166 const char *name, unsigned mode)
168 add_pending_object_with_path(revs, obj, name, mode, NULL);
171 void add_pending_object(struct rev_info *revs,
172 struct object *obj, const char *name)
174 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
177 void add_head_to_pending(struct rev_info *revs)
179 struct object_id oid;
180 struct object *obj;
181 if (get_oid("HEAD", &oid))
182 return;
183 obj = parse_object(&oid);
184 if (!obj)
185 return;
186 add_pending_object(revs, obj, "HEAD");
189 static struct object *get_reference(struct rev_info *revs, const char *name,
190 const struct object_id *oid,
191 unsigned int flags)
193 struct object *object;
195 object = parse_object(oid);
196 if (!object) {
197 if (revs->ignore_missing)
198 return object;
199 die("bad object %s", name);
201 object->flags |= flags;
202 return object;
205 void add_pending_oid(struct rev_info *revs, const char *name,
206 const struct object_id *oid, unsigned int flags)
208 struct object *object = get_reference(revs, name, oid, flags);
209 add_pending_object(revs, object, name);
212 static struct commit *handle_commit(struct rev_info *revs,
213 struct object_array_entry *entry)
215 struct object *object = entry->item;
216 const char *name = entry->name;
217 const char *path = entry->path;
218 unsigned int mode = entry->mode;
219 unsigned long flags = object->flags;
222 * Tag object? Look what it points to..
224 while (object->type == OBJ_TAG) {
225 struct tag *tag = (struct tag *) object;
226 if (revs->tag_objects && !(flags & UNINTERESTING))
227 add_pending_object(revs, object, tag->tag);
228 if (!tag->tagged)
229 die("bad tag");
230 object = parse_object(&tag->tagged->oid);
231 if (!object) {
232 if (revs->ignore_missing_links || (flags & UNINTERESTING))
233 return NULL;
234 die("bad object %s", oid_to_hex(&tag->tagged->oid));
236 object->flags |= flags;
238 * We'll handle the tagged object by looping or dropping
239 * through to the non-tag handlers below. Do not
240 * propagate path data from the tag's pending entry.
242 path = NULL;
243 mode = 0;
247 * Commit object? Just return it, we'll do all the complex
248 * reachability crud.
250 if (object->type == OBJ_COMMIT) {
251 struct commit *commit = (struct commit *)object;
252 if (parse_commit(commit) < 0)
253 die("unable to parse commit %s", name);
254 if (flags & UNINTERESTING) {
255 mark_parents_uninteresting(commit);
256 revs->limited = 1;
258 if (revs->show_source && !commit->util)
259 commit->util = xstrdup(name);
260 return commit;
264 * Tree object? Either mark it uninteresting, or add it
265 * to the list of objects to look at later..
267 if (object->type == OBJ_TREE) {
268 struct tree *tree = (struct tree *)object;
269 if (!revs->tree_objects)
270 return NULL;
271 if (flags & UNINTERESTING) {
272 mark_tree_contents_uninteresting(tree);
273 return NULL;
275 add_pending_object_with_path(revs, object, name, mode, path);
276 return NULL;
280 * Blob object? You know the drill by now..
282 if (object->type == OBJ_BLOB) {
283 if (!revs->blob_objects)
284 return NULL;
285 if (flags & UNINTERESTING)
286 return NULL;
287 add_pending_object_with_path(revs, object, name, mode, path);
288 return NULL;
290 die("%s is unknown object", name);
293 static int everybody_uninteresting(struct commit_list *orig,
294 struct commit **interesting_cache)
296 struct commit_list *list = orig;
298 if (*interesting_cache) {
299 struct commit *commit = *interesting_cache;
300 if (!(commit->object.flags & UNINTERESTING))
301 return 0;
304 while (list) {
305 struct commit *commit = list->item;
306 list = list->next;
307 if (commit->object.flags & UNINTERESTING)
308 continue;
310 *interesting_cache = commit;
311 return 0;
313 return 1;
317 * A definition of "relevant" commit that we can use to simplify limited graphs
318 * by eliminating side branches.
320 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
321 * in our list), or that is a specified BOTTOM commit. Then after computing
322 * a limited list, during processing we can generally ignore boundary merges
323 * coming from outside the graph, (ie from irrelevant parents), and treat
324 * those merges as if they were single-parent. TREESAME is defined to consider
325 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
326 * we don't care if we were !TREESAME to non-graph parents.
328 * Treating bottom commits as relevant ensures that a limited graph's
329 * connection to the actual bottom commit is not viewed as a side branch, but
330 * treated as part of the graph. For example:
332 * ....Z...A---X---o---o---B
333 * . /
334 * W---Y
336 * When computing "A..B", the A-X connection is at least as important as
337 * Y-X, despite A being flagged UNINTERESTING.
339 * And when computing --ancestry-path "A..B", the A-X connection is more
340 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
342 static inline int relevant_commit(struct commit *commit)
344 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
348 * Return a single relevant commit from a parent list. If we are a TREESAME
349 * commit, and this selects one of our parents, then we can safely simplify to
350 * that parent.
352 static struct commit *one_relevant_parent(const struct rev_info *revs,
353 struct commit_list *orig)
355 struct commit_list *list = orig;
356 struct commit *relevant = NULL;
358 if (!orig)
359 return NULL;
362 * For 1-parent commits, or if first-parent-only, then return that
363 * first parent (even if not "relevant" by the above definition).
364 * TREESAME will have been set purely on that parent.
366 if (revs->first_parent_only || !orig->next)
367 return orig->item;
370 * For multi-parent commits, identify a sole relevant parent, if any.
371 * If we have only one relevant parent, then TREESAME will be set purely
372 * with regard to that parent, and we can simplify accordingly.
374 * If we have more than one relevant parent, or no relevant parents
375 * (and multiple irrelevant ones), then we can't select a parent here
376 * and return NULL.
378 while (list) {
379 struct commit *commit = list->item;
380 list = list->next;
381 if (relevant_commit(commit)) {
382 if (relevant)
383 return NULL;
384 relevant = commit;
387 return relevant;
391 * The goal is to get REV_TREE_NEW as the result only if the
392 * diff consists of all '+' (and no other changes), REV_TREE_OLD
393 * if the whole diff is removal of old data, and otherwise
394 * REV_TREE_DIFFERENT (of course if the trees are the same we
395 * want REV_TREE_SAME).
396 * That means that once we get to REV_TREE_DIFFERENT, we do not
397 * have to look any further.
399 static int tree_difference = REV_TREE_SAME;
401 static void file_add_remove(struct diff_options *options,
402 int addremove, unsigned mode,
403 const struct object_id *oid,
404 int oid_valid,
405 const char *fullpath, unsigned dirty_submodule)
407 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
409 tree_difference |= diff;
410 if (tree_difference == REV_TREE_DIFFERENT)
411 DIFF_OPT_SET(options, HAS_CHANGES);
414 static void file_change(struct diff_options *options,
415 unsigned old_mode, unsigned new_mode,
416 const struct object_id *old_oid,
417 const struct object_id *new_oid,
418 int old_oid_valid, int new_oid_valid,
419 const char *fullpath,
420 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
422 tree_difference = REV_TREE_DIFFERENT;
423 DIFF_OPT_SET(options, HAS_CHANGES);
426 static int rev_compare_tree(struct rev_info *revs,
427 struct commit *parent, struct commit *commit)
429 struct tree *t1 = parent->tree;
430 struct tree *t2 = commit->tree;
432 if (!t1)
433 return REV_TREE_NEW;
434 if (!t2)
435 return REV_TREE_OLD;
437 if (revs->simplify_by_decoration) {
439 * If we are simplifying by decoration, then the commit
440 * is worth showing if it has a tag pointing at it.
442 if (get_name_decoration(&commit->object))
443 return REV_TREE_DIFFERENT;
445 * A commit that is not pointed by a tag is uninteresting
446 * if we are not limited by path. This means that you will
447 * see the usual "commits that touch the paths" plus any
448 * tagged commit by specifying both --simplify-by-decoration
449 * and pathspec.
451 if (!revs->prune_data.nr)
452 return REV_TREE_SAME;
455 tree_difference = REV_TREE_SAME;
456 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
457 if (diff_tree_oid(&t1->object.oid, &t2->object.oid, "",
458 &revs->pruning) < 0)
459 return REV_TREE_DIFFERENT;
460 return tree_difference;
463 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
465 int retval;
466 struct tree *t1 = commit->tree;
468 if (!t1)
469 return 0;
471 tree_difference = REV_TREE_SAME;
472 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
473 retval = diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
475 return retval >= 0 && (tree_difference == REV_TREE_SAME);
478 struct treesame_state {
479 unsigned int nparents;
480 unsigned char treesame[FLEX_ARRAY];
483 static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
485 unsigned n = commit_list_count(commit->parents);
486 struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
487 st->nparents = n;
488 add_decoration(&revs->treesame, &commit->object, st);
489 return st;
493 * Must be called immediately after removing the nth_parent from a commit's
494 * parent list, if we are maintaining the per-parent treesame[] decoration.
495 * This does not recalculate the master TREESAME flag - update_treesame()
496 * should be called to update it after a sequence of treesame[] modifications
497 * that may have affected it.
499 static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
501 struct treesame_state *st;
502 int old_same;
504 if (!commit->parents) {
506 * Have just removed the only parent from a non-merge.
507 * Different handling, as we lack decoration.
509 if (nth_parent != 0)
510 die("compact_treesame %u", nth_parent);
511 old_same = !!(commit->object.flags & TREESAME);
512 if (rev_same_tree_as_empty(revs, commit))
513 commit->object.flags |= TREESAME;
514 else
515 commit->object.flags &= ~TREESAME;
516 return old_same;
519 st = lookup_decoration(&revs->treesame, &commit->object);
520 if (!st || nth_parent >= st->nparents)
521 die("compact_treesame %u", nth_parent);
523 old_same = st->treesame[nth_parent];
524 memmove(st->treesame + nth_parent,
525 st->treesame + nth_parent + 1,
526 st->nparents - nth_parent - 1);
529 * If we've just become a non-merge commit, update TREESAME
530 * immediately, and remove the no-longer-needed decoration.
531 * If still a merge, defer update until update_treesame().
533 if (--st->nparents == 1) {
534 if (commit->parents->next)
535 die("compact_treesame parents mismatch");
536 if (st->treesame[0] && revs->dense)
537 commit->object.flags |= TREESAME;
538 else
539 commit->object.flags &= ~TREESAME;
540 free(add_decoration(&revs->treesame, &commit->object, NULL));
543 return old_same;
546 static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
548 if (commit->parents && commit->parents->next) {
549 unsigned n;
550 struct treesame_state *st;
551 struct commit_list *p;
552 unsigned relevant_parents;
553 unsigned relevant_change, irrelevant_change;
555 st = lookup_decoration(&revs->treesame, &commit->object);
556 if (!st)
557 die("update_treesame %s", oid_to_hex(&commit->object.oid));
558 relevant_parents = 0;
559 relevant_change = irrelevant_change = 0;
560 for (p = commit->parents, n = 0; p; n++, p = p->next) {
561 if (relevant_commit(p->item)) {
562 relevant_change |= !st->treesame[n];
563 relevant_parents++;
564 } else
565 irrelevant_change |= !st->treesame[n];
567 if (relevant_parents ? relevant_change : irrelevant_change)
568 commit->object.flags &= ~TREESAME;
569 else
570 commit->object.flags |= TREESAME;
573 return commit->object.flags & TREESAME;
576 static inline int limiting_can_increase_treesame(const struct rev_info *revs)
579 * TREESAME is irrelevant unless prune && dense;
580 * if simplify_history is set, we can't have a mixture of TREESAME and
581 * !TREESAME INTERESTING parents (and we don't have treesame[]
582 * decoration anyway);
583 * if first_parent_only is set, then the TREESAME flag is locked
584 * against the first parent (and again we lack treesame[] decoration).
586 return revs->prune && revs->dense &&
587 !revs->simplify_history &&
588 !revs->first_parent_only;
591 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
593 struct commit_list **pp, *parent;
594 struct treesame_state *ts = NULL;
595 int relevant_change = 0, irrelevant_change = 0;
596 int relevant_parents, nth_parent;
599 * If we don't do pruning, everything is interesting
601 if (!revs->prune)
602 return;
604 if (!commit->tree)
605 return;
607 if (!commit->parents) {
608 if (rev_same_tree_as_empty(revs, commit))
609 commit->object.flags |= TREESAME;
610 return;
614 * Normal non-merge commit? If we don't want to make the
615 * history dense, we consider it always to be a change..
617 if (!revs->dense && !commit->parents->next)
618 return;
620 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
621 (parent = *pp) != NULL;
622 pp = &parent->next, nth_parent++) {
623 struct commit *p = parent->item;
624 if (relevant_commit(p))
625 relevant_parents++;
627 if (nth_parent == 1) {
629 * This our second loop iteration - so we now know
630 * we're dealing with a merge.
632 * Do not compare with later parents when we care only about
633 * the first parent chain, in order to avoid derailing the
634 * traversal to follow a side branch that brought everything
635 * in the path we are limited to by the pathspec.
637 if (revs->first_parent_only)
638 break;
640 * If this will remain a potentially-simplifiable
641 * merge, remember per-parent treesame if needed.
642 * Initialise the array with the comparison from our
643 * first iteration.
645 if (revs->treesame.name &&
646 !revs->simplify_history &&
647 !(commit->object.flags & UNINTERESTING)) {
648 ts = initialise_treesame(revs, commit);
649 if (!(irrelevant_change || relevant_change))
650 ts->treesame[0] = 1;
653 if (parse_commit(p) < 0)
654 die("cannot simplify commit %s (because of %s)",
655 oid_to_hex(&commit->object.oid),
656 oid_to_hex(&p->object.oid));
657 switch (rev_compare_tree(revs, p, commit)) {
658 case REV_TREE_SAME:
659 if (!revs->simplify_history || !relevant_commit(p)) {
660 /* Even if a merge with an uninteresting
661 * side branch brought the entire change
662 * we are interested in, we do not want
663 * to lose the other branches of this
664 * merge, so we just keep going.
666 if (ts)
667 ts->treesame[nth_parent] = 1;
668 continue;
670 parent->next = NULL;
671 commit->parents = parent;
672 commit->object.flags |= TREESAME;
673 return;
675 case REV_TREE_NEW:
676 if (revs->remove_empty_trees &&
677 rev_same_tree_as_empty(revs, p)) {
678 /* We are adding all the specified
679 * paths from this parent, so the
680 * history beyond this parent is not
681 * interesting. Remove its parents
682 * (they are grandparents for us).
683 * IOW, we pretend this parent is a
684 * "root" commit.
686 if (parse_commit(p) < 0)
687 die("cannot simplify commit %s (invalid %s)",
688 oid_to_hex(&commit->object.oid),
689 oid_to_hex(&p->object.oid));
690 p->parents = NULL;
692 /* fallthrough */
693 case REV_TREE_OLD:
694 case REV_TREE_DIFFERENT:
695 if (relevant_commit(p))
696 relevant_change = 1;
697 else
698 irrelevant_change = 1;
699 continue;
701 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
705 * TREESAME is straightforward for single-parent commits. For merge
706 * commits, it is most useful to define it so that "irrelevant"
707 * parents cannot make us !TREESAME - if we have any relevant
708 * parents, then we only consider TREESAMEness with respect to them,
709 * allowing irrelevant merges from uninteresting branches to be
710 * simplified away. Only if we have only irrelevant parents do we
711 * base TREESAME on them. Note that this logic is replicated in
712 * update_treesame, which should be kept in sync.
714 if (relevant_parents ? !relevant_change : !irrelevant_change)
715 commit->object.flags |= TREESAME;
718 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
719 struct commit_list *cached_base, struct commit_list **cache)
721 struct commit_list *new_entry;
723 if (cached_base && p->date < cached_base->item->date)
724 new_entry = commit_list_insert_by_date(p, &cached_base->next);
725 else
726 new_entry = commit_list_insert_by_date(p, head);
728 if (cache && (!*cache || p->date < (*cache)->item->date))
729 *cache = new_entry;
732 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
733 struct commit_list **list, struct commit_list **cache_ptr)
735 struct commit_list *parent = commit->parents;
736 unsigned left_flag;
737 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
739 if (commit->object.flags & ADDED)
740 return 0;
741 commit->object.flags |= ADDED;
743 if (revs->include_check &&
744 !revs->include_check(commit, revs->include_check_data))
745 return 0;
748 * If the commit is uninteresting, don't try to
749 * prune parents - we want the maximal uninteresting
750 * set.
752 * Normally we haven't parsed the parent
753 * yet, so we won't have a parent of a parent
754 * here. However, it may turn out that we've
755 * reached this commit some other way (where it
756 * wasn't uninteresting), in which case we need
757 * to mark its parents recursively too..
759 if (commit->object.flags & UNINTERESTING) {
760 while (parent) {
761 struct commit *p = parent->item;
762 parent = parent->next;
763 if (p)
764 p->object.flags |= UNINTERESTING;
765 if (parse_commit_gently(p, 1) < 0)
766 continue;
767 if (p->parents)
768 mark_parents_uninteresting(p);
769 if (p->object.flags & SEEN)
770 continue;
771 p->object.flags |= SEEN;
772 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
774 return 0;
778 * Ok, the commit wasn't uninteresting. Try to
779 * simplify the commit history and find the parent
780 * that has no differences in the path set if one exists.
782 try_to_simplify_commit(revs, commit);
784 if (revs->no_walk)
785 return 0;
787 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
789 for (parent = commit->parents; parent; parent = parent->next) {
790 struct commit *p = parent->item;
792 if (parse_commit_gently(p, revs->ignore_missing_links) < 0)
793 return -1;
794 if (revs->show_source && !p->util)
795 p->util = commit->util;
796 p->object.flags |= left_flag;
797 if (!(p->object.flags & SEEN)) {
798 p->object.flags |= SEEN;
799 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
801 if (revs->first_parent_only)
802 break;
804 return 0;
807 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
809 struct commit_list *p;
810 int left_count = 0, right_count = 0;
811 int left_first;
812 struct patch_ids ids;
813 unsigned cherry_flag;
815 /* First count the commits on the left and on the right */
816 for (p = list; p; p = p->next) {
817 struct commit *commit = p->item;
818 unsigned flags = commit->object.flags;
819 if (flags & BOUNDARY)
821 else if (flags & SYMMETRIC_LEFT)
822 left_count++;
823 else
824 right_count++;
827 if (!left_count || !right_count)
828 return;
830 left_first = left_count < right_count;
831 init_patch_ids(&ids);
832 ids.diffopts.pathspec = revs->diffopt.pathspec;
834 /* Compute patch-ids for one side */
835 for (p = list; p; p = p->next) {
836 struct commit *commit = p->item;
837 unsigned flags = commit->object.flags;
839 if (flags & BOUNDARY)
840 continue;
842 * If we have fewer left, left_first is set and we omit
843 * commits on the right branch in this loop. If we have
844 * fewer right, we skip the left ones.
846 if (left_first != !!(flags & SYMMETRIC_LEFT))
847 continue;
848 add_commit_patch_id(commit, &ids);
851 /* either cherry_mark or cherry_pick are true */
852 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
854 /* Check the other side */
855 for (p = list; p; p = p->next) {
856 struct commit *commit = p->item;
857 struct patch_id *id;
858 unsigned flags = commit->object.flags;
860 if (flags & BOUNDARY)
861 continue;
863 * If we have fewer left, left_first is set and we omit
864 * commits on the left branch in this loop.
866 if (left_first == !!(flags & SYMMETRIC_LEFT))
867 continue;
870 * Have we seen the same patch id?
872 id = has_commit_patch_id(commit, &ids);
873 if (!id)
874 continue;
876 commit->object.flags |= cherry_flag;
877 id->commit->object.flags |= cherry_flag;
880 free_patch_ids(&ids);
883 /* How many extra uninteresting commits we want to see.. */
884 #define SLOP 5
886 static int still_interesting(struct commit_list *src, timestamp_t date, int slop,
887 struct commit **interesting_cache)
890 * No source list at all? We're definitely done..
892 if (!src)
893 return 0;
896 * Does the destination list contain entries with a date
897 * before the source list? Definitely _not_ done.
899 if (date <= src->item->date)
900 return SLOP;
903 * Does the source list still have interesting commits in
904 * it? Definitely not done..
906 if (!everybody_uninteresting(src, interesting_cache))
907 return SLOP;
909 /* Ok, we're closing in.. */
910 return slop-1;
914 * "rev-list --ancestry-path A..B" computes commits that are ancestors
915 * of B but not ancestors of A but further limits the result to those
916 * that are descendants of A. This takes the list of bottom commits and
917 * the result of "A..B" without --ancestry-path, and limits the latter
918 * further to the ones that can reach one of the commits in "bottom".
920 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
922 struct commit_list *p;
923 struct commit_list *rlist = NULL;
924 int made_progress;
927 * Reverse the list so that it will be likely that we would
928 * process parents before children.
930 for (p = list; p; p = p->next)
931 commit_list_insert(p->item, &rlist);
933 for (p = bottom; p; p = p->next)
934 p->item->object.flags |= TMP_MARK;
937 * Mark the ones that can reach bottom commits in "list",
938 * in a bottom-up fashion.
940 do {
941 made_progress = 0;
942 for (p = rlist; p; p = p->next) {
943 struct commit *c = p->item;
944 struct commit_list *parents;
945 if (c->object.flags & (TMP_MARK | UNINTERESTING))
946 continue;
947 for (parents = c->parents;
948 parents;
949 parents = parents->next) {
950 if (!(parents->item->object.flags & TMP_MARK))
951 continue;
952 c->object.flags |= TMP_MARK;
953 made_progress = 1;
954 break;
957 } while (made_progress);
960 * NEEDSWORK: decide if we want to remove parents that are
961 * not marked with TMP_MARK from commit->parents for commits
962 * in the resulting list. We may not want to do that, though.
966 * The ones that are not marked with TMP_MARK are uninteresting
968 for (p = list; p; p = p->next) {
969 struct commit *c = p->item;
970 if (c->object.flags & TMP_MARK)
971 continue;
972 c->object.flags |= UNINTERESTING;
975 /* We are done with the TMP_MARK */
976 for (p = list; p; p = p->next)
977 p->item->object.flags &= ~TMP_MARK;
978 for (p = bottom; p; p = p->next)
979 p->item->object.flags &= ~TMP_MARK;
980 free_commit_list(rlist);
984 * Before walking the history, keep the set of "negative" refs the
985 * caller has asked to exclude.
987 * This is used to compute "rev-list --ancestry-path A..B", as we need
988 * to filter the result of "A..B" further to the ones that can actually
989 * reach A.
991 static struct commit_list *collect_bottom_commits(struct commit_list *list)
993 struct commit_list *elem, *bottom = NULL;
994 for (elem = list; elem; elem = elem->next)
995 if (elem->item->object.flags & BOTTOM)
996 commit_list_insert(elem->item, &bottom);
997 return bottom;
1000 /* Assumes either left_only or right_only is set */
1001 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1003 struct commit_list *p;
1005 for (p = list; p; p = p->next) {
1006 struct commit *commit = p->item;
1008 if (revs->right_only) {
1009 if (commit->object.flags & SYMMETRIC_LEFT)
1010 commit->object.flags |= SHOWN;
1011 } else /* revs->left_only is set */
1012 if (!(commit->object.flags & SYMMETRIC_LEFT))
1013 commit->object.flags |= SHOWN;
1017 static int limit_list(struct rev_info *revs)
1019 int slop = SLOP;
1020 timestamp_t date = TIME_MAX;
1021 struct commit_list *list = revs->commits;
1022 struct commit_list *newlist = NULL;
1023 struct commit_list **p = &newlist;
1024 struct commit_list *bottom = NULL;
1025 struct commit *interesting_cache = NULL;
1027 if (revs->ancestry_path) {
1028 bottom = collect_bottom_commits(list);
1029 if (!bottom)
1030 die("--ancestry-path given but there are no bottom commits");
1033 while (list) {
1034 struct commit *commit = pop_commit(&list);
1035 struct object *obj = &commit->object;
1036 show_early_output_fn_t show;
1038 if (commit == interesting_cache)
1039 interesting_cache = NULL;
1041 if (revs->max_age != -1 && (commit->date < revs->max_age))
1042 obj->flags |= UNINTERESTING;
1043 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
1044 return -1;
1045 if (obj->flags & UNINTERESTING) {
1046 mark_parents_uninteresting(commit);
1047 if (revs->show_all)
1048 p = &commit_list_insert(commit, p)->next;
1049 slop = still_interesting(list, date, slop, &interesting_cache);
1050 if (slop)
1051 continue;
1052 /* If showing all, add the whole pending list to the end */
1053 if (revs->show_all)
1054 *p = list;
1055 break;
1057 if (revs->min_age != -1 && (commit->date > revs->min_age))
1058 continue;
1059 date = commit->date;
1060 p = &commit_list_insert(commit, p)->next;
1062 show = show_early_output;
1063 if (!show)
1064 continue;
1066 show(revs, newlist);
1067 show_early_output = NULL;
1069 if (revs->cherry_pick || revs->cherry_mark)
1070 cherry_pick_list(newlist, revs);
1072 if (revs->left_only || revs->right_only)
1073 limit_left_right(newlist, revs);
1075 if (bottom) {
1076 limit_to_ancestry(bottom, newlist);
1077 free_commit_list(bottom);
1081 * Check if any commits have become TREESAME by some of their parents
1082 * becoming UNINTERESTING.
1084 if (limiting_can_increase_treesame(revs))
1085 for (list = newlist; list; list = list->next) {
1086 struct commit *c = list->item;
1087 if (c->object.flags & (UNINTERESTING | TREESAME))
1088 continue;
1089 update_treesame(revs, c);
1092 revs->commits = newlist;
1093 return 0;
1097 * Add an entry to refs->cmdline with the specified information.
1098 * *name is copied.
1100 static void add_rev_cmdline(struct rev_info *revs,
1101 struct object *item,
1102 const char *name,
1103 int whence,
1104 unsigned flags)
1106 struct rev_cmdline_info *info = &revs->cmdline;
1107 int nr = info->nr;
1109 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1110 info->rev[nr].item = item;
1111 info->rev[nr].name = xstrdup(name);
1112 info->rev[nr].whence = whence;
1113 info->rev[nr].flags = flags;
1114 info->nr++;
1117 static void add_rev_cmdline_list(struct rev_info *revs,
1118 struct commit_list *commit_list,
1119 int whence,
1120 unsigned flags)
1122 while (commit_list) {
1123 struct object *object = &commit_list->item->object;
1124 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1125 whence, flags);
1126 commit_list = commit_list->next;
1130 struct all_refs_cb {
1131 int all_flags;
1132 int warned_bad_reflog;
1133 struct rev_info *all_revs;
1134 const char *name_for_errormsg;
1137 int ref_excluded(struct string_list *ref_excludes, const char *path)
1139 struct string_list_item *item;
1141 if (!ref_excludes)
1142 return 0;
1143 for_each_string_list_item(item, ref_excludes) {
1144 if (!wildmatch(item->string, path, 0))
1145 return 1;
1147 return 0;
1150 static int handle_one_ref(const char *path, const struct object_id *oid,
1151 int flag, void *cb_data)
1153 struct all_refs_cb *cb = cb_data;
1154 struct object *object;
1156 if (ref_excluded(cb->all_revs->ref_excludes, path))
1157 return 0;
1159 object = get_reference(cb->all_revs, path, oid, cb->all_flags);
1160 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1161 add_pending_oid(cb->all_revs, path, oid, cb->all_flags);
1162 return 0;
1165 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1166 unsigned flags)
1168 cb->all_revs = revs;
1169 cb->all_flags = flags;
1170 revs->rev_input_given = 1;
1173 void clear_ref_exclusion(struct string_list **ref_excludes_p)
1175 if (*ref_excludes_p) {
1176 string_list_clear(*ref_excludes_p, 0);
1177 free(*ref_excludes_p);
1179 *ref_excludes_p = NULL;
1182 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1184 if (!*ref_excludes_p) {
1185 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1186 (*ref_excludes_p)->strdup_strings = 1;
1188 string_list_append(*ref_excludes_p, exclude);
1191 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1192 int (*for_each)(const char *, each_ref_fn, void *))
1194 struct all_refs_cb cb;
1195 init_all_refs_cb(&cb, revs, flags);
1196 for_each(submodule, handle_one_ref, &cb);
1199 static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
1201 struct all_refs_cb *cb = cb_data;
1202 if (!is_null_oid(oid)) {
1203 struct object *o = parse_object(oid);
1204 if (o) {
1205 o->flags |= cb->all_flags;
1206 /* ??? CMDLINEFLAGS ??? */
1207 add_pending_object(cb->all_revs, o, "");
1209 else if (!cb->warned_bad_reflog) {
1210 warning("reflog of '%s' references pruned commits",
1211 cb->name_for_errormsg);
1212 cb->warned_bad_reflog = 1;
1217 static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
1218 const char *email, timestamp_t timestamp, int tz,
1219 const char *message, void *cb_data)
1221 handle_one_reflog_commit(ooid, cb_data);
1222 handle_one_reflog_commit(noid, cb_data);
1223 return 0;
1226 static int handle_one_reflog(const char *path, const struct object_id *oid,
1227 int flag, void *cb_data)
1229 struct all_refs_cb *cb = cb_data;
1230 cb->warned_bad_reflog = 0;
1231 cb->name_for_errormsg = path;
1232 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1233 return 0;
1236 void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1238 struct all_refs_cb cb;
1240 cb.all_revs = revs;
1241 cb.all_flags = flags;
1242 for_each_reflog(handle_one_reflog, &cb);
1245 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1246 struct strbuf *path)
1248 size_t baselen = path->len;
1249 int i;
1251 if (it->entry_count >= 0) {
1252 struct tree *tree = lookup_tree(&it->oid);
1253 add_pending_object_with_path(revs, &tree->object, "",
1254 040000, path->buf);
1257 for (i = 0; i < it->subtree_nr; i++) {
1258 struct cache_tree_sub *sub = it->down[i];
1259 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1260 add_cache_tree(sub->cache_tree, revs, path);
1261 strbuf_setlen(path, baselen);
1266 void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
1268 int i;
1270 read_cache();
1271 for (i = 0; i < active_nr; i++) {
1272 struct cache_entry *ce = active_cache[i];
1273 struct blob *blob;
1275 if (S_ISGITLINK(ce->ce_mode))
1276 continue;
1278 blob = lookup_blob(&ce->oid);
1279 if (!blob)
1280 die("unable to add index blob to traversal");
1281 add_pending_object_with_path(revs, &blob->object, "",
1282 ce->ce_mode, ce->name);
1285 if (active_cache_tree) {
1286 struct strbuf path = STRBUF_INIT;
1287 add_cache_tree(active_cache_tree, revs, &path);
1288 strbuf_release(&path);
1292 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1293 int exclude_parent)
1295 struct object_id oid;
1296 struct object *it;
1297 struct commit *commit;
1298 struct commit_list *parents;
1299 int parent_number;
1300 const char *arg = arg_;
1302 if (*arg == '^') {
1303 flags ^= UNINTERESTING | BOTTOM;
1304 arg++;
1306 if (get_oid_committish(arg, &oid))
1307 return 0;
1308 while (1) {
1309 it = get_reference(revs, arg, &oid, 0);
1310 if (!it && revs->ignore_missing)
1311 return 0;
1312 if (it->type != OBJ_TAG)
1313 break;
1314 if (!((struct tag*)it)->tagged)
1315 return 0;
1316 oidcpy(&oid, &((struct tag*)it)->tagged->oid);
1318 if (it->type != OBJ_COMMIT)
1319 return 0;
1320 commit = (struct commit *)it;
1321 if (exclude_parent &&
1322 exclude_parent > commit_list_count(commit->parents))
1323 return 0;
1324 for (parents = commit->parents, parent_number = 1;
1325 parents;
1326 parents = parents->next, parent_number++) {
1327 if (exclude_parent && parent_number != exclude_parent)
1328 continue;
1330 it = &parents->item->object;
1331 it->flags |= flags;
1332 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1333 add_pending_object(revs, it, arg);
1335 return 1;
1338 void init_revisions(struct rev_info *revs, const char *prefix)
1340 memset(revs, 0, sizeof(*revs));
1342 revs->abbrev = DEFAULT_ABBREV;
1343 revs->ignore_merges = 1;
1344 revs->simplify_history = 1;
1345 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1346 DIFF_OPT_SET(&revs->pruning, QUICK);
1347 revs->pruning.add_remove = file_add_remove;
1348 revs->pruning.change = file_change;
1349 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1350 revs->dense = 1;
1351 revs->prefix = prefix;
1352 revs->max_age = -1;
1353 revs->min_age = -1;
1354 revs->skip_count = -1;
1355 revs->max_count = -1;
1356 revs->max_parents = -1;
1357 revs->expand_tabs_in_log = -1;
1359 revs->commit_format = CMIT_FMT_DEFAULT;
1360 revs->expand_tabs_in_log_default = 8;
1362 init_grep_defaults();
1363 grep_init(&revs->grep_filter, prefix);
1364 revs->grep_filter.status_only = 1;
1366 diff_setup(&revs->diffopt);
1367 if (prefix && !revs->diffopt.prefix) {
1368 revs->diffopt.prefix = prefix;
1369 revs->diffopt.prefix_length = strlen(prefix);
1372 revs->notes_opt.use_default_notes = -1;
1375 static void add_pending_commit_list(struct rev_info *revs,
1376 struct commit_list *commit_list,
1377 unsigned int flags)
1379 while (commit_list) {
1380 struct object *object = &commit_list->item->object;
1381 object->flags |= flags;
1382 add_pending_object(revs, object, oid_to_hex(&object->oid));
1383 commit_list = commit_list->next;
1387 static void prepare_show_merge(struct rev_info *revs)
1389 struct commit_list *bases;
1390 struct commit *head, *other;
1391 struct object_id oid;
1392 const char **prune = NULL;
1393 int i, prune_num = 1; /* counting terminating NULL */
1395 if (get_oid("HEAD", &oid))
1396 die("--merge without HEAD?");
1397 head = lookup_commit_or_die(&oid, "HEAD");
1398 if (get_oid("MERGE_HEAD", &oid))
1399 die("--merge without MERGE_HEAD?");
1400 other = lookup_commit_or_die(&oid, "MERGE_HEAD");
1401 add_pending_object(revs, &head->object, "HEAD");
1402 add_pending_object(revs, &other->object, "MERGE_HEAD");
1403 bases = get_merge_bases(head, other);
1404 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1405 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1406 free_commit_list(bases);
1407 head->object.flags |= SYMMETRIC_LEFT;
1409 if (!active_nr)
1410 read_cache();
1411 for (i = 0; i < active_nr; i++) {
1412 const struct cache_entry *ce = active_cache[i];
1413 if (!ce_stage(ce))
1414 continue;
1415 if (ce_path_match(ce, &revs->prune_data, NULL)) {
1416 prune_num++;
1417 REALLOC_ARRAY(prune, prune_num);
1418 prune[prune_num-2] = ce->name;
1419 prune[prune_num-1] = NULL;
1421 while ((i+1 < active_nr) &&
1422 ce_same_name(ce, active_cache[i+1]))
1423 i++;
1425 clear_pathspec(&revs->prune_data);
1426 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1427 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1428 revs->limited = 1;
1431 static int dotdot_missing(const char *arg, char *dotdot,
1432 struct rev_info *revs, int symmetric)
1434 if (revs->ignore_missing)
1435 return 0;
1436 /* de-munge so we report the full argument */
1437 *dotdot = '.';
1438 die(symmetric
1439 ? "Invalid symmetric difference expression %s"
1440 : "Invalid revision range %s", arg);
1443 static int handle_dotdot_1(const char *arg, char *dotdot,
1444 struct rev_info *revs, int flags,
1445 int cant_be_filename,
1446 struct object_context *a_oc,
1447 struct object_context *b_oc)
1449 const char *a_name, *b_name;
1450 struct object_id a_oid, b_oid;
1451 struct object *a_obj, *b_obj;
1452 unsigned int a_flags, b_flags;
1453 int symmetric = 0;
1454 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1455 unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH;
1457 a_name = arg;
1458 if (!*a_name)
1459 a_name = "HEAD";
1461 b_name = dotdot + 2;
1462 if (*b_name == '.') {
1463 symmetric = 1;
1464 b_name++;
1466 if (!*b_name)
1467 b_name = "HEAD";
1469 if (get_oid_with_context(a_name, oc_flags, &a_oid, a_oc) ||
1470 get_oid_with_context(b_name, oc_flags, &b_oid, b_oc))
1471 return -1;
1473 if (!cant_be_filename) {
1474 *dotdot = '.';
1475 verify_non_filename(revs->prefix, arg);
1476 *dotdot = '\0';
1479 a_obj = parse_object(&a_oid);
1480 b_obj = parse_object(&b_oid);
1481 if (!a_obj || !b_obj)
1482 return dotdot_missing(arg, dotdot, revs, symmetric);
1484 if (!symmetric) {
1485 /* just A..B */
1486 b_flags = flags;
1487 a_flags = flags_exclude;
1488 } else {
1489 /* A...B -- find merge bases between the two */
1490 struct commit *a, *b;
1491 struct commit_list *exclude;
1493 a = lookup_commit_reference(&a_obj->oid);
1494 b = lookup_commit_reference(&b_obj->oid);
1495 if (!a || !b)
1496 return dotdot_missing(arg, dotdot, revs, symmetric);
1498 exclude = get_merge_bases(a, b);
1499 add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE,
1500 flags_exclude);
1501 add_pending_commit_list(revs, exclude, flags_exclude);
1502 free_commit_list(exclude);
1504 b_flags = flags;
1505 a_flags = flags | SYMMETRIC_LEFT;
1508 a_obj->flags |= a_flags;
1509 b_obj->flags |= b_flags;
1510 add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
1511 add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
1512 add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path);
1513 add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path);
1514 return 0;
1517 static int handle_dotdot(const char *arg,
1518 struct rev_info *revs, int flags,
1519 int cant_be_filename)
1521 struct object_context a_oc, b_oc;
1522 char *dotdot = strstr(arg, "..");
1523 int ret;
1525 if (!dotdot)
1526 return -1;
1528 memset(&a_oc, 0, sizeof(a_oc));
1529 memset(&b_oc, 0, sizeof(b_oc));
1531 *dotdot = '\0';
1532 ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename,
1533 &a_oc, &b_oc);
1534 *dotdot = '.';
1536 free(a_oc.path);
1537 free(b_oc.path);
1539 return ret;
1542 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1544 struct object_context oc;
1545 char *mark;
1546 struct object *object;
1547 struct object_id oid;
1548 int local_flags;
1549 const char *arg = arg_;
1550 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1551 unsigned get_sha1_flags = GET_OID_RECORD_PATH;
1553 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1555 if (!cant_be_filename && !strcmp(arg, "..")) {
1557 * Just ".."? That is not a range but the
1558 * pathspec for the parent directory.
1560 return -1;
1563 if (!handle_dotdot(arg, revs, flags, revarg_opt))
1564 return 0;
1566 mark = strstr(arg, "^@");
1567 if (mark && !mark[2]) {
1568 *mark = 0;
1569 if (add_parents_only(revs, arg, flags, 0))
1570 return 0;
1571 *mark = '^';
1573 mark = strstr(arg, "^!");
1574 if (mark && !mark[2]) {
1575 *mark = 0;
1576 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0))
1577 *mark = '^';
1579 mark = strstr(arg, "^-");
1580 if (mark) {
1581 int exclude_parent = 1;
1583 if (mark[2]) {
1584 char *end;
1585 exclude_parent = strtoul(mark + 2, &end, 10);
1586 if (*end != '\0' || !exclude_parent)
1587 return -1;
1590 *mark = 0;
1591 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent))
1592 *mark = '^';
1595 local_flags = 0;
1596 if (*arg == '^') {
1597 local_flags = UNINTERESTING | BOTTOM;
1598 arg++;
1601 if (revarg_opt & REVARG_COMMITTISH)
1602 get_sha1_flags |= GET_OID_COMMITTISH;
1604 if (get_oid_with_context(arg, get_sha1_flags, &oid, &oc))
1605 return revs->ignore_missing ? 0 : -1;
1606 if (!cant_be_filename)
1607 verify_non_filename(revs->prefix, arg);
1608 object = get_reference(revs, arg, &oid, flags ^ local_flags);
1609 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1610 add_pending_object_with_path(revs, object, arg, oc.mode, oc.path);
1611 free(oc.path);
1612 return 0;
1615 struct cmdline_pathspec {
1616 int alloc;
1617 int nr;
1618 const char **path;
1621 static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1623 while (*av) {
1624 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1625 prune->path[prune->nr++] = *(av++);
1629 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1630 struct cmdline_pathspec *prune)
1632 while (strbuf_getline(sb, stdin) != EOF) {
1633 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1634 prune->path[prune->nr++] = xstrdup(sb->buf);
1638 static void read_revisions_from_stdin(struct rev_info *revs,
1639 struct cmdline_pathspec *prune)
1641 struct strbuf sb;
1642 int seen_dashdash = 0;
1643 int save_warning;
1645 save_warning = warn_on_object_refname_ambiguity;
1646 warn_on_object_refname_ambiguity = 0;
1648 strbuf_init(&sb, 1000);
1649 while (strbuf_getline(&sb, stdin) != EOF) {
1650 int len = sb.len;
1651 if (!len)
1652 break;
1653 if (sb.buf[0] == '-') {
1654 if (len == 2 && sb.buf[1] == '-') {
1655 seen_dashdash = 1;
1656 break;
1658 die("options not supported in --stdin mode");
1660 if (handle_revision_arg(sb.buf, revs, 0,
1661 REVARG_CANNOT_BE_FILENAME))
1662 die("bad revision '%s'", sb.buf);
1664 if (seen_dashdash)
1665 read_pathspec_from_stdin(revs, &sb, prune);
1667 strbuf_release(&sb);
1668 warn_on_object_refname_ambiguity = save_warning;
1671 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1673 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1676 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1678 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1681 static void add_message_grep(struct rev_info *revs, const char *pattern)
1683 add_grep(revs, pattern, GREP_PATTERN_BODY);
1686 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1687 int *unkc, const char **unkv)
1689 const char *arg = argv[0];
1690 const char *optarg;
1691 int argcount;
1693 /* pseudo revision arguments */
1694 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1695 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1696 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1697 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1698 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
1699 !strcmp(arg, "--indexed-objects") ||
1700 starts_with(arg, "--exclude=") ||
1701 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1702 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
1704 unkv[(*unkc)++] = arg;
1705 return 1;
1708 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1709 revs->max_count = atoi(optarg);
1710 revs->no_walk = 0;
1711 return argcount;
1712 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1713 revs->skip_count = atoi(optarg);
1714 return argcount;
1715 } else if ((*arg == '-') && isdigit(arg[1])) {
1716 /* accept -<digit>, like traditional "head" */
1717 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1718 revs->max_count < 0)
1719 die("'%s': not a non-negative integer", arg + 1);
1720 revs->no_walk = 0;
1721 } else if (!strcmp(arg, "-n")) {
1722 if (argc <= 1)
1723 return error("-n requires an argument");
1724 revs->max_count = atoi(argv[1]);
1725 revs->no_walk = 0;
1726 return 2;
1727 } else if (skip_prefix(arg, "-n", &optarg)) {
1728 revs->max_count = atoi(optarg);
1729 revs->no_walk = 0;
1730 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1731 revs->max_age = atoi(optarg);
1732 return argcount;
1733 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1734 revs->max_age = approxidate(optarg);
1735 return argcount;
1736 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1737 revs->max_age = approxidate(optarg);
1738 return argcount;
1739 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1740 revs->min_age = atoi(optarg);
1741 return argcount;
1742 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1743 revs->min_age = approxidate(optarg);
1744 return argcount;
1745 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1746 revs->min_age = approxidate(optarg);
1747 return argcount;
1748 } else if (!strcmp(arg, "--first-parent")) {
1749 revs->first_parent_only = 1;
1750 } else if (!strcmp(arg, "--ancestry-path")) {
1751 revs->ancestry_path = 1;
1752 revs->simplify_history = 0;
1753 revs->limited = 1;
1754 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1755 init_reflog_walk(&revs->reflog_info);
1756 } else if (!strcmp(arg, "--default")) {
1757 if (argc <= 1)
1758 return error("bad --default argument");
1759 revs->def = argv[1];
1760 return 2;
1761 } else if (!strcmp(arg, "--merge")) {
1762 revs->show_merge = 1;
1763 } else if (!strcmp(arg, "--topo-order")) {
1764 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1765 revs->topo_order = 1;
1766 } else if (!strcmp(arg, "--simplify-merges")) {
1767 revs->simplify_merges = 1;
1768 revs->topo_order = 1;
1769 revs->rewrite_parents = 1;
1770 revs->simplify_history = 0;
1771 revs->limited = 1;
1772 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1773 revs->simplify_merges = 1;
1774 revs->topo_order = 1;
1775 revs->rewrite_parents = 1;
1776 revs->simplify_history = 0;
1777 revs->simplify_by_decoration = 1;
1778 revs->limited = 1;
1779 revs->prune = 1;
1780 load_ref_decorations(DECORATE_SHORT_REFS);
1781 } else if (!strcmp(arg, "--date-order")) {
1782 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
1783 revs->topo_order = 1;
1784 } else if (!strcmp(arg, "--author-date-order")) {
1785 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
1786 revs->topo_order = 1;
1787 } else if (!strcmp(arg, "--early-output")) {
1788 revs->early_output = 100;
1789 revs->topo_order = 1;
1790 } else if (skip_prefix(arg, "--early-output=", &optarg)) {
1791 if (strtoul_ui(optarg, 10, &revs->early_output) < 0)
1792 die("'%s': not a non-negative integer", optarg);
1793 revs->topo_order = 1;
1794 } else if (!strcmp(arg, "--parents")) {
1795 revs->rewrite_parents = 1;
1796 revs->print_parents = 1;
1797 } else if (!strcmp(arg, "--dense")) {
1798 revs->dense = 1;
1799 } else if (!strcmp(arg, "--sparse")) {
1800 revs->dense = 0;
1801 } else if (!strcmp(arg, "--show-all")) {
1802 revs->show_all = 1;
1803 } else if (!strcmp(arg, "--remove-empty")) {
1804 revs->remove_empty_trees = 1;
1805 } else if (!strcmp(arg, "--merges")) {
1806 revs->min_parents = 2;
1807 } else if (!strcmp(arg, "--no-merges")) {
1808 revs->max_parents = 1;
1809 } else if (skip_prefix(arg, "--min-parents=", &optarg)) {
1810 revs->min_parents = atoi(optarg);
1811 } else if (!strcmp(arg, "--no-min-parents")) {
1812 revs->min_parents = 0;
1813 } else if (skip_prefix(arg, "--max-parents=", &optarg)) {
1814 revs->max_parents = atoi(optarg);
1815 } else if (!strcmp(arg, "--no-max-parents")) {
1816 revs->max_parents = -1;
1817 } else if (!strcmp(arg, "--boundary")) {
1818 revs->boundary = 1;
1819 } else if (!strcmp(arg, "--left-right")) {
1820 revs->left_right = 1;
1821 } else if (!strcmp(arg, "--left-only")) {
1822 if (revs->right_only)
1823 die("--left-only is incompatible with --right-only"
1824 " or --cherry");
1825 revs->left_only = 1;
1826 } else if (!strcmp(arg, "--right-only")) {
1827 if (revs->left_only)
1828 die("--right-only is incompatible with --left-only");
1829 revs->right_only = 1;
1830 } else if (!strcmp(arg, "--cherry")) {
1831 if (revs->left_only)
1832 die("--cherry is incompatible with --left-only");
1833 revs->cherry_mark = 1;
1834 revs->right_only = 1;
1835 revs->max_parents = 1;
1836 revs->limited = 1;
1837 } else if (!strcmp(arg, "--count")) {
1838 revs->count = 1;
1839 } else if (!strcmp(arg, "--cherry-mark")) {
1840 if (revs->cherry_pick)
1841 die("--cherry-mark is incompatible with --cherry-pick");
1842 revs->cherry_mark = 1;
1843 revs->limited = 1; /* needs limit_list() */
1844 } else if (!strcmp(arg, "--cherry-pick")) {
1845 if (revs->cherry_mark)
1846 die("--cherry-pick is incompatible with --cherry-mark");
1847 revs->cherry_pick = 1;
1848 revs->limited = 1;
1849 } else if (!strcmp(arg, "--objects")) {
1850 revs->tag_objects = 1;
1851 revs->tree_objects = 1;
1852 revs->blob_objects = 1;
1853 } else if (!strcmp(arg, "--objects-edge")) {
1854 revs->tag_objects = 1;
1855 revs->tree_objects = 1;
1856 revs->blob_objects = 1;
1857 revs->edge_hint = 1;
1858 } else if (!strcmp(arg, "--objects-edge-aggressive")) {
1859 revs->tag_objects = 1;
1860 revs->tree_objects = 1;
1861 revs->blob_objects = 1;
1862 revs->edge_hint = 1;
1863 revs->edge_hint_aggressive = 1;
1864 } else if (!strcmp(arg, "--verify-objects")) {
1865 revs->tag_objects = 1;
1866 revs->tree_objects = 1;
1867 revs->blob_objects = 1;
1868 revs->verify_objects = 1;
1869 } else if (!strcmp(arg, "--unpacked")) {
1870 revs->unpacked = 1;
1871 } else if (starts_with(arg, "--unpacked=")) {
1872 die("--unpacked=<packfile> no longer supported.");
1873 } else if (!strcmp(arg, "-r")) {
1874 revs->diff = 1;
1875 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1876 } else if (!strcmp(arg, "-t")) {
1877 revs->diff = 1;
1878 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1879 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1880 } else if (!strcmp(arg, "-m")) {
1881 revs->ignore_merges = 0;
1882 } else if (!strcmp(arg, "-c")) {
1883 revs->diff = 1;
1884 revs->dense_combined_merges = 0;
1885 revs->combine_merges = 1;
1886 } else if (!strcmp(arg, "--cc")) {
1887 revs->diff = 1;
1888 revs->dense_combined_merges = 1;
1889 revs->combine_merges = 1;
1890 } else if (!strcmp(arg, "-v")) {
1891 revs->verbose_header = 1;
1892 } else if (!strcmp(arg, "--pretty")) {
1893 revs->verbose_header = 1;
1894 revs->pretty_given = 1;
1895 get_commit_format(NULL, revs);
1896 } else if (skip_prefix(arg, "--pretty=", &optarg) ||
1897 skip_prefix(arg, "--format=", &optarg)) {
1899 * Detached form ("--pretty X" as opposed to "--pretty=X")
1900 * not allowed, since the argument is optional.
1902 revs->verbose_header = 1;
1903 revs->pretty_given = 1;
1904 get_commit_format(optarg, revs);
1905 } else if (!strcmp(arg, "--expand-tabs")) {
1906 revs->expand_tabs_in_log = 8;
1907 } else if (!strcmp(arg, "--no-expand-tabs")) {
1908 revs->expand_tabs_in_log = 0;
1909 } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
1910 int val;
1911 if (strtol_i(arg, 10, &val) < 0 || val < 0)
1912 die("'%s': not a non-negative integer", arg);
1913 revs->expand_tabs_in_log = val;
1914 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1915 revs->show_notes = 1;
1916 revs->show_notes_given = 1;
1917 revs->notes_opt.use_default_notes = 1;
1918 } else if (!strcmp(arg, "--show-signature")) {
1919 revs->show_signature = 1;
1920 } else if (!strcmp(arg, "--no-show-signature")) {
1921 revs->show_signature = 0;
1922 } else if (!strcmp(arg, "--show-linear-break")) {
1923 revs->break_bar = " ..........";
1924 revs->track_linear = 1;
1925 revs->track_first_time = 1;
1926 } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) {
1927 revs->break_bar = xstrdup(optarg);
1928 revs->track_linear = 1;
1929 revs->track_first_time = 1;
1930 } else if (skip_prefix(arg, "--show-notes=", &optarg) ||
1931 skip_prefix(arg, "--notes=", &optarg)) {
1932 struct strbuf buf = STRBUF_INIT;
1933 revs->show_notes = 1;
1934 revs->show_notes_given = 1;
1935 if (starts_with(arg, "--show-notes=") &&
1936 revs->notes_opt.use_default_notes < 0)
1937 revs->notes_opt.use_default_notes = 1;
1938 strbuf_addstr(&buf, optarg);
1939 expand_notes_ref(&buf);
1940 string_list_append(&revs->notes_opt.extra_notes_refs,
1941 strbuf_detach(&buf, NULL));
1942 } else if (!strcmp(arg, "--no-notes")) {
1943 revs->show_notes = 0;
1944 revs->show_notes_given = 1;
1945 revs->notes_opt.use_default_notes = -1;
1946 /* we have been strdup'ing ourselves, so trick
1947 * string_list into free()ing strings */
1948 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1949 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1950 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1951 } else if (!strcmp(arg, "--standard-notes")) {
1952 revs->show_notes_given = 1;
1953 revs->notes_opt.use_default_notes = 1;
1954 } else if (!strcmp(arg, "--no-standard-notes")) {
1955 revs->notes_opt.use_default_notes = 0;
1956 } else if (!strcmp(arg, "--oneline")) {
1957 revs->verbose_header = 1;
1958 get_commit_format("oneline", revs);
1959 revs->pretty_given = 1;
1960 revs->abbrev_commit = 1;
1961 } else if (!strcmp(arg, "--graph")) {
1962 revs->topo_order = 1;
1963 revs->rewrite_parents = 1;
1964 revs->graph = graph_init(revs);
1965 } else if (!strcmp(arg, "--root")) {
1966 revs->show_root_diff = 1;
1967 } else if (!strcmp(arg, "--no-commit-id")) {
1968 revs->no_commit_id = 1;
1969 } else if (!strcmp(arg, "--always")) {
1970 revs->always_show_header = 1;
1971 } else if (!strcmp(arg, "--no-abbrev")) {
1972 revs->abbrev = 0;
1973 } else if (!strcmp(arg, "--abbrev")) {
1974 revs->abbrev = DEFAULT_ABBREV;
1975 } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
1976 revs->abbrev = strtoul(optarg, NULL, 10);
1977 if (revs->abbrev < MINIMUM_ABBREV)
1978 revs->abbrev = MINIMUM_ABBREV;
1979 else if (revs->abbrev > 40)
1980 revs->abbrev = 40;
1981 } else if (!strcmp(arg, "--abbrev-commit")) {
1982 revs->abbrev_commit = 1;
1983 revs->abbrev_commit_given = 1;
1984 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1985 revs->abbrev_commit = 0;
1986 } else if (!strcmp(arg, "--full-diff")) {
1987 revs->diff = 1;
1988 revs->full_diff = 1;
1989 } else if (!strcmp(arg, "--full-history")) {
1990 revs->simplify_history = 0;
1991 } else if (!strcmp(arg, "--relative-date")) {
1992 revs->date_mode.type = DATE_RELATIVE;
1993 revs->date_mode_explicit = 1;
1994 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1995 parse_date_format(optarg, &revs->date_mode);
1996 revs->date_mode_explicit = 1;
1997 return argcount;
1998 } else if (!strcmp(arg, "--log-size")) {
1999 revs->show_log_size = 1;
2002 * Grepping the commit log
2004 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2005 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2006 return argcount;
2007 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2008 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2009 return argcount;
2010 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2011 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2012 return argcount;
2013 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2014 add_message_grep(revs, optarg);
2015 return argcount;
2016 } else if (!strcmp(arg, "--grep-debug")) {
2017 revs->grep_filter.debug = 1;
2018 } else if (!strcmp(arg, "--basic-regexp")) {
2019 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
2020 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2021 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
2022 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2023 revs->grep_filter.ignore_case = 1;
2024 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
2025 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2026 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
2027 } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) {
2028 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
2029 } else if (!strcmp(arg, "--all-match")) {
2030 revs->grep_filter.all_match = 1;
2031 } else if (!strcmp(arg, "--invert-grep")) {
2032 revs->invert_grep = 1;
2033 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2034 if (strcmp(optarg, "none"))
2035 git_log_output_encoding = xstrdup(optarg);
2036 else
2037 git_log_output_encoding = "";
2038 return argcount;
2039 } else if (!strcmp(arg, "--reverse")) {
2040 revs->reverse ^= 1;
2041 } else if (!strcmp(arg, "--children")) {
2042 revs->children.name = "children";
2043 revs->limited = 1;
2044 } else if (!strcmp(arg, "--ignore-missing")) {
2045 revs->ignore_missing = 1;
2046 } else {
2047 int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
2048 if (!opts)
2049 unkv[(*unkc)++] = arg;
2050 return opts;
2052 if (revs->graph && revs->track_linear)
2053 die("--show-linear-break and --graph are incompatible");
2055 return 1;
2058 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2059 const struct option *options,
2060 const char * const usagestr[])
2062 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2063 &ctx->cpidx, ctx->out);
2064 if (n <= 0) {
2065 error("unknown option `%s'", ctx->argv[0]);
2066 usage_with_options(usagestr, options);
2068 ctx->argv += n;
2069 ctx->argc -= n;
2072 static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
2073 struct strbuf bisect_refs = STRBUF_INIT;
2074 int status;
2075 strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2076 status = for_each_fullref_in_submodule(submodule, bisect_refs.buf, fn, cb_data, 0);
2077 strbuf_release(&bisect_refs);
2078 return status;
2081 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2083 return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
2086 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2088 return for_each_bisect_ref(submodule, fn, cb_data, term_good);
2091 static int handle_revision_pseudo_opt(const char *submodule,
2092 struct rev_info *revs,
2093 int argc, const char **argv, int *flags)
2095 const char *arg = argv[0];
2096 const char *optarg;
2097 int argcount;
2100 * NOTE!
2102 * Commands like "git shortlog" will not accept the options below
2103 * unless parse_revision_opt queues them (as opposed to erroring
2104 * out).
2106 * When implementing your new pseudo-option, remember to
2107 * register it in the list at the top of handle_revision_opt.
2109 if (!strcmp(arg, "--all")) {
2110 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2111 handle_refs(submodule, revs, *flags, head_ref_submodule);
2112 clear_ref_exclusion(&revs->ref_excludes);
2113 } else if (!strcmp(arg, "--branches")) {
2114 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
2115 clear_ref_exclusion(&revs->ref_excludes);
2116 } else if (!strcmp(arg, "--bisect")) {
2117 read_bisect_terms(&term_bad, &term_good);
2118 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
2119 handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
2120 revs->bisect = 1;
2121 } else if (!strcmp(arg, "--tags")) {
2122 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
2123 clear_ref_exclusion(&revs->ref_excludes);
2124 } else if (!strcmp(arg, "--remotes")) {
2125 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
2126 clear_ref_exclusion(&revs->ref_excludes);
2127 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2128 struct all_refs_cb cb;
2129 init_all_refs_cb(&cb, revs, *flags);
2130 for_each_glob_ref(handle_one_ref, optarg, &cb);
2131 clear_ref_exclusion(&revs->ref_excludes);
2132 return argcount;
2133 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2134 add_ref_exclusion(&revs->ref_excludes, optarg);
2135 return argcount;
2136 } else if (skip_prefix(arg, "--branches=", &optarg)) {
2137 struct all_refs_cb cb;
2138 init_all_refs_cb(&cb, revs, *flags);
2139 for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb);
2140 clear_ref_exclusion(&revs->ref_excludes);
2141 } else if (skip_prefix(arg, "--tags=", &optarg)) {
2142 struct all_refs_cb cb;
2143 init_all_refs_cb(&cb, revs, *flags);
2144 for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb);
2145 clear_ref_exclusion(&revs->ref_excludes);
2146 } else if (skip_prefix(arg, "--remotes=", &optarg)) {
2147 struct all_refs_cb cb;
2148 init_all_refs_cb(&cb, revs, *flags);
2149 for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb);
2150 clear_ref_exclusion(&revs->ref_excludes);
2151 } else if (!strcmp(arg, "--reflog")) {
2152 add_reflogs_to_pending(revs, *flags);
2153 } else if (!strcmp(arg, "--indexed-objects")) {
2154 add_index_objects_to_pending(revs, *flags);
2155 } else if (!strcmp(arg, "--not")) {
2156 *flags ^= UNINTERESTING | BOTTOM;
2157 } else if (!strcmp(arg, "--no-walk")) {
2158 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2159 } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
2161 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2162 * not allowed, since the argument is optional.
2164 if (!strcmp(optarg, "sorted"))
2165 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2166 else if (!strcmp(optarg, "unsorted"))
2167 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2168 else
2169 return error("invalid argument to --no-walk");
2170 } else if (!strcmp(arg, "--do-walk")) {
2171 revs->no_walk = 0;
2172 } else {
2173 return 0;
2176 return 1;
2179 static void NORETURN diagnose_missing_default(const char *def)
2181 unsigned char sha1[20];
2182 int flags;
2183 const char *refname;
2185 refname = resolve_ref_unsafe(def, 0, sha1, &flags);
2186 if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2187 die(_("your current branch appears to be broken"));
2189 skip_prefix(refname, "refs/heads/", &refname);
2190 die(_("your current branch '%s' does not have any commits yet"),
2191 refname);
2195 * Parse revision information, filling in the "rev_info" structure,
2196 * and removing the used arguments from the argument list.
2198 * Returns the number of arguments left that weren't recognized
2199 * (which are also moved to the head of the argument list)
2201 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2203 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
2204 struct cmdline_pathspec prune_data;
2205 const char *submodule = NULL;
2207 memset(&prune_data, 0, sizeof(prune_data));
2208 if (opt)
2209 submodule = opt->submodule;
2211 /* First, search for "--" */
2212 if (opt && opt->assume_dashdash) {
2213 seen_dashdash = 1;
2214 } else {
2215 seen_dashdash = 0;
2216 for (i = 1; i < argc; i++) {
2217 const char *arg = argv[i];
2218 if (strcmp(arg, "--"))
2219 continue;
2220 argv[i] = NULL;
2221 argc = i;
2222 if (argv[i + 1])
2223 append_prune_data(&prune_data, argv + i + 1);
2224 seen_dashdash = 1;
2225 break;
2229 /* Second, deal with arguments and options */
2230 flags = 0;
2231 revarg_opt = opt ? opt->revarg_opt : 0;
2232 if (seen_dashdash)
2233 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2234 read_from_stdin = 0;
2235 for (left = i = 1; i < argc; i++) {
2236 const char *arg = argv[i];
2237 if (*arg == '-') {
2238 int opts;
2240 opts = handle_revision_pseudo_opt(submodule,
2241 revs, argc - i, argv + i,
2242 &flags);
2243 if (opts > 0) {
2244 i += opts - 1;
2245 continue;
2248 if (!strcmp(arg, "--stdin")) {
2249 if (revs->disable_stdin) {
2250 argv[left++] = arg;
2251 continue;
2253 if (read_from_stdin++)
2254 die("--stdin given twice?");
2255 read_revisions_from_stdin(revs, &prune_data);
2256 continue;
2259 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
2260 if (opts > 0) {
2261 i += opts - 1;
2262 continue;
2264 if (opts < 0)
2265 exit(128);
2266 continue;
2270 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2271 int j;
2272 if (seen_dashdash || *arg == '^')
2273 die("bad revision '%s'", arg);
2275 /* If we didn't have a "--":
2276 * (1) all filenames must exist;
2277 * (2) all rev-args must not be interpretable
2278 * as a valid filename.
2279 * but the latter we have checked in the main loop.
2281 for (j = i; j < argc; j++)
2282 verify_filename(revs->prefix, argv[j], j == i);
2284 append_prune_data(&prune_data, argv + i);
2285 break;
2287 else
2288 got_rev_arg = 1;
2291 if (prune_data.nr) {
2293 * If we need to introduce the magic "a lone ':' means no
2294 * pathspec whatsoever", here is the place to do so.
2296 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2297 * prune_data.nr = 0;
2298 * prune_data.alloc = 0;
2299 * free(prune_data.path);
2300 * prune_data.path = NULL;
2301 * } else {
2302 * terminate prune_data.alloc with NULL and
2303 * call init_pathspec() to set revs->prune_data here.
2306 ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
2307 prune_data.path[prune_data.nr++] = NULL;
2308 parse_pathspec(&revs->prune_data, 0, 0,
2309 revs->prefix, prune_data.path);
2312 if (revs->def == NULL)
2313 revs->def = opt ? opt->def : NULL;
2314 if (opt && opt->tweak)
2315 opt->tweak(revs, opt);
2316 if (revs->show_merge)
2317 prepare_show_merge(revs);
2318 if (revs->def && !revs->pending.nr && !revs->rev_input_given && !got_rev_arg) {
2319 struct object_id oid;
2320 struct object *object;
2321 struct object_context oc;
2322 if (get_oid_with_context(revs->def, 0, &oid, &oc))
2323 diagnose_missing_default(revs->def);
2324 object = get_reference(revs, revs->def, &oid, 0);
2325 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2328 /* Did the user ask for any diff output? Run the diff! */
2329 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2330 revs->diff = 1;
2332 /* Pickaxe, diff-filter and rename following need diffs */
2333 if (revs->diffopt.pickaxe ||
2334 revs->diffopt.filter ||
2335 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2336 revs->diff = 1;
2338 if (revs->topo_order)
2339 revs->limited = 1;
2341 if (revs->prune_data.nr) {
2342 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2343 /* Can't prune commits with rename following: the paths change.. */
2344 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2345 revs->prune = 1;
2346 if (!revs->full_diff)
2347 copy_pathspec(&revs->diffopt.pathspec,
2348 &revs->prune_data);
2350 if (revs->combine_merges)
2351 revs->ignore_merges = 0;
2352 revs->diffopt.abbrev = revs->abbrev;
2354 if (revs->line_level_traverse) {
2355 revs->limited = 1;
2356 revs->topo_order = 1;
2359 diff_setup_done(&revs->diffopt);
2361 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2362 &revs->grep_filter);
2363 compile_grep_patterns(&revs->grep_filter);
2365 if (revs->reverse && revs->reflog_info)
2366 die("cannot combine --reverse with --walk-reflogs");
2367 if (revs->reflog_info && revs->limited)
2368 die("cannot combine --walk-reflogs with history-limiting options");
2369 if (revs->rewrite_parents && revs->children.name)
2370 die("cannot combine --parents and --children");
2373 * Limitations on the graph functionality
2375 if (revs->reverse && revs->graph)
2376 die("cannot combine --reverse with --graph");
2378 if (revs->reflog_info && revs->graph)
2379 die("cannot combine --walk-reflogs with --graph");
2380 if (revs->no_walk && revs->graph)
2381 die("cannot combine --no-walk with --graph");
2382 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2383 die("cannot use --grep-reflog without --walk-reflogs");
2385 if (revs->first_parent_only && revs->bisect)
2386 die(_("--first-parent is incompatible with --bisect"));
2388 if (revs->expand_tabs_in_log < 0)
2389 revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2391 return left;
2394 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2396 struct commit_list *l = xcalloc(1, sizeof(*l));
2398 l->item = child;
2399 l->next = add_decoration(&revs->children, &parent->object, l);
2402 static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2404 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2405 struct commit_list **pp, *p;
2406 int surviving_parents;
2408 /* Examine existing parents while marking ones we have seen... */
2409 pp = &commit->parents;
2410 surviving_parents = 0;
2411 while ((p = *pp) != NULL) {
2412 struct commit *parent = p->item;
2413 if (parent->object.flags & TMP_MARK) {
2414 *pp = p->next;
2415 if (ts)
2416 compact_treesame(revs, commit, surviving_parents);
2417 continue;
2419 parent->object.flags |= TMP_MARK;
2420 surviving_parents++;
2421 pp = &p->next;
2423 /* clear the temporary mark */
2424 for (p = commit->parents; p; p = p->next) {
2425 p->item->object.flags &= ~TMP_MARK;
2427 /* no update_treesame() - removing duplicates can't affect TREESAME */
2428 return surviving_parents;
2431 struct merge_simplify_state {
2432 struct commit *simplified;
2435 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2437 struct merge_simplify_state *st;
2439 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2440 if (!st) {
2441 st = xcalloc(1, sizeof(*st));
2442 add_decoration(&revs->merge_simplification, &commit->object, st);
2444 return st;
2447 static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2449 struct commit_list *h = reduce_heads(commit->parents);
2450 int i = 0, marked = 0;
2451 struct commit_list *po, *pn;
2453 /* Want these for sanity-checking only */
2454 int orig_cnt = commit_list_count(commit->parents);
2455 int cnt = commit_list_count(h);
2458 * Not ready to remove items yet, just mark them for now, based
2459 * on the output of reduce_heads(). reduce_heads outputs the reduced
2460 * set in its original order, so this isn't too hard.
2462 po = commit->parents;
2463 pn = h;
2464 while (po) {
2465 if (pn && po->item == pn->item) {
2466 pn = pn->next;
2467 i++;
2468 } else {
2469 po->item->object.flags |= TMP_MARK;
2470 marked++;
2472 po=po->next;
2475 if (i != cnt || cnt+marked != orig_cnt)
2476 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2478 free_commit_list(h);
2480 return marked;
2483 static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2485 struct commit_list *p;
2486 int marked = 0;
2488 for (p = commit->parents; p; p = p->next) {
2489 struct commit *parent = p->item;
2490 if (!parent->parents && (parent->object.flags & TREESAME)) {
2491 parent->object.flags |= TMP_MARK;
2492 marked++;
2496 return marked;
2500 * Awkward naming - this means one parent we are TREESAME to.
2501 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2502 * empty tree). Better name suggestions?
2504 static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2506 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2507 struct commit *unmarked = NULL, *marked = NULL;
2508 struct commit_list *p;
2509 unsigned n;
2511 for (p = commit->parents, n = 0; p; p = p->next, n++) {
2512 if (ts->treesame[n]) {
2513 if (p->item->object.flags & TMP_MARK) {
2514 if (!marked)
2515 marked = p->item;
2516 } else {
2517 if (!unmarked) {
2518 unmarked = p->item;
2519 break;
2526 * If we are TREESAME to a marked-for-deletion parent, but not to any
2527 * unmarked parents, unmark the first TREESAME parent. This is the
2528 * parent that the default simplify_history==1 scan would have followed,
2529 * and it doesn't make sense to omit that path when asking for a
2530 * simplified full history. Retaining it improves the chances of
2531 * understanding odd missed merges that took an old version of a file.
2533 * Example:
2535 * I--------*X A modified the file, but mainline merge X used
2536 * \ / "-s ours", so took the version from I. X is
2537 * `-*A--' TREESAME to I and !TREESAME to A.
2539 * Default log from X would produce "I". Without this check,
2540 * --full-history --simplify-merges would produce "I-A-X", showing
2541 * the merge commit X and that it changed A, but not making clear that
2542 * it had just taken the I version. With this check, the topology above
2543 * is retained.
2545 * Note that it is possible that the simplification chooses a different
2546 * TREESAME parent from the default, in which case this test doesn't
2547 * activate, and we _do_ drop the default parent. Example:
2549 * I------X A modified the file, but it was reverted in B,
2550 * \ / meaning mainline merge X is TREESAME to both
2551 * *A-*B parents.
2553 * Default log would produce "I" by following the first parent;
2554 * --full-history --simplify-merges will produce "I-A-B". But this is a
2555 * reasonable result - it presents a logical full history leading from
2556 * I to X, and X is not an important merge.
2558 if (!unmarked && marked) {
2559 marked->object.flags &= ~TMP_MARK;
2560 return 1;
2563 return 0;
2566 static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2568 struct commit_list **pp, *p;
2569 int nth_parent, removed = 0;
2571 pp = &commit->parents;
2572 nth_parent = 0;
2573 while ((p = *pp) != NULL) {
2574 struct commit *parent = p->item;
2575 if (parent->object.flags & TMP_MARK) {
2576 parent->object.flags &= ~TMP_MARK;
2577 *pp = p->next;
2578 free(p);
2579 removed++;
2580 compact_treesame(revs, commit, nth_parent);
2581 continue;
2583 pp = &p->next;
2584 nth_parent++;
2587 /* Removing parents can only increase TREESAMEness */
2588 if (removed && !(commit->object.flags & TREESAME))
2589 update_treesame(revs, commit);
2591 return nth_parent;
2594 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
2596 struct commit_list *p;
2597 struct commit *parent;
2598 struct merge_simplify_state *st, *pst;
2599 int cnt;
2601 st = locate_simplify_state(revs, commit);
2604 * Have we handled this one?
2606 if (st->simplified)
2607 return tail;
2610 * An UNINTERESTING commit simplifies to itself, so does a
2611 * root commit. We do not rewrite parents of such commit
2612 * anyway.
2614 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
2615 st->simplified = commit;
2616 return tail;
2620 * Do we know what commit all of our parents that matter
2621 * should be rewritten to? Otherwise we are not ready to
2622 * rewrite this one yet.
2624 for (cnt = 0, p = commit->parents; p; p = p->next) {
2625 pst = locate_simplify_state(revs, p->item);
2626 if (!pst->simplified) {
2627 tail = &commit_list_insert(p->item, tail)->next;
2628 cnt++;
2630 if (revs->first_parent_only)
2631 break;
2633 if (cnt) {
2634 tail = &commit_list_insert(commit, tail)->next;
2635 return tail;
2639 * Rewrite our list of parents. Note that this cannot
2640 * affect our TREESAME flags in any way - a commit is
2641 * always TREESAME to its simplification.
2643 for (p = commit->parents; p; p = p->next) {
2644 pst = locate_simplify_state(revs, p->item);
2645 p->item = pst->simplified;
2646 if (revs->first_parent_only)
2647 break;
2650 if (revs->first_parent_only)
2651 cnt = 1;
2652 else
2653 cnt = remove_duplicate_parents(revs, commit);
2656 * It is possible that we are a merge and one side branch
2657 * does not have any commit that touches the given paths;
2658 * in such a case, the immediate parent from that branch
2659 * will be rewritten to be the merge base.
2661 * o----X X: the commit we are looking at;
2662 * / / o: a commit that touches the paths;
2663 * ---o----'
2665 * Further, a merge of an independent branch that doesn't
2666 * touch the path will reduce to a treesame root parent:
2668 * ----o----X X: the commit we are looking at;
2669 * / o: a commit that touches the paths;
2670 * r r: a root commit not touching the paths
2672 * Detect and simplify both cases.
2674 if (1 < cnt) {
2675 int marked = mark_redundant_parents(revs, commit);
2676 marked += mark_treesame_root_parents(revs, commit);
2677 if (marked)
2678 marked -= leave_one_treesame_to_parent(revs, commit);
2679 if (marked)
2680 cnt = remove_marked_parents(revs, commit);
2684 * A commit simplifies to itself if it is a root, if it is
2685 * UNINTERESTING, if it touches the given paths, or if it is a
2686 * merge and its parents don't simplify to one relevant commit
2687 * (the first two cases are already handled at the beginning of
2688 * this function).
2690 * Otherwise, it simplifies to what its sole relevant parent
2691 * simplifies to.
2693 if (!cnt ||
2694 (commit->object.flags & UNINTERESTING) ||
2695 !(commit->object.flags & TREESAME) ||
2696 (parent = one_relevant_parent(revs, commit->parents)) == NULL)
2697 st->simplified = commit;
2698 else {
2699 pst = locate_simplify_state(revs, parent);
2700 st->simplified = pst->simplified;
2702 return tail;
2705 static void simplify_merges(struct rev_info *revs)
2707 struct commit_list *list, *next;
2708 struct commit_list *yet_to_do, **tail;
2709 struct commit *commit;
2711 if (!revs->prune)
2712 return;
2714 /* feed the list reversed */
2715 yet_to_do = NULL;
2716 for (list = revs->commits; list; list = next) {
2717 commit = list->item;
2718 next = list->next;
2720 * Do not free(list) here yet; the original list
2721 * is used later in this function.
2723 commit_list_insert(commit, &yet_to_do);
2725 while (yet_to_do) {
2726 list = yet_to_do;
2727 yet_to_do = NULL;
2728 tail = &yet_to_do;
2729 while (list) {
2730 commit = pop_commit(&list);
2731 tail = simplify_one(revs, commit, tail);
2735 /* clean up the result, removing the simplified ones */
2736 list = revs->commits;
2737 revs->commits = NULL;
2738 tail = &revs->commits;
2739 while (list) {
2740 struct merge_simplify_state *st;
2742 commit = pop_commit(&list);
2743 st = locate_simplify_state(revs, commit);
2744 if (st->simplified == commit)
2745 tail = &commit_list_insert(commit, tail)->next;
2749 static void set_children(struct rev_info *revs)
2751 struct commit_list *l;
2752 for (l = revs->commits; l; l = l->next) {
2753 struct commit *commit = l->item;
2754 struct commit_list *p;
2756 for (p = commit->parents; p; p = p->next)
2757 add_child(revs, p->item, commit);
2761 void reset_revision_walk(void)
2763 clear_object_flags(SEEN | ADDED | SHOWN);
2766 int prepare_revision_walk(struct rev_info *revs)
2768 int i;
2769 struct object_array old_pending;
2770 struct commit_list **next = &revs->commits;
2772 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
2773 revs->pending.nr = 0;
2774 revs->pending.alloc = 0;
2775 revs->pending.objects = NULL;
2776 for (i = 0; i < old_pending.nr; i++) {
2777 struct object_array_entry *e = old_pending.objects + i;
2778 struct commit *commit = handle_commit(revs, e);
2779 if (commit) {
2780 if (!(commit->object.flags & SEEN)) {
2781 commit->object.flags |= SEEN;
2782 next = commit_list_append(commit, next);
2786 if (!revs->leak_pending)
2787 object_array_clear(&old_pending);
2789 /* Signal whether we need per-parent treesame decoration */
2790 if (revs->simplify_merges ||
2791 (revs->limited && limiting_can_increase_treesame(revs)))
2792 revs->treesame.name = "treesame";
2794 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2795 commit_list_sort_by_date(&revs->commits);
2796 if (revs->no_walk)
2797 return 0;
2798 if (revs->limited)
2799 if (limit_list(revs) < 0)
2800 return -1;
2801 if (revs->topo_order)
2802 sort_in_topological_order(&revs->commits, revs->sort_order);
2803 if (revs->line_level_traverse)
2804 line_log_filter(revs);
2805 if (revs->simplify_merges)
2806 simplify_merges(revs);
2807 if (revs->children.name)
2808 set_children(revs);
2809 return 0;
2812 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2814 struct commit_list *cache = NULL;
2816 for (;;) {
2817 struct commit *p = *pp;
2818 if (!revs->limited)
2819 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2820 return rewrite_one_error;
2821 if (p->object.flags & UNINTERESTING)
2822 return rewrite_one_ok;
2823 if (!(p->object.flags & TREESAME))
2824 return rewrite_one_ok;
2825 if (!p->parents)
2826 return rewrite_one_noparents;
2827 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2828 return rewrite_one_ok;
2829 *pp = p;
2833 int rewrite_parents(struct rev_info *revs, struct commit *commit,
2834 rewrite_parent_fn_t rewrite_parent)
2836 struct commit_list **pp = &commit->parents;
2837 while (*pp) {
2838 struct commit_list *parent = *pp;
2839 switch (rewrite_parent(revs, &parent->item)) {
2840 case rewrite_one_ok:
2841 break;
2842 case rewrite_one_noparents:
2843 *pp = parent->next;
2844 continue;
2845 case rewrite_one_error:
2846 return -1;
2848 pp = &parent->next;
2850 remove_duplicate_parents(revs, commit);
2851 return 0;
2854 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2856 char *person, *endp;
2857 size_t len, namelen, maillen;
2858 const char *name;
2859 const char *mail;
2860 struct ident_split ident;
2862 person = strstr(buf->buf, what);
2863 if (!person)
2864 return 0;
2866 person += strlen(what);
2867 endp = strchr(person, '\n');
2868 if (!endp)
2869 return 0;
2871 len = endp - person;
2873 if (split_ident_line(&ident, person, len))
2874 return 0;
2876 mail = ident.mail_begin;
2877 maillen = ident.mail_end - ident.mail_begin;
2878 name = ident.name_begin;
2879 namelen = ident.name_end - ident.name_begin;
2881 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2882 struct strbuf namemail = STRBUF_INIT;
2884 strbuf_addf(&namemail, "%.*s <%.*s>",
2885 (int)namelen, name, (int)maillen, mail);
2887 strbuf_splice(buf, ident.name_begin - buf->buf,
2888 ident.mail_end - ident.name_begin + 1,
2889 namemail.buf, namemail.len);
2891 strbuf_release(&namemail);
2893 return 1;
2896 return 0;
2899 static int commit_match(struct commit *commit, struct rev_info *opt)
2901 int retval;
2902 const char *encoding;
2903 const char *message;
2904 struct strbuf buf = STRBUF_INIT;
2906 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2907 return 1;
2909 /* Prepend "fake" headers as needed */
2910 if (opt->grep_filter.use_reflog_filter) {
2911 strbuf_addstr(&buf, "reflog ");
2912 get_reflog_message(&buf, opt->reflog_info);
2913 strbuf_addch(&buf, '\n');
2917 * We grep in the user's output encoding, under the assumption that it
2918 * is the encoding they are most likely to write their grep pattern
2919 * for. In addition, it means we will match the "notes" encoding below,
2920 * so we will not end up with a buffer that has two different encodings
2921 * in it.
2923 encoding = get_log_output_encoding();
2924 message = logmsg_reencode(commit, NULL, encoding);
2926 /* Copy the commit to temporary if we are using "fake" headers */
2927 if (buf.len)
2928 strbuf_addstr(&buf, message);
2930 if (opt->grep_filter.header_list && opt->mailmap) {
2931 if (!buf.len)
2932 strbuf_addstr(&buf, message);
2934 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2935 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2938 /* Append "fake" message parts as needed */
2939 if (opt->show_notes) {
2940 if (!buf.len)
2941 strbuf_addstr(&buf, message);
2942 format_display_notes(&commit->object.oid, &buf, encoding, 1);
2946 * Find either in the original commit message, or in the temporary.
2947 * Note that we cast away the constness of "message" here. It is
2948 * const because it may come from the cached commit buffer. That's OK,
2949 * because we know that it is modifiable heap memory, and that while
2950 * grep_buffer may modify it for speed, it will restore any
2951 * changes before returning.
2953 if (buf.len)
2954 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2955 else
2956 retval = grep_buffer(&opt->grep_filter,
2957 (char *)message, strlen(message));
2958 strbuf_release(&buf);
2959 unuse_commit_buffer(commit, message);
2960 return opt->invert_grep ? !retval : retval;
2963 static inline int want_ancestry(const struct rev_info *revs)
2965 return (revs->rewrite_parents || revs->children.name);
2969 * Return a timestamp to be used for --since/--until comparisons for this
2970 * commit, based on the revision options.
2972 static timestamp_t comparison_date(const struct rev_info *revs,
2973 struct commit *commit)
2975 return revs->reflog_info ?
2976 get_reflog_timestamp(revs->reflog_info) :
2977 commit->date;
2980 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2982 if (commit->object.flags & SHOWN)
2983 return commit_ignore;
2984 if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))
2985 return commit_ignore;
2986 if (revs->show_all)
2987 return commit_show;
2988 if (commit->object.flags & UNINTERESTING)
2989 return commit_ignore;
2990 if (revs->min_age != -1 &&
2991 comparison_date(revs, commit) > revs->min_age)
2992 return commit_ignore;
2993 if (revs->min_parents || (revs->max_parents >= 0)) {
2994 int n = commit_list_count(commit->parents);
2995 if ((n < revs->min_parents) ||
2996 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2997 return commit_ignore;
2999 if (!commit_match(commit, revs))
3000 return commit_ignore;
3001 if (revs->prune && revs->dense) {
3002 /* Commit without changes? */
3003 if (commit->object.flags & TREESAME) {
3004 int n;
3005 struct commit_list *p;
3006 /* drop merges unless we want parenthood */
3007 if (!want_ancestry(revs))
3008 return commit_ignore;
3010 * If we want ancestry, then need to keep any merges
3011 * between relevant commits to tie together topology.
3012 * For consistency with TREESAME and simplification
3013 * use "relevant" here rather than just INTERESTING,
3014 * to treat bottom commit(s) as part of the topology.
3016 for (n = 0, p = commit->parents; p; p = p->next)
3017 if (relevant_commit(p->item))
3018 if (++n >= 2)
3019 return commit_show;
3020 return commit_ignore;
3023 return commit_show;
3026 define_commit_slab(saved_parents, struct commit_list *);
3028 #define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3031 * You may only call save_parents() once per commit (this is checked
3032 * for non-root commits).
3034 static void save_parents(struct rev_info *revs, struct commit *commit)
3036 struct commit_list **pp;
3038 if (!revs->saved_parents_slab) {
3039 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3040 init_saved_parents(revs->saved_parents_slab);
3043 pp = saved_parents_at(revs->saved_parents_slab, commit);
3046 * When walking with reflogs, we may visit the same commit
3047 * several times: once for each appearance in the reflog.
3049 * In this case, save_parents() will be called multiple times.
3050 * We want to keep only the first set of parents. We need to
3051 * store a sentinel value for an empty (i.e., NULL) parent
3052 * list to distinguish it from a not-yet-saved list, however.
3054 if (*pp)
3055 return;
3056 if (commit->parents)
3057 *pp = copy_commit_list(commit->parents);
3058 else
3059 *pp = EMPTY_PARENT_LIST;
3062 static void free_saved_parents(struct rev_info *revs)
3064 if (revs->saved_parents_slab)
3065 clear_saved_parents(revs->saved_parents_slab);
3068 struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3070 struct commit_list *parents;
3072 if (!revs->saved_parents_slab)
3073 return commit->parents;
3075 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3076 if (parents == EMPTY_PARENT_LIST)
3077 return NULL;
3078 return parents;
3081 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3083 enum commit_action action = get_commit_action(revs, commit);
3085 if (action == commit_show &&
3086 !revs->show_all &&
3087 revs->prune && revs->dense && want_ancestry(revs)) {
3089 * --full-diff on simplified parents is no good: it
3090 * will show spurious changes from the commits that
3091 * were elided. So we save the parents on the side
3092 * when --full-diff is in effect.
3094 if (revs->full_diff)
3095 save_parents(revs, commit);
3096 if (rewrite_parents(revs, commit, rewrite_one) < 0)
3097 return commit_error;
3099 return action;
3102 static void track_linear(struct rev_info *revs, struct commit *commit)
3104 if (revs->track_first_time) {
3105 revs->linear = 1;
3106 revs->track_first_time = 0;
3107 } else {
3108 struct commit_list *p;
3109 for (p = revs->previous_parents; p; p = p->next)
3110 if (p->item == NULL || /* first commit */
3111 !oidcmp(&p->item->object.oid, &commit->object.oid))
3112 break;
3113 revs->linear = p != NULL;
3115 if (revs->reverse) {
3116 if (revs->linear)
3117 commit->object.flags |= TRACK_LINEAR;
3119 free_commit_list(revs->previous_parents);
3120 revs->previous_parents = copy_commit_list(commit->parents);
3123 static struct commit *get_revision_1(struct rev_info *revs)
3125 while (1) {
3126 struct commit *commit;
3128 if (revs->reflog_info)
3129 commit = next_reflog_entry(revs->reflog_info);
3130 else
3131 commit = pop_commit(&revs->commits);
3133 if (!commit)
3134 return NULL;
3136 if (revs->reflog_info)
3137 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3140 * If we haven't done the list limiting, we need to look at
3141 * the parents here. We also need to do the date-based limiting
3142 * that we'd otherwise have done in limit_list().
3144 if (!revs->limited) {
3145 if (revs->max_age != -1 &&
3146 comparison_date(revs, commit) < revs->max_age)
3147 continue;
3149 if (revs->reflog_info)
3150 try_to_simplify_commit(revs, commit);
3151 else if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3152 if (!revs->ignore_missing_links)
3153 die("Failed to traverse parents of commit %s",
3154 oid_to_hex(&commit->object.oid));
3158 switch (simplify_commit(revs, commit)) {
3159 case commit_ignore:
3160 continue;
3161 case commit_error:
3162 die("Failed to simplify parents of commit %s",
3163 oid_to_hex(&commit->object.oid));
3164 default:
3165 if (revs->track_linear)
3166 track_linear(revs, commit);
3167 return commit;
3173 * Return true for entries that have not yet been shown. (This is an
3174 * object_array_each_func_t.)
3176 static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3178 return !(entry->item->flags & SHOWN);
3182 * If array is on the verge of a realloc, garbage-collect any entries
3183 * that have already been shown to try to free up some space.
3185 static void gc_boundary(struct object_array *array)
3187 if (array->nr == array->alloc)
3188 object_array_filter(array, entry_unshown, NULL);
3191 static void create_boundary_commit_list(struct rev_info *revs)
3193 unsigned i;
3194 struct commit *c;
3195 struct object_array *array = &revs->boundary_commits;
3196 struct object_array_entry *objects = array->objects;
3199 * If revs->commits is non-NULL at this point, an error occurred in
3200 * get_revision_1(). Ignore the error and continue printing the
3201 * boundary commits anyway. (This is what the code has always
3202 * done.)
3204 if (revs->commits) {
3205 free_commit_list(revs->commits);
3206 revs->commits = NULL;
3210 * Put all of the actual boundary commits from revs->boundary_commits
3211 * into revs->commits
3213 for (i = 0; i < array->nr; i++) {
3214 c = (struct commit *)(objects[i].item);
3215 if (!c)
3216 continue;
3217 if (!(c->object.flags & CHILD_SHOWN))
3218 continue;
3219 if (c->object.flags & (SHOWN | BOUNDARY))
3220 continue;
3221 c->object.flags |= BOUNDARY;
3222 commit_list_insert(c, &revs->commits);
3226 * If revs->topo_order is set, sort the boundary commits
3227 * in topological order
3229 sort_in_topological_order(&revs->commits, revs->sort_order);
3232 static struct commit *get_revision_internal(struct rev_info *revs)
3234 struct commit *c = NULL;
3235 struct commit_list *l;
3237 if (revs->boundary == 2) {
3239 * All of the normal commits have already been returned,
3240 * and we are now returning boundary commits.
3241 * create_boundary_commit_list() has populated
3242 * revs->commits with the remaining commits to return.
3244 c = pop_commit(&revs->commits);
3245 if (c)
3246 c->object.flags |= SHOWN;
3247 return c;
3251 * If our max_count counter has reached zero, then we are done. We
3252 * don't simply return NULL because we still might need to show
3253 * boundary commits. But we want to avoid calling get_revision_1, which
3254 * might do a considerable amount of work finding the next commit only
3255 * for us to throw it away.
3257 * If it is non-zero, then either we don't have a max_count at all
3258 * (-1), or it is still counting, in which case we decrement.
3260 if (revs->max_count) {
3261 c = get_revision_1(revs);
3262 if (c) {
3263 while (revs->skip_count > 0) {
3264 revs->skip_count--;
3265 c = get_revision_1(revs);
3266 if (!c)
3267 break;
3271 if (revs->max_count > 0)
3272 revs->max_count--;
3275 if (c)
3276 c->object.flags |= SHOWN;
3278 if (!revs->boundary)
3279 return c;
3281 if (!c) {
3283 * get_revision_1() runs out the commits, and
3284 * we are done computing the boundaries.
3285 * switch to boundary commits output mode.
3287 revs->boundary = 2;
3290 * Update revs->commits to contain the list of
3291 * boundary commits.
3293 create_boundary_commit_list(revs);
3295 return get_revision_internal(revs);
3299 * boundary commits are the commits that are parents of the
3300 * ones we got from get_revision_1() but they themselves are
3301 * not returned from get_revision_1(). Before returning
3302 * 'c', we need to mark its parents that they could be boundaries.
3305 for (l = c->parents; l; l = l->next) {
3306 struct object *p;
3307 p = &(l->item->object);
3308 if (p->flags & (CHILD_SHOWN | SHOWN))
3309 continue;
3310 p->flags |= CHILD_SHOWN;
3311 gc_boundary(&revs->boundary_commits);
3312 add_object_array(p, NULL, &revs->boundary_commits);
3315 return c;
3318 struct commit *get_revision(struct rev_info *revs)
3320 struct commit *c;
3321 struct commit_list *reversed;
3323 if (revs->reverse) {
3324 reversed = NULL;
3325 while ((c = get_revision_internal(revs)))
3326 commit_list_insert(c, &reversed);
3327 revs->commits = reversed;
3328 revs->reverse = 0;
3329 revs->reverse_output_stage = 1;
3332 if (revs->reverse_output_stage) {
3333 c = pop_commit(&revs->commits);
3334 if (revs->track_linear)
3335 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3336 return c;
3339 c = get_revision_internal(revs);
3340 if (c && revs->graph)
3341 graph_update(revs->graph, c);
3342 if (!c) {
3343 free_saved_parents(revs);
3344 if (revs->previous_parents) {
3345 free_commit_list(revs->previous_parents);
3346 revs->previous_parents = NULL;
3349 return c;
3352 char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3354 if (commit->object.flags & BOUNDARY)
3355 return "-";
3356 else if (commit->object.flags & UNINTERESTING)
3357 return "^";
3358 else if (commit->object.flags & PATCHSAME)
3359 return "=";
3360 else if (!revs || revs->left_right) {
3361 if (commit->object.flags & SYMMETRIC_LEFT)
3362 return "<";
3363 else
3364 return ">";
3365 } else if (revs->graph)
3366 return "*";
3367 else if (revs->cherry_mark)
3368 return "+";
3369 return "";
3372 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3374 char *mark = get_revision_mark(revs, commit);
3375 if (!strlen(mark))
3376 return;
3377 fputs(mark, stdout);
3378 putchar(' ');