Merge branch 'maint'
[git.git] / revision.c
blob86d24704896d71de7bb554a3925ea88e2be3417b
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"
17 volatile show_early_output_fn_t show_early_output;
19 char *path_name(const struct name_path *path, const char *name)
21 const struct name_path *p;
22 char *n, *m;
23 int nlen = strlen(name);
24 int len = nlen + 1;
26 for (p = path; p; p = p->up) {
27 if (p->elem_len)
28 len += p->elem_len + 1;
30 n = xmalloc(len);
31 m = n + len - (nlen + 1);
32 strcpy(m, name);
33 for (p = path; p; p = p->up) {
34 if (p->elem_len) {
35 m -= p->elem_len + 1;
36 memcpy(m, p->elem, p->elem_len);
37 m[p->elem_len] = '/';
40 return n;
43 void add_object(struct object *obj,
44 struct object_array *p,
45 struct name_path *path,
46 const char *name)
48 add_object_array(obj, path_name(path, name), p);
51 static void mark_blob_uninteresting(struct blob *blob)
53 if (!blob)
54 return;
55 if (blob->object.flags & UNINTERESTING)
56 return;
57 blob->object.flags |= UNINTERESTING;
60 void mark_tree_uninteresting(struct tree *tree)
62 struct tree_desc desc;
63 struct name_entry entry;
64 struct object *obj = &tree->object;
66 if (!tree)
67 return;
68 if (obj->flags & UNINTERESTING)
69 return;
70 obj->flags |= UNINTERESTING;
71 if (!has_sha1_file(obj->sha1))
72 return;
73 if (parse_tree(tree) < 0)
74 die("bad tree %s", sha1_to_hex(obj->sha1));
76 init_tree_desc(&desc, tree->buffer, tree->size);
77 while (tree_entry(&desc, &entry)) {
78 switch (object_type(entry.mode)) {
79 case OBJ_TREE:
80 mark_tree_uninteresting(lookup_tree(entry.sha1));
81 break;
82 case OBJ_BLOB:
83 mark_blob_uninteresting(lookup_blob(entry.sha1));
84 break;
85 default:
86 /* Subproject commit - not in this repository */
87 break;
92 * We don't care about the tree any more
93 * after it has been marked uninteresting.
95 free(tree->buffer);
96 tree->buffer = NULL;
99 void mark_parents_uninteresting(struct commit *commit)
101 struct commit_list *parents = commit->parents;
103 while (parents) {
104 struct commit *commit = parents->item;
105 if (!(commit->object.flags & UNINTERESTING)) {
106 commit->object.flags |= UNINTERESTING;
109 * Normally we haven't parsed the parent
110 * yet, so we won't have a parent of a parent
111 * here. However, it may turn out that we've
112 * reached this commit some other way (where it
113 * wasn't uninteresting), in which case we need
114 * to mark its parents recursively too..
116 if (commit->parents)
117 mark_parents_uninteresting(commit);
121 * A missing commit is ok iff its parent is marked
122 * uninteresting.
124 * We just mark such a thing parsed, so that when
125 * it is popped next time around, we won't be trying
126 * to parse it and get an error.
128 if (!has_sha1_file(commit->object.sha1))
129 commit->object.parsed = 1;
130 parents = parents->next;
134 static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
136 if (revs->no_walk && (obj->flags & UNINTERESTING))
137 revs->no_walk = 0;
138 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
139 struct strbuf buf = STRBUF_INIT;
140 int len = interpret_branch_name(name, &buf);
141 int st;
143 if (0 < len && name[len] && buf.len)
144 strbuf_addstr(&buf, name + len);
145 st = add_reflog_for_walk(revs->reflog_info,
146 (struct commit *)obj,
147 buf.buf[0] ? buf.buf: name);
148 strbuf_release(&buf);
149 if (st)
150 return;
152 add_object_array_with_mode(obj, name, &revs->pending, mode);
155 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
157 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
160 void add_head_to_pending(struct rev_info *revs)
162 unsigned char sha1[20];
163 struct object *obj;
164 if (get_sha1("HEAD", sha1))
165 return;
166 obj = parse_object(sha1);
167 if (!obj)
168 return;
169 add_pending_object(revs, obj, "HEAD");
172 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
174 struct object *object;
176 object = parse_object(sha1);
177 if (!object)
178 die("bad object %s", name);
179 object->flags |= flags;
180 return object;
183 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
185 unsigned long flags = object->flags;
188 * Tag object? Look what it points to..
190 while (object->type == OBJ_TAG) {
191 struct tag *tag = (struct tag *) object;
192 if (revs->tag_objects && !(flags & UNINTERESTING))
193 add_pending_object(revs, object, tag->tag);
194 if (!tag->tagged)
195 die("bad tag");
196 object = parse_object(tag->tagged->sha1);
197 if (!object) {
198 if (flags & UNINTERESTING)
199 return NULL;
200 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
205 * Commit object? Just return it, we'll do all the complex
206 * reachability crud.
208 if (object->type == OBJ_COMMIT) {
209 struct commit *commit = (struct commit *)object;
210 if (parse_commit(commit) < 0)
211 die("unable to parse commit %s", name);
212 if (flags & UNINTERESTING) {
213 commit->object.flags |= UNINTERESTING;
214 mark_parents_uninteresting(commit);
215 revs->limited = 1;
217 if (revs->show_source && !commit->util)
218 commit->util = (void *) name;
219 return commit;
223 * Tree object? Either mark it uninteresting, or add it
224 * to the list of objects to look at later..
226 if (object->type == OBJ_TREE) {
227 struct tree *tree = (struct tree *)object;
228 if (!revs->tree_objects)
229 return NULL;
230 if (flags & UNINTERESTING) {
231 mark_tree_uninteresting(tree);
232 return NULL;
234 add_pending_object(revs, object, "");
235 return NULL;
239 * Blob object? You know the drill by now..
241 if (object->type == OBJ_BLOB) {
242 struct blob *blob = (struct blob *)object;
243 if (!revs->blob_objects)
244 return NULL;
245 if (flags & UNINTERESTING) {
246 mark_blob_uninteresting(blob);
247 return NULL;
249 add_pending_object(revs, object, "");
250 return NULL;
252 die("%s is unknown object", name);
255 static int everybody_uninteresting(struct commit_list *orig)
257 struct commit_list *list = orig;
258 while (list) {
259 struct commit *commit = list->item;
260 list = list->next;
261 if (commit->object.flags & UNINTERESTING)
262 continue;
263 return 0;
265 return 1;
269 * The goal is to get REV_TREE_NEW as the result only if the
270 * diff consists of all '+' (and no other changes), REV_TREE_OLD
271 * if the whole diff is removal of old data, and otherwise
272 * REV_TREE_DIFFERENT (of course if the trees are the same we
273 * want REV_TREE_SAME).
274 * That means that once we get to REV_TREE_DIFFERENT, we do not
275 * have to look any further.
277 static int tree_difference = REV_TREE_SAME;
279 static void file_add_remove(struct diff_options *options,
280 int addremove, unsigned mode,
281 const unsigned char *sha1,
282 const char *fullpath, unsigned dirty_submodule)
284 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
286 tree_difference |= diff;
287 if (tree_difference == REV_TREE_DIFFERENT)
288 DIFF_OPT_SET(options, HAS_CHANGES);
291 static void file_change(struct diff_options *options,
292 unsigned old_mode, unsigned new_mode,
293 const unsigned char *old_sha1,
294 const unsigned char *new_sha1,
295 const char *fullpath,
296 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
298 tree_difference = REV_TREE_DIFFERENT;
299 DIFF_OPT_SET(options, HAS_CHANGES);
302 static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
304 struct tree *t1 = parent->tree;
305 struct tree *t2 = commit->tree;
307 if (!t1)
308 return REV_TREE_NEW;
309 if (!t2)
310 return REV_TREE_OLD;
312 if (revs->simplify_by_decoration) {
314 * If we are simplifying by decoration, then the commit
315 * is worth showing if it has a tag pointing at it.
317 if (lookup_decoration(&name_decoration, &commit->object))
318 return REV_TREE_DIFFERENT;
320 * A commit that is not pointed by a tag is uninteresting
321 * if we are not limited by path. This means that you will
322 * see the usual "commits that touch the paths" plus any
323 * tagged commit by specifying both --simplify-by-decoration
324 * and pathspec.
326 if (!revs->prune_data.nr)
327 return REV_TREE_SAME;
330 tree_difference = REV_TREE_SAME;
331 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
332 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
333 &revs->pruning) < 0)
334 return REV_TREE_DIFFERENT;
335 return tree_difference;
338 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
340 int retval;
341 void *tree;
342 unsigned long size;
343 struct tree_desc empty, real;
344 struct tree *t1 = commit->tree;
346 if (!t1)
347 return 0;
349 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
350 if (!tree)
351 return 0;
352 init_tree_desc(&real, tree, size);
353 init_tree_desc(&empty, "", 0);
355 tree_difference = REV_TREE_SAME;
356 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
357 retval = diff_tree(&empty, &real, "", &revs->pruning);
358 free(tree);
360 return retval >= 0 && (tree_difference == REV_TREE_SAME);
363 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
365 struct commit_list **pp, *parent;
366 int tree_changed = 0, tree_same = 0;
369 * If we don't do pruning, everything is interesting
371 if (!revs->prune)
372 return;
374 if (!commit->tree)
375 return;
377 if (!commit->parents) {
378 if (rev_same_tree_as_empty(revs, commit))
379 commit->object.flags |= TREESAME;
380 return;
384 * Normal non-merge commit? If we don't want to make the
385 * history dense, we consider it always to be a change..
387 if (!revs->dense && !commit->parents->next)
388 return;
390 pp = &commit->parents;
391 while ((parent = *pp) != NULL) {
392 struct commit *p = parent->item;
394 if (parse_commit(p) < 0)
395 die("cannot simplify commit %s (because of %s)",
396 sha1_to_hex(commit->object.sha1),
397 sha1_to_hex(p->object.sha1));
398 switch (rev_compare_tree(revs, p, commit)) {
399 case REV_TREE_SAME:
400 tree_same = 1;
401 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
402 /* Even if a merge with an uninteresting
403 * side branch brought the entire change
404 * we are interested in, we do not want
405 * to lose the other branches of this
406 * merge, so we just keep going.
408 pp = &parent->next;
409 continue;
411 parent->next = NULL;
412 commit->parents = parent;
413 commit->object.flags |= TREESAME;
414 return;
416 case REV_TREE_NEW:
417 if (revs->remove_empty_trees &&
418 rev_same_tree_as_empty(revs, p)) {
419 /* We are adding all the specified
420 * paths from this parent, so the
421 * history beyond this parent is not
422 * interesting. Remove its parents
423 * (they are grandparents for us).
424 * IOW, we pretend this parent is a
425 * "root" commit.
427 if (parse_commit(p) < 0)
428 die("cannot simplify commit %s (invalid %s)",
429 sha1_to_hex(commit->object.sha1),
430 sha1_to_hex(p->object.sha1));
431 p->parents = NULL;
433 /* fallthrough */
434 case REV_TREE_OLD:
435 case REV_TREE_DIFFERENT:
436 tree_changed = 1;
437 pp = &parent->next;
438 continue;
440 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
442 if (tree_changed && !tree_same)
443 return;
444 commit->object.flags |= TREESAME;
447 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
448 struct commit_list *cached_base, struct commit_list **cache)
450 struct commit_list *new_entry;
452 if (cached_base && p->date < cached_base->item->date)
453 new_entry = commit_list_insert_by_date(p, &cached_base->next);
454 else
455 new_entry = commit_list_insert_by_date(p, head);
457 if (cache && (!*cache || p->date < (*cache)->item->date))
458 *cache = new_entry;
461 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
462 struct commit_list **list, struct commit_list **cache_ptr)
464 struct commit_list *parent = commit->parents;
465 unsigned left_flag;
466 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
468 if (commit->object.flags & ADDED)
469 return 0;
470 commit->object.flags |= ADDED;
473 * If the commit is uninteresting, don't try to
474 * prune parents - we want the maximal uninteresting
475 * set.
477 * Normally we haven't parsed the parent
478 * yet, so we won't have a parent of a parent
479 * here. However, it may turn out that we've
480 * reached this commit some other way (where it
481 * wasn't uninteresting), in which case we need
482 * to mark its parents recursively too..
484 if (commit->object.flags & UNINTERESTING) {
485 while (parent) {
486 struct commit *p = parent->item;
487 parent = parent->next;
488 if (p)
489 p->object.flags |= UNINTERESTING;
490 if (parse_commit(p) < 0)
491 continue;
492 if (p->parents)
493 mark_parents_uninteresting(p);
494 if (p->object.flags & SEEN)
495 continue;
496 p->object.flags |= SEEN;
497 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
499 return 0;
503 * Ok, the commit wasn't uninteresting. Try to
504 * simplify the commit history and find the parent
505 * that has no differences in the path set if one exists.
507 try_to_simplify_commit(revs, commit);
509 if (revs->no_walk)
510 return 0;
512 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
514 for (parent = commit->parents; parent; parent = parent->next) {
515 struct commit *p = parent->item;
517 if (parse_commit(p) < 0)
518 return -1;
519 if (revs->show_source && !p->util)
520 p->util = commit->util;
521 p->object.flags |= left_flag;
522 if (!(p->object.flags & SEEN)) {
523 p->object.flags |= SEEN;
524 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
526 if (revs->first_parent_only)
527 break;
529 return 0;
532 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
534 struct commit_list *p;
535 int left_count = 0, right_count = 0;
536 int left_first;
537 struct patch_ids ids;
539 /* First count the commits on the left and on the right */
540 for (p = list; p; p = p->next) {
541 struct commit *commit = p->item;
542 unsigned flags = commit->object.flags;
543 if (flags & BOUNDARY)
545 else if (flags & SYMMETRIC_LEFT)
546 left_count++;
547 else
548 right_count++;
551 if (!left_count || !right_count)
552 return;
554 left_first = left_count < right_count;
555 init_patch_ids(&ids);
556 ids.diffopts.pathspec = revs->diffopt.pathspec;
558 /* Compute patch-ids for one side */
559 for (p = list; p; p = p->next) {
560 struct commit *commit = p->item;
561 unsigned flags = commit->object.flags;
563 if (flags & BOUNDARY)
564 continue;
566 * If we have fewer left, left_first is set and we omit
567 * commits on the right branch in this loop. If we have
568 * fewer right, we skip the left ones.
570 if (left_first != !!(flags & SYMMETRIC_LEFT))
571 continue;
572 commit->util = add_commit_patch_id(commit, &ids);
575 /* Check the other side */
576 for (p = list; p; p = p->next) {
577 struct commit *commit = p->item;
578 struct patch_id *id;
579 unsigned flags = commit->object.flags;
581 if (flags & BOUNDARY)
582 continue;
584 * If we have fewer left, left_first is set and we omit
585 * commits on the left branch in this loop.
587 if (left_first == !!(flags & SYMMETRIC_LEFT))
588 continue;
591 * Have we seen the same patch id?
593 id = has_commit_patch_id(commit, &ids);
594 if (!id)
595 continue;
596 id->seen = 1;
597 commit->object.flags |= SHOWN;
600 /* Now check the original side for seen ones */
601 for (p = list; p; p = p->next) {
602 struct commit *commit = p->item;
603 struct patch_id *ent;
605 ent = commit->util;
606 if (!ent)
607 continue;
608 if (ent->seen)
609 commit->object.flags |= SHOWN;
610 commit->util = NULL;
613 free_patch_ids(&ids);
616 /* How many extra uninteresting commits we want to see.. */
617 #define SLOP 5
619 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
622 * No source list at all? We're definitely done..
624 if (!src)
625 return 0;
628 * Does the destination list contain entries with a date
629 * before the source list? Definitely _not_ done.
631 if (date < src->item->date)
632 return SLOP;
635 * Does the source list still have interesting commits in
636 * it? Definitely not done..
638 if (!everybody_uninteresting(src))
639 return SLOP;
641 /* Ok, we're closing in.. */
642 return slop-1;
646 * "rev-list --ancestry-path A..B" computes commits that are ancestors
647 * of B but not ancestors of A but further limits the result to those
648 * that are descendants of A. This takes the list of bottom commits and
649 * the result of "A..B" without --ancestry-path, and limits the latter
650 * further to the ones that can reach one of the commits in "bottom".
652 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
654 struct commit_list *p;
655 struct commit_list *rlist = NULL;
656 int made_progress;
659 * Reverse the list so that it will be likely that we would
660 * process parents before children.
662 for (p = list; p; p = p->next)
663 commit_list_insert(p->item, &rlist);
665 for (p = bottom; p; p = p->next)
666 p->item->object.flags |= TMP_MARK;
669 * Mark the ones that can reach bottom commits in "list",
670 * in a bottom-up fashion.
672 do {
673 made_progress = 0;
674 for (p = rlist; p; p = p->next) {
675 struct commit *c = p->item;
676 struct commit_list *parents;
677 if (c->object.flags & (TMP_MARK | UNINTERESTING))
678 continue;
679 for (parents = c->parents;
680 parents;
681 parents = parents->next) {
682 if (!(parents->item->object.flags & TMP_MARK))
683 continue;
684 c->object.flags |= TMP_MARK;
685 made_progress = 1;
686 break;
689 } while (made_progress);
692 * NEEDSWORK: decide if we want to remove parents that are
693 * not marked with TMP_MARK from commit->parents for commits
694 * in the resulting list. We may not want to do that, though.
698 * The ones that are not marked with TMP_MARK are uninteresting
700 for (p = list; p; p = p->next) {
701 struct commit *c = p->item;
702 if (c->object.flags & TMP_MARK)
703 continue;
704 c->object.flags |= UNINTERESTING;
707 /* We are done with the TMP_MARK */
708 for (p = list; p; p = p->next)
709 p->item->object.flags &= ~TMP_MARK;
710 for (p = bottom; p; p = p->next)
711 p->item->object.flags &= ~TMP_MARK;
712 free_commit_list(rlist);
716 * Before walking the history, keep the set of "negative" refs the
717 * caller has asked to exclude.
719 * This is used to compute "rev-list --ancestry-path A..B", as we need
720 * to filter the result of "A..B" further to the ones that can actually
721 * reach A.
723 static struct commit_list *collect_bottom_commits(struct commit_list *list)
725 struct commit_list *elem, *bottom = NULL;
726 for (elem = list; elem; elem = elem->next)
727 if (elem->item->object.flags & UNINTERESTING)
728 commit_list_insert(elem->item, &bottom);
729 return bottom;
732 static int limit_list(struct rev_info *revs)
734 int slop = SLOP;
735 unsigned long date = ~0ul;
736 struct commit_list *list = revs->commits;
737 struct commit_list *newlist = NULL;
738 struct commit_list **p = &newlist;
739 struct commit_list *bottom = NULL;
741 if (revs->ancestry_path) {
742 bottom = collect_bottom_commits(list);
743 if (!bottom)
744 die("--ancestry-path given but there are no bottom commits");
747 while (list) {
748 struct commit_list *entry = list;
749 struct commit *commit = list->item;
750 struct object *obj = &commit->object;
751 show_early_output_fn_t show;
753 list = list->next;
754 free(entry);
756 if (revs->max_age != -1 && (commit->date < revs->max_age))
757 obj->flags |= UNINTERESTING;
758 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
759 return -1;
760 if (obj->flags & UNINTERESTING) {
761 mark_parents_uninteresting(commit);
762 if (revs->show_all)
763 p = &commit_list_insert(commit, p)->next;
764 slop = still_interesting(list, date, slop);
765 if (slop)
766 continue;
767 /* If showing all, add the whole pending list to the end */
768 if (revs->show_all)
769 *p = list;
770 break;
772 if (revs->min_age != -1 && (commit->date > revs->min_age))
773 continue;
774 date = commit->date;
775 p = &commit_list_insert(commit, p)->next;
777 show = show_early_output;
778 if (!show)
779 continue;
781 show(revs, newlist);
782 show_early_output = NULL;
784 if (revs->cherry_pick)
785 cherry_pick_list(newlist, revs);
787 if (bottom) {
788 limit_to_ancestry(bottom, newlist);
789 free_commit_list(bottom);
792 revs->commits = newlist;
793 return 0;
796 struct all_refs_cb {
797 int all_flags;
798 int warned_bad_reflog;
799 struct rev_info *all_revs;
800 const char *name_for_errormsg;
803 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
805 struct all_refs_cb *cb = cb_data;
806 struct object *object = get_reference(cb->all_revs, path, sha1,
807 cb->all_flags);
808 add_pending_object(cb->all_revs, object, path);
809 return 0;
812 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
813 unsigned flags)
815 cb->all_revs = revs;
816 cb->all_flags = flags;
819 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
820 int (*for_each)(const char *, each_ref_fn, void *))
822 struct all_refs_cb cb;
823 init_all_refs_cb(&cb, revs, flags);
824 for_each(submodule, handle_one_ref, &cb);
827 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
829 struct all_refs_cb *cb = cb_data;
830 if (!is_null_sha1(sha1)) {
831 struct object *o = parse_object(sha1);
832 if (o) {
833 o->flags |= cb->all_flags;
834 add_pending_object(cb->all_revs, o, "");
836 else if (!cb->warned_bad_reflog) {
837 warning("reflog of '%s' references pruned commits",
838 cb->name_for_errormsg);
839 cb->warned_bad_reflog = 1;
844 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
845 const char *email, unsigned long timestamp, int tz,
846 const char *message, void *cb_data)
848 handle_one_reflog_commit(osha1, cb_data);
849 handle_one_reflog_commit(nsha1, cb_data);
850 return 0;
853 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
855 struct all_refs_cb *cb = cb_data;
856 cb->warned_bad_reflog = 0;
857 cb->name_for_errormsg = path;
858 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
859 return 0;
862 static void handle_reflog(struct rev_info *revs, unsigned flags)
864 struct all_refs_cb cb;
865 cb.all_revs = revs;
866 cb.all_flags = flags;
867 for_each_reflog(handle_one_reflog, &cb);
870 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
872 unsigned char sha1[20];
873 struct object *it;
874 struct commit *commit;
875 struct commit_list *parents;
877 if (*arg == '^') {
878 flags ^= UNINTERESTING;
879 arg++;
881 if (get_sha1(arg, sha1))
882 return 0;
883 while (1) {
884 it = get_reference(revs, arg, sha1, 0);
885 if (it->type != OBJ_TAG)
886 break;
887 if (!((struct tag*)it)->tagged)
888 return 0;
889 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
891 if (it->type != OBJ_COMMIT)
892 return 0;
893 commit = (struct commit *)it;
894 for (parents = commit->parents; parents; parents = parents->next) {
895 it = &parents->item->object;
896 it->flags |= flags;
897 add_pending_object(revs, it, arg);
899 return 1;
902 void init_revisions(struct rev_info *revs, const char *prefix)
904 memset(revs, 0, sizeof(*revs));
906 revs->abbrev = DEFAULT_ABBREV;
907 revs->ignore_merges = 1;
908 revs->simplify_history = 1;
909 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
910 DIFF_OPT_SET(&revs->pruning, QUICK);
911 revs->pruning.add_remove = file_add_remove;
912 revs->pruning.change = file_change;
913 revs->lifo = 1;
914 revs->dense = 1;
915 revs->prefix = prefix;
916 revs->max_age = -1;
917 revs->min_age = -1;
918 revs->skip_count = -1;
919 revs->max_count = -1;
921 revs->commit_format = CMIT_FMT_DEFAULT;
923 revs->grep_filter.status_only = 1;
924 revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
925 revs->grep_filter.header_tail = &(revs->grep_filter.header_list);
926 revs->grep_filter.regflags = REG_NEWLINE;
928 diff_setup(&revs->diffopt);
929 if (prefix && !revs->diffopt.prefix) {
930 revs->diffopt.prefix = prefix;
931 revs->diffopt.prefix_length = strlen(prefix);
935 static void add_pending_commit_list(struct rev_info *revs,
936 struct commit_list *commit_list,
937 unsigned int flags)
939 while (commit_list) {
940 struct object *object = &commit_list->item->object;
941 object->flags |= flags;
942 add_pending_object(revs, object, sha1_to_hex(object->sha1));
943 commit_list = commit_list->next;
947 static void prepare_show_merge(struct rev_info *revs)
949 struct commit_list *bases;
950 struct commit *head, *other;
951 unsigned char sha1[20];
952 const char **prune = NULL;
953 int i, prune_num = 1; /* counting terminating NULL */
955 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
956 die("--merge without HEAD?");
957 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
958 die("--merge without MERGE_HEAD?");
959 add_pending_object(revs, &head->object, "HEAD");
960 add_pending_object(revs, &other->object, "MERGE_HEAD");
961 bases = get_merge_bases(head, other, 1);
962 add_pending_commit_list(revs, bases, UNINTERESTING);
963 free_commit_list(bases);
964 head->object.flags |= SYMMETRIC_LEFT;
966 if (!active_nr)
967 read_cache();
968 for (i = 0; i < active_nr; i++) {
969 struct cache_entry *ce = active_cache[i];
970 if (!ce_stage(ce))
971 continue;
972 if (ce_path_match(ce, &revs->prune_data)) {
973 prune_num++;
974 prune = xrealloc(prune, sizeof(*prune) * prune_num);
975 prune[prune_num-2] = ce->name;
976 prune[prune_num-1] = NULL;
978 while ((i+1 < active_nr) &&
979 ce_same_name(ce, active_cache[i+1]))
980 i++;
982 free_pathspec(&revs->prune_data);
983 init_pathspec(&revs->prune_data, prune);
984 revs->limited = 1;
987 int handle_revision_arg(const char *arg, struct rev_info *revs,
988 int flags,
989 int cant_be_filename)
991 unsigned mode;
992 char *dotdot;
993 struct object *object;
994 unsigned char sha1[20];
995 int local_flags;
997 dotdot = strstr(arg, "..");
998 if (dotdot) {
999 unsigned char from_sha1[20];
1000 const char *next = dotdot + 2;
1001 const char *this = arg;
1002 int symmetric = *next == '.';
1003 unsigned int flags_exclude = flags ^ UNINTERESTING;
1005 *dotdot = 0;
1006 next += symmetric;
1008 if (!*next)
1009 next = "HEAD";
1010 if (dotdot == arg)
1011 this = "HEAD";
1012 if (!get_sha1(this, from_sha1) &&
1013 !get_sha1(next, sha1)) {
1014 struct commit *a, *b;
1015 struct commit_list *exclude;
1017 a = lookup_commit_reference(from_sha1);
1018 b = lookup_commit_reference(sha1);
1019 if (!a || !b) {
1020 die(symmetric ?
1021 "Invalid symmetric difference expression %s...%s" :
1022 "Invalid revision range %s..%s",
1023 arg, next);
1026 if (!cant_be_filename) {
1027 *dotdot = '.';
1028 verify_non_filename(revs->prefix, arg);
1031 if (symmetric) {
1032 exclude = get_merge_bases(a, b, 1);
1033 add_pending_commit_list(revs, exclude,
1034 flags_exclude);
1035 free_commit_list(exclude);
1036 a->object.flags |= flags | SYMMETRIC_LEFT;
1037 } else
1038 a->object.flags |= flags_exclude;
1039 b->object.flags |= flags;
1040 add_pending_object(revs, &a->object, this);
1041 add_pending_object(revs, &b->object, next);
1042 return 0;
1044 *dotdot = '.';
1046 dotdot = strstr(arg, "^@");
1047 if (dotdot && !dotdot[2]) {
1048 *dotdot = 0;
1049 if (add_parents_only(revs, arg, flags))
1050 return 0;
1051 *dotdot = '^';
1053 dotdot = strstr(arg, "^!");
1054 if (dotdot && !dotdot[2]) {
1055 *dotdot = 0;
1056 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
1057 *dotdot = '^';
1060 local_flags = 0;
1061 if (*arg == '^') {
1062 local_flags = UNINTERESTING;
1063 arg++;
1065 if (get_sha1_with_mode(arg, sha1, &mode))
1066 return -1;
1067 if (!cant_be_filename)
1068 verify_non_filename(revs->prefix, arg);
1069 object = get_reference(revs, arg, sha1, flags ^ local_flags);
1070 add_pending_object_with_mode(revs, object, arg, mode);
1071 return 0;
1074 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb, const char ***prune_data)
1076 const char **prune = *prune_data;
1077 int prune_nr;
1078 int prune_alloc;
1080 /* count existing ones */
1081 if (!prune)
1082 prune_nr = 0;
1083 else
1084 for (prune_nr = 0; prune[prune_nr]; prune_nr++)
1086 prune_alloc = prune_nr; /* not really, but we do not know */
1088 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1089 int len = sb->len;
1090 if (len && sb->buf[len - 1] == '\n')
1091 sb->buf[--len] = '\0';
1092 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1093 prune[prune_nr++] = xstrdup(sb->buf);
1095 if (prune) {
1096 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1097 prune[prune_nr] = NULL;
1099 *prune_data = prune;
1102 static void read_revisions_from_stdin(struct rev_info *revs, const char ***prune)
1104 struct strbuf sb;
1105 int seen_dashdash = 0;
1107 strbuf_init(&sb, 1000);
1108 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1109 int len = sb.len;
1110 if (len && sb.buf[len - 1] == '\n')
1111 sb.buf[--len] = '\0';
1112 if (!len)
1113 break;
1114 if (sb.buf[0] == '-') {
1115 if (len == 2 && sb.buf[1] == '-') {
1116 seen_dashdash = 1;
1117 break;
1119 die("options not supported in --stdin mode");
1121 if (handle_revision_arg(sb.buf, revs, 0, 1))
1122 die("bad revision '%s'", sb.buf);
1124 if (seen_dashdash)
1125 read_pathspec_from_stdin(revs, &sb, prune);
1126 strbuf_release(&sb);
1129 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1131 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1134 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1136 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1139 static void add_message_grep(struct rev_info *revs, const char *pattern)
1141 add_grep(revs, pattern, GREP_PATTERN_BODY);
1144 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1145 int *unkc, const char **unkv)
1147 const char *arg = argv[0];
1148 const char *optarg;
1149 int argcount;
1151 /* pseudo revision arguments */
1152 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1153 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1154 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1155 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1156 !strcmp(arg, "--bisect"))
1158 unkv[(*unkc)++] = arg;
1159 return 1;
1162 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1163 revs->max_count = atoi(optarg);
1164 revs->no_walk = 0;
1165 return argcount;
1166 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1167 revs->skip_count = atoi(optarg);
1168 return argcount;
1169 } else if ((*arg == '-') && isdigit(arg[1])) {
1170 /* accept -<digit>, like traditional "head" */
1171 revs->max_count = atoi(arg + 1);
1172 revs->no_walk = 0;
1173 } else if (!strcmp(arg, "-n")) {
1174 if (argc <= 1)
1175 return error("-n requires an argument");
1176 revs->max_count = atoi(argv[1]);
1177 revs->no_walk = 0;
1178 return 2;
1179 } else if (!prefixcmp(arg, "-n")) {
1180 revs->max_count = atoi(arg + 2);
1181 revs->no_walk = 0;
1182 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1183 revs->max_age = atoi(optarg);
1184 return argcount;
1185 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1186 revs->max_age = approxidate(optarg);
1187 return argcount;
1188 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1189 revs->max_age = approxidate(optarg);
1190 return argcount;
1191 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1192 revs->min_age = atoi(optarg);
1193 return argcount;
1194 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1195 revs->min_age = approxidate(optarg);
1196 return argcount;
1197 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1198 revs->min_age = approxidate(optarg);
1199 return argcount;
1200 } else if (!strcmp(arg, "--first-parent")) {
1201 revs->first_parent_only = 1;
1202 } else if (!strcmp(arg, "--ancestry-path")) {
1203 revs->ancestry_path = 1;
1204 revs->simplify_history = 0;
1205 revs->limited = 1;
1206 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1207 init_reflog_walk(&revs->reflog_info);
1208 } else if (!strcmp(arg, "--default")) {
1209 if (argc <= 1)
1210 return error("bad --default argument");
1211 revs->def = argv[1];
1212 return 2;
1213 } else if (!strcmp(arg, "--merge")) {
1214 revs->show_merge = 1;
1215 } else if (!strcmp(arg, "--topo-order")) {
1216 revs->lifo = 1;
1217 revs->topo_order = 1;
1218 } else if (!strcmp(arg, "--simplify-merges")) {
1219 revs->simplify_merges = 1;
1220 revs->rewrite_parents = 1;
1221 revs->simplify_history = 0;
1222 revs->limited = 1;
1223 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1224 revs->simplify_merges = 1;
1225 revs->rewrite_parents = 1;
1226 revs->simplify_history = 0;
1227 revs->simplify_by_decoration = 1;
1228 revs->limited = 1;
1229 revs->prune = 1;
1230 load_ref_decorations(DECORATE_SHORT_REFS);
1231 } else if (!strcmp(arg, "--date-order")) {
1232 revs->lifo = 0;
1233 revs->topo_order = 1;
1234 } else if (!prefixcmp(arg, "--early-output")) {
1235 int count = 100;
1236 switch (arg[14]) {
1237 case '=':
1238 count = atoi(arg+15);
1239 /* Fallthrough */
1240 case 0:
1241 revs->topo_order = 1;
1242 revs->early_output = count;
1244 } else if (!strcmp(arg, "--parents")) {
1245 revs->rewrite_parents = 1;
1246 revs->print_parents = 1;
1247 } else if (!strcmp(arg, "--dense")) {
1248 revs->dense = 1;
1249 } else if (!strcmp(arg, "--sparse")) {
1250 revs->dense = 0;
1251 } else if (!strcmp(arg, "--show-all")) {
1252 revs->show_all = 1;
1253 } else if (!strcmp(arg, "--remove-empty")) {
1254 revs->remove_empty_trees = 1;
1255 } else if (!strcmp(arg, "--merges")) {
1256 revs->merges_only = 1;
1257 } else if (!strcmp(arg, "--no-merges")) {
1258 revs->no_merges = 1;
1259 } else if (!strcmp(arg, "--boundary")) {
1260 revs->boundary = 1;
1261 } else if (!strcmp(arg, "--left-right")) {
1262 revs->left_right = 1;
1263 } else if (!strcmp(arg, "--count")) {
1264 revs->count = 1;
1265 } else if (!strcmp(arg, "--cherry-pick")) {
1266 revs->cherry_pick = 1;
1267 revs->limited = 1;
1268 } else if (!strcmp(arg, "--objects")) {
1269 revs->tag_objects = 1;
1270 revs->tree_objects = 1;
1271 revs->blob_objects = 1;
1272 } else if (!strcmp(arg, "--objects-edge")) {
1273 revs->tag_objects = 1;
1274 revs->tree_objects = 1;
1275 revs->blob_objects = 1;
1276 revs->edge_hint = 1;
1277 } else if (!strcmp(arg, "--unpacked")) {
1278 revs->unpacked = 1;
1279 } else if (!prefixcmp(arg, "--unpacked=")) {
1280 die("--unpacked=<packfile> no longer supported.");
1281 } else if (!strcmp(arg, "-r")) {
1282 revs->diff = 1;
1283 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1284 } else if (!strcmp(arg, "-t")) {
1285 revs->diff = 1;
1286 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1287 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1288 } else if (!strcmp(arg, "-m")) {
1289 revs->ignore_merges = 0;
1290 } else if (!strcmp(arg, "-c")) {
1291 revs->diff = 1;
1292 revs->dense_combined_merges = 0;
1293 revs->combine_merges = 1;
1294 } else if (!strcmp(arg, "--cc")) {
1295 revs->diff = 1;
1296 revs->dense_combined_merges = 1;
1297 revs->combine_merges = 1;
1298 } else if (!strcmp(arg, "-v")) {
1299 revs->verbose_header = 1;
1300 } else if (!strcmp(arg, "--pretty")) {
1301 revs->verbose_header = 1;
1302 revs->pretty_given = 1;
1303 get_commit_format(arg+8, revs);
1304 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
1306 * Detached form ("--pretty X" as opposed to "--pretty=X")
1307 * not allowed, since the argument is optional.
1309 revs->verbose_header = 1;
1310 revs->pretty_given = 1;
1311 get_commit_format(arg+9, revs);
1312 } else if (!strcmp(arg, "--show-notes")) {
1313 revs->show_notes = 1;
1314 revs->show_notes_given = 1;
1315 } else if (!prefixcmp(arg, "--show-notes=")) {
1316 struct strbuf buf = STRBUF_INIT;
1317 revs->show_notes = 1;
1318 revs->show_notes_given = 1;
1319 if (!revs->notes_opt.extra_notes_refs)
1320 revs->notes_opt.extra_notes_refs = xcalloc(1, sizeof(struct string_list));
1321 if (!prefixcmp(arg+13, "refs/"))
1322 /* happy */;
1323 else if (!prefixcmp(arg+13, "notes/"))
1324 strbuf_addstr(&buf, "refs/");
1325 else
1326 strbuf_addstr(&buf, "refs/notes/");
1327 strbuf_addstr(&buf, arg+13);
1328 string_list_append(revs->notes_opt.extra_notes_refs,
1329 strbuf_detach(&buf, NULL));
1330 } else if (!strcmp(arg, "--no-notes")) {
1331 revs->show_notes = 0;
1332 revs->show_notes_given = 1;
1333 } else if (!strcmp(arg, "--standard-notes")) {
1334 revs->show_notes_given = 1;
1335 revs->notes_opt.suppress_default_notes = 0;
1336 } else if (!strcmp(arg, "--no-standard-notes")) {
1337 revs->notes_opt.suppress_default_notes = 1;
1338 } else if (!strcmp(arg, "--oneline")) {
1339 revs->verbose_header = 1;
1340 get_commit_format("oneline", revs);
1341 revs->pretty_given = 1;
1342 revs->abbrev_commit = 1;
1343 } else if (!strcmp(arg, "--graph")) {
1344 revs->topo_order = 1;
1345 revs->rewrite_parents = 1;
1346 revs->graph = graph_init(revs);
1347 } else if (!strcmp(arg, "--root")) {
1348 revs->show_root_diff = 1;
1349 } else if (!strcmp(arg, "--no-commit-id")) {
1350 revs->no_commit_id = 1;
1351 } else if (!strcmp(arg, "--always")) {
1352 revs->always_show_header = 1;
1353 } else if (!strcmp(arg, "--no-abbrev")) {
1354 revs->abbrev = 0;
1355 } else if (!strcmp(arg, "--abbrev")) {
1356 revs->abbrev = DEFAULT_ABBREV;
1357 } else if (!prefixcmp(arg, "--abbrev=")) {
1358 revs->abbrev = strtoul(arg + 9, NULL, 10);
1359 if (revs->abbrev < MINIMUM_ABBREV)
1360 revs->abbrev = MINIMUM_ABBREV;
1361 else if (revs->abbrev > 40)
1362 revs->abbrev = 40;
1363 } else if (!strcmp(arg, "--abbrev-commit")) {
1364 revs->abbrev_commit = 1;
1365 } else if (!strcmp(arg, "--full-diff")) {
1366 revs->diff = 1;
1367 revs->full_diff = 1;
1368 } else if (!strcmp(arg, "--full-history")) {
1369 revs->simplify_history = 0;
1370 } else if (!strcmp(arg, "--relative-date")) {
1371 revs->date_mode = DATE_RELATIVE;
1372 revs->date_mode_explicit = 1;
1373 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1374 revs->date_mode = parse_date_format(optarg);
1375 revs->date_mode_explicit = 1;
1376 return argcount;
1377 } else if (!strcmp(arg, "--log-size")) {
1378 revs->show_log_size = 1;
1381 * Grepping the commit log
1383 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1384 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1385 return argcount;
1386 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1387 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1388 return argcount;
1389 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1390 add_message_grep(revs, optarg);
1391 return argcount;
1392 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1393 revs->grep_filter.regflags |= REG_EXTENDED;
1394 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1395 revs->grep_filter.regflags |= REG_ICASE;
1396 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1397 revs->grep_filter.fixed = 1;
1398 } else if (!strcmp(arg, "--all-match")) {
1399 revs->grep_filter.all_match = 1;
1400 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
1401 if (strcmp(optarg, "none"))
1402 git_log_output_encoding = xstrdup(optarg);
1403 else
1404 git_log_output_encoding = "";
1405 return argcount;
1406 } else if (!strcmp(arg, "--reverse")) {
1407 revs->reverse ^= 1;
1408 } else if (!strcmp(arg, "--children")) {
1409 revs->children.name = "children";
1410 revs->limited = 1;
1411 } else {
1412 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1413 if (!opts)
1414 unkv[(*unkc)++] = arg;
1415 return opts;
1418 return 1;
1421 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1422 const struct option *options,
1423 const char * const usagestr[])
1425 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1426 &ctx->cpidx, ctx->out);
1427 if (n <= 0) {
1428 error("unknown option `%s'", ctx->argv[0]);
1429 usage_with_options(usagestr, options);
1431 ctx->argv += n;
1432 ctx->argc -= n;
1435 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1437 return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
1440 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1442 return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
1445 static void append_prune_data(const char ***prune_data, const char **av)
1447 const char **prune = *prune_data;
1448 int prune_nr;
1449 int prune_alloc;
1451 if (!prune) {
1452 *prune_data = av;
1453 return;
1456 /* count existing ones */
1457 for (prune_nr = 0; prune[prune_nr]; prune_nr++)
1459 prune_alloc = prune_nr; /* not really, but we do not know */
1461 while (*av) {
1462 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1463 prune[prune_nr++] = *av;
1464 av++;
1466 if (prune) {
1467 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1468 prune[prune_nr] = NULL;
1470 *prune_data = prune;
1474 * Parse revision information, filling in the "rev_info" structure,
1475 * and removing the used arguments from the argument list.
1477 * Returns the number of arguments left that weren't recognized
1478 * (which are also moved to the head of the argument list)
1480 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
1482 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
1483 const char **prune_data = NULL;
1484 const char *submodule = NULL;
1485 const char *optarg;
1486 int argcount;
1488 if (opt)
1489 submodule = opt->submodule;
1491 /* First, search for "--" */
1492 seen_dashdash = 0;
1493 for (i = 1; i < argc; i++) {
1494 const char *arg = argv[i];
1495 if (strcmp(arg, "--"))
1496 continue;
1497 argv[i] = NULL;
1498 argc = i;
1499 if (argv[i + 1])
1500 prune_data = argv + i + 1;
1501 seen_dashdash = 1;
1502 break;
1505 /* Second, deal with arguments and options */
1506 flags = 0;
1507 read_from_stdin = 0;
1508 for (left = i = 1; i < argc; i++) {
1509 const char *arg = argv[i];
1510 if (*arg == '-') {
1511 int opts;
1513 if (!strcmp(arg, "--all")) {
1514 handle_refs(submodule, revs, flags, for_each_ref_submodule);
1515 handle_refs(submodule, revs, flags, head_ref_submodule);
1516 continue;
1518 if (!strcmp(arg, "--branches")) {
1519 handle_refs(submodule, revs, flags, for_each_branch_ref_submodule);
1520 continue;
1522 if (!strcmp(arg, "--bisect")) {
1523 handle_refs(submodule, revs, flags, for_each_bad_bisect_ref);
1524 handle_refs(submodule, revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);
1525 revs->bisect = 1;
1526 continue;
1528 if (!strcmp(arg, "--tags")) {
1529 handle_refs(submodule, revs, flags, for_each_tag_ref_submodule);
1530 continue;
1532 if (!strcmp(arg, "--remotes")) {
1533 handle_refs(submodule, revs, flags, for_each_remote_ref_submodule);
1534 continue;
1536 if ((argcount = parse_long_opt("glob", argv + i, &optarg))) {
1537 struct all_refs_cb cb;
1538 i += argcount - 1;
1539 init_all_refs_cb(&cb, revs, flags);
1540 for_each_glob_ref(handle_one_ref, optarg, &cb);
1541 continue;
1543 if (!prefixcmp(arg, "--branches=")) {
1544 struct all_refs_cb cb;
1545 init_all_refs_cb(&cb, revs, flags);
1546 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
1547 continue;
1549 if (!prefixcmp(arg, "--tags=")) {
1550 struct all_refs_cb cb;
1551 init_all_refs_cb(&cb, revs, flags);
1552 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
1553 continue;
1555 if (!prefixcmp(arg, "--remotes=")) {
1556 struct all_refs_cb cb;
1557 init_all_refs_cb(&cb, revs, flags);
1558 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
1559 continue;
1561 if (!strcmp(arg, "--reflog")) {
1562 handle_reflog(revs, flags);
1563 continue;
1565 if (!strcmp(arg, "--not")) {
1566 flags ^= UNINTERESTING;
1567 continue;
1569 if (!strcmp(arg, "--no-walk")) {
1570 revs->no_walk = 1;
1571 continue;
1573 if (!strcmp(arg, "--do-walk")) {
1574 revs->no_walk = 0;
1575 continue;
1577 if (!strcmp(arg, "--stdin")) {
1578 if (revs->disable_stdin) {
1579 argv[left++] = arg;
1580 continue;
1582 if (read_from_stdin++)
1583 die("--stdin given twice?");
1584 read_revisions_from_stdin(revs, &prune_data);
1585 continue;
1588 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1589 if (opts > 0) {
1590 i += opts - 1;
1591 continue;
1593 if (opts < 0)
1594 exit(128);
1595 continue;
1598 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1599 int j;
1600 if (seen_dashdash || *arg == '^')
1601 die("bad revision '%s'", arg);
1603 /* If we didn't have a "--":
1604 * (1) all filenames must exist;
1605 * (2) all rev-args must not be interpretable
1606 * as a valid filename.
1607 * but the latter we have checked in the main loop.
1609 for (j = i; j < argc; j++)
1610 verify_filename(revs->prefix, argv[j]);
1612 append_prune_data(&prune_data, argv + i);
1613 break;
1615 else
1616 got_rev_arg = 1;
1619 if (prune_data)
1620 init_pathspec(&revs->prune_data, get_pathspec(revs->prefix, prune_data));
1622 if (revs->def == NULL)
1623 revs->def = opt ? opt->def : NULL;
1624 if (opt && opt->tweak)
1625 opt->tweak(revs, opt);
1626 if (revs->show_merge)
1627 prepare_show_merge(revs);
1628 if (revs->def && !revs->pending.nr && !got_rev_arg) {
1629 unsigned char sha1[20];
1630 struct object *object;
1631 unsigned mode;
1632 if (get_sha1_with_mode(revs->def, sha1, &mode))
1633 die("bad default revision '%s'", revs->def);
1634 object = get_reference(revs, revs->def, sha1, 0);
1635 add_pending_object_with_mode(revs, object, revs->def, mode);
1638 /* Did the user ask for any diff output? Run the diff! */
1639 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1640 revs->diff = 1;
1642 /* Pickaxe, diff-filter and rename following need diffs */
1643 if (revs->diffopt.pickaxe ||
1644 revs->diffopt.filter ||
1645 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1646 revs->diff = 1;
1648 if (revs->topo_order)
1649 revs->limited = 1;
1651 if (revs->prune_data.nr) {
1652 diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning);
1653 /* Can't prune commits with rename following: the paths change.. */
1654 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1655 revs->prune = 1;
1656 if (!revs->full_diff)
1657 diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt);
1659 if (revs->combine_merges)
1660 revs->ignore_merges = 0;
1661 revs->diffopt.abbrev = revs->abbrev;
1662 if (diff_setup_done(&revs->diffopt) < 0)
1663 die("diff_setup_done failed");
1665 compile_grep_patterns(&revs->grep_filter);
1667 if (revs->reverse && revs->reflog_info)
1668 die("cannot combine --reverse with --walk-reflogs");
1669 if (revs->rewrite_parents && revs->children.name)
1670 die("cannot combine --parents and --children");
1673 * Limitations on the graph functionality
1675 if (revs->reverse && revs->graph)
1676 die("cannot combine --reverse with --graph");
1678 if (revs->reflog_info && revs->graph)
1679 die("cannot combine --walk-reflogs with --graph");
1681 return left;
1684 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1686 struct commit_list *l = xcalloc(1, sizeof(*l));
1688 l->item = child;
1689 l->next = add_decoration(&revs->children, &parent->object, l);
1692 static int remove_duplicate_parents(struct commit *commit)
1694 struct commit_list **pp, *p;
1695 int surviving_parents;
1697 /* Examine existing parents while marking ones we have seen... */
1698 pp = &commit->parents;
1699 while ((p = *pp) != NULL) {
1700 struct commit *parent = p->item;
1701 if (parent->object.flags & TMP_MARK) {
1702 *pp = p->next;
1703 continue;
1705 parent->object.flags |= TMP_MARK;
1706 pp = &p->next;
1708 /* count them while clearing the temporary mark */
1709 surviving_parents = 0;
1710 for (p = commit->parents; p; p = p->next) {
1711 p->item->object.flags &= ~TMP_MARK;
1712 surviving_parents++;
1714 return surviving_parents;
1717 struct merge_simplify_state {
1718 struct commit *simplified;
1721 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1723 struct merge_simplify_state *st;
1725 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1726 if (!st) {
1727 st = xcalloc(1, sizeof(*st));
1728 add_decoration(&revs->merge_simplification, &commit->object, st);
1730 return st;
1733 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1735 struct commit_list *p;
1736 struct merge_simplify_state *st, *pst;
1737 int cnt;
1739 st = locate_simplify_state(revs, commit);
1742 * Have we handled this one?
1744 if (st->simplified)
1745 return tail;
1748 * An UNINTERESTING commit simplifies to itself, so does a
1749 * root commit. We do not rewrite parents of such commit
1750 * anyway.
1752 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
1753 st->simplified = commit;
1754 return tail;
1758 * Do we know what commit all of our parents should be rewritten to?
1759 * Otherwise we are not ready to rewrite this one yet.
1761 for (cnt = 0, p = commit->parents; p; p = p->next) {
1762 pst = locate_simplify_state(revs, p->item);
1763 if (!pst->simplified) {
1764 tail = &commit_list_insert(p->item, tail)->next;
1765 cnt++;
1768 if (cnt) {
1769 tail = &commit_list_insert(commit, tail)->next;
1770 return tail;
1774 * Rewrite our list of parents.
1776 for (p = commit->parents; p; p = p->next) {
1777 pst = locate_simplify_state(revs, p->item);
1778 p->item = pst->simplified;
1780 cnt = remove_duplicate_parents(commit);
1783 * It is possible that we are a merge and one side branch
1784 * does not have any commit that touches the given paths;
1785 * in such a case, the immediate parents will be rewritten
1786 * to different commits.
1788 * o----X X: the commit we are looking at;
1789 * / / o: a commit that touches the paths;
1790 * ---o----'
1792 * Further reduce the parents by removing redundant parents.
1794 if (1 < cnt) {
1795 struct commit_list *h = reduce_heads(commit->parents);
1796 cnt = commit_list_count(h);
1797 free_commit_list(commit->parents);
1798 commit->parents = h;
1802 * A commit simplifies to itself if it is a root, if it is
1803 * UNINTERESTING, if it touches the given paths, or if it is a
1804 * merge and its parents simplifies to more than one commits
1805 * (the first two cases are already handled at the beginning of
1806 * this function).
1808 * Otherwise, it simplifies to what its sole parent simplifies to.
1810 if (!cnt ||
1811 (commit->object.flags & UNINTERESTING) ||
1812 !(commit->object.flags & TREESAME) ||
1813 (1 < cnt))
1814 st->simplified = commit;
1815 else {
1816 pst = locate_simplify_state(revs, commit->parents->item);
1817 st->simplified = pst->simplified;
1819 return tail;
1822 static void simplify_merges(struct rev_info *revs)
1824 struct commit_list *list;
1825 struct commit_list *yet_to_do, **tail;
1827 if (!revs->topo_order)
1828 sort_in_topological_order(&revs->commits, revs->lifo);
1829 if (!revs->prune)
1830 return;
1832 /* feed the list reversed */
1833 yet_to_do = NULL;
1834 for (list = revs->commits; list; list = list->next)
1835 commit_list_insert(list->item, &yet_to_do);
1836 while (yet_to_do) {
1837 list = yet_to_do;
1838 yet_to_do = NULL;
1839 tail = &yet_to_do;
1840 while (list) {
1841 struct commit *commit = list->item;
1842 struct commit_list *next = list->next;
1843 free(list);
1844 list = next;
1845 tail = simplify_one(revs, commit, tail);
1849 /* clean up the result, removing the simplified ones */
1850 list = revs->commits;
1851 revs->commits = NULL;
1852 tail = &revs->commits;
1853 while (list) {
1854 struct commit *commit = list->item;
1855 struct commit_list *next = list->next;
1856 struct merge_simplify_state *st;
1857 free(list);
1858 list = next;
1859 st = locate_simplify_state(revs, commit);
1860 if (st->simplified == commit)
1861 tail = &commit_list_insert(commit, tail)->next;
1865 static void set_children(struct rev_info *revs)
1867 struct commit_list *l;
1868 for (l = revs->commits; l; l = l->next) {
1869 struct commit *commit = l->item;
1870 struct commit_list *p;
1872 for (p = commit->parents; p; p = p->next)
1873 add_child(revs, p->item, commit);
1877 int prepare_revision_walk(struct rev_info *revs)
1879 int nr = revs->pending.nr;
1880 struct object_array_entry *e, *list;
1882 e = list = revs->pending.objects;
1883 revs->pending.nr = 0;
1884 revs->pending.alloc = 0;
1885 revs->pending.objects = NULL;
1886 while (--nr >= 0) {
1887 struct commit *commit = handle_commit(revs, e->item, e->name);
1888 if (commit) {
1889 if (!(commit->object.flags & SEEN)) {
1890 commit->object.flags |= SEEN;
1891 commit_list_insert_by_date(commit, &revs->commits);
1894 e++;
1896 free(list);
1898 if (revs->no_walk)
1899 return 0;
1900 if (revs->limited)
1901 if (limit_list(revs) < 0)
1902 return -1;
1903 if (revs->topo_order)
1904 sort_in_topological_order(&revs->commits, revs->lifo);
1905 if (revs->simplify_merges)
1906 simplify_merges(revs);
1907 if (revs->children.name)
1908 set_children(revs);
1909 return 0;
1912 enum rewrite_result {
1913 rewrite_one_ok,
1914 rewrite_one_noparents,
1915 rewrite_one_error
1918 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
1920 struct commit_list *cache = NULL;
1922 for (;;) {
1923 struct commit *p = *pp;
1924 if (!revs->limited)
1925 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
1926 return rewrite_one_error;
1927 if (p->parents && p->parents->next)
1928 return rewrite_one_ok;
1929 if (p->object.flags & UNINTERESTING)
1930 return rewrite_one_ok;
1931 if (!(p->object.flags & TREESAME))
1932 return rewrite_one_ok;
1933 if (!p->parents)
1934 return rewrite_one_noparents;
1935 *pp = p->parents->item;
1939 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
1941 struct commit_list **pp = &commit->parents;
1942 while (*pp) {
1943 struct commit_list *parent = *pp;
1944 switch (rewrite_one(revs, &parent->item)) {
1945 case rewrite_one_ok:
1946 break;
1947 case rewrite_one_noparents:
1948 *pp = parent->next;
1949 continue;
1950 case rewrite_one_error:
1951 return -1;
1953 pp = &parent->next;
1955 remove_duplicate_parents(commit);
1956 return 0;
1959 static int commit_match(struct commit *commit, struct rev_info *opt)
1961 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
1962 return 1;
1963 return grep_buffer(&opt->grep_filter,
1964 NULL, /* we say nothing, not even filename */
1965 commit->buffer, strlen(commit->buffer));
1968 static inline int want_ancestry(struct rev_info *revs)
1970 return (revs->rewrite_parents || revs->children.name);
1973 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
1975 if (commit->object.flags & SHOWN)
1976 return commit_ignore;
1977 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
1978 return commit_ignore;
1979 if (revs->show_all)
1980 return commit_show;
1981 if (commit->object.flags & UNINTERESTING)
1982 return commit_ignore;
1983 if (revs->min_age != -1 && (commit->date > revs->min_age))
1984 return commit_ignore;
1985 if (revs->no_merges && commit->parents && commit->parents->next)
1986 return commit_ignore;
1987 if (revs->merges_only && !(commit->parents && commit->parents->next))
1988 return commit_ignore;
1989 if (!commit_match(commit, revs))
1990 return commit_ignore;
1991 if (revs->prune && revs->dense) {
1992 /* Commit without changes? */
1993 if (commit->object.flags & TREESAME) {
1994 /* drop merges unless we want parenthood */
1995 if (!want_ancestry(revs))
1996 return commit_ignore;
1997 /* non-merge - always ignore it */
1998 if (!commit->parents || !commit->parents->next)
1999 return commit_ignore;
2002 return commit_show;
2005 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
2007 enum commit_action action = get_commit_action(revs, commit);
2009 if (action == commit_show &&
2010 !revs->show_all &&
2011 revs->prune && revs->dense && want_ancestry(revs)) {
2012 if (rewrite_parents(revs, commit) < 0)
2013 return commit_error;
2015 return action;
2018 static struct commit *get_revision_1(struct rev_info *revs)
2020 if (!revs->commits)
2021 return NULL;
2023 do {
2024 struct commit_list *entry = revs->commits;
2025 struct commit *commit = entry->item;
2027 revs->commits = entry->next;
2028 free(entry);
2030 if (revs->reflog_info) {
2031 fake_reflog_parent(revs->reflog_info, commit);
2032 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
2036 * If we haven't done the list limiting, we need to look at
2037 * the parents here. We also need to do the date-based limiting
2038 * that we'd otherwise have done in limit_list().
2040 if (!revs->limited) {
2041 if (revs->max_age != -1 &&
2042 (commit->date < revs->max_age))
2043 continue;
2044 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
2045 die("Failed to traverse parents of commit %s",
2046 sha1_to_hex(commit->object.sha1));
2049 switch (simplify_commit(revs, commit)) {
2050 case commit_ignore:
2051 continue;
2052 case commit_error:
2053 die("Failed to simplify parents of commit %s",
2054 sha1_to_hex(commit->object.sha1));
2055 default:
2056 return commit;
2058 } while (revs->commits);
2059 return NULL;
2062 static void gc_boundary(struct object_array *array)
2064 unsigned nr = array->nr;
2065 unsigned alloc = array->alloc;
2066 struct object_array_entry *objects = array->objects;
2068 if (alloc <= nr) {
2069 unsigned i, j;
2070 for (i = j = 0; i < nr; i++) {
2071 if (objects[i].item->flags & SHOWN)
2072 continue;
2073 if (i != j)
2074 objects[j] = objects[i];
2075 j++;
2077 for (i = j; i < nr; i++)
2078 objects[i].item = NULL;
2079 array->nr = j;
2083 static void create_boundary_commit_list(struct rev_info *revs)
2085 unsigned i;
2086 struct commit *c;
2087 struct object_array *array = &revs->boundary_commits;
2088 struct object_array_entry *objects = array->objects;
2091 * If revs->commits is non-NULL at this point, an error occurred in
2092 * get_revision_1(). Ignore the error and continue printing the
2093 * boundary commits anyway. (This is what the code has always
2094 * done.)
2096 if (revs->commits) {
2097 free_commit_list(revs->commits);
2098 revs->commits = NULL;
2102 * Put all of the actual boundary commits from revs->boundary_commits
2103 * into revs->commits
2105 for (i = 0; i < array->nr; i++) {
2106 c = (struct commit *)(objects[i].item);
2107 if (!c)
2108 continue;
2109 if (!(c->object.flags & CHILD_SHOWN))
2110 continue;
2111 if (c->object.flags & (SHOWN | BOUNDARY))
2112 continue;
2113 c->object.flags |= BOUNDARY;
2114 commit_list_insert(c, &revs->commits);
2118 * If revs->topo_order is set, sort the boundary commits
2119 * in topological order
2121 sort_in_topological_order(&revs->commits, revs->lifo);
2124 static struct commit *get_revision_internal(struct rev_info *revs)
2126 struct commit *c = NULL;
2127 struct commit_list *l;
2129 if (revs->boundary == 2) {
2131 * All of the normal commits have already been returned,
2132 * and we are now returning boundary commits.
2133 * create_boundary_commit_list() has populated
2134 * revs->commits with the remaining commits to return.
2136 c = pop_commit(&revs->commits);
2137 if (c)
2138 c->object.flags |= SHOWN;
2139 return c;
2143 * Now pick up what they want to give us
2145 c = get_revision_1(revs);
2146 if (c) {
2147 while (0 < revs->skip_count) {
2148 revs->skip_count--;
2149 c = get_revision_1(revs);
2150 if (!c)
2151 break;
2156 * Check the max_count.
2158 switch (revs->max_count) {
2159 case -1:
2160 break;
2161 case 0:
2162 c = NULL;
2163 break;
2164 default:
2165 revs->max_count--;
2168 if (c)
2169 c->object.flags |= SHOWN;
2171 if (!revs->boundary) {
2172 return c;
2175 if (!c) {
2177 * get_revision_1() runs out the commits, and
2178 * we are done computing the boundaries.
2179 * switch to boundary commits output mode.
2181 revs->boundary = 2;
2184 * Update revs->commits to contain the list of
2185 * boundary commits.
2187 create_boundary_commit_list(revs);
2189 return get_revision_internal(revs);
2193 * boundary commits are the commits that are parents of the
2194 * ones we got from get_revision_1() but they themselves are
2195 * not returned from get_revision_1(). Before returning
2196 * 'c', we need to mark its parents that they could be boundaries.
2199 for (l = c->parents; l; l = l->next) {
2200 struct object *p;
2201 p = &(l->item->object);
2202 if (p->flags & (CHILD_SHOWN | SHOWN))
2203 continue;
2204 p->flags |= CHILD_SHOWN;
2205 gc_boundary(&revs->boundary_commits);
2206 add_object_array(p, NULL, &revs->boundary_commits);
2209 return c;
2212 struct commit *get_revision(struct rev_info *revs)
2214 struct commit *c;
2215 struct commit_list *reversed;
2217 if (revs->reverse) {
2218 reversed = NULL;
2219 while ((c = get_revision_internal(revs))) {
2220 commit_list_insert(c, &reversed);
2222 revs->commits = reversed;
2223 revs->reverse = 0;
2224 revs->reverse_output_stage = 1;
2227 if (revs->reverse_output_stage)
2228 return pop_commit(&revs->commits);
2230 c = get_revision_internal(revs);
2231 if (c && revs->graph)
2232 graph_update(revs->graph, c);
2233 return c;