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