git-remote-hg: add GitHg, a helper class for converting hg commits to git
[git/dscho.git] / revision.c
blob206a5b69fea5458c251d74c9f7a0c5c085069858
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 static int show_path_component_truncated(FILE *out, const char *name, int len)
45 int cnt;
46 for (cnt = 0; cnt < len; cnt++) {
47 int ch = name[cnt];
48 if (!ch || ch == '\n')
49 return -1;
50 fputc(ch, out);
52 return len;
55 static int show_path_truncated(FILE *out, const struct name_path *path)
57 int emitted, ours;
59 if (!path)
60 return 0;
61 emitted = show_path_truncated(out, path->up);
62 if (emitted < 0)
63 return emitted;
64 if (emitted)
65 fputc('/', out);
66 ours = show_path_component_truncated(out, path->elem, path->elem_len);
67 if (ours < 0)
68 return ours;
69 return ours || emitted;
72 void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component)
74 struct name_path leaf;
75 leaf.up = (struct name_path *)path;
76 leaf.elem = component;
77 leaf.elem_len = strlen(component);
79 fprintf(out, "%s ", sha1_to_hex(obj->sha1));
80 show_path_truncated(out, &leaf);
81 fputc('\n', out);
84 void add_object(struct object *obj,
85 struct object_array *p,
86 struct name_path *path,
87 const char *name)
89 add_object_array(obj, path_name(path, name), p);
92 static void mark_blob_uninteresting(struct blob *blob)
94 if (!blob)
95 return;
96 if (blob->object.flags & UNINTERESTING)
97 return;
98 blob->object.flags |= UNINTERESTING;
101 void mark_tree_uninteresting(struct tree *tree)
103 struct tree_desc desc;
104 struct name_entry entry;
105 struct object *obj = &tree->object;
107 if (!tree)
108 return;
109 if (obj->flags & UNINTERESTING)
110 return;
111 obj->flags |= UNINTERESTING;
112 if (!has_sha1_file(obj->sha1))
113 return;
114 if (parse_tree(tree) < 0)
115 die("bad tree %s", sha1_to_hex(obj->sha1));
117 init_tree_desc(&desc, tree->buffer, tree->size);
118 while (tree_entry(&desc, &entry)) {
119 switch (object_type(entry.mode)) {
120 case OBJ_TREE:
121 mark_tree_uninteresting(lookup_tree(entry.sha1));
122 break;
123 case OBJ_BLOB:
124 mark_blob_uninteresting(lookup_blob(entry.sha1));
125 break;
126 default:
127 /* Subproject commit - not in this repository */
128 break;
133 * We don't care about the tree any more
134 * after it has been marked uninteresting.
136 free(tree->buffer);
137 tree->buffer = NULL;
140 void mark_parents_uninteresting(struct commit *commit)
142 struct commit_list *parents = NULL, *l;
144 for (l = commit->parents; l; l = l->next)
145 commit_list_insert(l->item, &parents);
147 while (parents) {
148 struct commit *commit = parents->item;
149 l = parents;
150 parents = parents->next;
151 free(l);
153 while (commit) {
155 * A missing commit is ok iff its parent is marked
156 * uninteresting.
158 * We just mark such a thing parsed, so that when
159 * it is popped next time around, we won't be trying
160 * to parse it and get an error.
162 if (!has_sha1_file(commit->object.sha1))
163 commit->object.parsed = 1;
165 if (commit->object.flags & UNINTERESTING)
166 break;
168 commit->object.flags |= UNINTERESTING;
171 * Normally we haven't parsed the parent
172 * yet, so we won't have a parent of a parent
173 * here. However, it may turn out that we've
174 * reached this commit some other way (where it
175 * wasn't uninteresting), in which case we need
176 * to mark its parents recursively too..
178 if (!commit->parents)
179 break;
181 for (l = commit->parents->next; l; l = l->next)
182 commit_list_insert(l->item, &parents);
183 commit = commit->parents->item;
188 static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode, unsigned flags)
190 if (!obj)
191 return;
192 if (revs->no_walk && (obj->flags & UNINTERESTING))
193 revs->no_walk = 0;
194 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
195 struct strbuf buf = STRBUF_INIT;
196 int len = interpret_branch_name(name, &buf);
197 int st;
199 if (0 < len && name[len] && buf.len)
200 strbuf_addstr(&buf, name + len);
201 st = add_reflog_for_walk(revs->reflog_info,
202 (struct commit *)obj,
203 buf.buf[0] ? buf.buf: name);
204 strbuf_release(&buf);
205 if (st)
206 return;
208 add_object_array_with_mode(obj, name, &revs->pending, mode);
209 revs->pending.objects[revs->pending.nr-1].flags = flags;
212 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
214 add_pending_object_with_mode(revs, obj, name, S_IFINVALID, 0);
217 void add_head_to_pending(struct rev_info *revs)
219 unsigned char sha1[20];
220 struct object *obj;
221 if (get_sha1("HEAD", sha1))
222 return;
223 obj = parse_object(sha1);
224 if (!obj)
225 return;
226 add_pending_object(revs, obj, "HEAD");
229 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
231 struct object *object;
233 object = parse_object(sha1);
234 if (!object) {
235 if (revs->ignore_missing)
236 return object;
237 die("bad object %s", name);
239 object->flags |= flags;
240 return object;
243 void add_pending_sha1(struct rev_info *revs, const char *name,
244 const unsigned char *sha1, unsigned int flags)
246 struct object *object = get_reference(revs, name, sha1, flags);
247 add_pending_object(revs, object, name);
250 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
252 unsigned long flags = object->flags;
255 * Tag object? Look what it points to..
257 while (object->type == OBJ_TAG) {
258 struct tag *tag = (struct tag *) object;
259 if (revs->tag_objects && !(flags & UNINTERESTING))
260 add_pending_object(revs, object, tag->tag);
261 if (!tag->tagged)
262 die("bad tag");
263 object = parse_object(tag->tagged->sha1);
264 if (!object) {
265 if (flags & UNINTERESTING)
266 return NULL;
267 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
272 * Commit object? Just return it, we'll do all the complex
273 * reachability crud.
275 if (object->type == OBJ_COMMIT) {
276 struct commit *commit = (struct commit *)object;
277 if (parse_commit(commit) < 0)
278 die("unable to parse commit %s", name);
279 if (flags & UNINTERESTING) {
280 commit->object.flags |= UNINTERESTING;
281 mark_parents_uninteresting(commit);
282 revs->limited = 1;
284 if (revs->show_source && !commit->util)
285 commit->util = (void *) name;
286 return commit;
290 * Tree object? Either mark it uninteresting, or add it
291 * to the list of objects to look at later..
293 if (object->type == OBJ_TREE) {
294 struct tree *tree = (struct tree *)object;
295 if (!revs->tree_objects)
296 return NULL;
297 if (flags & UNINTERESTING) {
298 mark_tree_uninteresting(tree);
299 return NULL;
301 add_pending_object(revs, object, "");
302 return NULL;
306 * Blob object? You know the drill by now..
308 if (object->type == OBJ_BLOB) {
309 struct blob *blob = (struct blob *)object;
310 if (!revs->blob_objects)
311 return NULL;
312 if (flags & UNINTERESTING) {
313 mark_blob_uninteresting(blob);
314 return NULL;
316 add_pending_object(revs, object, "");
317 return NULL;
319 die("%s is unknown object", name);
322 static int everybody_uninteresting(struct commit_list *orig)
324 struct commit_list *list = orig;
325 while (list) {
326 struct commit *commit = list->item;
327 list = list->next;
328 if (commit->object.flags & UNINTERESTING)
329 continue;
330 return 0;
332 return 1;
336 * The goal is to get REV_TREE_NEW as the result only if the
337 * diff consists of all '+' (and no other changes), REV_TREE_OLD
338 * if the whole diff is removal of old data, and otherwise
339 * REV_TREE_DIFFERENT (of course if the trees are the same we
340 * want REV_TREE_SAME).
341 * That means that once we get to REV_TREE_DIFFERENT, we do not
342 * have to look any further.
344 static int tree_difference = REV_TREE_SAME;
346 static void file_add_remove(struct diff_options *options,
347 int addremove, unsigned mode,
348 const unsigned char *sha1,
349 const char *fullpath, unsigned dirty_submodule)
351 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
353 tree_difference |= diff;
354 if (tree_difference == REV_TREE_DIFFERENT)
355 DIFF_OPT_SET(options, HAS_CHANGES);
358 static void file_change(struct diff_options *options,
359 unsigned old_mode, unsigned new_mode,
360 const unsigned char *old_sha1,
361 const unsigned char *new_sha1,
362 const char *fullpath,
363 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
365 tree_difference = REV_TREE_DIFFERENT;
366 DIFF_OPT_SET(options, HAS_CHANGES);
369 static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
371 struct tree *t1 = parent->tree;
372 struct tree *t2 = commit->tree;
374 if (!t1)
375 return REV_TREE_NEW;
376 if (!t2)
377 return REV_TREE_OLD;
379 if (revs->simplify_by_decoration) {
381 * If we are simplifying by decoration, then the commit
382 * is worth showing if it has a tag pointing at it.
384 if (lookup_decoration(&name_decoration, &commit->object))
385 return REV_TREE_DIFFERENT;
387 * A commit that is not pointed by a tag is uninteresting
388 * if we are not limited by path. This means that you will
389 * see the usual "commits that touch the paths" plus any
390 * tagged commit by specifying both --simplify-by-decoration
391 * and pathspec.
393 if (!revs->prune_data.nr)
394 return REV_TREE_SAME;
397 tree_difference = REV_TREE_SAME;
398 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
399 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
400 &revs->pruning) < 0)
401 return REV_TREE_DIFFERENT;
402 return tree_difference;
405 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
407 int retval;
408 void *tree;
409 unsigned long size;
410 struct tree_desc empty, real;
411 struct tree *t1 = commit->tree;
413 if (!t1)
414 return 0;
416 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
417 if (!tree)
418 return 0;
419 init_tree_desc(&real, tree, size);
420 init_tree_desc(&empty, "", 0);
422 tree_difference = REV_TREE_SAME;
423 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
424 retval = diff_tree(&empty, &real, "", &revs->pruning);
425 free(tree);
427 return retval >= 0 && (tree_difference == REV_TREE_SAME);
430 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
432 struct commit_list **pp, *parent;
433 int tree_changed = 0, tree_same = 0, nth_parent = 0;
436 * If we don't do pruning, everything is interesting
438 if (!revs->prune)
439 return;
441 if (!commit->tree)
442 return;
444 if (!commit->parents) {
445 if (rev_same_tree_as_empty(revs, commit))
446 commit->object.flags |= TREESAME;
447 return;
451 * Normal non-merge commit? If we don't want to make the
452 * history dense, we consider it always to be a change..
454 if (!revs->dense && !commit->parents->next)
455 return;
457 pp = &commit->parents;
458 while ((parent = *pp) != NULL) {
459 struct commit *p = parent->item;
462 * Do not compare with later parents when we care only about
463 * the first parent chain, in order to avoid derailing the
464 * traversal to follow a side branch that brought everything
465 * in the path we are limited to by the pathspec.
467 if (revs->first_parent_only && nth_parent++)
468 break;
469 if (parse_commit(p) < 0)
470 die("cannot simplify commit %s (because of %s)",
471 sha1_to_hex(commit->object.sha1),
472 sha1_to_hex(p->object.sha1));
473 switch (rev_compare_tree(revs, p, commit)) {
474 case REV_TREE_SAME:
475 tree_same = 1;
476 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
477 /* Even if a merge with an uninteresting
478 * side branch brought the entire change
479 * we are interested in, we do not want
480 * to lose the other branches of this
481 * merge, so we just keep going.
483 pp = &parent->next;
484 continue;
486 parent->next = NULL;
487 commit->parents = parent;
488 commit->object.flags |= TREESAME;
489 return;
491 case REV_TREE_NEW:
492 if (revs->remove_empty_trees &&
493 rev_same_tree_as_empty(revs, p)) {
494 /* We are adding all the specified
495 * paths from this parent, so the
496 * history beyond this parent is not
497 * interesting. Remove its parents
498 * (they are grandparents for us).
499 * IOW, we pretend this parent is a
500 * "root" commit.
502 if (parse_commit(p) < 0)
503 die("cannot simplify commit %s (invalid %s)",
504 sha1_to_hex(commit->object.sha1),
505 sha1_to_hex(p->object.sha1));
506 p->parents = NULL;
508 /* fallthrough */
509 case REV_TREE_OLD:
510 case REV_TREE_DIFFERENT:
511 tree_changed = 1;
512 pp = &parent->next;
513 continue;
515 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
517 if (tree_changed && !tree_same)
518 return;
519 commit->object.flags |= TREESAME;
522 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
523 struct commit_list *cached_base, struct commit_list **cache)
525 struct commit_list *new_entry;
527 if (cached_base && p->date < cached_base->item->date)
528 new_entry = commit_list_insert_by_date(p, &cached_base->next);
529 else
530 new_entry = commit_list_insert_by_date(p, head);
532 if (cache && (!*cache || p->date < (*cache)->item->date))
533 *cache = new_entry;
536 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
537 struct commit_list **list, struct commit_list **cache_ptr)
539 struct commit_list *parent = commit->parents;
540 unsigned left_flag;
541 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
543 if (commit->object.flags & ADDED)
544 return 0;
545 commit->object.flags |= ADDED;
548 * If the commit is uninteresting, don't try to
549 * prune parents - we want the maximal uninteresting
550 * set.
552 * Normally we haven't parsed the parent
553 * yet, so we won't have a parent of a parent
554 * here. However, it may turn out that we've
555 * reached this commit some other way (where it
556 * wasn't uninteresting), in which case we need
557 * to mark its parents recursively too..
559 if (commit->object.flags & UNINTERESTING) {
560 while (parent) {
561 struct commit *p = parent->item;
562 parent = parent->next;
563 if (p)
564 p->object.flags |= UNINTERESTING;
565 if (parse_commit(p) < 0)
566 continue;
567 if (p->parents)
568 mark_parents_uninteresting(p);
569 if (p->object.flags & SEEN)
570 continue;
571 p->object.flags |= SEEN;
572 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
574 return 0;
578 * Ok, the commit wasn't uninteresting. Try to
579 * simplify the commit history and find the parent
580 * that has no differences in the path set if one exists.
582 try_to_simplify_commit(revs, commit);
584 if (revs->no_walk)
585 return 0;
587 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
589 for (parent = commit->parents; parent; parent = parent->next) {
590 struct commit *p = parent->item;
592 if (parse_commit(p) < 0)
593 return -1;
594 if (revs->show_source && !p->util)
595 p->util = commit->util;
596 p->object.flags |= left_flag;
597 if (!(p->object.flags & SEEN)) {
598 p->object.flags |= SEEN;
599 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
601 if (revs->first_parent_only)
602 break;
604 return 0;
607 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
609 struct commit_list *p;
610 int left_count = 0, right_count = 0;
611 int left_first;
612 struct patch_ids ids;
613 unsigned cherry_flag;
615 /* First count the commits on the left and on the right */
616 for (p = list; p; p = p->next) {
617 struct commit *commit = p->item;
618 unsigned flags = commit->object.flags;
619 if (flags & BOUNDARY)
621 else if (flags & SYMMETRIC_LEFT)
622 left_count++;
623 else
624 right_count++;
627 if (!left_count || !right_count)
628 return;
630 left_first = left_count < right_count;
631 init_patch_ids(&ids);
632 ids.diffopts.pathspec = revs->diffopt.pathspec;
634 /* Compute patch-ids for one side */
635 for (p = list; p; p = p->next) {
636 struct commit *commit = p->item;
637 unsigned flags = commit->object.flags;
639 if (flags & BOUNDARY)
640 continue;
642 * If we have fewer left, left_first is set and we omit
643 * commits on the right branch in this loop. If we have
644 * fewer right, we skip the left ones.
646 if (left_first != !!(flags & SYMMETRIC_LEFT))
647 continue;
648 commit->util = add_commit_patch_id(commit, &ids);
651 /* either cherry_mark or cherry_pick are true */
652 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
654 /* Check the other side */
655 for (p = list; p; p = p->next) {
656 struct commit *commit = p->item;
657 struct patch_id *id;
658 unsigned flags = commit->object.flags;
660 if (flags & BOUNDARY)
661 continue;
663 * If we have fewer left, left_first is set and we omit
664 * commits on the left branch in this loop.
666 if (left_first == !!(flags & SYMMETRIC_LEFT))
667 continue;
670 * Have we seen the same patch id?
672 id = has_commit_patch_id(commit, &ids);
673 if (!id)
674 continue;
675 id->seen = 1;
676 commit->object.flags |= cherry_flag;
679 /* Now check the original side for seen ones */
680 for (p = list; p; p = p->next) {
681 struct commit *commit = p->item;
682 struct patch_id *ent;
684 ent = commit->util;
685 if (!ent)
686 continue;
687 if (ent->seen)
688 commit->object.flags |= cherry_flag;
689 commit->util = NULL;
692 free_patch_ids(&ids);
695 /* How many extra uninteresting commits we want to see.. */
696 #define SLOP 5
698 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
701 * No source list at all? We're definitely done..
703 if (!src)
704 return 0;
707 * Does the destination list contain entries with a date
708 * before the source list? Definitely _not_ done.
710 if (date < src->item->date)
711 return SLOP;
714 * Does the source list still have interesting commits in
715 * it? Definitely not done..
717 if (!everybody_uninteresting(src))
718 return SLOP;
720 /* Ok, we're closing in.. */
721 return slop-1;
725 * "rev-list --ancestry-path A..B" computes commits that are ancestors
726 * of B but not ancestors of A but further limits the result to those
727 * that are descendants of A. This takes the list of bottom commits and
728 * the result of "A..B" without --ancestry-path, and limits the latter
729 * further to the ones that can reach one of the commits in "bottom".
731 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
733 struct commit_list *p;
734 struct commit_list *rlist = NULL;
735 int made_progress;
738 * Reverse the list so that it will be likely that we would
739 * process parents before children.
741 for (p = list; p; p = p->next)
742 commit_list_insert(p->item, &rlist);
744 for (p = bottom; p; p = p->next)
745 p->item->object.flags |= TMP_MARK;
748 * Mark the ones that can reach bottom commits in "list",
749 * in a bottom-up fashion.
751 do {
752 made_progress = 0;
753 for (p = rlist; p; p = p->next) {
754 struct commit *c = p->item;
755 struct commit_list *parents;
756 if (c->object.flags & (TMP_MARK | UNINTERESTING))
757 continue;
758 for (parents = c->parents;
759 parents;
760 parents = parents->next) {
761 if (!(parents->item->object.flags & TMP_MARK))
762 continue;
763 c->object.flags |= TMP_MARK;
764 made_progress = 1;
765 break;
768 } while (made_progress);
771 * NEEDSWORK: decide if we want to remove parents that are
772 * not marked with TMP_MARK from commit->parents for commits
773 * in the resulting list. We may not want to do that, though.
777 * The ones that are not marked with TMP_MARK are uninteresting
779 for (p = list; p; p = p->next) {
780 struct commit *c = p->item;
781 if (c->object.flags & TMP_MARK)
782 continue;
783 c->object.flags |= UNINTERESTING;
786 /* We are done with the TMP_MARK */
787 for (p = list; p; p = p->next)
788 p->item->object.flags &= ~TMP_MARK;
789 for (p = bottom; p; p = p->next)
790 p->item->object.flags &= ~TMP_MARK;
791 free_commit_list(rlist);
795 * Before walking the history, keep the set of "negative" refs the
796 * caller has asked to exclude.
798 * This is used to compute "rev-list --ancestry-path A..B", as we need
799 * to filter the result of "A..B" further to the ones that can actually
800 * reach A.
802 static struct commit_list *collect_bottom_commits(struct rev_info *revs)
804 struct commit_list *bottom = NULL;
805 int i;
806 for (i = 0; i < revs->cmdline.nr; i++) {
807 struct rev_cmdline_entry *elem = &revs->cmdline.rev[i];
808 if ((elem->flags & UNINTERESTING) &&
809 elem->item->type == OBJ_COMMIT)
810 commit_list_insert((struct commit *)elem->item, &bottom);
812 return bottom;
815 /* Assumes either left_only or right_only is set */
816 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
818 struct commit_list *p;
820 for (p = list; p; p = p->next) {
821 struct commit *commit = p->item;
823 if (revs->right_only) {
824 if (commit->object.flags & SYMMETRIC_LEFT)
825 commit->object.flags |= SHOWN;
826 } else /* revs->left_only is set */
827 if (!(commit->object.flags & SYMMETRIC_LEFT))
828 commit->object.flags |= SHOWN;
832 static int limit_list(struct rev_info *revs)
834 int slop = SLOP;
835 unsigned long date = ~0ul;
836 struct commit_list *list = revs->commits;
837 struct commit_list *newlist = NULL;
838 struct commit_list **p = &newlist;
839 struct commit_list *bottom = NULL;
841 if (revs->ancestry_path) {
842 bottom = collect_bottom_commits(revs);
843 if (!bottom)
844 die("--ancestry-path given but there are no bottom commits");
847 while (list) {
848 struct commit_list *entry = list;
849 struct commit *commit = list->item;
850 struct object *obj = &commit->object;
851 show_early_output_fn_t show;
853 list = list->next;
854 free(entry);
856 if (revs->max_age != -1 && (commit->date < revs->max_age))
857 obj->flags |= UNINTERESTING;
858 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
859 return -1;
860 if (obj->flags & UNINTERESTING) {
861 mark_parents_uninteresting(commit);
862 if (revs->show_all)
863 p = &commit_list_insert(commit, p)->next;
864 slop = still_interesting(list, date, slop);
865 if (slop)
866 continue;
867 /* If showing all, add the whole pending list to the end */
868 if (revs->show_all)
869 *p = list;
870 break;
872 if (revs->min_age != -1 && (commit->date > revs->min_age))
873 continue;
874 date = commit->date;
875 p = &commit_list_insert(commit, p)->next;
877 show = show_early_output;
878 if (!show)
879 continue;
881 show(revs, newlist);
882 show_early_output = NULL;
884 if (revs->cherry_pick || revs->cherry_mark)
885 cherry_pick_list(newlist, revs);
887 if (revs->left_only || revs->right_only)
888 limit_left_right(newlist, revs);
890 if (bottom) {
891 limit_to_ancestry(bottom, newlist);
892 free_commit_list(bottom);
895 revs->commits = newlist;
896 return 0;
899 static void add_rev_cmdline(struct rev_info *revs,
900 struct object *item,
901 const char *name,
902 int whence,
903 unsigned flags)
905 struct rev_cmdline_info *info = &revs->cmdline;
906 int nr = info->nr;
908 ALLOC_GROW(info->rev, nr + 1, info->alloc);
909 info->rev[nr].item = item;
910 info->rev[nr].name = name;
911 info->rev[nr].whence = whence;
912 info->rev[nr].flags = flags;
913 info->nr++;
916 struct all_refs_cb {
917 int all_flags;
918 int warned_bad_reflog;
919 struct rev_info *all_revs;
920 const char *name_for_errormsg;
923 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
925 struct all_refs_cb *cb = cb_data;
926 struct object *object = get_reference(cb->all_revs, path, sha1,
927 cb->all_flags);
928 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
929 add_pending_sha1(cb->all_revs, path, sha1, cb->all_flags);
930 return 0;
933 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
934 unsigned flags)
936 cb->all_revs = revs;
937 cb->all_flags = flags;
940 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
941 int (*for_each)(const char *, each_ref_fn, void *))
943 struct all_refs_cb cb;
944 init_all_refs_cb(&cb, revs, flags);
945 for_each(submodule, handle_one_ref, &cb);
948 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
950 struct all_refs_cb *cb = cb_data;
951 if (!is_null_sha1(sha1)) {
952 struct object *o = parse_object(sha1);
953 if (o) {
954 o->flags |= cb->all_flags;
955 /* ??? CMDLINEFLAGS ??? */
956 add_pending_object(cb->all_revs, o, "");
958 else if (!cb->warned_bad_reflog) {
959 warning("reflog of '%s' references pruned commits",
960 cb->name_for_errormsg);
961 cb->warned_bad_reflog = 1;
966 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
967 const char *email, unsigned long timestamp, int tz,
968 const char *message, void *cb_data)
970 handle_one_reflog_commit(osha1, cb_data);
971 handle_one_reflog_commit(nsha1, cb_data);
972 return 0;
975 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
977 struct all_refs_cb *cb = cb_data;
978 cb->warned_bad_reflog = 0;
979 cb->name_for_errormsg = path;
980 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
981 return 0;
984 static void handle_reflog(struct rev_info *revs, unsigned flags)
986 struct all_refs_cb cb;
987 cb.all_revs = revs;
988 cb.all_flags = flags;
989 for_each_reflog(handle_one_reflog, &cb);
992 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
994 unsigned char sha1[20];
995 struct object *it;
996 struct commit *commit;
997 struct commit_list *parents;
998 const char *arg = arg_;
1000 if (*arg == '^') {
1001 flags ^= UNINTERESTING;
1002 arg++;
1004 if (get_sha1(arg, sha1))
1005 return 0;
1006 while (1) {
1007 it = get_reference(revs, arg, sha1, 0);
1008 if (!it && revs->ignore_missing)
1009 return 0;
1010 if (it->type != OBJ_TAG)
1011 break;
1012 if (!((struct tag*)it)->tagged)
1013 return 0;
1014 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
1016 if (it->type != OBJ_COMMIT)
1017 return 0;
1018 commit = (struct commit *)it;
1019 for (parents = commit->parents; parents; parents = parents->next) {
1020 it = &parents->item->object;
1021 it->flags |= flags;
1022 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1023 add_pending_object(revs, it, arg);
1025 return 1;
1028 void init_revisions(struct rev_info *revs, const char *prefix)
1030 memset(revs, 0, sizeof(*revs));
1032 revs->abbrev = DEFAULT_ABBREV;
1033 revs->ignore_merges = 1;
1034 revs->simplify_history = 1;
1035 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1036 DIFF_OPT_SET(&revs->pruning, QUICK);
1037 revs->pruning.add_remove = file_add_remove;
1038 revs->pruning.change = file_change;
1039 revs->lifo = 1;
1040 revs->dense = 1;
1041 revs->prefix = prefix;
1042 revs->max_age = -1;
1043 revs->min_age = -1;
1044 revs->skip_count = -1;
1045 revs->max_count = -1;
1046 revs->max_parents = -1;
1048 revs->commit_format = CMIT_FMT_DEFAULT;
1050 revs->grep_filter.status_only = 1;
1051 revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
1052 revs->grep_filter.header_tail = &(revs->grep_filter.header_list);
1053 revs->grep_filter.regflags = REG_NEWLINE;
1055 diff_setup(&revs->diffopt);
1056 if (prefix && !revs->diffopt.prefix) {
1057 revs->diffopt.prefix = prefix;
1058 revs->diffopt.prefix_length = strlen(prefix);
1061 revs->notes_opt.use_default_notes = -1;
1064 static void add_pending_commit_list(struct rev_info *revs,
1065 struct commit_list *commit_list,
1066 unsigned int flags)
1068 while (commit_list) {
1069 struct object *object = &commit_list->item->object;
1070 object->flags |= flags;
1071 add_pending_object(revs, object, sha1_to_hex(object->sha1));
1072 commit_list = commit_list->next;
1076 static void prepare_show_merge(struct rev_info *revs)
1078 struct commit_list *bases;
1079 struct commit *head, *other;
1080 unsigned char sha1[20];
1081 const char **prune = NULL;
1082 int i, prune_num = 1; /* counting terminating NULL */
1084 if (get_sha1("HEAD", sha1))
1085 die("--merge without HEAD?");
1086 head = lookup_commit_or_die(sha1, "HEAD");
1087 if (get_sha1("MERGE_HEAD", sha1))
1088 die("--merge without MERGE_HEAD?");
1089 other = lookup_commit_or_die(sha1, "MERGE_HEAD");
1090 add_pending_object(revs, &head->object, "HEAD");
1091 add_pending_object(revs, &other->object, "MERGE_HEAD");
1092 bases = get_merge_bases(head, other, 1);
1093 add_pending_commit_list(revs, bases, UNINTERESTING);
1094 free_commit_list(bases);
1095 head->object.flags |= SYMMETRIC_LEFT;
1097 if (!active_nr)
1098 read_cache();
1099 for (i = 0; i < active_nr; i++) {
1100 struct cache_entry *ce = active_cache[i];
1101 if (!ce_stage(ce))
1102 continue;
1103 if (ce_path_match(ce, &revs->prune_data)) {
1104 prune_num++;
1105 prune = xrealloc(prune, sizeof(*prune) * prune_num);
1106 prune[prune_num-2] = ce->name;
1107 prune[prune_num-1] = NULL;
1109 while ((i+1 < active_nr) &&
1110 ce_same_name(ce, active_cache[i+1]))
1111 i++;
1113 free_pathspec(&revs->prune_data);
1114 init_pathspec(&revs->prune_data, prune);
1115 revs->limited = 1;
1118 int handle_revision_arg(const char *arg_, struct rev_info *revs,
1119 int flags,
1120 int cant_be_filename)
1122 unsigned mode;
1123 char *dotdot;
1124 struct object *object;
1125 unsigned char sha1[20];
1126 int local_flags;
1127 const char *arg = arg_;
1129 dotdot = strstr(arg, "..");
1130 if (dotdot) {
1131 unsigned char from_sha1[20];
1132 const char *next = dotdot + 2;
1133 const char *this = arg;
1134 int symmetric = *next == '.';
1135 unsigned int flags_exclude = flags ^ UNINTERESTING;
1136 unsigned int a_flags;
1138 *dotdot = 0;
1139 next += symmetric;
1141 if (!*next)
1142 next = "HEAD";
1143 if (dotdot == arg)
1144 this = "HEAD";
1145 if (!get_sha1(this, from_sha1) &&
1146 !get_sha1(next, sha1)) {
1147 struct commit *a, *b;
1148 struct commit_list *exclude;
1150 a = lookup_commit_reference(from_sha1);
1151 b = lookup_commit_reference(sha1);
1152 if (!a || !b) {
1153 if (revs->ignore_missing)
1154 return 0;
1155 die(symmetric ?
1156 "Invalid symmetric difference expression %s...%s" :
1157 "Invalid revision range %s..%s",
1158 arg, next);
1161 if (!cant_be_filename) {
1162 *dotdot = '.';
1163 verify_non_filename(revs->prefix, arg);
1166 if (symmetric) {
1167 exclude = get_merge_bases(a, b, 1);
1168 add_pending_commit_list(revs, exclude,
1169 flags_exclude);
1170 free_commit_list(exclude);
1171 a_flags = flags | SYMMETRIC_LEFT;
1172 } else
1173 a_flags = flags_exclude;
1174 a->object.flags |= a_flags;
1175 b->object.flags |= flags;
1176 add_rev_cmdline(revs, &a->object, this,
1177 REV_CMD_LEFT, a_flags);
1178 add_rev_cmdline(revs, &b->object, next,
1179 REV_CMD_RIGHT, flags);
1180 add_pending_object_with_mode(revs, &a->object, this,
1181 S_IFINVALID, flags_exclude);
1182 add_pending_object(revs, &b->object, next);
1183 return 0;
1185 *dotdot = '.';
1187 dotdot = strstr(arg, "^@");
1188 if (dotdot && !dotdot[2]) {
1189 *dotdot = 0;
1190 if (add_parents_only(revs, arg, flags))
1191 return 0;
1192 *dotdot = '^';
1194 dotdot = strstr(arg, "^!");
1195 if (dotdot && !dotdot[2]) {
1196 *dotdot = 0;
1197 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
1198 *dotdot = '^';
1201 local_flags = 0;
1202 if (*arg == '^') {
1203 local_flags = UNINTERESTING;
1204 arg++;
1206 if (get_sha1_with_mode(arg, sha1, &mode))
1207 return revs->ignore_missing ? 0 : -1;
1208 if (!cant_be_filename)
1209 verify_non_filename(revs->prefix, arg);
1210 object = get_reference(revs, arg, sha1, flags ^ local_flags);
1211 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1212 add_pending_object_with_mode(revs, object, arg, mode, local_flags);
1213 return 0;
1216 struct cmdline_pathspec {
1217 int alloc;
1218 int nr;
1219 const char **path;
1222 static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1224 while (*av) {
1225 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1226 prune->path[prune->nr++] = *(av++);
1230 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1231 struct cmdline_pathspec *prune)
1233 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1234 int len = sb->len;
1235 if (len && sb->buf[len - 1] == '\n')
1236 sb->buf[--len] = '\0';
1237 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1238 prune->path[prune->nr++] = xstrdup(sb->buf);
1242 static void read_revisions_from_stdin(struct rev_info *revs,
1243 struct cmdline_pathspec *prune)
1245 struct strbuf sb;
1246 int seen_dashdash = 0;
1248 strbuf_init(&sb, 1000);
1249 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1250 int len = sb.len;
1251 if (len && sb.buf[len - 1] == '\n')
1252 sb.buf[--len] = '\0';
1253 if (!len)
1254 break;
1255 if (sb.buf[0] == '-') {
1256 if (len == 2 && sb.buf[1] == '-') {
1257 seen_dashdash = 1;
1258 break;
1260 die("options not supported in --stdin mode");
1262 if (handle_revision_arg(sb.buf, revs, 0, 1))
1263 die("bad revision '%s'", sb.buf);
1265 if (seen_dashdash)
1266 read_pathspec_from_stdin(revs, &sb, prune);
1267 strbuf_release(&sb);
1270 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1272 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1275 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1277 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1280 static void add_message_grep(struct rev_info *revs, const char *pattern)
1282 add_grep(revs, pattern, GREP_PATTERN_BODY);
1285 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1286 int *unkc, const char **unkv)
1288 const char *arg = argv[0];
1289 const char *optarg;
1290 int argcount;
1292 /* pseudo revision arguments */
1293 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1294 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1295 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1296 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1297 !strcmp(arg, "--bisect") || !prefixcmp(arg, "--glob=") ||
1298 !prefixcmp(arg, "--branches=") || !prefixcmp(arg, "--tags=") ||
1299 !prefixcmp(arg, "--remotes="))
1301 unkv[(*unkc)++] = arg;
1302 return 1;
1305 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1306 revs->max_count = atoi(optarg);
1307 revs->no_walk = 0;
1308 return argcount;
1309 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1310 revs->skip_count = atoi(optarg);
1311 return argcount;
1312 } else if ((*arg == '-') && isdigit(arg[1])) {
1313 /* accept -<digit>, like traditional "head" */
1314 revs->max_count = atoi(arg + 1);
1315 revs->no_walk = 0;
1316 } else if (!strcmp(arg, "-n")) {
1317 if (argc <= 1)
1318 return error("-n requires an argument");
1319 revs->max_count = atoi(argv[1]);
1320 revs->no_walk = 0;
1321 return 2;
1322 } else if (!prefixcmp(arg, "-n")) {
1323 revs->max_count = atoi(arg + 2);
1324 revs->no_walk = 0;
1325 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1326 revs->max_age = atoi(optarg);
1327 return argcount;
1328 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1329 revs->max_age = approxidate(optarg);
1330 return argcount;
1331 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1332 revs->max_age = approxidate(optarg);
1333 return argcount;
1334 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1335 revs->min_age = atoi(optarg);
1336 return argcount;
1337 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1338 revs->min_age = approxidate(optarg);
1339 return argcount;
1340 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1341 revs->min_age = approxidate(optarg);
1342 return argcount;
1343 } else if (!strcmp(arg, "--first-parent")) {
1344 revs->first_parent_only = 1;
1345 } else if (!strcmp(arg, "--ancestry-path")) {
1346 revs->ancestry_path = 1;
1347 revs->simplify_history = 0;
1348 revs->limited = 1;
1349 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1350 init_reflog_walk(&revs->reflog_info);
1351 } else if (!strcmp(arg, "--default")) {
1352 if (argc <= 1)
1353 return error("bad --default argument");
1354 revs->def = argv[1];
1355 return 2;
1356 } else if (!strcmp(arg, "--merge")) {
1357 revs->show_merge = 1;
1358 } else if (!strcmp(arg, "--topo-order")) {
1359 revs->lifo = 1;
1360 revs->topo_order = 1;
1361 } else if (!strcmp(arg, "--simplify-merges")) {
1362 revs->simplify_merges = 1;
1363 revs->rewrite_parents = 1;
1364 revs->simplify_history = 0;
1365 revs->limited = 1;
1366 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1367 revs->simplify_merges = 1;
1368 revs->rewrite_parents = 1;
1369 revs->simplify_history = 0;
1370 revs->simplify_by_decoration = 1;
1371 revs->limited = 1;
1372 revs->prune = 1;
1373 load_ref_decorations(DECORATE_SHORT_REFS);
1374 } else if (!strcmp(arg, "--date-order")) {
1375 revs->lifo = 0;
1376 revs->topo_order = 1;
1377 } else if (!prefixcmp(arg, "--early-output")) {
1378 int count = 100;
1379 switch (arg[14]) {
1380 case '=':
1381 count = atoi(arg+15);
1382 /* Fallthrough */
1383 case 0:
1384 revs->topo_order = 1;
1385 revs->early_output = count;
1387 } else if (!strcmp(arg, "--parents")) {
1388 revs->rewrite_parents = 1;
1389 revs->print_parents = 1;
1390 } else if (!strcmp(arg, "--dense")) {
1391 revs->dense = 1;
1392 } else if (!strcmp(arg, "--sparse")) {
1393 revs->dense = 0;
1394 } else if (!strcmp(arg, "--show-all")) {
1395 revs->show_all = 1;
1396 } else if (!strcmp(arg, "--remove-empty")) {
1397 revs->remove_empty_trees = 1;
1398 } else if (!strcmp(arg, "--merges")) {
1399 revs->min_parents = 2;
1400 } else if (!strcmp(arg, "--no-merges")) {
1401 revs->max_parents = 1;
1402 } else if (!prefixcmp(arg, "--min-parents=")) {
1403 revs->min_parents = atoi(arg+14);
1404 } else if (!prefixcmp(arg, "--no-min-parents")) {
1405 revs->min_parents = 0;
1406 } else if (!prefixcmp(arg, "--max-parents=")) {
1407 revs->max_parents = atoi(arg+14);
1408 } else if (!prefixcmp(arg, "--no-max-parents")) {
1409 revs->max_parents = -1;
1410 } else if (!strcmp(arg, "--boundary")) {
1411 revs->boundary = 1;
1412 } else if (!strcmp(arg, "--left-right")) {
1413 revs->left_right = 1;
1414 } else if (!strcmp(arg, "--left-only")) {
1415 if (revs->right_only)
1416 die("--left-only is incompatible with --right-only"
1417 " or --cherry");
1418 revs->left_only = 1;
1419 } else if (!strcmp(arg, "--right-only")) {
1420 if (revs->left_only)
1421 die("--right-only is incompatible with --left-only");
1422 revs->right_only = 1;
1423 } else if (!strcmp(arg, "--cherry")) {
1424 if (revs->left_only)
1425 die("--cherry is incompatible with --left-only");
1426 revs->cherry_mark = 1;
1427 revs->right_only = 1;
1428 revs->max_parents = 1;
1429 revs->limited = 1;
1430 } else if (!strcmp(arg, "--count")) {
1431 revs->count = 1;
1432 } else if (!strcmp(arg, "--cherry-mark")) {
1433 if (revs->cherry_pick)
1434 die("--cherry-mark is incompatible with --cherry-pick");
1435 revs->cherry_mark = 1;
1436 revs->limited = 1; /* needs limit_list() */
1437 } else if (!strcmp(arg, "--cherry-pick")) {
1438 if (revs->cherry_mark)
1439 die("--cherry-pick is incompatible with --cherry-mark");
1440 revs->cherry_pick = 1;
1441 revs->limited = 1;
1442 } else if (!strcmp(arg, "--objects")) {
1443 revs->tag_objects = 1;
1444 revs->tree_objects = 1;
1445 revs->blob_objects = 1;
1446 } else if (!strcmp(arg, "--objects-edge")) {
1447 revs->tag_objects = 1;
1448 revs->tree_objects = 1;
1449 revs->blob_objects = 1;
1450 revs->edge_hint = 1;
1451 } else if (!strcmp(arg, "--verify-objects")) {
1452 revs->tag_objects = 1;
1453 revs->tree_objects = 1;
1454 revs->blob_objects = 1;
1455 revs->verify_objects = 1;
1456 } else if (!strcmp(arg, "--unpacked")) {
1457 revs->unpacked = 1;
1458 } else if (!prefixcmp(arg, "--unpacked=")) {
1459 die("--unpacked=<packfile> no longer supported.");
1460 } else if (!strcmp(arg, "-r")) {
1461 revs->diff = 1;
1462 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1463 } else if (!strcmp(arg, "-t")) {
1464 revs->diff = 1;
1465 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1466 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1467 } else if (!strcmp(arg, "-m")) {
1468 revs->ignore_merges = 0;
1469 } else if (!strcmp(arg, "-c")) {
1470 revs->diff = 1;
1471 revs->dense_combined_merges = 0;
1472 revs->combine_merges = 1;
1473 } else if (!strcmp(arg, "--cc")) {
1474 revs->diff = 1;
1475 revs->dense_combined_merges = 1;
1476 revs->combine_merges = 1;
1477 } else if (!strcmp(arg, "-v")) {
1478 revs->verbose_header = 1;
1479 } else if (!strcmp(arg, "--pretty")) {
1480 revs->verbose_header = 1;
1481 revs->pretty_given = 1;
1482 get_commit_format(arg+8, revs);
1483 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
1485 * Detached form ("--pretty X" as opposed to "--pretty=X")
1486 * not allowed, since the argument is optional.
1488 revs->verbose_header = 1;
1489 revs->pretty_given = 1;
1490 get_commit_format(arg+9, revs);
1491 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1492 revs->show_notes = 1;
1493 revs->show_notes_given = 1;
1494 revs->notes_opt.use_default_notes = 1;
1495 } else if (!strcmp(arg, "--show-signature")) {
1496 revs->show_signature = 1;
1497 } else if (!prefixcmp(arg, "--show-notes=") ||
1498 !prefixcmp(arg, "--notes=")) {
1499 struct strbuf buf = STRBUF_INIT;
1500 revs->show_notes = 1;
1501 revs->show_notes_given = 1;
1502 if (!prefixcmp(arg, "--show-notes")) {
1503 if (revs->notes_opt.use_default_notes < 0)
1504 revs->notes_opt.use_default_notes = 1;
1505 strbuf_addstr(&buf, arg+13);
1507 else
1508 strbuf_addstr(&buf, arg+8);
1509 expand_notes_ref(&buf);
1510 string_list_append(&revs->notes_opt.extra_notes_refs,
1511 strbuf_detach(&buf, NULL));
1512 } else if (!strcmp(arg, "--no-notes")) {
1513 revs->show_notes = 0;
1514 revs->show_notes_given = 1;
1515 revs->notes_opt.use_default_notes = -1;
1516 /* we have been strdup'ing ourselves, so trick
1517 * string_list into free()ing strings */
1518 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1519 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1520 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1521 } else if (!strcmp(arg, "--standard-notes")) {
1522 revs->show_notes_given = 1;
1523 revs->notes_opt.use_default_notes = 1;
1524 } else if (!strcmp(arg, "--no-standard-notes")) {
1525 revs->notes_opt.use_default_notes = 0;
1526 } else if (!strcmp(arg, "--oneline")) {
1527 revs->verbose_header = 1;
1528 get_commit_format("oneline", revs);
1529 revs->pretty_given = 1;
1530 revs->abbrev_commit = 1;
1531 } else if (!strcmp(arg, "--graph")) {
1532 revs->topo_order = 1;
1533 revs->rewrite_parents = 1;
1534 revs->graph = graph_init(revs);
1535 } else if (!strcmp(arg, "--root")) {
1536 revs->show_root_diff = 1;
1537 } else if (!strcmp(arg, "--no-commit-id")) {
1538 revs->no_commit_id = 1;
1539 } else if (!strcmp(arg, "--always")) {
1540 revs->always_show_header = 1;
1541 } else if (!strcmp(arg, "--no-abbrev")) {
1542 revs->abbrev = 0;
1543 } else if (!strcmp(arg, "--abbrev")) {
1544 revs->abbrev = DEFAULT_ABBREV;
1545 } else if (!prefixcmp(arg, "--abbrev=")) {
1546 revs->abbrev = strtoul(arg + 9, NULL, 10);
1547 if (revs->abbrev < MINIMUM_ABBREV)
1548 revs->abbrev = MINIMUM_ABBREV;
1549 else if (revs->abbrev > 40)
1550 revs->abbrev = 40;
1551 } else if (!strcmp(arg, "--abbrev-commit")) {
1552 revs->abbrev_commit = 1;
1553 revs->abbrev_commit_given = 1;
1554 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1555 revs->abbrev_commit = 0;
1556 } else if (!strcmp(arg, "--full-diff")) {
1557 revs->diff = 1;
1558 revs->full_diff = 1;
1559 } else if (!strcmp(arg, "--full-history")) {
1560 revs->simplify_history = 0;
1561 } else if (!strcmp(arg, "--relative-date")) {
1562 revs->date_mode = DATE_RELATIVE;
1563 revs->date_mode_explicit = 1;
1564 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1565 revs->date_mode = parse_date_format(optarg);
1566 revs->date_mode_explicit = 1;
1567 return argcount;
1568 } else if (!strcmp(arg, "--log-size")) {
1569 revs->show_log_size = 1;
1572 * Grepping the commit log
1574 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1575 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1576 return argcount;
1577 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1578 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1579 return argcount;
1580 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1581 add_message_grep(revs, optarg);
1582 return argcount;
1583 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1584 revs->grep_filter.regflags |= REG_EXTENDED;
1585 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1586 revs->grep_filter.regflags |= REG_ICASE;
1587 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
1588 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1589 revs->grep_filter.fixed = 1;
1590 } else if (!strcmp(arg, "--all-match")) {
1591 revs->grep_filter.all_match = 1;
1592 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
1593 if (strcmp(optarg, "none"))
1594 git_log_output_encoding = xstrdup(optarg);
1595 else
1596 git_log_output_encoding = "";
1597 return argcount;
1598 } else if (!strcmp(arg, "--reverse")) {
1599 revs->reverse ^= 1;
1600 } else if (!strcmp(arg, "--children")) {
1601 revs->children.name = "children";
1602 revs->limited = 1;
1603 } else if (!strcmp(arg, "--ignore-missing")) {
1604 revs->ignore_missing = 1;
1605 } else {
1606 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1607 if (!opts)
1608 unkv[(*unkc)++] = arg;
1609 return opts;
1612 return 1;
1615 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1616 const struct option *options,
1617 const char * const usagestr[])
1619 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1620 &ctx->cpidx, ctx->out);
1621 if (n <= 0) {
1622 error("unknown option `%s'", ctx->argv[0]);
1623 usage_with_options(usagestr, options);
1625 ctx->argv += n;
1626 ctx->argc -= n;
1629 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1631 return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
1634 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1636 return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
1639 static int handle_revision_pseudo_opt(const char *submodule,
1640 struct rev_info *revs,
1641 int argc, const char **argv, int *flags)
1643 const char *arg = argv[0];
1644 const char *optarg;
1645 int argcount;
1648 * NOTE!
1650 * Commands like "git shortlog" will not accept the options below
1651 * unless parse_revision_opt queues them (as opposed to erroring
1652 * out).
1654 * When implementing your new pseudo-option, remember to
1655 * register it in the list at the top of handle_revision_opt.
1657 if (!strcmp(arg, "--all")) {
1658 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
1659 handle_refs(submodule, revs, *flags, head_ref_submodule);
1660 } else if (!strcmp(arg, "--branches")) {
1661 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
1662 } else if (!strcmp(arg, "--bisect")) {
1663 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
1664 handle_refs(submodule, revs, *flags ^ UNINTERESTING, for_each_good_bisect_ref);
1665 revs->bisect = 1;
1666 } else if (!strcmp(arg, "--tags")) {
1667 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
1668 } else if (!strcmp(arg, "--remotes")) {
1669 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
1670 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
1671 struct all_refs_cb cb;
1672 init_all_refs_cb(&cb, revs, *flags);
1673 for_each_glob_ref(handle_one_ref, optarg, &cb);
1674 return argcount;
1675 } else if (!prefixcmp(arg, "--branches=")) {
1676 struct all_refs_cb cb;
1677 init_all_refs_cb(&cb, revs, *flags);
1678 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
1679 } else if (!prefixcmp(arg, "--tags=")) {
1680 struct all_refs_cb cb;
1681 init_all_refs_cb(&cb, revs, *flags);
1682 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
1683 } else if (!prefixcmp(arg, "--remotes=")) {
1684 struct all_refs_cb cb;
1685 init_all_refs_cb(&cb, revs, *flags);
1686 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
1687 } else if (!strcmp(arg, "--reflog")) {
1688 handle_reflog(revs, *flags);
1689 } else if (!strcmp(arg, "--not")) {
1690 *flags ^= UNINTERESTING;
1691 } else if (!strcmp(arg, "--no-walk")) {
1692 revs->no_walk = 1;
1693 } else if (!strcmp(arg, "--do-walk")) {
1694 revs->no_walk = 0;
1695 } else {
1696 return 0;
1699 return 1;
1703 * Parse revision information, filling in the "rev_info" structure,
1704 * and removing the used arguments from the argument list.
1706 * Returns the number of arguments left that weren't recognized
1707 * (which are also moved to the head of the argument list)
1709 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
1711 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
1712 struct cmdline_pathspec prune_data;
1713 const char *submodule = NULL;
1715 memset(&prune_data, 0, sizeof(prune_data));
1716 if (opt)
1717 submodule = opt->submodule;
1719 /* First, search for "--" */
1720 if (opt && opt->assume_dashdash) {
1721 seen_dashdash = 1;
1722 } else {
1723 seen_dashdash = 0;
1724 for (i = 1; i < argc; i++) {
1725 const char *arg = argv[i];
1726 if (strcmp(arg, "--"))
1727 continue;
1728 argv[i] = NULL;
1729 argc = i;
1730 if (argv[i + 1])
1731 append_prune_data(&prune_data, argv + i + 1);
1732 seen_dashdash = 1;
1733 break;
1737 /* Second, deal with arguments and options */
1738 flags = 0;
1739 read_from_stdin = 0;
1740 for (left = i = 1; i < argc; i++) {
1741 const char *arg = argv[i];
1742 if (*arg == '-') {
1743 int opts;
1745 opts = handle_revision_pseudo_opt(submodule,
1746 revs, argc - i, argv + i,
1747 &flags);
1748 if (opts > 0) {
1749 i += opts - 1;
1750 continue;
1753 if (!strcmp(arg, "--stdin")) {
1754 if (revs->disable_stdin) {
1755 argv[left++] = arg;
1756 continue;
1758 if (read_from_stdin++)
1759 die("--stdin given twice?");
1760 read_revisions_from_stdin(revs, &prune_data);
1761 continue;
1764 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1765 if (opts > 0) {
1766 i += opts - 1;
1767 continue;
1769 if (opts < 0)
1770 exit(128);
1771 continue;
1774 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1775 int j;
1776 if (seen_dashdash || *arg == '^')
1777 die("bad revision '%s'", arg);
1779 /* If we didn't have a "--":
1780 * (1) all filenames must exist;
1781 * (2) all rev-args must not be interpretable
1782 * as a valid filename.
1783 * but the latter we have checked in the main loop.
1785 for (j = i; j < argc; j++)
1786 verify_filename(revs->prefix, argv[j]);
1788 append_prune_data(&prune_data, argv + i);
1789 break;
1791 else
1792 got_rev_arg = 1;
1795 if (prune_data.nr) {
1797 * If we need to introduce the magic "a lone ':' means no
1798 * pathspec whatsoever", here is the place to do so.
1800 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
1801 * prune_data.nr = 0;
1802 * prune_data.alloc = 0;
1803 * free(prune_data.path);
1804 * prune_data.path = NULL;
1805 * } else {
1806 * terminate prune_data.alloc with NULL and
1807 * call init_pathspec() to set revs->prune_data here.
1810 ALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc);
1811 prune_data.path[prune_data.nr++] = NULL;
1812 init_pathspec(&revs->prune_data,
1813 get_pathspec(revs->prefix, prune_data.path));
1816 if (revs->def == NULL)
1817 revs->def = opt ? opt->def : NULL;
1818 if (opt && opt->tweak)
1819 opt->tweak(revs, opt);
1820 if (revs->show_merge)
1821 prepare_show_merge(revs);
1822 if (revs->def && !revs->pending.nr && !got_rev_arg) {
1823 unsigned char sha1[20];
1824 struct object *object;
1825 unsigned mode;
1826 if (get_sha1_with_mode(revs->def, sha1, &mode))
1827 die("bad default revision '%s'", revs->def);
1828 object = get_reference(revs, revs->def, sha1, 0);
1829 add_pending_object_with_mode(revs, object, revs->def, mode, 0);
1832 /* Did the user ask for any diff output? Run the diff! */
1833 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1834 revs->diff = 1;
1836 /* Pickaxe, diff-filter and rename following need diffs */
1837 if (revs->diffopt.pickaxe ||
1838 revs->diffopt.filter ||
1839 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1840 revs->diff = 1;
1842 if (revs->topo_order)
1843 revs->limited = 1;
1845 if (revs->prune_data.nr) {
1846 diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning);
1847 /* Can't prune commits with rename following: the paths change.. */
1848 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1849 revs->prune = 1;
1850 if (!revs->full_diff)
1851 diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt);
1853 if (revs->combine_merges)
1854 revs->ignore_merges = 0;
1855 revs->diffopt.abbrev = revs->abbrev;
1856 if (diff_setup_done(&revs->diffopt) < 0)
1857 die("diff_setup_done failed");
1859 compile_grep_patterns(&revs->grep_filter);
1861 if (revs->reverse && revs->reflog_info)
1862 die("cannot combine --reverse with --walk-reflogs");
1863 if (revs->rewrite_parents && revs->children.name)
1864 die("cannot combine --parents and --children");
1867 * Limitations on the graph functionality
1869 if (revs->reverse && revs->graph)
1870 die("cannot combine --reverse with --graph");
1872 if (revs->reflog_info && revs->graph)
1873 die("cannot combine --walk-reflogs with --graph");
1875 return left;
1878 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1880 struct commit_list *l = xcalloc(1, sizeof(*l));
1882 l->item = child;
1883 l->next = add_decoration(&revs->children, &parent->object, l);
1886 static int remove_duplicate_parents(struct commit *commit)
1888 struct commit_list **pp, *p;
1889 int surviving_parents;
1891 /* Examine existing parents while marking ones we have seen... */
1892 pp = &commit->parents;
1893 while ((p = *pp) != NULL) {
1894 struct commit *parent = p->item;
1895 if (parent->object.flags & TMP_MARK) {
1896 *pp = p->next;
1897 continue;
1899 parent->object.flags |= TMP_MARK;
1900 pp = &p->next;
1902 /* count them while clearing the temporary mark */
1903 surviving_parents = 0;
1904 for (p = commit->parents; p; p = p->next) {
1905 p->item->object.flags &= ~TMP_MARK;
1906 surviving_parents++;
1908 return surviving_parents;
1911 struct merge_simplify_state {
1912 struct commit *simplified;
1915 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1917 struct merge_simplify_state *st;
1919 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1920 if (!st) {
1921 st = xcalloc(1, sizeof(*st));
1922 add_decoration(&revs->merge_simplification, &commit->object, st);
1924 return st;
1927 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1929 struct commit_list *p;
1930 struct merge_simplify_state *st, *pst;
1931 int cnt;
1933 st = locate_simplify_state(revs, commit);
1936 * Have we handled this one?
1938 if (st->simplified)
1939 return tail;
1942 * An UNINTERESTING commit simplifies to itself, so does a
1943 * root commit. We do not rewrite parents of such commit
1944 * anyway.
1946 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
1947 st->simplified = commit;
1948 return tail;
1952 * Do we know what commit all of our parents should be rewritten to?
1953 * Otherwise we are not ready to rewrite this one yet.
1955 for (cnt = 0, p = commit->parents; p; p = p->next) {
1956 pst = locate_simplify_state(revs, p->item);
1957 if (!pst->simplified) {
1958 tail = &commit_list_insert(p->item, tail)->next;
1959 cnt++;
1962 if (cnt) {
1963 tail = &commit_list_insert(commit, tail)->next;
1964 return tail;
1968 * Rewrite our list of parents.
1970 for (p = commit->parents; p; p = p->next) {
1971 pst = locate_simplify_state(revs, p->item);
1972 p->item = pst->simplified;
1974 cnt = remove_duplicate_parents(commit);
1977 * It is possible that we are a merge and one side branch
1978 * does not have any commit that touches the given paths;
1979 * in such a case, the immediate parents will be rewritten
1980 * to different commits.
1982 * o----X X: the commit we are looking at;
1983 * / / o: a commit that touches the paths;
1984 * ---o----'
1986 * Further reduce the parents by removing redundant parents.
1988 if (1 < cnt) {
1989 struct commit_list *h = reduce_heads(commit->parents);
1990 cnt = commit_list_count(h);
1991 free_commit_list(commit->parents);
1992 commit->parents = h;
1996 * A commit simplifies to itself if it is a root, if it is
1997 * UNINTERESTING, if it touches the given paths, or if it is a
1998 * merge and its parents simplifies to more than one commits
1999 * (the first two cases are already handled at the beginning of
2000 * this function).
2002 * Otherwise, it simplifies to what its sole parent simplifies to.
2004 if (!cnt ||
2005 (commit->object.flags & UNINTERESTING) ||
2006 !(commit->object.flags & TREESAME) ||
2007 (1 < cnt))
2008 st->simplified = commit;
2009 else {
2010 pst = locate_simplify_state(revs, commit->parents->item);
2011 st->simplified = pst->simplified;
2013 return tail;
2016 static void simplify_merges(struct rev_info *revs)
2018 struct commit_list *list;
2019 struct commit_list *yet_to_do, **tail;
2021 if (!revs->topo_order)
2022 sort_in_topological_order(&revs->commits, revs->lifo);
2023 if (!revs->prune)
2024 return;
2026 /* feed the list reversed */
2027 yet_to_do = NULL;
2028 for (list = revs->commits; list; list = list->next)
2029 commit_list_insert(list->item, &yet_to_do);
2030 while (yet_to_do) {
2031 list = yet_to_do;
2032 yet_to_do = NULL;
2033 tail = &yet_to_do;
2034 while (list) {
2035 struct commit *commit = list->item;
2036 struct commit_list *next = list->next;
2037 free(list);
2038 list = next;
2039 tail = simplify_one(revs, commit, tail);
2043 /* clean up the result, removing the simplified ones */
2044 list = revs->commits;
2045 revs->commits = NULL;
2046 tail = &revs->commits;
2047 while (list) {
2048 struct commit *commit = list->item;
2049 struct commit_list *next = list->next;
2050 struct merge_simplify_state *st;
2051 free(list);
2052 list = next;
2053 st = locate_simplify_state(revs, commit);
2054 if (st->simplified == commit)
2055 tail = &commit_list_insert(commit, tail)->next;
2059 static void set_children(struct rev_info *revs)
2061 struct commit_list *l;
2062 for (l = revs->commits; l; l = l->next) {
2063 struct commit *commit = l->item;
2064 struct commit_list *p;
2066 for (p = commit->parents; p; p = p->next)
2067 add_child(revs, p->item, commit);
2071 void reset_revision_walk(void)
2073 clear_object_flags(SEEN | ADDED | SHOWN);
2076 int prepare_revision_walk(struct rev_info *revs)
2078 int nr = revs->pending.nr;
2079 struct object_array_entry *e, *list;
2080 struct commit_list **next = &revs->commits;
2082 e = list = revs->pending.objects;
2083 revs->pending.nr = 0;
2084 revs->pending.alloc = 0;
2085 revs->pending.objects = NULL;
2086 while (--nr >= 0) {
2087 struct commit *commit = handle_commit(revs, e->item, e->name);
2088 if (commit) {
2089 if (!(commit->object.flags & SEEN)) {
2090 commit->object.flags |= SEEN;
2091 next = commit_list_append(commit, next);
2094 e++;
2096 commit_list_sort_by_date(&revs->commits);
2097 if (!revs->leak_pending)
2098 free(list);
2100 if (revs->no_walk)
2101 return 0;
2102 if (revs->limited)
2103 if (limit_list(revs) < 0)
2104 return -1;
2105 if (revs->topo_order)
2106 sort_in_topological_order(&revs->commits, revs->lifo);
2107 if (revs->simplify_merges)
2108 simplify_merges(revs);
2109 if (revs->children.name)
2110 set_children(revs);
2111 return 0;
2114 enum rewrite_result {
2115 rewrite_one_ok,
2116 rewrite_one_noparents,
2117 rewrite_one_error
2120 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2122 struct commit_list *cache = NULL;
2124 for (;;) {
2125 struct commit *p = *pp;
2126 if (!revs->limited)
2127 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2128 return rewrite_one_error;
2129 if (p->parents && p->parents->next)
2130 return rewrite_one_ok;
2131 if (p->object.flags & UNINTERESTING)
2132 return rewrite_one_ok;
2133 if (!(p->object.flags & TREESAME))
2134 return rewrite_one_ok;
2135 if (!p->parents)
2136 return rewrite_one_noparents;
2137 *pp = p->parents->item;
2141 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
2143 struct commit_list **pp = &commit->parents;
2144 while (*pp) {
2145 struct commit_list *parent = *pp;
2146 switch (rewrite_one(revs, &parent->item)) {
2147 case rewrite_one_ok:
2148 break;
2149 case rewrite_one_noparents:
2150 *pp = parent->next;
2151 continue;
2152 case rewrite_one_error:
2153 return -1;
2155 pp = &parent->next;
2157 remove_duplicate_parents(commit);
2158 return 0;
2161 static int commit_match(struct commit *commit, struct rev_info *opt)
2163 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2164 return 1;
2165 return grep_buffer(&opt->grep_filter,
2166 commit->buffer, strlen(commit->buffer));
2169 static inline int want_ancestry(struct rev_info *revs)
2171 return (revs->rewrite_parents || revs->children.name);
2174 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2176 if (commit->object.flags & SHOWN)
2177 return commit_ignore;
2178 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
2179 return commit_ignore;
2180 if (revs->show_all)
2181 return commit_show;
2182 if (commit->object.flags & UNINTERESTING)
2183 return commit_ignore;
2184 if (revs->min_age != -1 && (commit->date > revs->min_age))
2185 return commit_ignore;
2186 if (revs->min_parents || (revs->max_parents >= 0)) {
2187 int n = 0;
2188 struct commit_list *p;
2189 for (p = commit->parents; p; p = p->next)
2190 n++;
2191 if ((n < revs->min_parents) ||
2192 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2193 return commit_ignore;
2195 if (!commit_match(commit, revs))
2196 return commit_ignore;
2197 if (revs->prune && revs->dense) {
2198 /* Commit without changes? */
2199 if (commit->object.flags & TREESAME) {
2200 /* drop merges unless we want parenthood */
2201 if (!want_ancestry(revs))
2202 return commit_ignore;
2203 /* non-merge - always ignore it */
2204 if (!commit->parents || !commit->parents->next)
2205 return commit_ignore;
2208 return commit_show;
2211 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
2213 enum commit_action action = get_commit_action(revs, commit);
2215 if (action == commit_show &&
2216 !revs->show_all &&
2217 revs->prune && revs->dense && want_ancestry(revs)) {
2218 if (rewrite_parents(revs, commit) < 0)
2219 return commit_error;
2221 return action;
2224 static struct commit *get_revision_1(struct rev_info *revs)
2226 if (!revs->commits)
2227 return NULL;
2229 do {
2230 struct commit_list *entry = revs->commits;
2231 struct commit *commit = entry->item;
2233 revs->commits = entry->next;
2234 free(entry);
2236 if (revs->reflog_info) {
2237 fake_reflog_parent(revs->reflog_info, commit);
2238 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
2242 * If we haven't done the list limiting, we need to look at
2243 * the parents here. We also need to do the date-based limiting
2244 * that we'd otherwise have done in limit_list().
2246 if (!revs->limited) {
2247 if (revs->max_age != -1 &&
2248 (commit->date < revs->max_age))
2249 continue;
2250 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
2251 die("Failed to traverse parents of commit %s",
2252 sha1_to_hex(commit->object.sha1));
2255 switch (simplify_commit(revs, commit)) {
2256 case commit_ignore:
2257 continue;
2258 case commit_error:
2259 die("Failed to simplify parents of commit %s",
2260 sha1_to_hex(commit->object.sha1));
2261 default:
2262 return commit;
2264 } while (revs->commits);
2265 return NULL;
2268 static void gc_boundary(struct object_array *array)
2270 unsigned nr = array->nr;
2271 unsigned alloc = array->alloc;
2272 struct object_array_entry *objects = array->objects;
2274 if (alloc <= nr) {
2275 unsigned i, j;
2276 for (i = j = 0; i < nr; i++) {
2277 if (objects[i].item->flags & SHOWN)
2278 continue;
2279 if (i != j)
2280 objects[j] = objects[i];
2281 j++;
2283 for (i = j; i < nr; i++)
2284 objects[i].item = NULL;
2285 array->nr = j;
2289 static void create_boundary_commit_list(struct rev_info *revs)
2291 unsigned i;
2292 struct commit *c;
2293 struct object_array *array = &revs->boundary_commits;
2294 struct object_array_entry *objects = array->objects;
2297 * If revs->commits is non-NULL at this point, an error occurred in
2298 * get_revision_1(). Ignore the error and continue printing the
2299 * boundary commits anyway. (This is what the code has always
2300 * done.)
2302 if (revs->commits) {
2303 free_commit_list(revs->commits);
2304 revs->commits = NULL;
2308 * Put all of the actual boundary commits from revs->boundary_commits
2309 * into revs->commits
2311 for (i = 0; i < array->nr; i++) {
2312 c = (struct commit *)(objects[i].item);
2313 if (!c)
2314 continue;
2315 if (!(c->object.flags & CHILD_SHOWN))
2316 continue;
2317 if (c->object.flags & (SHOWN | BOUNDARY))
2318 continue;
2319 c->object.flags |= BOUNDARY;
2320 commit_list_insert(c, &revs->commits);
2324 * If revs->topo_order is set, sort the boundary commits
2325 * in topological order
2327 sort_in_topological_order(&revs->commits, revs->lifo);
2330 static struct commit *get_revision_internal(struct rev_info *revs)
2332 struct commit *c = NULL;
2333 struct commit_list *l;
2335 if (revs->boundary == 2) {
2337 * All of the normal commits have already been returned,
2338 * and we are now returning boundary commits.
2339 * create_boundary_commit_list() has populated
2340 * revs->commits with the remaining commits to return.
2342 c = pop_commit(&revs->commits);
2343 if (c)
2344 c->object.flags |= SHOWN;
2345 return c;
2349 * Now pick up what they want to give us
2351 c = get_revision_1(revs);
2352 if (c) {
2353 while (0 < revs->skip_count) {
2354 revs->skip_count--;
2355 c = get_revision_1(revs);
2356 if (!c)
2357 break;
2362 * Check the max_count.
2364 switch (revs->max_count) {
2365 case -1:
2366 break;
2367 case 0:
2368 c = NULL;
2369 break;
2370 default:
2371 revs->max_count--;
2374 if (c)
2375 c->object.flags |= SHOWN;
2377 if (!revs->boundary) {
2378 return c;
2381 if (!c) {
2383 * get_revision_1() runs out the commits, and
2384 * we are done computing the boundaries.
2385 * switch to boundary commits output mode.
2387 revs->boundary = 2;
2390 * Update revs->commits to contain the list of
2391 * boundary commits.
2393 create_boundary_commit_list(revs);
2395 return get_revision_internal(revs);
2399 * boundary commits are the commits that are parents of the
2400 * ones we got from get_revision_1() but they themselves are
2401 * not returned from get_revision_1(). Before returning
2402 * 'c', we need to mark its parents that they could be boundaries.
2405 for (l = c->parents; l; l = l->next) {
2406 struct object *p;
2407 p = &(l->item->object);
2408 if (p->flags & (CHILD_SHOWN | SHOWN))
2409 continue;
2410 p->flags |= CHILD_SHOWN;
2411 gc_boundary(&revs->boundary_commits);
2412 add_object_array(p, NULL, &revs->boundary_commits);
2415 return c;
2418 struct commit *get_revision(struct rev_info *revs)
2420 struct commit *c;
2421 struct commit_list *reversed;
2423 if (revs->reverse) {
2424 reversed = NULL;
2425 while ((c = get_revision_internal(revs))) {
2426 commit_list_insert(c, &reversed);
2428 revs->commits = reversed;
2429 revs->reverse = 0;
2430 revs->reverse_output_stage = 1;
2433 if (revs->reverse_output_stage)
2434 return pop_commit(&revs->commits);
2436 c = get_revision_internal(revs);
2437 if (c && revs->graph)
2438 graph_update(revs->graph, c);
2439 return c;
2442 char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
2444 if (commit->object.flags & BOUNDARY)
2445 return "-";
2446 else if (commit->object.flags & UNINTERESTING)
2447 return "^";
2448 else if (commit->object.flags & PATCHSAME)
2449 return "=";
2450 else if (!revs || revs->left_right) {
2451 if (commit->object.flags & SYMMETRIC_LEFT)
2452 return "<";
2453 else
2454 return ">";
2455 } else if (revs->graph)
2456 return "*";
2457 else if (revs->cherry_mark)
2458 return "+";
2459 return "";
2462 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
2464 char *mark = get_revision_mark(revs, commit);
2465 if (!strlen(mark))
2466 return;
2467 fputs(mark, stdout);
2468 putchar(' ');