Merge commit 'junio/next' into next
[git/platforms/storm.git] / revision.c
blob39ceef071c2cc0df58d4e63f8dfd7159da882577
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 *base, const char *path)
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 *base, const char *path)
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 int add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
418 struct commit_list *parent = commit->parents;
419 unsigned left_flag;
421 if (commit->object.flags & ADDED)
422 return 0;
423 commit->object.flags |= ADDED;
426 * If the commit is uninteresting, don't try to
427 * prune parents - we want the maximal uninteresting
428 * set.
430 * Normally we haven't parsed the parent
431 * yet, so we won't have a parent of a parent
432 * here. However, it may turn out that we've
433 * reached this commit some other way (where it
434 * wasn't uninteresting), in which case we need
435 * to mark its parents recursively too..
437 if (commit->object.flags & UNINTERESTING) {
438 while (parent) {
439 struct commit *p = parent->item;
440 parent = parent->next;
441 if (parse_commit(p) < 0)
442 return -1;
443 p->object.flags |= UNINTERESTING;
444 if (p->parents)
445 mark_parents_uninteresting(p);
446 if (p->object.flags & SEEN)
447 continue;
448 p->object.flags |= SEEN;
449 insert_by_date(p, list);
451 return 0;
455 * Ok, the commit wasn't uninteresting. Try to
456 * simplify the commit history and find the parent
457 * that has no differences in the path set if one exists.
459 try_to_simplify_commit(revs, commit);
461 if (revs->no_walk)
462 return 0;
464 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
466 for (parent = commit->parents; parent; parent = parent->next) {
467 struct commit *p = parent->item;
469 if (parse_commit(p) < 0)
470 return -1;
471 p->object.flags |= left_flag;
472 if (!(p->object.flags & SEEN)) {
473 p->object.flags |= SEEN;
474 insert_by_date(p, list);
476 if(revs->first_parent_only)
477 break;
479 return 0;
482 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
484 struct commit_list *p;
485 int left_count = 0, right_count = 0;
486 int left_first;
487 struct patch_ids ids;
489 /* First count the commits on the left and on the right */
490 for (p = list; p; p = p->next) {
491 struct commit *commit = p->item;
492 unsigned flags = commit->object.flags;
493 if (flags & BOUNDARY)
495 else if (flags & SYMMETRIC_LEFT)
496 left_count++;
497 else
498 right_count++;
501 left_first = left_count < right_count;
502 init_patch_ids(&ids);
503 if (revs->diffopt.nr_paths) {
504 ids.diffopts.nr_paths = revs->diffopt.nr_paths;
505 ids.diffopts.paths = revs->diffopt.paths;
506 ids.diffopts.pathlens = revs->diffopt.pathlens;
509 /* Compute patch-ids for one side */
510 for (p = list; p; p = p->next) {
511 struct commit *commit = p->item;
512 unsigned flags = commit->object.flags;
514 if (flags & BOUNDARY)
515 continue;
517 * If we have fewer left, left_first is set and we omit
518 * commits on the right branch in this loop. If we have
519 * fewer right, we skip the left ones.
521 if (left_first != !!(flags & SYMMETRIC_LEFT))
522 continue;
523 commit->util = add_commit_patch_id(commit, &ids);
526 /* Check the other side */
527 for (p = list; p; p = p->next) {
528 struct commit *commit = p->item;
529 struct patch_id *id;
530 unsigned flags = commit->object.flags;
532 if (flags & BOUNDARY)
533 continue;
535 * If we have fewer left, left_first is set and we omit
536 * commits on the left branch in this loop.
538 if (left_first == !!(flags & SYMMETRIC_LEFT))
539 continue;
542 * Have we seen the same patch id?
544 id = has_commit_patch_id(commit, &ids);
545 if (!id)
546 continue;
547 id->seen = 1;
548 commit->object.flags |= SHOWN;
551 /* Now check the original side for seen ones */
552 for (p = list; p; p = p->next) {
553 struct commit *commit = p->item;
554 struct patch_id *ent;
556 ent = commit->util;
557 if (!ent)
558 continue;
559 if (ent->seen)
560 commit->object.flags |= SHOWN;
561 commit->util = NULL;
564 free_patch_ids(&ids);
567 /* How many extra uninteresting commits we want to see.. */
568 #define SLOP 5
570 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
573 * No source list at all? We're definitely done..
575 if (!src)
576 return 0;
579 * Does the destination list contain entries with a date
580 * before the source list? Definitely _not_ done.
582 if (date < src->item->date)
583 return SLOP;
586 * Does the source list still have interesting commits in
587 * it? Definitely not done..
589 if (!everybody_uninteresting(src))
590 return SLOP;
592 /* Ok, we're closing in.. */
593 return slop-1;
596 static int limit_list(struct rev_info *revs)
598 int slop = SLOP;
599 unsigned long date = ~0ul;
600 struct commit_list *list = revs->commits;
601 struct commit_list *newlist = NULL;
602 struct commit_list **p = &newlist;
604 while (list) {
605 struct commit_list *entry = list;
606 struct commit *commit = list->item;
607 struct object *obj = &commit->object;
608 show_early_output_fn_t show;
610 list = list->next;
611 free(entry);
613 if (revs->max_age != -1 && (commit->date < revs->max_age))
614 obj->flags |= UNINTERESTING;
615 if (add_parents_to_list(revs, commit, &list) < 0)
616 return -1;
617 if (obj->flags & UNINTERESTING) {
618 mark_parents_uninteresting(commit);
619 if (revs->show_all)
620 p = &commit_list_insert(commit, p)->next;
621 slop = still_interesting(list, date, slop);
622 if (slop)
623 continue;
624 /* If showing all, add the whole pending list to the end */
625 if (revs->show_all)
626 *p = list;
627 break;
629 if (revs->min_age != -1 && (commit->date > revs->min_age))
630 continue;
631 date = commit->date;
632 p = &commit_list_insert(commit, p)->next;
634 show = show_early_output;
635 if (!show)
636 continue;
638 show(revs, newlist);
639 show_early_output = NULL;
641 if (revs->cherry_pick)
642 cherry_pick_list(newlist, revs);
644 revs->commits = newlist;
645 return 0;
648 struct all_refs_cb {
649 int all_flags;
650 int warned_bad_reflog;
651 struct rev_info *all_revs;
652 const char *name_for_errormsg;
655 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
657 struct all_refs_cb *cb = cb_data;
658 struct object *object = get_reference(cb->all_revs, path, sha1,
659 cb->all_flags);
660 add_pending_object(cb->all_revs, object, path);
661 return 0;
664 static void handle_refs(struct rev_info *revs, unsigned flags,
665 int (*for_each)(each_ref_fn, void *))
667 struct all_refs_cb cb;
668 cb.all_revs = revs;
669 cb.all_flags = flags;
670 for_each(handle_one_ref, &cb);
673 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
675 struct all_refs_cb *cb = cb_data;
676 if (!is_null_sha1(sha1)) {
677 struct object *o = parse_object(sha1);
678 if (o) {
679 o->flags |= cb->all_flags;
680 add_pending_object(cb->all_revs, o, "");
682 else if (!cb->warned_bad_reflog) {
683 warning("reflog of '%s' references pruned commits",
684 cb->name_for_errormsg);
685 cb->warned_bad_reflog = 1;
690 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
691 const char *email, unsigned long timestamp, int tz,
692 const char *message, void *cb_data)
694 handle_one_reflog_commit(osha1, cb_data);
695 handle_one_reflog_commit(nsha1, cb_data);
696 return 0;
699 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
701 struct all_refs_cb *cb = cb_data;
702 cb->warned_bad_reflog = 0;
703 cb->name_for_errormsg = path;
704 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
705 return 0;
708 static void handle_reflog(struct rev_info *revs, unsigned flags)
710 struct all_refs_cb cb;
711 cb.all_revs = revs;
712 cb.all_flags = flags;
713 for_each_reflog(handle_one_reflog, &cb);
716 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
718 unsigned char sha1[20];
719 struct object *it;
720 struct commit *commit;
721 struct commit_list *parents;
723 if (*arg == '^') {
724 flags ^= UNINTERESTING;
725 arg++;
727 if (get_sha1(arg, sha1))
728 return 0;
729 while (1) {
730 it = get_reference(revs, arg, sha1, 0);
731 if (it->type != OBJ_TAG)
732 break;
733 if (!((struct tag*)it)->tagged)
734 return 0;
735 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
737 if (it->type != OBJ_COMMIT)
738 return 0;
739 commit = (struct commit *)it;
740 for (parents = commit->parents; parents; parents = parents->next) {
741 it = &parents->item->object;
742 it->flags |= flags;
743 add_pending_object(revs, it, arg);
745 return 1;
748 void init_revisions(struct rev_info *revs, const char *prefix)
750 memset(revs, 0, sizeof(*revs));
752 revs->abbrev = DEFAULT_ABBREV;
753 revs->ignore_merges = 1;
754 revs->simplify_history = 1;
755 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
756 DIFF_OPT_SET(&revs->pruning, QUIET);
757 revs->pruning.add_remove = file_add_remove;
758 revs->pruning.change = file_change;
759 revs->lifo = 1;
760 revs->dense = 1;
761 revs->prefix = prefix;
762 revs->max_age = -1;
763 revs->min_age = -1;
764 revs->skip_count = -1;
765 revs->max_count = -1;
767 revs->commit_format = CMIT_FMT_DEFAULT;
769 diff_setup(&revs->diffopt);
770 if (prefix && !revs->diffopt.prefix) {
771 revs->diffopt.prefix = prefix;
772 revs->diffopt.prefix_length = strlen(prefix);
776 static void add_pending_commit_list(struct rev_info *revs,
777 struct commit_list *commit_list,
778 unsigned int flags)
780 while (commit_list) {
781 struct object *object = &commit_list->item->object;
782 object->flags |= flags;
783 add_pending_object(revs, object, sha1_to_hex(object->sha1));
784 commit_list = commit_list->next;
788 static void prepare_show_merge(struct rev_info *revs)
790 struct commit_list *bases;
791 struct commit *head, *other;
792 unsigned char sha1[20];
793 const char **prune = NULL;
794 int i, prune_num = 1; /* counting terminating NULL */
796 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
797 die("--merge without HEAD?");
798 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
799 die("--merge without MERGE_HEAD?");
800 add_pending_object(revs, &head->object, "HEAD");
801 add_pending_object(revs, &other->object, "MERGE_HEAD");
802 bases = get_merge_bases(head, other, 1);
803 add_pending_commit_list(revs, bases, UNINTERESTING);
804 free_commit_list(bases);
805 head->object.flags |= SYMMETRIC_LEFT;
807 if (!active_nr)
808 read_cache();
809 for (i = 0; i < active_nr; i++) {
810 struct cache_entry *ce = active_cache[i];
811 if (!ce_stage(ce))
812 continue;
813 if (ce_path_match(ce, revs->prune_data)) {
814 prune_num++;
815 prune = xrealloc(prune, sizeof(*prune) * prune_num);
816 prune[prune_num-2] = ce->name;
817 prune[prune_num-1] = NULL;
819 while ((i+1 < active_nr) &&
820 ce_same_name(ce, active_cache[i+1]))
821 i++;
823 revs->prune_data = prune;
824 revs->limited = 1;
827 int handle_revision_arg(const char *arg, struct rev_info *revs,
828 int flags,
829 int cant_be_filename)
831 unsigned mode;
832 char *dotdot;
833 struct object *object;
834 unsigned char sha1[20];
835 int local_flags;
837 dotdot = strstr(arg, "..");
838 if (dotdot) {
839 unsigned char from_sha1[20];
840 const char *next = dotdot + 2;
841 const char *this = arg;
842 int symmetric = *next == '.';
843 unsigned int flags_exclude = flags ^ UNINTERESTING;
845 *dotdot = 0;
846 next += symmetric;
848 if (!*next)
849 next = "HEAD";
850 if (dotdot == arg)
851 this = "HEAD";
852 if (!get_sha1(this, from_sha1) &&
853 !get_sha1(next, sha1)) {
854 struct commit *a, *b;
855 struct commit_list *exclude;
857 a = lookup_commit_reference(from_sha1);
858 b = lookup_commit_reference(sha1);
859 if (!a || !b) {
860 die(symmetric ?
861 "Invalid symmetric difference expression %s...%s" :
862 "Invalid revision range %s..%s",
863 arg, next);
866 if (!cant_be_filename) {
867 *dotdot = '.';
868 verify_non_filename(revs->prefix, arg);
871 if (symmetric) {
872 exclude = get_merge_bases(a, b, 1);
873 add_pending_commit_list(revs, exclude,
874 flags_exclude);
875 free_commit_list(exclude);
876 a->object.flags |= flags | SYMMETRIC_LEFT;
877 } else
878 a->object.flags |= flags_exclude;
879 b->object.flags |= flags;
880 add_pending_object(revs, &a->object, this);
881 add_pending_object(revs, &b->object, next);
882 return 0;
884 *dotdot = '.';
886 dotdot = strstr(arg, "^@");
887 if (dotdot && !dotdot[2]) {
888 *dotdot = 0;
889 if (add_parents_only(revs, arg, flags))
890 return 0;
891 *dotdot = '^';
893 dotdot = strstr(arg, "^!");
894 if (dotdot && !dotdot[2]) {
895 *dotdot = 0;
896 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
897 *dotdot = '^';
900 local_flags = 0;
901 if (*arg == '^') {
902 local_flags = UNINTERESTING;
903 arg++;
905 if (get_sha1_with_mode(arg, sha1, &mode))
906 return -1;
907 if (!cant_be_filename)
908 verify_non_filename(revs->prefix, arg);
909 object = get_reference(revs, arg, sha1, flags ^ local_flags);
910 add_pending_object_with_mode(revs, object, arg, mode);
911 return 0;
914 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
916 if (!revs->grep_filter) {
917 struct grep_opt *opt = xcalloc(1, sizeof(*opt));
918 opt->status_only = 1;
919 opt->pattern_tail = &(opt->pattern_list);
920 opt->regflags = REG_NEWLINE;
921 revs->grep_filter = opt;
923 append_grep_pattern(revs->grep_filter, ptn,
924 "command line", 0, what);
927 static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
929 char *pat;
930 const char *prefix;
931 int patlen, fldlen;
933 fldlen = strlen(field);
934 patlen = strlen(pattern);
935 pat = xmalloc(patlen + fldlen + 10);
936 prefix = ".*";
937 if (*pattern == '^') {
938 prefix = "";
939 pattern++;
941 sprintf(pat, "^%s %s%s", field, prefix, pattern);
942 add_grep(revs, pat, GREP_PATTERN_HEAD);
945 static void add_message_grep(struct rev_info *revs, const char *pattern)
947 add_grep(revs, pattern, GREP_PATTERN_BODY);
950 static void add_ignore_packed(struct rev_info *revs, const char *name)
952 int num = ++revs->num_ignore_packed;
954 revs->ignore_packed = xrealloc(revs->ignore_packed,
955 sizeof(const char **) * (num + 1));
956 revs->ignore_packed[num-1] = name;
957 revs->ignore_packed[num] = NULL;
961 * Parse revision information, filling in the "rev_info" structure,
962 * and removing the used arguments from the argument list.
964 * Returns the number of arguments left that weren't recognized
965 * (which are also moved to the head of the argument list)
967 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
969 int i, flags, seen_dashdash, show_merge;
970 const char **unrecognized = argv + 1;
971 int left = 1;
972 int all_match = 0;
973 int regflags = 0;
974 int fixed = 0;
976 /* First, search for "--" */
977 seen_dashdash = 0;
978 for (i = 1; i < argc; i++) {
979 const char *arg = argv[i];
980 if (strcmp(arg, "--"))
981 continue;
982 argv[i] = NULL;
983 argc = i;
984 if (argv[i + 1])
985 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
986 seen_dashdash = 1;
987 break;
990 flags = show_merge = 0;
991 for (i = 1; i < argc; i++) {
992 const char *arg = argv[i];
993 if (*arg == '-') {
994 int opts;
995 if (!prefixcmp(arg, "--max-count=")) {
996 revs->max_count = atoi(arg + 12);
997 continue;
999 if (!prefixcmp(arg, "--skip=")) {
1000 revs->skip_count = atoi(arg + 7);
1001 continue;
1003 /* accept -<digit>, like traditional "head" */
1004 if ((*arg == '-') && isdigit(arg[1])) {
1005 revs->max_count = atoi(arg + 1);
1006 continue;
1008 if (!strcmp(arg, "-n")) {
1009 if (argc <= i + 1)
1010 die("-n requires an argument");
1011 revs->max_count = atoi(argv[++i]);
1012 continue;
1014 if (!prefixcmp(arg, "-n")) {
1015 revs->max_count = atoi(arg + 2);
1016 continue;
1018 if (!prefixcmp(arg, "--max-age=")) {
1019 revs->max_age = atoi(arg + 10);
1020 continue;
1022 if (!prefixcmp(arg, "--since=")) {
1023 revs->max_age = approxidate(arg + 8);
1024 continue;
1026 if (!prefixcmp(arg, "--after=")) {
1027 revs->max_age = approxidate(arg + 8);
1028 continue;
1030 if (!prefixcmp(arg, "--min-age=")) {
1031 revs->min_age = atoi(arg + 10);
1032 continue;
1034 if (!prefixcmp(arg, "--before=")) {
1035 revs->min_age = approxidate(arg + 9);
1036 continue;
1038 if (!prefixcmp(arg, "--until=")) {
1039 revs->min_age = approxidate(arg + 8);
1040 continue;
1042 if (!strcmp(arg, "--all")) {
1043 handle_refs(revs, flags, for_each_ref);
1044 continue;
1046 if (!strcmp(arg, "--branches")) {
1047 handle_refs(revs, flags, for_each_branch_ref);
1048 continue;
1050 if (!strcmp(arg, "--tags")) {
1051 handle_refs(revs, flags, for_each_tag_ref);
1052 continue;
1054 if (!strcmp(arg, "--remotes")) {
1055 handle_refs(revs, flags, for_each_remote_ref);
1056 continue;
1058 if (!strcmp(arg, "--first-parent")) {
1059 revs->first_parent_only = 1;
1060 continue;
1062 if (!strcmp(arg, "--reflog")) {
1063 handle_reflog(revs, flags);
1064 continue;
1066 if (!strcmp(arg, "-g") ||
1067 !strcmp(arg, "--walk-reflogs")) {
1068 init_reflog_walk(&revs->reflog_info);
1069 continue;
1071 if (!strcmp(arg, "--not")) {
1072 flags ^= UNINTERESTING;
1073 continue;
1075 if (!strcmp(arg, "--default")) {
1076 if (++i >= argc)
1077 die("bad --default argument");
1078 def = argv[i];
1079 continue;
1081 if (!strcmp(arg, "--merge")) {
1082 show_merge = 1;
1083 continue;
1085 if (!strcmp(arg, "--topo-order")) {
1086 revs->lifo = 1;
1087 revs->topo_order = 1;
1088 continue;
1090 if (!strcmp(arg, "--date-order")) {
1091 revs->lifo = 0;
1092 revs->topo_order = 1;
1093 continue;
1095 if (!prefixcmp(arg, "--early-output")) {
1096 int count = 100;
1097 switch (arg[14]) {
1098 case '=':
1099 count = atoi(arg+15);
1100 /* Fallthrough */
1101 case 0:
1102 revs->topo_order = 1;
1103 revs->early_output = count;
1104 continue;
1107 if (!strcmp(arg, "--parents")) {
1108 revs->rewrite_parents = 1;
1109 revs->print_parents = 1;
1110 continue;
1112 if (!strcmp(arg, "--dense")) {
1113 revs->dense = 1;
1114 continue;
1116 if (!strcmp(arg, "--sparse")) {
1117 revs->dense = 0;
1118 continue;
1120 if (!strcmp(arg, "--show-all")) {
1121 revs->show_all = 1;
1122 continue;
1124 if (!strcmp(arg, "--remove-empty")) {
1125 revs->remove_empty_trees = 1;
1126 continue;
1128 if (!strcmp(arg, "--no-merges")) {
1129 revs->no_merges = 1;
1130 continue;
1132 if (!strcmp(arg, "--boundary")) {
1133 revs->boundary = 1;
1134 continue;
1136 if (!strcmp(arg, "--left-right")) {
1137 revs->left_right = 1;
1138 continue;
1140 if (!strcmp(arg, "--cherry-pick")) {
1141 revs->cherry_pick = 1;
1142 revs->limited = 1;
1143 continue;
1145 if (!strcmp(arg, "--objects")) {
1146 revs->tag_objects = 1;
1147 revs->tree_objects = 1;
1148 revs->blob_objects = 1;
1149 continue;
1151 if (!strcmp(arg, "--objects-edge")) {
1152 revs->tag_objects = 1;
1153 revs->tree_objects = 1;
1154 revs->blob_objects = 1;
1155 revs->edge_hint = 1;
1156 continue;
1158 if (!strcmp(arg, "--unpacked")) {
1159 revs->unpacked = 1;
1160 free(revs->ignore_packed);
1161 revs->ignore_packed = NULL;
1162 revs->num_ignore_packed = 0;
1163 continue;
1165 if (!prefixcmp(arg, "--unpacked=")) {
1166 revs->unpacked = 1;
1167 add_ignore_packed(revs, arg+11);
1168 continue;
1170 if (!strcmp(arg, "-r")) {
1171 revs->diff = 1;
1172 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1173 continue;
1175 if (!strcmp(arg, "-t")) {
1176 revs->diff = 1;
1177 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1178 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1179 continue;
1181 if (!strcmp(arg, "-m")) {
1182 revs->ignore_merges = 0;
1183 continue;
1185 if (!strcmp(arg, "-c")) {
1186 revs->diff = 1;
1187 revs->dense_combined_merges = 0;
1188 revs->combine_merges = 1;
1189 continue;
1191 if (!strcmp(arg, "--cc")) {
1192 revs->diff = 1;
1193 revs->dense_combined_merges = 1;
1194 revs->combine_merges = 1;
1195 continue;
1197 if (!strcmp(arg, "-v")) {
1198 revs->verbose_header = 1;
1199 continue;
1201 if (!prefixcmp(arg, "--pretty")) {
1202 revs->verbose_header = 1;
1203 get_commit_format(arg+8, revs);
1204 continue;
1206 if (!prefixcmp(arg, "--graph")) {
1207 revs->topo_order = 1;
1208 revs->rewrite_parents = 1;
1209 revs->graph = graph_init();
1210 continue;
1212 if (!strcmp(arg, "--root")) {
1213 revs->show_root_diff = 1;
1214 continue;
1216 if (!strcmp(arg, "--no-commit-id")) {
1217 revs->no_commit_id = 1;
1218 continue;
1220 if (!strcmp(arg, "--always")) {
1221 revs->always_show_header = 1;
1222 continue;
1224 if (!strcmp(arg, "--no-abbrev")) {
1225 revs->abbrev = 0;
1226 continue;
1228 if (!strcmp(arg, "--abbrev")) {
1229 revs->abbrev = DEFAULT_ABBREV;
1230 continue;
1232 if (!prefixcmp(arg, "--abbrev=")) {
1233 revs->abbrev = strtoul(arg + 9, NULL, 10);
1234 if (revs->abbrev < MINIMUM_ABBREV)
1235 revs->abbrev = MINIMUM_ABBREV;
1236 else if (revs->abbrev > 40)
1237 revs->abbrev = 40;
1238 continue;
1240 if (!strcmp(arg, "--abbrev-commit")) {
1241 revs->abbrev_commit = 1;
1242 continue;
1244 if (!strcmp(arg, "--full-diff")) {
1245 revs->diff = 1;
1246 revs->full_diff = 1;
1247 continue;
1249 if (!strcmp(arg, "--full-history")) {
1250 revs->simplify_history = 0;
1251 continue;
1253 if (!strcmp(arg, "--relative-date")) {
1254 revs->date_mode = DATE_RELATIVE;
1255 continue;
1257 if (!strncmp(arg, "--date=", 7)) {
1258 revs->date_mode = parse_date_format(arg + 7);
1259 continue;
1261 if (!strcmp(arg, "--log-size")) {
1262 revs->show_log_size = 1;
1263 continue;
1267 * Grepping the commit log
1269 if (!prefixcmp(arg, "--author=")) {
1270 add_header_grep(revs, "author", arg+9);
1271 continue;
1273 if (!prefixcmp(arg, "--committer=")) {
1274 add_header_grep(revs, "committer", arg+12);
1275 continue;
1277 if (!prefixcmp(arg, "--grep=")) {
1278 add_message_grep(revs, arg+7);
1279 continue;
1281 if (!strcmp(arg, "--extended-regexp") ||
1282 !strcmp(arg, "-E")) {
1283 regflags |= REG_EXTENDED;
1284 continue;
1286 if (!strcmp(arg, "--regexp-ignore-case") ||
1287 !strcmp(arg, "-i")) {
1288 regflags |= REG_ICASE;
1289 continue;
1291 if (!strcmp(arg, "--fixed-strings") ||
1292 !strcmp(arg, "-F")) {
1293 fixed = 1;
1294 continue;
1296 if (!strcmp(arg, "--all-match")) {
1297 all_match = 1;
1298 continue;
1300 if (!prefixcmp(arg, "--encoding=")) {
1301 arg += 11;
1302 if (strcmp(arg, "none"))
1303 git_log_output_encoding = xstrdup(arg);
1304 else
1305 git_log_output_encoding = "";
1306 continue;
1308 if (!strcmp(arg, "--reverse")) {
1309 revs->reverse ^= 1;
1310 continue;
1312 if (!strcmp(arg, "--no-walk")) {
1313 revs->no_walk = 1;
1314 continue;
1316 if (!strcmp(arg, "--do-walk")) {
1317 revs->no_walk = 0;
1318 continue;
1320 if (!strcmp(arg, "--children")) {
1321 revs->children.name = "children";
1322 revs->limited = 1;
1323 continue;
1326 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
1327 if (opts > 0) {
1328 i += opts - 1;
1329 continue;
1331 *unrecognized++ = arg;
1332 left++;
1333 continue;
1336 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1337 int j;
1338 if (seen_dashdash || *arg == '^')
1339 die("bad revision '%s'", arg);
1341 /* If we didn't have a "--":
1342 * (1) all filenames must exist;
1343 * (2) all rev-args must not be interpretable
1344 * as a valid filename.
1345 * but the latter we have checked in the main loop.
1347 for (j = i; j < argc; j++)
1348 verify_filename(revs->prefix, argv[j]);
1350 revs->prune_data = get_pathspec(revs->prefix,
1351 argv + i);
1352 break;
1356 if (revs->grep_filter) {
1357 revs->grep_filter->regflags |= regflags;
1358 revs->grep_filter->fixed = fixed;
1361 if (show_merge)
1362 prepare_show_merge(revs);
1363 if (def && !revs->pending.nr) {
1364 unsigned char sha1[20];
1365 struct object *object;
1366 unsigned mode;
1367 if (get_sha1_with_mode(def, sha1, &mode))
1368 die("bad default revision '%s'", def);
1369 object = get_reference(revs, def, sha1, 0);
1370 add_pending_object_with_mode(revs, object, def, mode);
1373 /* Did the user ask for any diff output? Run the diff! */
1374 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1375 revs->diff = 1;
1377 /* Pickaxe, diff-filter and rename following need diffs */
1378 if (revs->diffopt.pickaxe ||
1379 revs->diffopt.filter ||
1380 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1381 revs->diff = 1;
1383 if (revs->topo_order)
1384 revs->limited = 1;
1386 if (revs->prune_data) {
1387 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1388 /* Can't prune commits with rename following: the paths change.. */
1389 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1390 revs->prune = 1;
1391 if (!revs->full_diff)
1392 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1394 if (revs->combine_merges) {
1395 revs->ignore_merges = 0;
1396 if (revs->dense_combined_merges && !revs->diffopt.output_format)
1397 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1399 revs->diffopt.abbrev = revs->abbrev;
1400 if (diff_setup_done(&revs->diffopt) < 0)
1401 die("diff_setup_done failed");
1403 if (revs->grep_filter) {
1404 revs->grep_filter->all_match = all_match;
1405 compile_grep_patterns(revs->grep_filter);
1408 if (revs->reverse && revs->reflog_info)
1409 die("cannot combine --reverse with --walk-reflogs");
1410 if (revs->rewrite_parents && revs->children.name)
1411 die("cannot combine --parents and --children");
1414 * Limitations on the graph functionality
1416 if (revs->reverse && revs->graph)
1417 die("cannot combine --reverse with --graph");
1419 if (revs->reflog_info && revs->graph)
1420 die("cannot combine --walk-reflogs with --graph");
1422 return left;
1425 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1427 struct commit_list *l = xcalloc(1, sizeof(*l));
1429 l->item = child;
1430 l->next = add_decoration(&revs->children, &parent->object, l);
1433 static void set_children(struct rev_info *revs)
1435 struct commit_list *l;
1436 for (l = revs->commits; l; l = l->next) {
1437 struct commit *commit = l->item;
1438 struct commit_list *p;
1440 for (p = commit->parents; p; p = p->next)
1441 add_child(revs, p->item, commit);
1445 int prepare_revision_walk(struct rev_info *revs)
1447 int nr = revs->pending.nr;
1448 struct object_array_entry *e, *list;
1450 e = list = revs->pending.objects;
1451 revs->pending.nr = 0;
1452 revs->pending.alloc = 0;
1453 revs->pending.objects = NULL;
1454 while (--nr >= 0) {
1455 struct commit *commit = handle_commit(revs, e->item, e->name);
1456 if (commit) {
1457 if (!(commit->object.flags & SEEN)) {
1458 commit->object.flags |= SEEN;
1459 insert_by_date(commit, &revs->commits);
1462 e++;
1464 free(list);
1466 if (revs->no_walk)
1467 return 0;
1468 if (revs->limited)
1469 if (limit_list(revs) < 0)
1470 return -1;
1471 if (revs->topo_order)
1472 sort_in_topological_order(&revs->commits, revs->lifo);
1473 if (revs->children.name)
1474 set_children(revs);
1475 return 0;
1478 enum rewrite_result {
1479 rewrite_one_ok,
1480 rewrite_one_noparents,
1481 rewrite_one_error,
1484 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
1486 for (;;) {
1487 struct commit *p = *pp;
1488 if (!revs->limited)
1489 if (add_parents_to_list(revs, p, &revs->commits) < 0)
1490 return rewrite_one_error;
1491 if (p->parents && p->parents->next)
1492 return rewrite_one_ok;
1493 if (p->object.flags & UNINTERESTING)
1494 return rewrite_one_ok;
1495 if (!(p->object.flags & TREESAME))
1496 return rewrite_one_ok;
1497 if (!p->parents)
1498 return rewrite_one_noparents;
1499 *pp = p->parents->item;
1503 static void remove_duplicate_parents(struct commit *commit)
1505 struct commit_list **pp, *p;
1507 /* Examine existing parents while marking ones we have seen... */
1508 pp = &commit->parents;
1509 while ((p = *pp) != NULL) {
1510 struct commit *parent = p->item;
1511 if (parent->object.flags & TMP_MARK) {
1512 *pp = p->next;
1513 continue;
1515 parent->object.flags |= TMP_MARK;
1516 pp = &p->next;
1518 /* ... and clear the temporary mark */
1519 for (p = commit->parents; p; p = p->next)
1520 p->item->object.flags &= ~TMP_MARK;
1523 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
1525 struct commit_list **pp = &commit->parents;
1526 while (*pp) {
1527 struct commit_list *parent = *pp;
1528 switch (rewrite_one(revs, &parent->item)) {
1529 case rewrite_one_ok:
1530 break;
1531 case rewrite_one_noparents:
1532 *pp = parent->next;
1533 continue;
1534 case rewrite_one_error:
1535 return -1;
1537 pp = &parent->next;
1539 remove_duplicate_parents(commit);
1540 return 0;
1543 static int commit_match(struct commit *commit, struct rev_info *opt)
1545 if (!opt->grep_filter)
1546 return 1;
1547 return grep_buffer(opt->grep_filter,
1548 NULL, /* we say nothing, not even filename */
1549 commit->buffer, strlen(commit->buffer));
1552 static inline int want_ancestry(struct rev_info *revs)
1554 return (revs->rewrite_parents || revs->children.name);
1557 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1559 if (commit->object.flags & SHOWN)
1560 return commit_ignore;
1561 if (revs->unpacked && has_sha1_pack(commit->object.sha1, revs->ignore_packed))
1562 return commit_ignore;
1563 if (revs->show_all)
1564 return commit_show;
1565 if (commit->object.flags & UNINTERESTING)
1566 return commit_ignore;
1567 if (revs->min_age != -1 && (commit->date > revs->min_age))
1568 return commit_ignore;
1569 if (revs->no_merges && commit->parents && commit->parents->next)
1570 return commit_ignore;
1571 if (!commit_match(commit, revs))
1572 return commit_ignore;
1573 if (revs->prune && revs->dense) {
1574 /* Commit without changes? */
1575 if (commit->object.flags & TREESAME) {
1576 /* drop merges unless we want parenthood */
1577 if (!want_ancestry(revs))
1578 return commit_ignore;
1579 /* non-merge - always ignore it */
1580 if (!commit->parents || !commit->parents->next)
1581 return commit_ignore;
1583 if (want_ancestry(revs) && rewrite_parents(revs, commit) < 0)
1584 return commit_error;
1586 return commit_show;
1589 static struct commit *get_revision_1(struct rev_info *revs)
1591 if (!revs->commits)
1592 return NULL;
1594 do {
1595 struct commit_list *entry = revs->commits;
1596 struct commit *commit = entry->item;
1598 revs->commits = entry->next;
1599 free(entry);
1601 if (revs->reflog_info)
1602 fake_reflog_parent(revs->reflog_info, commit);
1605 * If we haven't done the list limiting, we need to look at
1606 * the parents here. We also need to do the date-based limiting
1607 * that we'd otherwise have done in limit_list().
1609 if (!revs->limited) {
1610 if (revs->max_age != -1 &&
1611 (commit->date < revs->max_age))
1612 continue;
1613 if (add_parents_to_list(revs, commit, &revs->commits) < 0)
1614 return NULL;
1617 switch (simplify_commit(revs, commit)) {
1618 case commit_ignore:
1619 continue;
1620 case commit_error:
1621 return NULL;
1622 default:
1623 return commit;
1625 } while (revs->commits);
1626 return NULL;
1629 static void gc_boundary(struct object_array *array)
1631 unsigned nr = array->nr;
1632 unsigned alloc = array->alloc;
1633 struct object_array_entry *objects = array->objects;
1635 if (alloc <= nr) {
1636 unsigned i, j;
1637 for (i = j = 0; i < nr; i++) {
1638 if (objects[i].item->flags & SHOWN)
1639 continue;
1640 if (i != j)
1641 objects[j] = objects[i];
1642 j++;
1644 for (i = j; i < nr; i++)
1645 objects[i].item = NULL;
1646 array->nr = j;
1650 static struct commit *get_revision_internal(struct rev_info *revs)
1652 struct commit *c = NULL;
1653 struct commit_list *l;
1655 if (revs->boundary == 2) {
1656 unsigned i;
1657 struct object_array *array = &revs->boundary_commits;
1658 struct object_array_entry *objects = array->objects;
1659 for (i = 0; i < array->nr; i++) {
1660 c = (struct commit *)(objects[i].item);
1661 if (!c)
1662 continue;
1663 if (!(c->object.flags & CHILD_SHOWN))
1664 continue;
1665 if (!(c->object.flags & SHOWN))
1666 break;
1668 if (array->nr <= i)
1669 return NULL;
1671 c->object.flags |= SHOWN | BOUNDARY;
1672 return c;
1675 if (revs->reverse) {
1676 int limit = -1;
1678 if (0 <= revs->max_count) {
1679 limit = revs->max_count;
1680 if (0 < revs->skip_count)
1681 limit += revs->skip_count;
1683 l = NULL;
1684 while ((c = get_revision_1(revs))) {
1685 commit_list_insert(c, &l);
1686 if ((0 < limit) && !--limit)
1687 break;
1689 revs->commits = l;
1690 revs->reverse = 0;
1691 revs->max_count = -1;
1692 c = NULL;
1696 * Now pick up what they want to give us
1698 c = get_revision_1(revs);
1699 if (c) {
1700 while (0 < revs->skip_count) {
1701 revs->skip_count--;
1702 c = get_revision_1(revs);
1703 if (!c)
1704 break;
1709 * Check the max_count.
1711 switch (revs->max_count) {
1712 case -1:
1713 break;
1714 case 0:
1715 c = NULL;
1716 break;
1717 default:
1718 revs->max_count--;
1721 if (c)
1722 c->object.flags |= SHOWN;
1724 if (!revs->boundary) {
1725 return c;
1728 if (!c) {
1730 * get_revision_1() runs out the commits, and
1731 * we are done computing the boundaries.
1732 * switch to boundary commits output mode.
1734 revs->boundary = 2;
1735 return get_revision(revs);
1739 * boundary commits are the commits that are parents of the
1740 * ones we got from get_revision_1() but they themselves are
1741 * not returned from get_revision_1(). Before returning
1742 * 'c', we need to mark its parents that they could be boundaries.
1745 for (l = c->parents; l; l = l->next) {
1746 struct object *p;
1747 p = &(l->item->object);
1748 if (p->flags & (CHILD_SHOWN | SHOWN))
1749 continue;
1750 p->flags |= CHILD_SHOWN;
1751 gc_boundary(&revs->boundary_commits);
1752 add_object_array(p, NULL, &revs->boundary_commits);
1755 return c;
1758 struct commit *get_revision(struct rev_info *revs)
1760 struct commit *c = get_revision_internal(revs);
1761 if (c && revs->graph)
1762 graph_update(revs->graph, c);
1763 return c;