gitweb: use new Git::Repo API, and add optional caching
[git/gitweb-caching.git] / revision.c
blobef3f3f4059fc9ea8ee86e1d2a85ea47d05c48226
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"
15 volatile show_early_output_fn_t show_early_output;
17 static char *path_name(struct name_path *path, const char *name)
19 struct name_path *p;
20 char *n, *m;
21 int nlen = strlen(name);
22 int len = nlen + 1;
24 for (p = path; p; p = p->up) {
25 if (p->elem_len)
26 len += p->elem_len + 1;
28 n = xmalloc(len);
29 m = n + len - (nlen + 1);
30 strcpy(m, name);
31 for (p = path; p; p = p->up) {
32 if (p->elem_len) {
33 m -= p->elem_len + 1;
34 memcpy(m, p->elem, p->elem_len);
35 m[p->elem_len] = '/';
38 return n;
41 void add_object(struct object *obj,
42 struct object_array *p,
43 struct name_path *path,
44 const char *name)
46 add_object_array(obj, path_name(path, name), p);
49 static void mark_blob_uninteresting(struct blob *blob)
51 if (!blob)
52 return;
53 if (blob->object.flags & UNINTERESTING)
54 return;
55 blob->object.flags |= UNINTERESTING;
58 void mark_tree_uninteresting(struct tree *tree)
60 struct tree_desc desc;
61 struct name_entry entry;
62 struct object *obj = &tree->object;
64 if (!tree)
65 return;
66 if (obj->flags & UNINTERESTING)
67 return;
68 obj->flags |= UNINTERESTING;
69 if (!has_sha1_file(obj->sha1))
70 return;
71 if (parse_tree(tree) < 0)
72 die("bad tree %s", sha1_to_hex(obj->sha1));
74 init_tree_desc(&desc, tree->buffer, tree->size);
75 while (tree_entry(&desc, &entry)) {
76 switch (object_type(entry.mode)) {
77 case OBJ_TREE:
78 mark_tree_uninteresting(lookup_tree(entry.sha1));
79 break;
80 case OBJ_BLOB:
81 mark_blob_uninteresting(lookup_blob(entry.sha1));
82 break;
83 default:
84 /* Subproject commit - not in this repository */
85 break;
90 * We don't care about the tree any more
91 * after it has been marked uninteresting.
93 free(tree->buffer);
94 tree->buffer = NULL;
97 void mark_parents_uninteresting(struct commit *commit)
99 struct commit_list *parents = commit->parents;
101 while (parents) {
102 struct commit *commit = parents->item;
103 if (!(commit->object.flags & UNINTERESTING)) {
104 commit->object.flags |= UNINTERESTING;
107 * Normally we haven't parsed the parent
108 * yet, so we won't have a parent of a parent
109 * here. However, it may turn out that we've
110 * reached this commit some other way (where it
111 * wasn't uninteresting), in which case we need
112 * to mark its parents recursively too..
114 if (commit->parents)
115 mark_parents_uninteresting(commit);
119 * A missing commit is ok iff its parent is marked
120 * uninteresting.
122 * We just mark such a thing parsed, so that when
123 * it is popped next time around, we won't be trying
124 * to parse it and get an error.
126 if (!has_sha1_file(commit->object.sha1))
127 commit->object.parsed = 1;
128 parents = parents->next;
132 static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
134 if (revs->no_walk && (obj->flags & UNINTERESTING))
135 die("object ranges do not make sense when not walking revisions");
136 if (revs->reflog_info && obj->type == OBJ_COMMIT &&
137 add_reflog_for_walk(revs->reflog_info,
138 (struct commit *)obj, name))
139 return;
140 add_object_array_with_mode(obj, name, &revs->pending, mode);
143 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
145 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
148 void add_head_to_pending(struct rev_info *revs)
150 unsigned char sha1[20];
151 struct object *obj;
152 if (get_sha1("HEAD", sha1))
153 return;
154 obj = parse_object(sha1);
155 if (!obj)
156 return;
157 add_pending_object(revs, obj, "HEAD");
160 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
162 struct object *object;
164 object = parse_object(sha1);
165 if (!object)
166 die("bad object %s", name);
167 object->flags |= flags;
168 return object;
171 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
173 unsigned long flags = object->flags;
176 * Tag object? Look what it points to..
178 while (object->type == OBJ_TAG) {
179 struct tag *tag = (struct tag *) object;
180 if (revs->tag_objects && !(flags & UNINTERESTING))
181 add_pending_object(revs, object, tag->tag);
182 if (!tag->tagged)
183 die("bad tag");
184 object = parse_object(tag->tagged->sha1);
185 if (!object)
186 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
190 * Commit object? Just return it, we'll do all the complex
191 * reachability crud.
193 if (object->type == OBJ_COMMIT) {
194 struct commit *commit = (struct commit *)object;
195 if (parse_commit(commit) < 0)
196 die("unable to parse commit %s", name);
197 if (flags & UNINTERESTING) {
198 commit->object.flags |= UNINTERESTING;
199 mark_parents_uninteresting(commit);
200 revs->limited = 1;
202 return commit;
206 * Tree object? Either mark it uniniteresting, or add it
207 * to the list of objects to look at later..
209 if (object->type == OBJ_TREE) {
210 struct tree *tree = (struct tree *)object;
211 if (!revs->tree_objects)
212 return NULL;
213 if (flags & UNINTERESTING) {
214 mark_tree_uninteresting(tree);
215 return NULL;
217 add_pending_object(revs, object, "");
218 return NULL;
222 * Blob object? You know the drill by now..
224 if (object->type == OBJ_BLOB) {
225 struct blob *blob = (struct blob *)object;
226 if (!revs->blob_objects)
227 return NULL;
228 if (flags & UNINTERESTING) {
229 mark_blob_uninteresting(blob);
230 return NULL;
232 add_pending_object(revs, object, "");
233 return NULL;
235 die("%s is unknown object", name);
238 static int everybody_uninteresting(struct commit_list *orig)
240 struct commit_list *list = orig;
241 while (list) {
242 struct commit *commit = list->item;
243 list = list->next;
244 if (commit->object.flags & UNINTERESTING)
245 continue;
246 return 0;
248 return 1;
252 * The goal is to get REV_TREE_NEW as the result only if the
253 * diff consists of all '+' (and no other changes), and
254 * REV_TREE_DIFFERENT otherwise (of course if the trees are
255 * the same we want REV_TREE_SAME). That means that once we
256 * get to REV_TREE_DIFFERENT, we do not have to look any further.
258 static int tree_difference = REV_TREE_SAME;
260 static void file_add_remove(struct diff_options *options,
261 int addremove, unsigned mode,
262 const unsigned char *sha1,
263 const char *fullpath)
265 int diff = REV_TREE_DIFFERENT;
268 * Is it an add of a new file? It means that the old tree
269 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
270 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
271 * (and if it already was "REV_TREE_NEW", we'll keep it
272 * "REV_TREE_NEW" of course).
274 if (addremove == '+') {
275 diff = tree_difference;
276 if (diff != REV_TREE_SAME)
277 return;
278 diff = REV_TREE_NEW;
280 tree_difference = diff;
281 if (tree_difference == REV_TREE_DIFFERENT)
282 DIFF_OPT_SET(options, HAS_CHANGES);
285 static void file_change(struct diff_options *options,
286 unsigned old_mode, unsigned new_mode,
287 const unsigned char *old_sha1,
288 const unsigned char *new_sha1,
289 const char *fullpath)
291 tree_difference = REV_TREE_DIFFERENT;
292 DIFF_OPT_SET(options, HAS_CHANGES);
295 static int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
297 if (!t1)
298 return REV_TREE_NEW;
299 if (!t2)
300 return REV_TREE_DIFFERENT;
301 tree_difference = REV_TREE_SAME;
302 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
303 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
304 &revs->pruning) < 0)
305 return REV_TREE_DIFFERENT;
306 return tree_difference;
309 static int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
311 int retval;
312 void *tree;
313 unsigned long size;
314 struct tree_desc empty, real;
316 if (!t1)
317 return 0;
319 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
320 if (!tree)
321 return 0;
322 init_tree_desc(&real, tree, size);
323 init_tree_desc(&empty, "", 0);
325 tree_difference = REV_TREE_SAME;
326 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
327 retval = diff_tree(&empty, &real, "", &revs->pruning);
328 free(tree);
330 return retval >= 0 && (tree_difference == REV_TREE_SAME);
333 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
335 struct commit_list **pp, *parent;
336 int tree_changed = 0, tree_same = 0;
339 * If we don't do pruning, everything is interesting
341 if (!revs->prune)
342 return;
344 if (!commit->tree)
345 return;
347 if (!commit->parents) {
348 if (rev_same_tree_as_empty(revs, commit->tree))
349 commit->object.flags |= TREESAME;
350 return;
354 * Normal non-merge commit? If we don't want to make the
355 * history dense, we consider it always to be a change..
357 if (!revs->dense && !commit->parents->next)
358 return;
360 pp = &commit->parents;
361 while ((parent = *pp) != NULL) {
362 struct commit *p = parent->item;
364 if (parse_commit(p) < 0)
365 die("cannot simplify commit %s (because of %s)",
366 sha1_to_hex(commit->object.sha1),
367 sha1_to_hex(p->object.sha1));
368 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
369 case REV_TREE_SAME:
370 tree_same = 1;
371 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
372 /* Even if a merge with an uninteresting
373 * side branch brought the entire change
374 * we are interested in, we do not want
375 * to lose the other branches of this
376 * merge, so we just keep going.
378 pp = &parent->next;
379 continue;
381 parent->next = NULL;
382 commit->parents = parent;
383 commit->object.flags |= TREESAME;
384 return;
386 case REV_TREE_NEW:
387 if (revs->remove_empty_trees &&
388 rev_same_tree_as_empty(revs, p->tree)) {
389 /* We are adding all the specified
390 * paths from this parent, so the
391 * history beyond this parent is not
392 * interesting. Remove its parents
393 * (they are grandparents for us).
394 * IOW, we pretend this parent is a
395 * "root" commit.
397 if (parse_commit(p) < 0)
398 die("cannot simplify commit %s (invalid %s)",
399 sha1_to_hex(commit->object.sha1),
400 sha1_to_hex(p->object.sha1));
401 p->parents = NULL;
403 /* fallthrough */
404 case REV_TREE_DIFFERENT:
405 tree_changed = 1;
406 pp = &parent->next;
407 continue;
409 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
411 if (tree_changed && !tree_same)
412 return;
413 commit->object.flags |= TREESAME;
416 static void insert_by_date_cached(struct commit *p, struct commit_list **head,
417 struct commit_list *cached_base, struct commit_list **cache)
419 struct commit_list *new_entry;
421 if (cached_base && p->date < cached_base->item->date)
422 new_entry = insert_by_date(p, &cached_base->next);
423 else
424 new_entry = insert_by_date(p, head);
426 if (cache && (!*cache || p->date < (*cache)->item->date))
427 *cache = new_entry;
430 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
431 struct commit_list **list, struct commit_list **cache_ptr)
433 struct commit_list *parent = commit->parents;
434 unsigned left_flag;
435 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
437 if (commit->object.flags & ADDED)
438 return 0;
439 commit->object.flags |= ADDED;
442 * If the commit is uninteresting, don't try to
443 * prune parents - we want the maximal uninteresting
444 * set.
446 * Normally we haven't parsed the parent
447 * yet, so we won't have a parent of a parent
448 * here. However, it may turn out that we've
449 * reached this commit some other way (where it
450 * wasn't uninteresting), in which case we need
451 * to mark its parents recursively too..
453 if (commit->object.flags & UNINTERESTING) {
454 while (parent) {
455 struct commit *p = parent->item;
456 parent = parent->next;
457 if (parse_commit(p) < 0)
458 return -1;
459 p->object.flags |= UNINTERESTING;
460 if (p->parents)
461 mark_parents_uninteresting(p);
462 if (p->object.flags & SEEN)
463 continue;
464 p->object.flags |= SEEN;
465 insert_by_date_cached(p, list, cached_base, cache_ptr);
467 return 0;
471 * Ok, the commit wasn't uninteresting. Try to
472 * simplify the commit history and find the parent
473 * that has no differences in the path set if one exists.
475 try_to_simplify_commit(revs, commit);
477 if (revs->no_walk)
478 return 0;
480 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
482 for (parent = commit->parents; parent; parent = parent->next) {
483 struct commit *p = parent->item;
485 if (parse_commit(p) < 0)
486 return -1;
487 p->object.flags |= left_flag;
488 if (!(p->object.flags & SEEN)) {
489 p->object.flags |= SEEN;
490 insert_by_date_cached(p, list, cached_base, cache_ptr);
492 if (revs->first_parent_only)
493 break;
495 return 0;
498 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
500 struct commit_list *p;
501 int left_count = 0, right_count = 0;
502 int left_first;
503 struct patch_ids ids;
505 /* First count the commits on the left and on the right */
506 for (p = list; p; p = p->next) {
507 struct commit *commit = p->item;
508 unsigned flags = commit->object.flags;
509 if (flags & BOUNDARY)
511 else if (flags & SYMMETRIC_LEFT)
512 left_count++;
513 else
514 right_count++;
517 left_first = left_count < right_count;
518 init_patch_ids(&ids);
519 if (revs->diffopt.nr_paths) {
520 ids.diffopts.nr_paths = revs->diffopt.nr_paths;
521 ids.diffopts.paths = revs->diffopt.paths;
522 ids.diffopts.pathlens = revs->diffopt.pathlens;
525 /* Compute patch-ids for one side */
526 for (p = list; p; p = p->next) {
527 struct commit *commit = p->item;
528 unsigned flags = commit->object.flags;
530 if (flags & BOUNDARY)
531 continue;
533 * If we have fewer left, left_first is set and we omit
534 * commits on the right branch in this loop. If we have
535 * fewer right, we skip the left ones.
537 if (left_first != !!(flags & SYMMETRIC_LEFT))
538 continue;
539 commit->util = add_commit_patch_id(commit, &ids);
542 /* Check the other side */
543 for (p = list; p; p = p->next) {
544 struct commit *commit = p->item;
545 struct patch_id *id;
546 unsigned flags = commit->object.flags;
548 if (flags & BOUNDARY)
549 continue;
551 * If we have fewer left, left_first is set and we omit
552 * commits on the left branch in this loop.
554 if (left_first == !!(flags & SYMMETRIC_LEFT))
555 continue;
558 * Have we seen the same patch id?
560 id = has_commit_patch_id(commit, &ids);
561 if (!id)
562 continue;
563 id->seen = 1;
564 commit->object.flags |= SHOWN;
567 /* Now check the original side for seen ones */
568 for (p = list; p; p = p->next) {
569 struct commit *commit = p->item;
570 struct patch_id *ent;
572 ent = commit->util;
573 if (!ent)
574 continue;
575 if (ent->seen)
576 commit->object.flags |= SHOWN;
577 commit->util = NULL;
580 free_patch_ids(&ids);
583 /* How many extra uninteresting commits we want to see.. */
584 #define SLOP 5
586 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
589 * No source list at all? We're definitely done..
591 if (!src)
592 return 0;
595 * Does the destination list contain entries with a date
596 * before the source list? Definitely _not_ done.
598 if (date < src->item->date)
599 return SLOP;
602 * Does the source list still have interesting commits in
603 * it? Definitely not done..
605 if (!everybody_uninteresting(src))
606 return SLOP;
608 /* Ok, we're closing in.. */
609 return slop-1;
612 static int limit_list(struct rev_info *revs)
614 int slop = SLOP;
615 unsigned long date = ~0ul;
616 struct commit_list *list = revs->commits;
617 struct commit_list *newlist = NULL;
618 struct commit_list **p = &newlist;
620 while (list) {
621 struct commit_list *entry = list;
622 struct commit *commit = list->item;
623 struct object *obj = &commit->object;
624 show_early_output_fn_t show;
626 list = list->next;
627 free(entry);
629 if (revs->max_age != -1 && (commit->date < revs->max_age))
630 obj->flags |= UNINTERESTING;
631 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
632 return -1;
633 if (obj->flags & UNINTERESTING) {
634 mark_parents_uninteresting(commit);
635 if (revs->show_all)
636 p = &commit_list_insert(commit, p)->next;
637 slop = still_interesting(list, date, slop);
638 if (slop)
639 continue;
640 /* If showing all, add the whole pending list to the end */
641 if (revs->show_all)
642 *p = list;
643 break;
645 if (revs->min_age != -1 && (commit->date > revs->min_age))
646 continue;
647 date = commit->date;
648 p = &commit_list_insert(commit, p)->next;
650 show = show_early_output;
651 if (!show)
652 continue;
654 show(revs, newlist);
655 show_early_output = NULL;
657 if (revs->cherry_pick)
658 cherry_pick_list(newlist, revs);
660 revs->commits = newlist;
661 return 0;
664 struct all_refs_cb {
665 int all_flags;
666 int warned_bad_reflog;
667 struct rev_info *all_revs;
668 const char *name_for_errormsg;
671 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
673 struct all_refs_cb *cb = cb_data;
674 struct object *object = get_reference(cb->all_revs, path, sha1,
675 cb->all_flags);
676 add_pending_object(cb->all_revs, object, path);
677 return 0;
680 static void handle_refs(struct rev_info *revs, unsigned flags,
681 int (*for_each)(each_ref_fn, void *))
683 struct all_refs_cb cb;
684 cb.all_revs = revs;
685 cb.all_flags = flags;
686 for_each(handle_one_ref, &cb);
689 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
691 struct all_refs_cb *cb = cb_data;
692 if (!is_null_sha1(sha1)) {
693 struct object *o = parse_object(sha1);
694 if (o) {
695 o->flags |= cb->all_flags;
696 add_pending_object(cb->all_revs, o, "");
698 else if (!cb->warned_bad_reflog) {
699 warning("reflog of '%s' references pruned commits",
700 cb->name_for_errormsg);
701 cb->warned_bad_reflog = 1;
706 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
707 const char *email, unsigned long timestamp, int tz,
708 const char *message, void *cb_data)
710 handle_one_reflog_commit(osha1, cb_data);
711 handle_one_reflog_commit(nsha1, cb_data);
712 return 0;
715 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
717 struct all_refs_cb *cb = cb_data;
718 cb->warned_bad_reflog = 0;
719 cb->name_for_errormsg = path;
720 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
721 return 0;
724 static void handle_reflog(struct rev_info *revs, unsigned flags)
726 struct all_refs_cb cb;
727 cb.all_revs = revs;
728 cb.all_flags = flags;
729 for_each_reflog(handle_one_reflog, &cb);
732 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
734 unsigned char sha1[20];
735 struct object *it;
736 struct commit *commit;
737 struct commit_list *parents;
739 if (*arg == '^') {
740 flags ^= UNINTERESTING;
741 arg++;
743 if (get_sha1(arg, sha1))
744 return 0;
745 while (1) {
746 it = get_reference(revs, arg, sha1, 0);
747 if (it->type != OBJ_TAG)
748 break;
749 if (!((struct tag*)it)->tagged)
750 return 0;
751 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
753 if (it->type != OBJ_COMMIT)
754 return 0;
755 commit = (struct commit *)it;
756 for (parents = commit->parents; parents; parents = parents->next) {
757 it = &parents->item->object;
758 it->flags |= flags;
759 add_pending_object(revs, it, arg);
761 return 1;
764 void init_revisions(struct rev_info *revs, const char *prefix)
766 memset(revs, 0, sizeof(*revs));
768 revs->abbrev = DEFAULT_ABBREV;
769 revs->ignore_merges = 1;
770 revs->simplify_history = 1;
771 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
772 DIFF_OPT_SET(&revs->pruning, QUIET);
773 revs->pruning.add_remove = file_add_remove;
774 revs->pruning.change = file_change;
775 revs->lifo = 1;
776 revs->dense = 1;
777 revs->prefix = prefix;
778 revs->max_age = -1;
779 revs->min_age = -1;
780 revs->skip_count = -1;
781 revs->max_count = -1;
783 revs->commit_format = CMIT_FMT_DEFAULT;
785 revs->grep_filter.status_only = 1;
786 revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
787 revs->grep_filter.regflags = REG_NEWLINE;
789 diff_setup(&revs->diffopt);
790 if (prefix && !revs->diffopt.prefix) {
791 revs->diffopt.prefix = prefix;
792 revs->diffopt.prefix_length = strlen(prefix);
796 static void add_pending_commit_list(struct rev_info *revs,
797 struct commit_list *commit_list,
798 unsigned int flags)
800 while (commit_list) {
801 struct object *object = &commit_list->item->object;
802 object->flags |= flags;
803 add_pending_object(revs, object, sha1_to_hex(object->sha1));
804 commit_list = commit_list->next;
808 static void prepare_show_merge(struct rev_info *revs)
810 struct commit_list *bases;
811 struct commit *head, *other;
812 unsigned char sha1[20];
813 const char **prune = NULL;
814 int i, prune_num = 1; /* counting terminating NULL */
816 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
817 die("--merge without HEAD?");
818 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
819 die("--merge without MERGE_HEAD?");
820 add_pending_object(revs, &head->object, "HEAD");
821 add_pending_object(revs, &other->object, "MERGE_HEAD");
822 bases = get_merge_bases(head, other, 1);
823 add_pending_commit_list(revs, bases, UNINTERESTING);
824 free_commit_list(bases);
825 head->object.flags |= SYMMETRIC_LEFT;
827 if (!active_nr)
828 read_cache();
829 for (i = 0; i < active_nr; i++) {
830 struct cache_entry *ce = active_cache[i];
831 if (!ce_stage(ce))
832 continue;
833 if (ce_path_match(ce, revs->prune_data)) {
834 prune_num++;
835 prune = xrealloc(prune, sizeof(*prune) * prune_num);
836 prune[prune_num-2] = ce->name;
837 prune[prune_num-1] = NULL;
839 while ((i+1 < active_nr) &&
840 ce_same_name(ce, active_cache[i+1]))
841 i++;
843 revs->prune_data = prune;
844 revs->limited = 1;
847 int handle_revision_arg(const char *arg, struct rev_info *revs,
848 int flags,
849 int cant_be_filename)
851 unsigned mode;
852 char *dotdot;
853 struct object *object;
854 unsigned char sha1[20];
855 int local_flags;
857 dotdot = strstr(arg, "..");
858 if (dotdot) {
859 unsigned char from_sha1[20];
860 const char *next = dotdot + 2;
861 const char *this = arg;
862 int symmetric = *next == '.';
863 unsigned int flags_exclude = flags ^ UNINTERESTING;
865 *dotdot = 0;
866 next += symmetric;
868 if (!*next)
869 next = "HEAD";
870 if (dotdot == arg)
871 this = "HEAD";
872 if (!get_sha1(this, from_sha1) &&
873 !get_sha1(next, sha1)) {
874 struct commit *a, *b;
875 struct commit_list *exclude;
877 a = lookup_commit_reference(from_sha1);
878 b = lookup_commit_reference(sha1);
879 if (!a || !b) {
880 die(symmetric ?
881 "Invalid symmetric difference expression %s...%s" :
882 "Invalid revision range %s..%s",
883 arg, next);
886 if (!cant_be_filename) {
887 *dotdot = '.';
888 verify_non_filename(revs->prefix, arg);
891 if (symmetric) {
892 exclude = get_merge_bases(a, b, 1);
893 add_pending_commit_list(revs, exclude,
894 flags_exclude);
895 free_commit_list(exclude);
896 a->object.flags |= flags | SYMMETRIC_LEFT;
897 } else
898 a->object.flags |= flags_exclude;
899 b->object.flags |= flags;
900 add_pending_object(revs, &a->object, this);
901 add_pending_object(revs, &b->object, next);
902 return 0;
904 *dotdot = '.';
906 dotdot = strstr(arg, "^@");
907 if (dotdot && !dotdot[2]) {
908 *dotdot = 0;
909 if (add_parents_only(revs, arg, flags))
910 return 0;
911 *dotdot = '^';
913 dotdot = strstr(arg, "^!");
914 if (dotdot && !dotdot[2]) {
915 *dotdot = 0;
916 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
917 *dotdot = '^';
920 local_flags = 0;
921 if (*arg == '^') {
922 local_flags = UNINTERESTING;
923 arg++;
925 if (get_sha1_with_mode(arg, sha1, &mode))
926 return -1;
927 if (!cant_be_filename)
928 verify_non_filename(revs->prefix, arg);
929 object = get_reference(revs, arg, sha1, flags ^ local_flags);
930 add_pending_object_with_mode(revs, object, arg, mode);
931 return 0;
934 void read_revisions_from_stdin(struct rev_info *revs)
936 char line[1000];
938 while (fgets(line, sizeof(line), stdin) != NULL) {
939 int len = strlen(line);
940 if (len && line[len - 1] == '\n')
941 line[--len] = '\0';
942 if (!len)
943 break;
944 if (line[0] == '-')
945 die("options not supported in --stdin mode");
946 if (handle_revision_arg(line, revs, 0, 1))
947 die("bad revision '%s'", line);
951 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
953 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
956 static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
958 char *pat;
959 const char *prefix;
960 int patlen, fldlen;
962 fldlen = strlen(field);
963 patlen = strlen(pattern);
964 pat = xmalloc(patlen + fldlen + 10);
965 prefix = ".*";
966 if (*pattern == '^') {
967 prefix = "";
968 pattern++;
970 sprintf(pat, "^%s %s%s", field, prefix, pattern);
971 add_grep(revs, pat, GREP_PATTERN_HEAD);
974 static void add_message_grep(struct rev_info *revs, const char *pattern)
976 add_grep(revs, pattern, GREP_PATTERN_BODY);
979 static void add_ignore_packed(struct rev_info *revs, const char *name)
981 int num = ++revs->num_ignore_packed;
983 revs->ignore_packed = xrealloc(revs->ignore_packed,
984 sizeof(const char **) * (num + 1));
985 revs->ignore_packed[num-1] = name;
986 revs->ignore_packed[num] = NULL;
989 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
990 int *unkc, const char **unkv)
992 const char *arg = argv[0];
994 /* pseudo revision arguments */
995 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
996 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
997 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
998 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk"))
1000 unkv[(*unkc)++] = arg;
1001 return 1;
1004 if (!prefixcmp(arg, "--max-count=")) {
1005 revs->max_count = atoi(arg + 12);
1006 } else if (!prefixcmp(arg, "--skip=")) {
1007 revs->skip_count = atoi(arg + 7);
1008 } else if ((*arg == '-') && isdigit(arg[1])) {
1009 /* accept -<digit>, like traditional "head" */
1010 revs->max_count = atoi(arg + 1);
1011 } else if (!strcmp(arg, "-n")) {
1012 if (argc <= 1)
1013 return error("-n requires an argument");
1014 revs->max_count = atoi(argv[1]);
1015 return 2;
1016 } else if (!prefixcmp(arg, "-n")) {
1017 revs->max_count = atoi(arg + 2);
1018 } else if (!prefixcmp(arg, "--max-age=")) {
1019 revs->max_age = atoi(arg + 10);
1020 } else if (!prefixcmp(arg, "--since=")) {
1021 revs->max_age = approxidate(arg + 8);
1022 } else if (!prefixcmp(arg, "--after=")) {
1023 revs->max_age = approxidate(arg + 8);
1024 } else if (!prefixcmp(arg, "--min-age=")) {
1025 revs->min_age = atoi(arg + 10);
1026 } else if (!prefixcmp(arg, "--before=")) {
1027 revs->min_age = approxidate(arg + 9);
1028 } else if (!prefixcmp(arg, "--until=")) {
1029 revs->min_age = approxidate(arg + 8);
1030 } else if (!strcmp(arg, "--first-parent")) {
1031 revs->first_parent_only = 1;
1032 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1033 init_reflog_walk(&revs->reflog_info);
1034 } else if (!strcmp(arg, "--default")) {
1035 if (argc <= 1)
1036 return error("bad --default argument");
1037 revs->def = argv[1];
1038 return 2;
1039 } else if (!strcmp(arg, "--merge")) {
1040 revs->show_merge = 1;
1041 } else if (!strcmp(arg, "--topo-order")) {
1042 revs->lifo = 1;
1043 revs->topo_order = 1;
1044 } else if (!strcmp(arg, "--simplify-merges")) {
1045 revs->simplify_merges = 1;
1046 revs->rewrite_parents = 1;
1047 revs->simplify_history = 0;
1048 revs->limited = 1;
1049 } else if (!strcmp(arg, "--date-order")) {
1050 revs->lifo = 0;
1051 revs->topo_order = 1;
1052 } else if (!prefixcmp(arg, "--early-output")) {
1053 int count = 100;
1054 switch (arg[14]) {
1055 case '=':
1056 count = atoi(arg+15);
1057 /* Fallthrough */
1058 case 0:
1059 revs->topo_order = 1;
1060 revs->early_output = count;
1062 } else if (!strcmp(arg, "--parents")) {
1063 revs->rewrite_parents = 1;
1064 revs->print_parents = 1;
1065 } else if (!strcmp(arg, "--dense")) {
1066 revs->dense = 1;
1067 } else if (!strcmp(arg, "--sparse")) {
1068 revs->dense = 0;
1069 } else if (!strcmp(arg, "--show-all")) {
1070 revs->show_all = 1;
1071 } else if (!strcmp(arg, "--remove-empty")) {
1072 revs->remove_empty_trees = 1;
1073 } else if (!strcmp(arg, "--no-merges")) {
1074 revs->no_merges = 1;
1075 } else if (!strcmp(arg, "--boundary")) {
1076 revs->boundary = 1;
1077 } else if (!strcmp(arg, "--left-right")) {
1078 revs->left_right = 1;
1079 } else if (!strcmp(arg, "--cherry-pick")) {
1080 revs->cherry_pick = 1;
1081 revs->limited = 1;
1082 } else if (!strcmp(arg, "--objects")) {
1083 revs->tag_objects = 1;
1084 revs->tree_objects = 1;
1085 revs->blob_objects = 1;
1086 } else if (!strcmp(arg, "--objects-edge")) {
1087 revs->tag_objects = 1;
1088 revs->tree_objects = 1;
1089 revs->blob_objects = 1;
1090 revs->edge_hint = 1;
1091 } else if (!strcmp(arg, "--unpacked")) {
1092 revs->unpacked = 1;
1093 free(revs->ignore_packed);
1094 revs->ignore_packed = NULL;
1095 revs->num_ignore_packed = 0;
1096 } else if (!prefixcmp(arg, "--unpacked=")) {
1097 revs->unpacked = 1;
1098 add_ignore_packed(revs, arg+11);
1099 } else if (!strcmp(arg, "-r")) {
1100 revs->diff = 1;
1101 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1102 } else if (!strcmp(arg, "-t")) {
1103 revs->diff = 1;
1104 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1105 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1106 } else if (!strcmp(arg, "-m")) {
1107 revs->ignore_merges = 0;
1108 } else if (!strcmp(arg, "-c")) {
1109 revs->diff = 1;
1110 revs->dense_combined_merges = 0;
1111 revs->combine_merges = 1;
1112 } else if (!strcmp(arg, "--cc")) {
1113 revs->diff = 1;
1114 revs->dense_combined_merges = 1;
1115 revs->combine_merges = 1;
1116 } else if (!strcmp(arg, "-v")) {
1117 revs->verbose_header = 1;
1118 } else if (!strcmp(arg, "--pretty")) {
1119 revs->verbose_header = 1;
1120 get_commit_format(arg+8, revs);
1121 } else if (!prefixcmp(arg, "--pretty=")) {
1122 revs->verbose_header = 1;
1123 get_commit_format(arg+9, revs);
1124 } else if (!strcmp(arg, "--graph")) {
1125 revs->topo_order = 1;
1126 revs->rewrite_parents = 1;
1127 revs->graph = graph_init(revs);
1128 } else if (!strcmp(arg, "--root")) {
1129 revs->show_root_diff = 1;
1130 } else if (!strcmp(arg, "--no-commit-id")) {
1131 revs->no_commit_id = 1;
1132 } else if (!strcmp(arg, "--always")) {
1133 revs->always_show_header = 1;
1134 } else if (!strcmp(arg, "--no-abbrev")) {
1135 revs->abbrev = 0;
1136 } else if (!strcmp(arg, "--abbrev")) {
1137 revs->abbrev = DEFAULT_ABBREV;
1138 } else if (!prefixcmp(arg, "--abbrev=")) {
1139 revs->abbrev = strtoul(arg + 9, NULL, 10);
1140 if (revs->abbrev < MINIMUM_ABBREV)
1141 revs->abbrev = MINIMUM_ABBREV;
1142 else if (revs->abbrev > 40)
1143 revs->abbrev = 40;
1144 } else if (!strcmp(arg, "--abbrev-commit")) {
1145 revs->abbrev_commit = 1;
1146 } else if (!strcmp(arg, "--full-diff")) {
1147 revs->diff = 1;
1148 revs->full_diff = 1;
1149 } else if (!strcmp(arg, "--full-history")) {
1150 revs->simplify_history = 0;
1151 } else if (!strcmp(arg, "--relative-date")) {
1152 revs->date_mode = DATE_RELATIVE;
1153 } else if (!strncmp(arg, "--date=", 7)) {
1154 revs->date_mode = parse_date_format(arg + 7);
1155 } else if (!strcmp(arg, "--log-size")) {
1156 revs->show_log_size = 1;
1159 * Grepping the commit log
1161 else if (!prefixcmp(arg, "--author=")) {
1162 add_header_grep(revs, "author", arg+9);
1163 } else if (!prefixcmp(arg, "--committer=")) {
1164 add_header_grep(revs, "committer", arg+12);
1165 } else if (!prefixcmp(arg, "--grep=")) {
1166 add_message_grep(revs, arg+7);
1167 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1168 revs->grep_filter.regflags |= REG_EXTENDED;
1169 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1170 revs->grep_filter.regflags |= REG_ICASE;
1171 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1172 revs->grep_filter.fixed = 1;
1173 } else if (!strcmp(arg, "--all-match")) {
1174 revs->grep_filter.all_match = 1;
1175 } else if (!prefixcmp(arg, "--encoding=")) {
1176 arg += 11;
1177 if (strcmp(arg, "none"))
1178 git_log_output_encoding = xstrdup(arg);
1179 else
1180 git_log_output_encoding = "";
1181 } else if (!strcmp(arg, "--reverse")) {
1182 revs->reverse ^= 1;
1183 } else if (!strcmp(arg, "--children")) {
1184 revs->children.name = "children";
1185 revs->limited = 1;
1186 } else {
1187 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1188 if (!opts)
1189 unkv[(*unkc)++] = arg;
1190 return opts;
1193 return 1;
1196 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1197 const struct option *options,
1198 const char * const usagestr[])
1200 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1201 &ctx->cpidx, ctx->out);
1202 if (n <= 0) {
1203 error("unknown option `%s'", ctx->argv[0]);
1204 usage_with_options(usagestr, options);
1206 ctx->argv += n;
1207 ctx->argc -= n;
1211 * Parse revision information, filling in the "rev_info" structure,
1212 * and removing the used arguments from the argument list.
1214 * Returns the number of arguments left that weren't recognized
1215 * (which are also moved to the head of the argument list)
1217 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
1219 int i, flags, left, seen_dashdash;
1221 /* First, search for "--" */
1222 seen_dashdash = 0;
1223 for (i = 1; i < argc; i++) {
1224 const char *arg = argv[i];
1225 if (strcmp(arg, "--"))
1226 continue;
1227 argv[i] = NULL;
1228 argc = i;
1229 if (argv[i + 1])
1230 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
1231 seen_dashdash = 1;
1232 break;
1235 /* Second, deal with arguments and options */
1236 flags = 0;
1237 for (left = i = 1; i < argc; i++) {
1238 const char *arg = argv[i];
1239 if (*arg == '-') {
1240 int opts;
1242 if (!strcmp(arg, "--all")) {
1243 handle_refs(revs, flags, for_each_ref);
1244 continue;
1246 if (!strcmp(arg, "--branches")) {
1247 handle_refs(revs, flags, for_each_branch_ref);
1248 continue;
1250 if (!strcmp(arg, "--tags")) {
1251 handle_refs(revs, flags, for_each_tag_ref);
1252 continue;
1254 if (!strcmp(arg, "--remotes")) {
1255 handle_refs(revs, flags, for_each_remote_ref);
1256 continue;
1258 if (!strcmp(arg, "--reflog")) {
1259 handle_reflog(revs, flags);
1260 continue;
1262 if (!strcmp(arg, "--not")) {
1263 flags ^= UNINTERESTING;
1264 continue;
1266 if (!strcmp(arg, "--no-walk")) {
1267 revs->no_walk = 1;
1268 continue;
1270 if (!strcmp(arg, "--do-walk")) {
1271 revs->no_walk = 0;
1272 continue;
1275 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1276 if (opts > 0) {
1277 i += opts - 1;
1278 continue;
1280 if (opts < 0)
1281 exit(128);
1282 continue;
1285 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1286 int j;
1287 if (seen_dashdash || *arg == '^')
1288 die("bad revision '%s'", arg);
1290 /* If we didn't have a "--":
1291 * (1) all filenames must exist;
1292 * (2) all rev-args must not be interpretable
1293 * as a valid filename.
1294 * but the latter we have checked in the main loop.
1296 for (j = i; j < argc; j++)
1297 verify_filename(revs->prefix, argv[j]);
1299 revs->prune_data = get_pathspec(revs->prefix,
1300 argv + i);
1301 break;
1305 if (revs->def == NULL)
1306 revs->def = def;
1307 if (revs->show_merge)
1308 prepare_show_merge(revs);
1309 if (revs->def && !revs->pending.nr) {
1310 unsigned char sha1[20];
1311 struct object *object;
1312 unsigned mode;
1313 if (get_sha1_with_mode(revs->def, sha1, &mode))
1314 die("bad default revision '%s'", revs->def);
1315 object = get_reference(revs, revs->def, sha1, 0);
1316 add_pending_object_with_mode(revs, object, revs->def, mode);
1319 /* Did the user ask for any diff output? Run the diff! */
1320 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1321 revs->diff = 1;
1323 /* Pickaxe, diff-filter and rename following need diffs */
1324 if (revs->diffopt.pickaxe ||
1325 revs->diffopt.filter ||
1326 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1327 revs->diff = 1;
1329 if (revs->topo_order)
1330 revs->limited = 1;
1332 if (revs->prune_data) {
1333 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1334 /* Can't prune commits with rename following: the paths change.. */
1335 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1336 revs->prune = 1;
1337 if (!revs->full_diff)
1338 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1340 if (revs->combine_merges) {
1341 revs->ignore_merges = 0;
1342 if (revs->dense_combined_merges && !revs->diffopt.output_format)
1343 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1345 revs->diffopt.abbrev = revs->abbrev;
1346 if (diff_setup_done(&revs->diffopt) < 0)
1347 die("diff_setup_done failed");
1349 compile_grep_patterns(&revs->grep_filter);
1351 if (revs->reverse && revs->reflog_info)
1352 die("cannot combine --reverse with --walk-reflogs");
1353 if (revs->rewrite_parents && revs->children.name)
1354 die("cannot combine --parents and --children");
1357 * Limitations on the graph functionality
1359 if (revs->reverse && revs->graph)
1360 die("cannot combine --reverse with --graph");
1362 if (revs->reflog_info && revs->graph)
1363 die("cannot combine --walk-reflogs with --graph");
1365 return left;
1368 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1370 struct commit_list *l = xcalloc(1, sizeof(*l));
1372 l->item = child;
1373 l->next = add_decoration(&revs->children, &parent->object, l);
1376 static int remove_duplicate_parents(struct commit *commit)
1378 struct commit_list **pp, *p;
1379 int surviving_parents;
1381 /* Examine existing parents while marking ones we have seen... */
1382 pp = &commit->parents;
1383 while ((p = *pp) != NULL) {
1384 struct commit *parent = p->item;
1385 if (parent->object.flags & TMP_MARK) {
1386 *pp = p->next;
1387 continue;
1389 parent->object.flags |= TMP_MARK;
1390 pp = &p->next;
1392 /* count them while clearing the temporary mark */
1393 surviving_parents = 0;
1394 for (p = commit->parents; p; p = p->next) {
1395 p->item->object.flags &= ~TMP_MARK;
1396 surviving_parents++;
1398 return surviving_parents;
1401 struct merge_simplify_state {
1402 struct commit *simplified;
1405 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1407 struct merge_simplify_state *st;
1409 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1410 if (!st) {
1411 st = xcalloc(1, sizeof(*st));
1412 add_decoration(&revs->merge_simplification, &commit->object, st);
1414 return st;
1417 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1419 struct commit_list *p;
1420 struct merge_simplify_state *st, *pst;
1421 int cnt;
1423 st = locate_simplify_state(revs, commit);
1426 * Have we handled this one?
1428 if (st->simplified)
1429 return tail;
1432 * An UNINTERESTING commit simplifies to itself, so does a
1433 * root commit. We do not rewrite parents of such commit
1434 * anyway.
1436 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
1437 st->simplified = commit;
1438 return tail;
1442 * Do we know what commit all of our parents should be rewritten to?
1443 * Otherwise we are not ready to rewrite this one yet.
1445 for (cnt = 0, p = commit->parents; p; p = p->next) {
1446 pst = locate_simplify_state(revs, p->item);
1447 if (!pst->simplified) {
1448 tail = &commit_list_insert(p->item, tail)->next;
1449 cnt++;
1452 if (cnt) {
1453 tail = &commit_list_insert(commit, tail)->next;
1454 return tail;
1458 * Rewrite our list of parents.
1460 for (p = commit->parents; p; p = p->next) {
1461 pst = locate_simplify_state(revs, p->item);
1462 p->item = pst->simplified;
1464 cnt = remove_duplicate_parents(commit);
1467 * It is possible that we are a merge and one side branch
1468 * does not have any commit that touches the given paths;
1469 * in such a case, the immediate parents will be rewritten
1470 * to different commits.
1472 * o----X X: the commit we are looking at;
1473 * / / o: a commit that touches the paths;
1474 * ---o----'
1476 * Further reduce the parents by removing redundant parents.
1478 if (1 < cnt) {
1479 struct commit_list *h = reduce_heads(commit->parents);
1480 cnt = commit_list_count(h);
1481 free_commit_list(commit->parents);
1482 commit->parents = h;
1486 * A commit simplifies to itself if it is a root, if it is
1487 * UNINTERESTING, if it touches the given paths, or if it is a
1488 * merge and its parents simplifies to more than one commits
1489 * (the first two cases are already handled at the beginning of
1490 * this function).
1492 * Otherwise, it simplifies to what its sole parent simplifies to.
1494 if (!cnt ||
1495 (commit->object.flags & UNINTERESTING) ||
1496 !(commit->object.flags & TREESAME) ||
1497 (1 < cnt))
1498 st->simplified = commit;
1499 else {
1500 pst = locate_simplify_state(revs, commit->parents->item);
1501 st->simplified = pst->simplified;
1503 return tail;
1506 static void simplify_merges(struct rev_info *revs)
1508 struct commit_list *list;
1509 struct commit_list *yet_to_do, **tail;
1511 sort_in_topological_order(&revs->commits, revs->lifo);
1513 /* feed the list reversed */
1514 yet_to_do = NULL;
1515 for (list = revs->commits; list; list = list->next)
1516 commit_list_insert(list->item, &yet_to_do);
1517 while (yet_to_do) {
1518 list = yet_to_do;
1519 yet_to_do = NULL;
1520 tail = &yet_to_do;
1521 while (list) {
1522 struct commit *commit = list->item;
1523 struct commit_list *next = list->next;
1524 free(list);
1525 list = next;
1526 tail = simplify_one(revs, commit, tail);
1530 /* clean up the result, removing the simplified ones */
1531 list = revs->commits;
1532 revs->commits = NULL;
1533 tail = &revs->commits;
1534 while (list) {
1535 struct commit *commit = list->item;
1536 struct commit_list *next = list->next;
1537 struct merge_simplify_state *st;
1538 free(list);
1539 list = next;
1540 st = locate_simplify_state(revs, commit);
1541 if (st->simplified == commit)
1542 tail = &commit_list_insert(commit, tail)->next;
1546 static void set_children(struct rev_info *revs)
1548 struct commit_list *l;
1549 for (l = revs->commits; l; l = l->next) {
1550 struct commit *commit = l->item;
1551 struct commit_list *p;
1553 for (p = commit->parents; p; p = p->next)
1554 add_child(revs, p->item, commit);
1558 int prepare_revision_walk(struct rev_info *revs)
1560 int nr = revs->pending.nr;
1561 struct object_array_entry *e, *list;
1563 e = list = revs->pending.objects;
1564 revs->pending.nr = 0;
1565 revs->pending.alloc = 0;
1566 revs->pending.objects = NULL;
1567 while (--nr >= 0) {
1568 struct commit *commit = handle_commit(revs, e->item, e->name);
1569 if (commit) {
1570 if (!(commit->object.flags & SEEN)) {
1571 commit->object.flags |= SEEN;
1572 insert_by_date(commit, &revs->commits);
1575 e++;
1577 free(list);
1579 if (revs->no_walk)
1580 return 0;
1581 if (revs->limited)
1582 if (limit_list(revs) < 0)
1583 return -1;
1584 if (revs->topo_order)
1585 sort_in_topological_order(&revs->commits, revs->lifo);
1586 if (revs->simplify_merges)
1587 simplify_merges(revs);
1588 if (revs->children.name)
1589 set_children(revs);
1590 return 0;
1593 enum rewrite_result {
1594 rewrite_one_ok,
1595 rewrite_one_noparents,
1596 rewrite_one_error,
1599 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
1601 struct commit_list *cache = NULL;
1603 for (;;) {
1604 struct commit *p = *pp;
1605 if (!revs->limited)
1606 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
1607 return rewrite_one_error;
1608 if (p->parents && p->parents->next)
1609 return rewrite_one_ok;
1610 if (p->object.flags & UNINTERESTING)
1611 return rewrite_one_ok;
1612 if (!(p->object.flags & TREESAME))
1613 return rewrite_one_ok;
1614 if (!p->parents)
1615 return rewrite_one_noparents;
1616 *pp = p->parents->item;
1620 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
1622 struct commit_list **pp = &commit->parents;
1623 while (*pp) {
1624 struct commit_list *parent = *pp;
1625 switch (rewrite_one(revs, &parent->item)) {
1626 case rewrite_one_ok:
1627 break;
1628 case rewrite_one_noparents:
1629 *pp = parent->next;
1630 continue;
1631 case rewrite_one_error:
1632 return -1;
1634 pp = &parent->next;
1636 remove_duplicate_parents(commit);
1637 return 0;
1640 static int commit_match(struct commit *commit, struct rev_info *opt)
1642 if (!opt->grep_filter.pattern_list)
1643 return 1;
1644 return grep_buffer(&opt->grep_filter,
1645 NULL, /* we say nothing, not even filename */
1646 commit->buffer, strlen(commit->buffer));
1649 static inline int want_ancestry(struct rev_info *revs)
1651 return (revs->rewrite_parents || revs->children.name);
1654 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1656 if (commit->object.flags & SHOWN)
1657 return commit_ignore;
1658 if (revs->unpacked && has_sha1_pack(commit->object.sha1, revs->ignore_packed))
1659 return commit_ignore;
1660 if (revs->show_all)
1661 return commit_show;
1662 if (commit->object.flags & UNINTERESTING)
1663 return commit_ignore;
1664 if (revs->min_age != -1 && (commit->date > revs->min_age))
1665 return commit_ignore;
1666 if (revs->no_merges && commit->parents && commit->parents->next)
1667 return commit_ignore;
1668 if (!commit_match(commit, revs))
1669 return commit_ignore;
1670 if (revs->prune && revs->dense) {
1671 /* Commit without changes? */
1672 if (commit->object.flags & TREESAME) {
1673 /* drop merges unless we want parenthood */
1674 if (!want_ancestry(revs))
1675 return commit_ignore;
1676 /* non-merge - always ignore it */
1677 if (!commit->parents || !commit->parents->next)
1678 return commit_ignore;
1680 if (want_ancestry(revs) && rewrite_parents(revs, commit) < 0)
1681 return commit_error;
1683 return commit_show;
1686 static struct commit *get_revision_1(struct rev_info *revs)
1688 if (!revs->commits)
1689 return NULL;
1691 do {
1692 struct commit_list *entry = revs->commits;
1693 struct commit *commit = entry->item;
1695 revs->commits = entry->next;
1696 free(entry);
1698 if (revs->reflog_info)
1699 fake_reflog_parent(revs->reflog_info, commit);
1702 * If we haven't done the list limiting, we need to look at
1703 * the parents here. We also need to do the date-based limiting
1704 * that we'd otherwise have done in limit_list().
1706 if (!revs->limited) {
1707 if (revs->max_age != -1 &&
1708 (commit->date < revs->max_age))
1709 continue;
1710 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
1711 return NULL;
1714 switch (simplify_commit(revs, commit)) {
1715 case commit_ignore:
1716 continue;
1717 case commit_error:
1718 return NULL;
1719 default:
1720 return commit;
1722 } while (revs->commits);
1723 return NULL;
1726 static void gc_boundary(struct object_array *array)
1728 unsigned nr = array->nr;
1729 unsigned alloc = array->alloc;
1730 struct object_array_entry *objects = array->objects;
1732 if (alloc <= nr) {
1733 unsigned i, j;
1734 for (i = j = 0; i < nr; i++) {
1735 if (objects[i].item->flags & SHOWN)
1736 continue;
1737 if (i != j)
1738 objects[j] = objects[i];
1739 j++;
1741 for (i = j; i < nr; i++)
1742 objects[i].item = NULL;
1743 array->nr = j;
1747 static void create_boundary_commit_list(struct rev_info *revs)
1749 unsigned i;
1750 struct commit *c;
1751 struct object_array *array = &revs->boundary_commits;
1752 struct object_array_entry *objects = array->objects;
1755 * If revs->commits is non-NULL at this point, an error occurred in
1756 * get_revision_1(). Ignore the error and continue printing the
1757 * boundary commits anyway. (This is what the code has always
1758 * done.)
1760 if (revs->commits) {
1761 free_commit_list(revs->commits);
1762 revs->commits = NULL;
1766 * Put all of the actual boundary commits from revs->boundary_commits
1767 * into revs->commits
1769 for (i = 0; i < array->nr; i++) {
1770 c = (struct commit *)(objects[i].item);
1771 if (!c)
1772 continue;
1773 if (!(c->object.flags & CHILD_SHOWN))
1774 continue;
1775 if (c->object.flags & (SHOWN | BOUNDARY))
1776 continue;
1777 c->object.flags |= BOUNDARY;
1778 commit_list_insert(c, &revs->commits);
1782 * If revs->topo_order is set, sort the boundary commits
1783 * in topological order
1785 sort_in_topological_order(&revs->commits, revs->lifo);
1788 static struct commit *get_revision_internal(struct rev_info *revs)
1790 struct commit *c = NULL;
1791 struct commit_list *l;
1793 if (revs->boundary == 2) {
1795 * All of the normal commits have already been returned,
1796 * and we are now returning boundary commits.
1797 * create_boundary_commit_list() has populated
1798 * revs->commits with the remaining commits to return.
1800 c = pop_commit(&revs->commits);
1801 if (c)
1802 c->object.flags |= SHOWN;
1803 return c;
1806 if (revs->reverse) {
1807 int limit = -1;
1809 if (0 <= revs->max_count) {
1810 limit = revs->max_count;
1811 if (0 < revs->skip_count)
1812 limit += revs->skip_count;
1814 l = NULL;
1815 while ((c = get_revision_1(revs))) {
1816 commit_list_insert(c, &l);
1817 if ((0 < limit) && !--limit)
1818 break;
1820 revs->commits = l;
1821 revs->reverse = 0;
1822 revs->max_count = -1;
1823 c = NULL;
1827 * Now pick up what they want to give us
1829 c = get_revision_1(revs);
1830 if (c) {
1831 while (0 < revs->skip_count) {
1832 revs->skip_count--;
1833 c = get_revision_1(revs);
1834 if (!c)
1835 break;
1840 * Check the max_count.
1842 switch (revs->max_count) {
1843 case -1:
1844 break;
1845 case 0:
1846 c = NULL;
1847 break;
1848 default:
1849 revs->max_count--;
1852 if (c)
1853 c->object.flags |= SHOWN;
1855 if (!revs->boundary) {
1856 return c;
1859 if (!c) {
1861 * get_revision_1() runs out the commits, and
1862 * we are done computing the boundaries.
1863 * switch to boundary commits output mode.
1865 revs->boundary = 2;
1868 * Update revs->commits to contain the list of
1869 * boundary commits.
1871 create_boundary_commit_list(revs);
1873 return get_revision_internal(revs);
1877 * boundary commits are the commits that are parents of the
1878 * ones we got from get_revision_1() but they themselves are
1879 * not returned from get_revision_1(). Before returning
1880 * 'c', we need to mark its parents that they could be boundaries.
1883 for (l = c->parents; l; l = l->next) {
1884 struct object *p;
1885 p = &(l->item->object);
1886 if (p->flags & (CHILD_SHOWN | SHOWN))
1887 continue;
1888 p->flags |= CHILD_SHOWN;
1889 gc_boundary(&revs->boundary_commits);
1890 add_object_array(p, NULL, &revs->boundary_commits);
1893 return c;
1896 struct commit *get_revision(struct rev_info *revs)
1898 struct commit *c = get_revision_internal(revs);
1899 if (c && revs->graph)
1900 graph_update(revs->graph, c);
1901 return c;