i18n: rev-parse: mark parseopt strings for translation
[git/jnareb-git.git] / revision.c
blob9e8f47a25d8def94cbf2a8389039e4d3d670cd06
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)
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);
211 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
213 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
216 void add_head_to_pending(struct rev_info *revs)
218 unsigned char sha1[20];
219 struct object *obj;
220 if (get_sha1("HEAD", sha1))
221 return;
222 obj = parse_object(sha1);
223 if (!obj)
224 return;
225 add_pending_object(revs, obj, "HEAD");
228 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
230 struct object *object;
232 object = parse_object(sha1);
233 if (!object) {
234 if (revs->ignore_missing)
235 return object;
236 die("bad object %s", name);
238 object->flags |= flags;
239 return object;
242 void add_pending_sha1(struct rev_info *revs, const char *name,
243 const unsigned char *sha1, unsigned int flags)
245 struct object *object = get_reference(revs, name, sha1, flags);
246 add_pending_object(revs, object, name);
249 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
251 unsigned long flags = object->flags;
254 * Tag object? Look what it points to..
256 while (object->type == OBJ_TAG) {
257 struct tag *tag = (struct tag *) object;
258 if (revs->tag_objects && !(flags & UNINTERESTING))
259 add_pending_object(revs, object, tag->tag);
260 if (!tag->tagged)
261 die("bad tag");
262 object = parse_object(tag->tagged->sha1);
263 if (!object) {
264 if (flags & UNINTERESTING)
265 return NULL;
266 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
271 * Commit object? Just return it, we'll do all the complex
272 * reachability crud.
274 if (object->type == OBJ_COMMIT) {
275 struct commit *commit = (struct commit *)object;
276 if (parse_commit(commit) < 0)
277 die("unable to parse commit %s", name);
278 if (flags & UNINTERESTING) {
279 commit->object.flags |= UNINTERESTING;
280 mark_parents_uninteresting(commit);
281 revs->limited = 1;
283 if (revs->show_source && !commit->util)
284 commit->util = (void *) name;
285 return commit;
289 * Tree object? Either mark it uninteresting, or add it
290 * to the list of objects to look at later..
292 if (object->type == OBJ_TREE) {
293 struct tree *tree = (struct tree *)object;
294 if (!revs->tree_objects)
295 return NULL;
296 if (flags & UNINTERESTING) {
297 mark_tree_uninteresting(tree);
298 return NULL;
300 add_pending_object(revs, object, "");
301 return NULL;
305 * Blob object? You know the drill by now..
307 if (object->type == OBJ_BLOB) {
308 struct blob *blob = (struct blob *)object;
309 if (!revs->blob_objects)
310 return NULL;
311 if (flags & UNINTERESTING) {
312 mark_blob_uninteresting(blob);
313 return NULL;
315 add_pending_object(revs, object, "");
316 return NULL;
318 die("%s is unknown object", name);
321 static int everybody_uninteresting(struct commit_list *orig)
323 struct commit_list *list = orig;
324 while (list) {
325 struct commit *commit = list->item;
326 list = list->next;
327 if (commit->object.flags & UNINTERESTING)
328 continue;
329 return 0;
331 return 1;
335 * The goal is to get REV_TREE_NEW as the result only if the
336 * diff consists of all '+' (and no other changes), REV_TREE_OLD
337 * if the whole diff is removal of old data, and otherwise
338 * REV_TREE_DIFFERENT (of course if the trees are the same we
339 * want REV_TREE_SAME).
340 * That means that once we get to REV_TREE_DIFFERENT, we do not
341 * have to look any further.
343 static int tree_difference = REV_TREE_SAME;
345 static void file_add_remove(struct diff_options *options,
346 int addremove, unsigned mode,
347 const unsigned char *sha1,
348 const char *fullpath, unsigned dirty_submodule)
350 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
352 tree_difference |= diff;
353 if (tree_difference == REV_TREE_DIFFERENT)
354 DIFF_OPT_SET(options, HAS_CHANGES);
357 static void file_change(struct diff_options *options,
358 unsigned old_mode, unsigned new_mode,
359 const unsigned char *old_sha1,
360 const unsigned char *new_sha1,
361 const char *fullpath,
362 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
364 tree_difference = REV_TREE_DIFFERENT;
365 DIFF_OPT_SET(options, HAS_CHANGES);
368 static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
370 struct tree *t1 = parent->tree;
371 struct tree *t2 = commit->tree;
373 if (!t1)
374 return REV_TREE_NEW;
375 if (!t2)
376 return REV_TREE_OLD;
378 if (revs->simplify_by_decoration) {
380 * If we are simplifying by decoration, then the commit
381 * is worth showing if it has a tag pointing at it.
383 if (lookup_decoration(&name_decoration, &commit->object))
384 return REV_TREE_DIFFERENT;
386 * A commit that is not pointed by a tag is uninteresting
387 * if we are not limited by path. This means that you will
388 * see the usual "commits that touch the paths" plus any
389 * tagged commit by specifying both --simplify-by-decoration
390 * and pathspec.
392 if (!revs->prune_data.nr)
393 return REV_TREE_SAME;
396 tree_difference = REV_TREE_SAME;
397 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
398 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
399 &revs->pruning) < 0)
400 return REV_TREE_DIFFERENT;
401 return tree_difference;
404 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
406 int retval;
407 void *tree;
408 unsigned long size;
409 struct tree_desc empty, real;
410 struct tree *t1 = commit->tree;
412 if (!t1)
413 return 0;
415 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
416 if (!tree)
417 return 0;
418 init_tree_desc(&real, tree, size);
419 init_tree_desc(&empty, "", 0);
421 tree_difference = REV_TREE_SAME;
422 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
423 retval = diff_tree(&empty, &real, "", &revs->pruning);
424 free(tree);
426 return retval >= 0 && (tree_difference == REV_TREE_SAME);
429 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
431 struct commit_list **pp, *parent;
432 int tree_changed = 0, tree_same = 0, nth_parent = 0;
435 * If we don't do pruning, everything is interesting
437 if (!revs->prune)
438 return;
440 if (!commit->tree)
441 return;
443 if (!commit->parents) {
444 if (rev_same_tree_as_empty(revs, commit))
445 commit->object.flags |= TREESAME;
446 return;
450 * Normal non-merge commit? If we don't want to make the
451 * history dense, we consider it always to be a change..
453 if (!revs->dense && !commit->parents->next)
454 return;
456 pp = &commit->parents;
457 while ((parent = *pp) != NULL) {
458 struct commit *p = parent->item;
461 * Do not compare with later parents when we care only about
462 * the first parent chain, in order to avoid derailing the
463 * traversal to follow a side branch that brought everything
464 * in the path we are limited to by the pathspec.
466 if (revs->first_parent_only && nth_parent++)
467 break;
468 if (parse_commit(p) < 0)
469 die("cannot simplify commit %s (because of %s)",
470 sha1_to_hex(commit->object.sha1),
471 sha1_to_hex(p->object.sha1));
472 switch (rev_compare_tree(revs, p, commit)) {
473 case REV_TREE_SAME:
474 tree_same = 1;
475 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
476 /* Even if a merge with an uninteresting
477 * side branch brought the entire change
478 * we are interested in, we do not want
479 * to lose the other branches of this
480 * merge, so we just keep going.
482 pp = &parent->next;
483 continue;
485 parent->next = NULL;
486 commit->parents = parent;
487 commit->object.flags |= TREESAME;
488 return;
490 case REV_TREE_NEW:
491 if (revs->remove_empty_trees &&
492 rev_same_tree_as_empty(revs, p)) {
493 /* We are adding all the specified
494 * paths from this parent, so the
495 * history beyond this parent is not
496 * interesting. Remove its parents
497 * (they are grandparents for us).
498 * IOW, we pretend this parent is a
499 * "root" commit.
501 if (parse_commit(p) < 0)
502 die("cannot simplify commit %s (invalid %s)",
503 sha1_to_hex(commit->object.sha1),
504 sha1_to_hex(p->object.sha1));
505 p->parents = NULL;
507 /* fallthrough */
508 case REV_TREE_OLD:
509 case REV_TREE_DIFFERENT:
510 tree_changed = 1;
511 pp = &parent->next;
512 continue;
514 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
516 if (tree_changed && !tree_same)
517 return;
518 commit->object.flags |= TREESAME;
521 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
522 struct commit_list *cached_base, struct commit_list **cache)
524 struct commit_list *new_entry;
526 if (cached_base && p->date < cached_base->item->date)
527 new_entry = commit_list_insert_by_date(p, &cached_base->next);
528 else
529 new_entry = commit_list_insert_by_date(p, head);
531 if (cache && (!*cache || p->date < (*cache)->item->date))
532 *cache = new_entry;
535 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
536 struct commit_list **list, struct commit_list **cache_ptr)
538 struct commit_list *parent = commit->parents;
539 unsigned left_flag;
540 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
542 if (commit->object.flags & ADDED)
543 return 0;
544 commit->object.flags |= ADDED;
547 * If the commit is uninteresting, don't try to
548 * prune parents - we want the maximal uninteresting
549 * set.
551 * Normally we haven't parsed the parent
552 * yet, so we won't have a parent of a parent
553 * here. However, it may turn out that we've
554 * reached this commit some other way (where it
555 * wasn't uninteresting), in which case we need
556 * to mark its parents recursively too..
558 if (commit->object.flags & UNINTERESTING) {
559 while (parent) {
560 struct commit *p = parent->item;
561 parent = parent->next;
562 if (p)
563 p->object.flags |= UNINTERESTING;
564 if (parse_commit(p) < 0)
565 continue;
566 if (p->parents)
567 mark_parents_uninteresting(p);
568 if (p->object.flags & SEEN)
569 continue;
570 p->object.flags |= SEEN;
571 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
573 return 0;
577 * Ok, the commit wasn't uninteresting. Try to
578 * simplify the commit history and find the parent
579 * that has no differences in the path set if one exists.
581 try_to_simplify_commit(revs, commit);
583 if (revs->no_walk)
584 return 0;
586 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
588 for (parent = commit->parents; parent; parent = parent->next) {
589 struct commit *p = parent->item;
591 if (parse_commit(p) < 0)
592 return -1;
593 if (revs->show_source && !p->util)
594 p->util = commit->util;
595 p->object.flags |= left_flag;
596 if (!(p->object.flags & SEEN)) {
597 p->object.flags |= SEEN;
598 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
600 if (revs->first_parent_only)
601 break;
603 return 0;
606 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
608 struct commit_list *p;
609 int left_count = 0, right_count = 0;
610 int left_first;
611 struct patch_ids ids;
612 unsigned cherry_flag;
614 /* First count the commits on the left and on the right */
615 for (p = list; p; p = p->next) {
616 struct commit *commit = p->item;
617 unsigned flags = commit->object.flags;
618 if (flags & BOUNDARY)
620 else if (flags & SYMMETRIC_LEFT)
621 left_count++;
622 else
623 right_count++;
626 if (!left_count || !right_count)
627 return;
629 left_first = left_count < right_count;
630 init_patch_ids(&ids);
631 ids.diffopts.pathspec = revs->diffopt.pathspec;
633 /* Compute patch-ids for one side */
634 for (p = list; p; p = p->next) {
635 struct commit *commit = p->item;
636 unsigned flags = commit->object.flags;
638 if (flags & BOUNDARY)
639 continue;
641 * If we have fewer left, left_first is set and we omit
642 * commits on the right branch in this loop. If we have
643 * fewer right, we skip the left ones.
645 if (left_first != !!(flags & SYMMETRIC_LEFT))
646 continue;
647 commit->util = add_commit_patch_id(commit, &ids);
650 /* either cherry_mark or cherry_pick are true */
651 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
653 /* Check the other side */
654 for (p = list; p; p = p->next) {
655 struct commit *commit = p->item;
656 struct patch_id *id;
657 unsigned flags = commit->object.flags;
659 if (flags & BOUNDARY)
660 continue;
662 * If we have fewer left, left_first is set and we omit
663 * commits on the left branch in this loop.
665 if (left_first == !!(flags & SYMMETRIC_LEFT))
666 continue;
669 * Have we seen the same patch id?
671 id = has_commit_patch_id(commit, &ids);
672 if (!id)
673 continue;
674 id->seen = 1;
675 commit->object.flags |= cherry_flag;
678 /* Now check the original side for seen ones */
679 for (p = list; p; p = p->next) {
680 struct commit *commit = p->item;
681 struct patch_id *ent;
683 ent = commit->util;
684 if (!ent)
685 continue;
686 if (ent->seen)
687 commit->object.flags |= cherry_flag;
688 commit->util = NULL;
691 free_patch_ids(&ids);
694 /* How many extra uninteresting commits we want to see.. */
695 #define SLOP 5
697 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
700 * No source list at all? We're definitely done..
702 if (!src)
703 return 0;
706 * Does the destination list contain entries with a date
707 * before the source list? Definitely _not_ done.
709 if (date < src->item->date)
710 return SLOP;
713 * Does the source list still have interesting commits in
714 * it? Definitely not done..
716 if (!everybody_uninteresting(src))
717 return SLOP;
719 /* Ok, we're closing in.. */
720 return slop-1;
724 * "rev-list --ancestry-path A..B" computes commits that are ancestors
725 * of B but not ancestors of A but further limits the result to those
726 * that are descendants of A. This takes the list of bottom commits and
727 * the result of "A..B" without --ancestry-path, and limits the latter
728 * further to the ones that can reach one of the commits in "bottom".
730 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
732 struct commit_list *p;
733 struct commit_list *rlist = NULL;
734 int made_progress;
737 * Reverse the list so that it will be likely that we would
738 * process parents before children.
740 for (p = list; p; p = p->next)
741 commit_list_insert(p->item, &rlist);
743 for (p = bottom; p; p = p->next)
744 p->item->object.flags |= TMP_MARK;
747 * Mark the ones that can reach bottom commits in "list",
748 * in a bottom-up fashion.
750 do {
751 made_progress = 0;
752 for (p = rlist; p; p = p->next) {
753 struct commit *c = p->item;
754 struct commit_list *parents;
755 if (c->object.flags & (TMP_MARK | UNINTERESTING))
756 continue;
757 for (parents = c->parents;
758 parents;
759 parents = parents->next) {
760 if (!(parents->item->object.flags & TMP_MARK))
761 continue;
762 c->object.flags |= TMP_MARK;
763 made_progress = 1;
764 break;
767 } while (made_progress);
770 * NEEDSWORK: decide if we want to remove parents that are
771 * not marked with TMP_MARK from commit->parents for commits
772 * in the resulting list. We may not want to do that, though.
776 * The ones that are not marked with TMP_MARK are uninteresting
778 for (p = list; p; p = p->next) {
779 struct commit *c = p->item;
780 if (c->object.flags & TMP_MARK)
781 continue;
782 c->object.flags |= UNINTERESTING;
785 /* We are done with the TMP_MARK */
786 for (p = list; p; p = p->next)
787 p->item->object.flags &= ~TMP_MARK;
788 for (p = bottom; p; p = p->next)
789 p->item->object.flags &= ~TMP_MARK;
790 free_commit_list(rlist);
794 * Before walking the history, keep the set of "negative" refs the
795 * caller has asked to exclude.
797 * This is used to compute "rev-list --ancestry-path A..B", as we need
798 * to filter the result of "A..B" further to the ones that can actually
799 * reach A.
801 static struct commit_list *collect_bottom_commits(struct rev_info *revs)
803 struct commit_list *bottom = NULL;
804 int i;
805 for (i = 0; i < revs->cmdline.nr; i++) {
806 struct rev_cmdline_entry *elem = &revs->cmdline.rev[i];
807 if ((elem->flags & UNINTERESTING) &&
808 elem->item->type == OBJ_COMMIT)
809 commit_list_insert((struct commit *)elem->item, &bottom);
811 return bottom;
814 /* Assumes either left_only or right_only is set */
815 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
817 struct commit_list *p;
819 for (p = list; p; p = p->next) {
820 struct commit *commit = p->item;
822 if (revs->right_only) {
823 if (commit->object.flags & SYMMETRIC_LEFT)
824 commit->object.flags |= SHOWN;
825 } else /* revs->left_only is set */
826 if (!(commit->object.flags & SYMMETRIC_LEFT))
827 commit->object.flags |= SHOWN;
831 static int limit_list(struct rev_info *revs)
833 int slop = SLOP;
834 unsigned long date = ~0ul;
835 struct commit_list *list = revs->commits;
836 struct commit_list *newlist = NULL;
837 struct commit_list **p = &newlist;
838 struct commit_list *bottom = NULL;
840 if (revs->ancestry_path) {
841 bottom = collect_bottom_commits(revs);
842 if (!bottom)
843 die("--ancestry-path given but there are no bottom commits");
846 while (list) {
847 struct commit_list *entry = list;
848 struct commit *commit = list->item;
849 struct object *obj = &commit->object;
850 show_early_output_fn_t show;
852 list = list->next;
853 free(entry);
855 if (revs->max_age != -1 && (commit->date < revs->max_age))
856 obj->flags |= UNINTERESTING;
857 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
858 return -1;
859 if (obj->flags & UNINTERESTING) {
860 mark_parents_uninteresting(commit);
861 if (revs->show_all)
862 p = &commit_list_insert(commit, p)->next;
863 slop = still_interesting(list, date, slop);
864 if (slop)
865 continue;
866 /* If showing all, add the whole pending list to the end */
867 if (revs->show_all)
868 *p = list;
869 break;
871 if (revs->min_age != -1 && (commit->date > revs->min_age))
872 continue;
873 date = commit->date;
874 p = &commit_list_insert(commit, p)->next;
876 show = show_early_output;
877 if (!show)
878 continue;
880 show(revs, newlist);
881 show_early_output = NULL;
883 if (revs->cherry_pick || revs->cherry_mark)
884 cherry_pick_list(newlist, revs);
886 if (revs->left_only || revs->right_only)
887 limit_left_right(newlist, revs);
889 if (bottom) {
890 limit_to_ancestry(bottom, newlist);
891 free_commit_list(bottom);
894 revs->commits = newlist;
895 return 0;
898 static void add_rev_cmdline(struct rev_info *revs,
899 struct object *item,
900 const char *name,
901 int whence,
902 unsigned flags)
904 struct rev_cmdline_info *info = &revs->cmdline;
905 int nr = info->nr;
907 ALLOC_GROW(info->rev, nr + 1, info->alloc);
908 info->rev[nr].item = item;
909 info->rev[nr].name = name;
910 info->rev[nr].whence = whence;
911 info->rev[nr].flags = flags;
912 info->nr++;
915 struct all_refs_cb {
916 int all_flags;
917 int warned_bad_reflog;
918 struct rev_info *all_revs;
919 const char *name_for_errormsg;
922 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
924 struct all_refs_cb *cb = cb_data;
925 struct object *object = get_reference(cb->all_revs, path, sha1,
926 cb->all_flags);
927 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
928 add_pending_sha1(cb->all_revs, path, sha1, cb->all_flags);
929 return 0;
932 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
933 unsigned flags)
935 cb->all_revs = revs;
936 cb->all_flags = flags;
939 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
940 int (*for_each)(const char *, each_ref_fn, void *))
942 struct all_refs_cb cb;
943 init_all_refs_cb(&cb, revs, flags);
944 for_each(submodule, handle_one_ref, &cb);
947 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
949 struct all_refs_cb *cb = cb_data;
950 if (!is_null_sha1(sha1)) {
951 struct object *o = parse_object(sha1);
952 if (o) {
953 o->flags |= cb->all_flags;
954 /* ??? CMDLINEFLAGS ??? */
955 add_pending_object(cb->all_revs, o, "");
957 else if (!cb->warned_bad_reflog) {
958 warning("reflog of '%s' references pruned commits",
959 cb->name_for_errormsg);
960 cb->warned_bad_reflog = 1;
965 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
966 const char *email, unsigned long timestamp, int tz,
967 const char *message, void *cb_data)
969 handle_one_reflog_commit(osha1, cb_data);
970 handle_one_reflog_commit(nsha1, cb_data);
971 return 0;
974 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
976 struct all_refs_cb *cb = cb_data;
977 cb->warned_bad_reflog = 0;
978 cb->name_for_errormsg = path;
979 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
980 return 0;
983 static void handle_reflog(struct rev_info *revs, unsigned flags)
985 struct all_refs_cb cb;
986 cb.all_revs = revs;
987 cb.all_flags = flags;
988 for_each_reflog(handle_one_reflog, &cb);
991 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
993 unsigned char sha1[20];
994 struct object *it;
995 struct commit *commit;
996 struct commit_list *parents;
997 const char *arg = arg_;
999 if (*arg == '^') {
1000 flags ^= UNINTERESTING;
1001 arg++;
1003 if (get_sha1_committish(arg, sha1))
1004 return 0;
1005 while (1) {
1006 it = get_reference(revs, arg, sha1, 0);
1007 if (!it && revs->ignore_missing)
1008 return 0;
1009 if (it->type != OBJ_TAG)
1010 break;
1011 if (!((struct tag*)it)->tagged)
1012 return 0;
1013 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
1015 if (it->type != OBJ_COMMIT)
1016 return 0;
1017 commit = (struct commit *)it;
1018 for (parents = commit->parents; parents; parents = parents->next) {
1019 it = &parents->item->object;
1020 it->flags |= flags;
1021 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1022 add_pending_object(revs, it, arg);
1024 return 1;
1027 void init_revisions(struct rev_info *revs, const char *prefix)
1029 memset(revs, 0, sizeof(*revs));
1031 revs->abbrev = DEFAULT_ABBREV;
1032 revs->ignore_merges = 1;
1033 revs->simplify_history = 1;
1034 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1035 DIFF_OPT_SET(&revs->pruning, QUICK);
1036 revs->pruning.add_remove = file_add_remove;
1037 revs->pruning.change = file_change;
1038 revs->lifo = 1;
1039 revs->dense = 1;
1040 revs->prefix = prefix;
1041 revs->max_age = -1;
1042 revs->min_age = -1;
1043 revs->skip_count = -1;
1044 revs->max_count = -1;
1045 revs->max_parents = -1;
1047 revs->commit_format = CMIT_FMT_DEFAULT;
1049 revs->grep_filter.status_only = 1;
1050 revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
1051 revs->grep_filter.header_tail = &(revs->grep_filter.header_list);
1052 revs->grep_filter.regflags = REG_NEWLINE;
1054 diff_setup(&revs->diffopt);
1055 if (prefix && !revs->diffopt.prefix) {
1056 revs->diffopt.prefix = prefix;
1057 revs->diffopt.prefix_length = strlen(prefix);
1060 revs->notes_opt.use_default_notes = -1;
1063 static void add_pending_commit_list(struct rev_info *revs,
1064 struct commit_list *commit_list,
1065 unsigned int flags)
1067 while (commit_list) {
1068 struct object *object = &commit_list->item->object;
1069 object->flags |= flags;
1070 add_pending_object(revs, object, sha1_to_hex(object->sha1));
1071 commit_list = commit_list->next;
1075 static void prepare_show_merge(struct rev_info *revs)
1077 struct commit_list *bases;
1078 struct commit *head, *other;
1079 unsigned char sha1[20];
1080 const char **prune = NULL;
1081 int i, prune_num = 1; /* counting terminating NULL */
1083 if (get_sha1("HEAD", sha1))
1084 die("--merge without HEAD?");
1085 head = lookup_commit_or_die(sha1, "HEAD");
1086 if (get_sha1("MERGE_HEAD", sha1))
1087 die("--merge without MERGE_HEAD?");
1088 other = lookup_commit_or_die(sha1, "MERGE_HEAD");
1089 add_pending_object(revs, &head->object, "HEAD");
1090 add_pending_object(revs, &other->object, "MERGE_HEAD");
1091 bases = get_merge_bases(head, other, 1);
1092 add_pending_commit_list(revs, bases, UNINTERESTING);
1093 free_commit_list(bases);
1094 head->object.flags |= SYMMETRIC_LEFT;
1096 if (!active_nr)
1097 read_cache();
1098 for (i = 0; i < active_nr; i++) {
1099 struct cache_entry *ce = active_cache[i];
1100 if (!ce_stage(ce))
1101 continue;
1102 if (ce_path_match(ce, &revs->prune_data)) {
1103 prune_num++;
1104 prune = xrealloc(prune, sizeof(*prune) * prune_num);
1105 prune[prune_num-2] = ce->name;
1106 prune[prune_num-1] = NULL;
1108 while ((i+1 < active_nr) &&
1109 ce_same_name(ce, active_cache[i+1]))
1110 i++;
1112 free_pathspec(&revs->prune_data);
1113 init_pathspec(&revs->prune_data, prune);
1114 revs->limited = 1;
1117 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1119 struct object_context oc;
1120 char *dotdot;
1121 struct object *object;
1122 unsigned char sha1[20];
1123 int local_flags;
1124 const char *arg = arg_;
1125 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1126 unsigned get_sha1_flags = 0;
1128 dotdot = strstr(arg, "..");
1129 if (dotdot) {
1130 unsigned char from_sha1[20];
1131 const char *next = dotdot + 2;
1132 const char *this = arg;
1133 int symmetric = *next == '.';
1134 unsigned int flags_exclude = flags ^ UNINTERESTING;
1135 unsigned int a_flags;
1137 *dotdot = 0;
1138 next += symmetric;
1140 if (!*next)
1141 next = "HEAD";
1142 if (dotdot == arg)
1143 this = "HEAD";
1144 if (!get_sha1_committish(this, from_sha1) &&
1145 !get_sha1_committish(next, sha1)) {
1146 struct commit *a, *b;
1147 struct commit_list *exclude;
1149 a = lookup_commit_reference(from_sha1);
1150 b = lookup_commit_reference(sha1);
1151 if (!a || !b) {
1152 if (revs->ignore_missing)
1153 return 0;
1154 die(symmetric ?
1155 "Invalid symmetric difference expression %s...%s" :
1156 "Invalid revision range %s..%s",
1157 arg, next);
1160 if (!cant_be_filename) {
1161 *dotdot = '.';
1162 verify_non_filename(revs->prefix, arg);
1165 if (symmetric) {
1166 exclude = get_merge_bases(a, b, 1);
1167 add_pending_commit_list(revs, exclude,
1168 flags_exclude);
1169 free_commit_list(exclude);
1170 a_flags = flags | SYMMETRIC_LEFT;
1171 } else
1172 a_flags = flags_exclude;
1173 a->object.flags |= a_flags;
1174 b->object.flags |= flags;
1175 add_rev_cmdline(revs, &a->object, this,
1176 REV_CMD_LEFT, a_flags);
1177 add_rev_cmdline(revs, &b->object, next,
1178 REV_CMD_RIGHT, flags);
1179 add_pending_object(revs, &a->object, this);
1180 add_pending_object(revs, &b->object, next);
1181 return 0;
1183 *dotdot = '.';
1185 dotdot = strstr(arg, "^@");
1186 if (dotdot && !dotdot[2]) {
1187 *dotdot = 0;
1188 if (add_parents_only(revs, arg, flags))
1189 return 0;
1190 *dotdot = '^';
1192 dotdot = strstr(arg, "^!");
1193 if (dotdot && !dotdot[2]) {
1194 *dotdot = 0;
1195 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
1196 *dotdot = '^';
1199 local_flags = 0;
1200 if (*arg == '^') {
1201 local_flags = UNINTERESTING;
1202 arg++;
1205 if (revarg_opt & REVARG_COMMITTISH)
1206 get_sha1_flags = GET_SHA1_COMMITTISH;
1208 if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
1209 return revs->ignore_missing ? 0 : -1;
1210 if (!cant_be_filename)
1211 verify_non_filename(revs->prefix, arg);
1212 object = get_reference(revs, arg, sha1, flags ^ local_flags);
1213 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1214 add_pending_object_with_mode(revs, object, arg, oc.mode);
1215 return 0;
1218 struct cmdline_pathspec {
1219 int alloc;
1220 int nr;
1221 const char **path;
1224 static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1226 while (*av) {
1227 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1228 prune->path[prune->nr++] = *(av++);
1232 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1233 struct cmdline_pathspec *prune)
1235 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1236 int len = sb->len;
1237 if (len && sb->buf[len - 1] == '\n')
1238 sb->buf[--len] = '\0';
1239 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1240 prune->path[prune->nr++] = xstrdup(sb->buf);
1244 static void read_revisions_from_stdin(struct rev_info *revs,
1245 struct cmdline_pathspec *prune)
1247 struct strbuf sb;
1248 int seen_dashdash = 0;
1250 strbuf_init(&sb, 1000);
1251 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1252 int len = sb.len;
1253 if (len && sb.buf[len - 1] == '\n')
1254 sb.buf[--len] = '\0';
1255 if (!len)
1256 break;
1257 if (sb.buf[0] == '-') {
1258 if (len == 2 && sb.buf[1] == '-') {
1259 seen_dashdash = 1;
1260 break;
1262 die("options not supported in --stdin mode");
1264 if (handle_revision_arg(sb.buf, revs, 0, REVARG_CANNOT_BE_FILENAME))
1265 die("bad revision '%s'", sb.buf);
1267 if (seen_dashdash)
1268 read_pathspec_from_stdin(revs, &sb, prune);
1269 strbuf_release(&sb);
1272 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1274 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1277 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1279 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1282 static void add_message_grep(struct rev_info *revs, const char *pattern)
1284 add_grep(revs, pattern, GREP_PATTERN_BODY);
1287 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1288 int *unkc, const char **unkv)
1290 const char *arg = argv[0];
1291 const char *optarg;
1292 int argcount;
1294 /* pseudo revision arguments */
1295 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1296 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1297 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1298 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1299 !strcmp(arg, "--bisect") || !prefixcmp(arg, "--glob=") ||
1300 !prefixcmp(arg, "--branches=") || !prefixcmp(arg, "--tags=") ||
1301 !prefixcmp(arg, "--remotes="))
1303 unkv[(*unkc)++] = arg;
1304 return 1;
1307 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1308 revs->max_count = atoi(optarg);
1309 revs->no_walk = 0;
1310 return argcount;
1311 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1312 revs->skip_count = atoi(optarg);
1313 return argcount;
1314 } else if ((*arg == '-') && isdigit(arg[1])) {
1315 /* accept -<digit>, like traditional "head" */
1316 revs->max_count = atoi(arg + 1);
1317 revs->no_walk = 0;
1318 } else if (!strcmp(arg, "-n")) {
1319 if (argc <= 1)
1320 return error("-n requires an argument");
1321 revs->max_count = atoi(argv[1]);
1322 revs->no_walk = 0;
1323 return 2;
1324 } else if (!prefixcmp(arg, "-n")) {
1325 revs->max_count = atoi(arg + 2);
1326 revs->no_walk = 0;
1327 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1328 revs->max_age = atoi(optarg);
1329 return argcount;
1330 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1331 revs->max_age = approxidate(optarg);
1332 return argcount;
1333 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1334 revs->max_age = approxidate(optarg);
1335 return argcount;
1336 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1337 revs->min_age = atoi(optarg);
1338 return argcount;
1339 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1340 revs->min_age = approxidate(optarg);
1341 return argcount;
1342 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1343 revs->min_age = approxidate(optarg);
1344 return argcount;
1345 } else if (!strcmp(arg, "--first-parent")) {
1346 revs->first_parent_only = 1;
1347 } else if (!strcmp(arg, "--ancestry-path")) {
1348 revs->ancestry_path = 1;
1349 revs->simplify_history = 0;
1350 revs->limited = 1;
1351 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1352 init_reflog_walk(&revs->reflog_info);
1353 } else if (!strcmp(arg, "--default")) {
1354 if (argc <= 1)
1355 return error("bad --default argument");
1356 revs->def = argv[1];
1357 return 2;
1358 } else if (!strcmp(arg, "--merge")) {
1359 revs->show_merge = 1;
1360 } else if (!strcmp(arg, "--topo-order")) {
1361 revs->lifo = 1;
1362 revs->topo_order = 1;
1363 } else if (!strcmp(arg, "--simplify-merges")) {
1364 revs->simplify_merges = 1;
1365 revs->topo_order = 1;
1366 revs->rewrite_parents = 1;
1367 revs->simplify_history = 0;
1368 revs->limited = 1;
1369 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1370 revs->simplify_merges = 1;
1371 revs->topo_order = 1;
1372 revs->rewrite_parents = 1;
1373 revs->simplify_history = 0;
1374 revs->simplify_by_decoration = 1;
1375 revs->limited = 1;
1376 revs->prune = 1;
1377 load_ref_decorations(DECORATE_SHORT_REFS);
1378 } else if (!strcmp(arg, "--date-order")) {
1379 revs->lifo = 0;
1380 revs->topo_order = 1;
1381 } else if (!prefixcmp(arg, "--early-output")) {
1382 int count = 100;
1383 switch (arg[14]) {
1384 case '=':
1385 count = atoi(arg+15);
1386 /* Fallthrough */
1387 case 0:
1388 revs->topo_order = 1;
1389 revs->early_output = count;
1391 } else if (!strcmp(arg, "--parents")) {
1392 revs->rewrite_parents = 1;
1393 revs->print_parents = 1;
1394 } else if (!strcmp(arg, "--dense")) {
1395 revs->dense = 1;
1396 } else if (!strcmp(arg, "--sparse")) {
1397 revs->dense = 0;
1398 } else if (!strcmp(arg, "--show-all")) {
1399 revs->show_all = 1;
1400 } else if (!strcmp(arg, "--remove-empty")) {
1401 revs->remove_empty_trees = 1;
1402 } else if (!strcmp(arg, "--merges")) {
1403 revs->min_parents = 2;
1404 } else if (!strcmp(arg, "--no-merges")) {
1405 revs->max_parents = 1;
1406 } else if (!prefixcmp(arg, "--min-parents=")) {
1407 revs->min_parents = atoi(arg+14);
1408 } else if (!prefixcmp(arg, "--no-min-parents")) {
1409 revs->min_parents = 0;
1410 } else if (!prefixcmp(arg, "--max-parents=")) {
1411 revs->max_parents = atoi(arg+14);
1412 } else if (!prefixcmp(arg, "--no-max-parents")) {
1413 revs->max_parents = -1;
1414 } else if (!strcmp(arg, "--boundary")) {
1415 revs->boundary = 1;
1416 } else if (!strcmp(arg, "--left-right")) {
1417 revs->left_right = 1;
1418 } else if (!strcmp(arg, "--left-only")) {
1419 if (revs->right_only)
1420 die("--left-only is incompatible with --right-only"
1421 " or --cherry");
1422 revs->left_only = 1;
1423 } else if (!strcmp(arg, "--right-only")) {
1424 if (revs->left_only)
1425 die("--right-only is incompatible with --left-only");
1426 revs->right_only = 1;
1427 } else if (!strcmp(arg, "--cherry")) {
1428 if (revs->left_only)
1429 die("--cherry is incompatible with --left-only");
1430 revs->cherry_mark = 1;
1431 revs->right_only = 1;
1432 revs->max_parents = 1;
1433 revs->limited = 1;
1434 } else if (!strcmp(arg, "--count")) {
1435 revs->count = 1;
1436 } else if (!strcmp(arg, "--cherry-mark")) {
1437 if (revs->cherry_pick)
1438 die("--cherry-mark is incompatible with --cherry-pick");
1439 revs->cherry_mark = 1;
1440 revs->limited = 1; /* needs limit_list() */
1441 } else if (!strcmp(arg, "--cherry-pick")) {
1442 if (revs->cherry_mark)
1443 die("--cherry-pick is incompatible with --cherry-mark");
1444 revs->cherry_pick = 1;
1445 revs->limited = 1;
1446 } else if (!strcmp(arg, "--objects")) {
1447 revs->tag_objects = 1;
1448 revs->tree_objects = 1;
1449 revs->blob_objects = 1;
1450 } else if (!strcmp(arg, "--objects-edge")) {
1451 revs->tag_objects = 1;
1452 revs->tree_objects = 1;
1453 revs->blob_objects = 1;
1454 revs->edge_hint = 1;
1455 } else if (!strcmp(arg, "--verify-objects")) {
1456 revs->tag_objects = 1;
1457 revs->tree_objects = 1;
1458 revs->blob_objects = 1;
1459 revs->verify_objects = 1;
1460 } else if (!strcmp(arg, "--unpacked")) {
1461 revs->unpacked = 1;
1462 } else if (!prefixcmp(arg, "--unpacked=")) {
1463 die("--unpacked=<packfile> no longer supported.");
1464 } else if (!strcmp(arg, "-r")) {
1465 revs->diff = 1;
1466 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1467 } else if (!strcmp(arg, "-t")) {
1468 revs->diff = 1;
1469 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1470 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1471 } else if (!strcmp(arg, "-m")) {
1472 revs->ignore_merges = 0;
1473 } else if (!strcmp(arg, "-c")) {
1474 revs->diff = 1;
1475 revs->dense_combined_merges = 0;
1476 revs->combine_merges = 1;
1477 } else if (!strcmp(arg, "--cc")) {
1478 revs->diff = 1;
1479 revs->dense_combined_merges = 1;
1480 revs->combine_merges = 1;
1481 } else if (!strcmp(arg, "-v")) {
1482 revs->verbose_header = 1;
1483 } else if (!strcmp(arg, "--pretty")) {
1484 revs->verbose_header = 1;
1485 revs->pretty_given = 1;
1486 get_commit_format(arg+8, revs);
1487 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
1489 * Detached form ("--pretty X" as opposed to "--pretty=X")
1490 * not allowed, since the argument is optional.
1492 revs->verbose_header = 1;
1493 revs->pretty_given = 1;
1494 get_commit_format(arg+9, revs);
1495 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1496 revs->show_notes = 1;
1497 revs->show_notes_given = 1;
1498 revs->notes_opt.use_default_notes = 1;
1499 } else if (!strcmp(arg, "--show-signature")) {
1500 revs->show_signature = 1;
1501 } else if (!prefixcmp(arg, "--show-notes=") ||
1502 !prefixcmp(arg, "--notes=")) {
1503 struct strbuf buf = STRBUF_INIT;
1504 revs->show_notes = 1;
1505 revs->show_notes_given = 1;
1506 if (!prefixcmp(arg, "--show-notes")) {
1507 if (revs->notes_opt.use_default_notes < 0)
1508 revs->notes_opt.use_default_notes = 1;
1509 strbuf_addstr(&buf, arg+13);
1511 else
1512 strbuf_addstr(&buf, arg+8);
1513 expand_notes_ref(&buf);
1514 string_list_append(&revs->notes_opt.extra_notes_refs,
1515 strbuf_detach(&buf, NULL));
1516 } else if (!strcmp(arg, "--no-notes")) {
1517 revs->show_notes = 0;
1518 revs->show_notes_given = 1;
1519 revs->notes_opt.use_default_notes = -1;
1520 /* we have been strdup'ing ourselves, so trick
1521 * string_list into free()ing strings */
1522 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1523 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1524 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1525 } else if (!strcmp(arg, "--standard-notes")) {
1526 revs->show_notes_given = 1;
1527 revs->notes_opt.use_default_notes = 1;
1528 } else if (!strcmp(arg, "--no-standard-notes")) {
1529 revs->notes_opt.use_default_notes = 0;
1530 } else if (!strcmp(arg, "--oneline")) {
1531 revs->verbose_header = 1;
1532 get_commit_format("oneline", revs);
1533 revs->pretty_given = 1;
1534 revs->abbrev_commit = 1;
1535 } else if (!strcmp(arg, "--graph")) {
1536 revs->topo_order = 1;
1537 revs->rewrite_parents = 1;
1538 revs->graph = graph_init(revs);
1539 } else if (!strcmp(arg, "--root")) {
1540 revs->show_root_diff = 1;
1541 } else if (!strcmp(arg, "--no-commit-id")) {
1542 revs->no_commit_id = 1;
1543 } else if (!strcmp(arg, "--always")) {
1544 revs->always_show_header = 1;
1545 } else if (!strcmp(arg, "--no-abbrev")) {
1546 revs->abbrev = 0;
1547 } else if (!strcmp(arg, "--abbrev")) {
1548 revs->abbrev = DEFAULT_ABBREV;
1549 } else if (!prefixcmp(arg, "--abbrev=")) {
1550 revs->abbrev = strtoul(arg + 9, NULL, 10);
1551 if (revs->abbrev < MINIMUM_ABBREV)
1552 revs->abbrev = MINIMUM_ABBREV;
1553 else if (revs->abbrev > 40)
1554 revs->abbrev = 40;
1555 } else if (!strcmp(arg, "--abbrev-commit")) {
1556 revs->abbrev_commit = 1;
1557 revs->abbrev_commit_given = 1;
1558 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1559 revs->abbrev_commit = 0;
1560 } else if (!strcmp(arg, "--full-diff")) {
1561 revs->diff = 1;
1562 revs->full_diff = 1;
1563 } else if (!strcmp(arg, "--full-history")) {
1564 revs->simplify_history = 0;
1565 } else if (!strcmp(arg, "--relative-date")) {
1566 revs->date_mode = DATE_RELATIVE;
1567 revs->date_mode_explicit = 1;
1568 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1569 revs->date_mode = parse_date_format(optarg);
1570 revs->date_mode_explicit = 1;
1571 return argcount;
1572 } else if (!strcmp(arg, "--log-size")) {
1573 revs->show_log_size = 1;
1576 * Grepping the commit log
1578 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1579 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1580 return argcount;
1581 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1582 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1583 return argcount;
1584 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1585 add_message_grep(revs, optarg);
1586 return argcount;
1587 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1588 revs->grep_filter.regflags |= REG_EXTENDED;
1589 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1590 revs->grep_filter.regflags |= REG_ICASE;
1591 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
1592 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1593 revs->grep_filter.fixed = 1;
1594 } else if (!strcmp(arg, "--all-match")) {
1595 revs->grep_filter.all_match = 1;
1596 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
1597 if (strcmp(optarg, "none"))
1598 git_log_output_encoding = xstrdup(optarg);
1599 else
1600 git_log_output_encoding = "";
1601 return argcount;
1602 } else if (!strcmp(arg, "--reverse")) {
1603 revs->reverse ^= 1;
1604 } else if (!strcmp(arg, "--children")) {
1605 revs->children.name = "children";
1606 revs->limited = 1;
1607 } else if (!strcmp(arg, "--ignore-missing")) {
1608 revs->ignore_missing = 1;
1609 } else {
1610 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1611 if (!opts)
1612 unkv[(*unkc)++] = arg;
1613 return opts;
1616 return 1;
1619 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1620 const struct option *options,
1621 const char * const usagestr[])
1623 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1624 &ctx->cpidx, ctx->out);
1625 if (n <= 0) {
1626 error("unknown option `%s'", ctx->argv[0]);
1627 usage_with_options(usagestr, options);
1629 ctx->argv += n;
1630 ctx->argc -= n;
1633 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1635 return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
1638 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1640 return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
1643 static int handle_revision_pseudo_opt(const char *submodule,
1644 struct rev_info *revs,
1645 int argc, const char **argv, int *flags)
1647 const char *arg = argv[0];
1648 const char *optarg;
1649 int argcount;
1652 * NOTE!
1654 * Commands like "git shortlog" will not accept the options below
1655 * unless parse_revision_opt queues them (as opposed to erroring
1656 * out).
1658 * When implementing your new pseudo-option, remember to
1659 * register it in the list at the top of handle_revision_opt.
1661 if (!strcmp(arg, "--all")) {
1662 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
1663 handle_refs(submodule, revs, *flags, head_ref_submodule);
1664 } else if (!strcmp(arg, "--branches")) {
1665 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
1666 } else if (!strcmp(arg, "--bisect")) {
1667 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
1668 handle_refs(submodule, revs, *flags ^ UNINTERESTING, for_each_good_bisect_ref);
1669 revs->bisect = 1;
1670 } else if (!strcmp(arg, "--tags")) {
1671 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
1672 } else if (!strcmp(arg, "--remotes")) {
1673 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
1674 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
1675 struct all_refs_cb cb;
1676 init_all_refs_cb(&cb, revs, *flags);
1677 for_each_glob_ref(handle_one_ref, optarg, &cb);
1678 return argcount;
1679 } else if (!prefixcmp(arg, "--branches=")) {
1680 struct all_refs_cb cb;
1681 init_all_refs_cb(&cb, revs, *flags);
1682 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
1683 } else if (!prefixcmp(arg, "--tags=")) {
1684 struct all_refs_cb cb;
1685 init_all_refs_cb(&cb, revs, *flags);
1686 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
1687 } else if (!prefixcmp(arg, "--remotes=")) {
1688 struct all_refs_cb cb;
1689 init_all_refs_cb(&cb, revs, *flags);
1690 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
1691 } else if (!strcmp(arg, "--reflog")) {
1692 handle_reflog(revs, *flags);
1693 } else if (!strcmp(arg, "--not")) {
1694 *flags ^= UNINTERESTING;
1695 } else if (!strcmp(arg, "--no-walk")) {
1696 revs->no_walk = 1;
1697 } else if (!strcmp(arg, "--do-walk")) {
1698 revs->no_walk = 0;
1699 } else {
1700 return 0;
1703 return 1;
1707 * Parse revision information, filling in the "rev_info" structure,
1708 * and removing the used arguments from the argument list.
1710 * Returns the number of arguments left that weren't recognized
1711 * (which are also moved to the head of the argument list)
1713 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
1715 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
1716 struct cmdline_pathspec prune_data;
1717 const char *submodule = NULL;
1719 memset(&prune_data, 0, sizeof(prune_data));
1720 if (opt)
1721 submodule = opt->submodule;
1723 /* First, search for "--" */
1724 if (opt && opt->assume_dashdash) {
1725 seen_dashdash = 1;
1726 } else {
1727 seen_dashdash = 0;
1728 for (i = 1; i < argc; i++) {
1729 const char *arg = argv[i];
1730 if (strcmp(arg, "--"))
1731 continue;
1732 argv[i] = NULL;
1733 argc = i;
1734 if (argv[i + 1])
1735 append_prune_data(&prune_data, argv + i + 1);
1736 seen_dashdash = 1;
1737 break;
1741 /* Second, deal with arguments and options */
1742 flags = 0;
1743 revarg_opt = opt ? opt->revarg_opt : 0;
1744 if (seen_dashdash)
1745 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
1746 read_from_stdin = 0;
1747 for (left = i = 1; i < argc; i++) {
1748 const char *arg = argv[i];
1749 if (*arg == '-') {
1750 int opts;
1752 opts = handle_revision_pseudo_opt(submodule,
1753 revs, argc - i, argv + i,
1754 &flags);
1755 if (opts > 0) {
1756 i += opts - 1;
1757 continue;
1760 if (!strcmp(arg, "--stdin")) {
1761 if (revs->disable_stdin) {
1762 argv[left++] = arg;
1763 continue;
1765 if (read_from_stdin++)
1766 die("--stdin given twice?");
1767 read_revisions_from_stdin(revs, &prune_data);
1768 continue;
1771 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1772 if (opts > 0) {
1773 i += opts - 1;
1774 continue;
1776 if (opts < 0)
1777 exit(128);
1778 continue;
1782 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
1783 int j;
1784 if (seen_dashdash || *arg == '^')
1785 die("bad revision '%s'", arg);
1787 /* If we didn't have a "--":
1788 * (1) all filenames must exist;
1789 * (2) all rev-args must not be interpretable
1790 * as a valid filename.
1791 * but the latter we have checked in the main loop.
1793 for (j = i; j < argc; j++)
1794 verify_filename(revs->prefix, argv[j], j == i);
1796 append_prune_data(&prune_data, argv + i);
1797 break;
1799 else
1800 got_rev_arg = 1;
1803 if (prune_data.nr) {
1805 * If we need to introduce the magic "a lone ':' means no
1806 * pathspec whatsoever", here is the place to do so.
1808 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
1809 * prune_data.nr = 0;
1810 * prune_data.alloc = 0;
1811 * free(prune_data.path);
1812 * prune_data.path = NULL;
1813 * } else {
1814 * terminate prune_data.alloc with NULL and
1815 * call init_pathspec() to set revs->prune_data here.
1818 ALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc);
1819 prune_data.path[prune_data.nr++] = NULL;
1820 init_pathspec(&revs->prune_data,
1821 get_pathspec(revs->prefix, prune_data.path));
1824 if (revs->def == NULL)
1825 revs->def = opt ? opt->def : NULL;
1826 if (opt && opt->tweak)
1827 opt->tweak(revs, opt);
1828 if (revs->show_merge)
1829 prepare_show_merge(revs);
1830 if (revs->def && !revs->pending.nr && !got_rev_arg) {
1831 unsigned char sha1[20];
1832 struct object *object;
1833 struct object_context oc;
1834 if (get_sha1_with_context(revs->def, 0, sha1, &oc))
1835 die("bad default revision '%s'", revs->def);
1836 object = get_reference(revs, revs->def, sha1, 0);
1837 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
1840 /* Did the user ask for any diff output? Run the diff! */
1841 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1842 revs->diff = 1;
1844 /* Pickaxe, diff-filter and rename following need diffs */
1845 if (revs->diffopt.pickaxe ||
1846 revs->diffopt.filter ||
1847 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1848 revs->diff = 1;
1850 if (revs->topo_order)
1851 revs->limited = 1;
1853 if (revs->prune_data.nr) {
1854 diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning);
1855 /* Can't prune commits with rename following: the paths change.. */
1856 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1857 revs->prune = 1;
1858 if (!revs->full_diff)
1859 diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt);
1861 if (revs->combine_merges)
1862 revs->ignore_merges = 0;
1863 revs->diffopt.abbrev = revs->abbrev;
1864 if (diff_setup_done(&revs->diffopt) < 0)
1865 die("diff_setup_done failed");
1867 compile_grep_patterns(&revs->grep_filter);
1869 if (revs->reverse && revs->reflog_info)
1870 die("cannot combine --reverse with --walk-reflogs");
1871 if (revs->rewrite_parents && revs->children.name)
1872 die("cannot combine --parents and --children");
1875 * Limitations on the graph functionality
1877 if (revs->reverse && revs->graph)
1878 die("cannot combine --reverse with --graph");
1880 if (revs->reflog_info && revs->graph)
1881 die("cannot combine --walk-reflogs with --graph");
1883 return left;
1886 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1888 struct commit_list *l = xcalloc(1, sizeof(*l));
1890 l->item = child;
1891 l->next = add_decoration(&revs->children, &parent->object, l);
1894 static int remove_duplicate_parents(struct commit *commit)
1896 struct commit_list **pp, *p;
1897 int surviving_parents;
1899 /* Examine existing parents while marking ones we have seen... */
1900 pp = &commit->parents;
1901 while ((p = *pp) != NULL) {
1902 struct commit *parent = p->item;
1903 if (parent->object.flags & TMP_MARK) {
1904 *pp = p->next;
1905 continue;
1907 parent->object.flags |= TMP_MARK;
1908 pp = &p->next;
1910 /* count them while clearing the temporary mark */
1911 surviving_parents = 0;
1912 for (p = commit->parents; p; p = p->next) {
1913 p->item->object.flags &= ~TMP_MARK;
1914 surviving_parents++;
1916 return surviving_parents;
1919 struct merge_simplify_state {
1920 struct commit *simplified;
1923 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1925 struct merge_simplify_state *st;
1927 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1928 if (!st) {
1929 st = xcalloc(1, sizeof(*st));
1930 add_decoration(&revs->merge_simplification, &commit->object, st);
1932 return st;
1935 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1937 struct commit_list *p;
1938 struct merge_simplify_state *st, *pst;
1939 int cnt;
1941 st = locate_simplify_state(revs, commit);
1944 * Have we handled this one?
1946 if (st->simplified)
1947 return tail;
1950 * An UNINTERESTING commit simplifies to itself, so does a
1951 * root commit. We do not rewrite parents of such commit
1952 * anyway.
1954 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
1955 st->simplified = commit;
1956 return tail;
1960 * Do we know what commit all of our parents that matter
1961 * should be rewritten to? Otherwise we are not ready to
1962 * rewrite this one yet.
1964 for (cnt = 0, p = commit->parents; p; p = p->next) {
1965 pst = locate_simplify_state(revs, p->item);
1966 if (!pst->simplified) {
1967 tail = &commit_list_insert(p->item, tail)->next;
1968 cnt++;
1970 if (revs->first_parent_only)
1971 break;
1973 if (cnt) {
1974 tail = &commit_list_insert(commit, tail)->next;
1975 return tail;
1979 * Rewrite our list of parents.
1981 for (p = commit->parents; p; p = p->next) {
1982 pst = locate_simplify_state(revs, p->item);
1983 p->item = pst->simplified;
1984 if (revs->first_parent_only)
1985 break;
1987 if (!revs->first_parent_only)
1988 cnt = remove_duplicate_parents(commit);
1989 else
1990 cnt = 1;
1993 * It is possible that we are a merge and one side branch
1994 * does not have any commit that touches the given paths;
1995 * in such a case, the immediate parents will be rewritten
1996 * to different commits.
1998 * o----X X: the commit we are looking at;
1999 * / / o: a commit that touches the paths;
2000 * ---o----'
2002 * Further reduce the parents by removing redundant parents.
2004 if (1 < cnt) {
2005 struct commit_list *h = reduce_heads(commit->parents);
2006 cnt = commit_list_count(h);
2007 free_commit_list(commit->parents);
2008 commit->parents = h;
2012 * A commit simplifies to itself if it is a root, if it is
2013 * UNINTERESTING, if it touches the given paths, or if it is a
2014 * merge and its parents simplifies to more than one commits
2015 * (the first two cases are already handled at the beginning of
2016 * this function).
2018 * Otherwise, it simplifies to what its sole parent simplifies to.
2020 if (!cnt ||
2021 (commit->object.flags & UNINTERESTING) ||
2022 !(commit->object.flags & TREESAME) ||
2023 (1 < cnt))
2024 st->simplified = commit;
2025 else {
2026 pst = locate_simplify_state(revs, commit->parents->item);
2027 st->simplified = pst->simplified;
2029 return tail;
2032 static void simplify_merges(struct rev_info *revs)
2034 struct commit_list *list, *next;
2035 struct commit_list *yet_to_do, **tail;
2036 struct commit *commit;
2038 if (!revs->prune)
2039 return;
2041 /* feed the list reversed */
2042 yet_to_do = NULL;
2043 for (list = revs->commits; list; list = next) {
2044 commit = list->item;
2045 next = list->next;
2047 * Do not free(list) here yet; the original list
2048 * is used later in this function.
2050 commit_list_insert(commit, &yet_to_do);
2052 while (yet_to_do) {
2053 list = yet_to_do;
2054 yet_to_do = NULL;
2055 tail = &yet_to_do;
2056 while (list) {
2057 commit = list->item;
2058 next = list->next;
2059 free(list);
2060 list = next;
2061 tail = simplify_one(revs, commit, tail);
2065 /* clean up the result, removing the simplified ones */
2066 list = revs->commits;
2067 revs->commits = NULL;
2068 tail = &revs->commits;
2069 while (list) {
2070 struct merge_simplify_state *st;
2072 commit = list->item;
2073 next = list->next;
2074 free(list);
2075 list = next;
2076 st = locate_simplify_state(revs, commit);
2077 if (st->simplified == commit)
2078 tail = &commit_list_insert(commit, tail)->next;
2082 static void set_children(struct rev_info *revs)
2084 struct commit_list *l;
2085 for (l = revs->commits; l; l = l->next) {
2086 struct commit *commit = l->item;
2087 struct commit_list *p;
2089 for (p = commit->parents; p; p = p->next)
2090 add_child(revs, p->item, commit);
2094 void reset_revision_walk(void)
2096 clear_object_flags(SEEN | ADDED | SHOWN);
2099 int prepare_revision_walk(struct rev_info *revs)
2101 int nr = revs->pending.nr;
2102 struct object_array_entry *e, *list;
2103 struct commit_list **next = &revs->commits;
2105 e = list = revs->pending.objects;
2106 revs->pending.nr = 0;
2107 revs->pending.alloc = 0;
2108 revs->pending.objects = NULL;
2109 while (--nr >= 0) {
2110 struct commit *commit = handle_commit(revs, e->item, e->name);
2111 if (commit) {
2112 if (!(commit->object.flags & SEEN)) {
2113 commit->object.flags |= SEEN;
2114 next = commit_list_append(commit, next);
2117 e++;
2119 commit_list_sort_by_date(&revs->commits);
2120 if (!revs->leak_pending)
2121 free(list);
2123 if (revs->no_walk)
2124 return 0;
2125 if (revs->limited)
2126 if (limit_list(revs) < 0)
2127 return -1;
2128 if (revs->topo_order)
2129 sort_in_topological_order(&revs->commits, revs->lifo);
2130 if (revs->simplify_merges)
2131 simplify_merges(revs);
2132 if (revs->children.name)
2133 set_children(revs);
2134 return 0;
2137 enum rewrite_result {
2138 rewrite_one_ok,
2139 rewrite_one_noparents,
2140 rewrite_one_error
2143 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2145 struct commit_list *cache = NULL;
2147 for (;;) {
2148 struct commit *p = *pp;
2149 if (!revs->limited)
2150 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2151 return rewrite_one_error;
2152 if (p->parents && p->parents->next)
2153 return rewrite_one_ok;
2154 if (p->object.flags & UNINTERESTING)
2155 return rewrite_one_ok;
2156 if (!(p->object.flags & TREESAME))
2157 return rewrite_one_ok;
2158 if (!p->parents)
2159 return rewrite_one_noparents;
2160 *pp = p->parents->item;
2164 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
2166 struct commit_list **pp = &commit->parents;
2167 while (*pp) {
2168 struct commit_list *parent = *pp;
2169 switch (rewrite_one(revs, &parent->item)) {
2170 case rewrite_one_ok:
2171 break;
2172 case rewrite_one_noparents:
2173 *pp = parent->next;
2174 continue;
2175 case rewrite_one_error:
2176 return -1;
2178 pp = &parent->next;
2180 remove_duplicate_parents(commit);
2181 return 0;
2184 static int commit_match(struct commit *commit, struct rev_info *opt)
2186 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2187 return 1;
2188 return grep_buffer(&opt->grep_filter,
2189 commit->buffer, strlen(commit->buffer));
2192 static inline int want_ancestry(struct rev_info *revs)
2194 return (revs->rewrite_parents || revs->children.name);
2197 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2199 if (commit->object.flags & SHOWN)
2200 return commit_ignore;
2201 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
2202 return commit_ignore;
2203 if (revs->show_all)
2204 return commit_show;
2205 if (commit->object.flags & UNINTERESTING)
2206 return commit_ignore;
2207 if (revs->min_age != -1 && (commit->date > revs->min_age))
2208 return commit_ignore;
2209 if (revs->min_parents || (revs->max_parents >= 0)) {
2210 int n = 0;
2211 struct commit_list *p;
2212 for (p = commit->parents; p; p = p->next)
2213 n++;
2214 if ((n < revs->min_parents) ||
2215 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2216 return commit_ignore;
2218 if (!commit_match(commit, revs))
2219 return commit_ignore;
2220 if (revs->prune && revs->dense) {
2221 /* Commit without changes? */
2222 if (commit->object.flags & TREESAME) {
2223 /* drop merges unless we want parenthood */
2224 if (!want_ancestry(revs))
2225 return commit_ignore;
2226 /* non-merge - always ignore it */
2227 if (!commit->parents || !commit->parents->next)
2228 return commit_ignore;
2231 return commit_show;
2234 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
2236 enum commit_action action = get_commit_action(revs, commit);
2238 if (action == commit_show &&
2239 !revs->show_all &&
2240 revs->prune && revs->dense && want_ancestry(revs)) {
2241 if (rewrite_parents(revs, commit) < 0)
2242 return commit_error;
2244 return action;
2247 static struct commit *get_revision_1(struct rev_info *revs)
2249 if (!revs->commits)
2250 return NULL;
2252 do {
2253 struct commit_list *entry = revs->commits;
2254 struct commit *commit = entry->item;
2256 revs->commits = entry->next;
2257 free(entry);
2259 if (revs->reflog_info) {
2260 fake_reflog_parent(revs->reflog_info, commit);
2261 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
2265 * If we haven't done the list limiting, we need to look at
2266 * the parents here. We also need to do the date-based limiting
2267 * that we'd otherwise have done in limit_list().
2269 if (!revs->limited) {
2270 if (revs->max_age != -1 &&
2271 (commit->date < revs->max_age))
2272 continue;
2273 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
2274 die("Failed to traverse parents of commit %s",
2275 sha1_to_hex(commit->object.sha1));
2278 switch (simplify_commit(revs, commit)) {
2279 case commit_ignore:
2280 continue;
2281 case commit_error:
2282 die("Failed to simplify parents of commit %s",
2283 sha1_to_hex(commit->object.sha1));
2284 default:
2285 return commit;
2287 } while (revs->commits);
2288 return NULL;
2291 static void gc_boundary(struct object_array *array)
2293 unsigned nr = array->nr;
2294 unsigned alloc = array->alloc;
2295 struct object_array_entry *objects = array->objects;
2297 if (alloc <= nr) {
2298 unsigned i, j;
2299 for (i = j = 0; i < nr; i++) {
2300 if (objects[i].item->flags & SHOWN)
2301 continue;
2302 if (i != j)
2303 objects[j] = objects[i];
2304 j++;
2306 for (i = j; i < nr; i++)
2307 objects[i].item = NULL;
2308 array->nr = j;
2312 static void create_boundary_commit_list(struct rev_info *revs)
2314 unsigned i;
2315 struct commit *c;
2316 struct object_array *array = &revs->boundary_commits;
2317 struct object_array_entry *objects = array->objects;
2320 * If revs->commits is non-NULL at this point, an error occurred in
2321 * get_revision_1(). Ignore the error and continue printing the
2322 * boundary commits anyway. (This is what the code has always
2323 * done.)
2325 if (revs->commits) {
2326 free_commit_list(revs->commits);
2327 revs->commits = NULL;
2331 * Put all of the actual boundary commits from revs->boundary_commits
2332 * into revs->commits
2334 for (i = 0; i < array->nr; i++) {
2335 c = (struct commit *)(objects[i].item);
2336 if (!c)
2337 continue;
2338 if (!(c->object.flags & CHILD_SHOWN))
2339 continue;
2340 if (c->object.flags & (SHOWN | BOUNDARY))
2341 continue;
2342 c->object.flags |= BOUNDARY;
2343 commit_list_insert(c, &revs->commits);
2347 * If revs->topo_order is set, sort the boundary commits
2348 * in topological order
2350 sort_in_topological_order(&revs->commits, revs->lifo);
2353 static struct commit *get_revision_internal(struct rev_info *revs)
2355 struct commit *c = NULL;
2356 struct commit_list *l;
2358 if (revs->boundary == 2) {
2360 * All of the normal commits have already been returned,
2361 * and we are now returning boundary commits.
2362 * create_boundary_commit_list() has populated
2363 * revs->commits with the remaining commits to return.
2365 c = pop_commit(&revs->commits);
2366 if (c)
2367 c->object.flags |= SHOWN;
2368 return c;
2372 * If our max_count counter has reached zero, then we are done. We
2373 * don't simply return NULL because we still might need to show
2374 * boundary commits. But we want to avoid calling get_revision_1, which
2375 * might do a considerable amount of work finding the next commit only
2376 * for us to throw it away.
2378 * If it is non-zero, then either we don't have a max_count at all
2379 * (-1), or it is still counting, in which case we decrement.
2381 if (revs->max_count) {
2382 c = get_revision_1(revs);
2383 if (c) {
2384 while (0 < revs->skip_count) {
2385 revs->skip_count--;
2386 c = get_revision_1(revs);
2387 if (!c)
2388 break;
2392 if (revs->max_count > 0)
2393 revs->max_count--;
2396 if (c)
2397 c->object.flags |= SHOWN;
2399 if (!revs->boundary) {
2400 return c;
2403 if (!c) {
2405 * get_revision_1() runs out the commits, and
2406 * we are done computing the boundaries.
2407 * switch to boundary commits output mode.
2409 revs->boundary = 2;
2412 * Update revs->commits to contain the list of
2413 * boundary commits.
2415 create_boundary_commit_list(revs);
2417 return get_revision_internal(revs);
2421 * boundary commits are the commits that are parents of the
2422 * ones we got from get_revision_1() but they themselves are
2423 * not returned from get_revision_1(). Before returning
2424 * 'c', we need to mark its parents that they could be boundaries.
2427 for (l = c->parents; l; l = l->next) {
2428 struct object *p;
2429 p = &(l->item->object);
2430 if (p->flags & (CHILD_SHOWN | SHOWN))
2431 continue;
2432 p->flags |= CHILD_SHOWN;
2433 gc_boundary(&revs->boundary_commits);
2434 add_object_array(p, NULL, &revs->boundary_commits);
2437 return c;
2440 struct commit *get_revision(struct rev_info *revs)
2442 struct commit *c;
2443 struct commit_list *reversed;
2445 if (revs->reverse) {
2446 reversed = NULL;
2447 while ((c = get_revision_internal(revs))) {
2448 commit_list_insert(c, &reversed);
2450 revs->commits = reversed;
2451 revs->reverse = 0;
2452 revs->reverse_output_stage = 1;
2455 if (revs->reverse_output_stage)
2456 return pop_commit(&revs->commits);
2458 c = get_revision_internal(revs);
2459 if (c && revs->graph)
2460 graph_update(revs->graph, c);
2461 return c;
2464 char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
2466 if (commit->object.flags & BOUNDARY)
2467 return "-";
2468 else if (commit->object.flags & UNINTERESTING)
2469 return "^";
2470 else if (commit->object.flags & PATCHSAME)
2471 return "=";
2472 else if (!revs || revs->left_right) {
2473 if (commit->object.flags & SYMMETRIC_LEFT)
2474 return "<";
2475 else
2476 return ">";
2477 } else if (revs->graph)
2478 return "*";
2479 else if (revs->cherry_mark)
2480 return "+";
2481 return "";
2484 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
2486 char *mark = get_revision_mark(revs, commit);
2487 if (!strlen(mark))
2488 return;
2489 fputs(mark, stdout);
2490 putchar(' ');