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"
16
17volatile show_early_output_fn_t show_early_output;
18
19char *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;
25
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}
42
43void 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}
50
51static 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}
59
60void mark_tree_uninteresting(struct tree *tree)
61{
62 struct tree_desc desc;
63 struct name_entry entry;
64 struct object *obj = &tree->object;
65
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));
75
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 }
90
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}
98
99void mark_parents_uninteresting(struct commit *commit)
100{
101 struct commit_list *parents = commit->parents;
102
103 while (parents) {
104 struct commit *commit = parents->item;
105 if (!(commit->object.flags & UNINTERESTING)) {
106 commit->object.flags |= UNINTERESTING;
107
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 }
119
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}
133
134static 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;
142
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}
154
155void 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}
159
160void 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}
171
172static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
173{
174 struct object *object;
175
176 object = parse_object(sha1);
177 if (!object)
178 die("bad object %s", name);
179 object->flags |= flags;
180 return object;
181}
182
183static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
184{
185 unsigned long flags = object->flags;
186
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 }
203
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 }
221
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 }
237
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}
254
255static 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}
267
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 */
277static int tree_difference = REV_TREE_SAME;
278
279static 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;
285
286 tree_difference |= diff;
287 if (tree_difference == REV_TREE_DIFFERENT)
288 DIFF_OPT_SET(options, HAS_CHANGES);
289}
290
291static 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}
301
302static 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;
306
307 if (!t1)
308 return REV_TREE_NEW;
309 if (!t2)
310 return REV_TREE_OLD;
311
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.nr)
327 return REV_TREE_SAME;
328 }
329
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}
337
338static 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;
345
346 if (!t1)
347 return 0;
348
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);
354
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);
359
360 return retval >= 0 && (tree_difference == REV_TREE_SAME);
361}
362
363static 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;
367
368 /*
369 * If we don't do pruning, everything is interesting
370 */
371 if (!revs->prune)
372 return;
373
374 if (!commit->tree)
375 return;
376
377 if (!commit->parents) {
378 if (rev_same_tree_as_empty(revs, commit))
379 commit->object.flags |= TREESAME;
380 return;
381 }
382
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;
389
390 pp = &commit->parents;
391 while ((parent = *pp) != NULL) {
392 struct commit *p = parent->item;
393
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;
415
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}
446
447static 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;
451
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);
456
457 if (cache && (!*cache || p->date < (*cache)->item->date))
458 *cache = new_entry;
459}
460
461static 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;
467
468 if (commit->object.flags & ADDED)
469 return 0;
470 commit->object.flags |= ADDED;
471
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 }
501
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);
508
509 if (revs->no_walk)
510 return 0;
511
512 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
513
514 for (parent = commit->parents; parent; parent = parent->next) {
515 struct commit *p = parent->item;
516
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}
531
532static 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;
538
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 }
550
551 if (!left_count || !right_count)
552 return;
553
554 left_first = left_count < right_count;
555 init_patch_ids(&ids);
556 ids.diffopts.pathspec = revs->diffopt.pathspec;
557
558 /* Compute patch-ids for one side */
559 for (p = list; p; p = p->next) {
560 struct commit *commit = p->item;
561 unsigned flags = commit->object.flags;
562
563 if (flags & BOUNDARY)
564 continue;
565 /*
566 * If we have fewer left, left_first is set and we omit
567 * commits on the right branch in this loop. If we have
568 * fewer right, we skip the left ones.
569 */
570 if (left_first != !!(flags & SYMMETRIC_LEFT))
571 continue;
572 commit->util = add_commit_patch_id(commit, &ids);
573 }
574
575 /* Check the other side */
576 for (p = list; p; p = p->next) {
577 struct commit *commit = p->item;
578 struct patch_id *id;
579 unsigned flags = commit->object.flags;
580
581 if (flags & BOUNDARY)
582 continue;
583 /*
584 * If we have fewer left, left_first is set and we omit
585 * commits on the left branch in this loop.
586 */
587 if (left_first == !!(flags & SYMMETRIC_LEFT))
588 continue;
589
590 /*
591 * Have we seen the same patch id?
592 */
593 id = has_commit_patch_id(commit, &ids);
594 if (!id)
595 continue;
596 id->seen = 1;
597 commit->object.flags |= SHOWN;
598 }
599
600 /* Now check the original side for seen ones */
601 for (p = list; p; p = p->next) {
602 struct commit *commit = p->item;
603 struct patch_id *ent;
604
605 ent = commit->util;
606 if (!ent)
607 continue;
608 if (ent->seen)
609 commit->object.flags |= SHOWN;
610 commit->util = NULL;
611 }
612
613 free_patch_ids(&ids);
614}
615
616/* How many extra uninteresting commits we want to see.. */
617#define SLOP 5
618
619static int still_interesting(struct commit_list *src, unsigned long date, int slop)
620{
621 /*
622 * No source list at all? We're definitely done..
623 */
624 if (!src)
625 return 0;
626
627 /*
628 * Does the destination list contain entries with a date
629 * before the source list? Definitely _not_ done.
630 */
631 if (date < src->item->date)
632 return SLOP;
633
634 /*
635 * Does the source list still have interesting commits in
636 * it? Definitely not done..
637 */
638 if (!everybody_uninteresting(src))
639 return SLOP;
640
641 /* Ok, we're closing in.. */
642 return slop-1;
643}
644
645/*
646 * "rev-list --ancestry-path A..B" computes commits that are ancestors
647 * of B but not ancestors of A but further limits the result to those
648 * that are descendants of A. This takes the list of bottom commits and
649 * the result of "A..B" without --ancestry-path, and limits the latter
650 * further to the ones that can reach one of the commits in "bottom".
651 */
652static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
653{
654 struct commit_list *p;
655 struct commit_list *rlist = NULL;
656 int made_progress;
657
658 /*
659 * Reverse the list so that it will be likely that we would
660 * process parents before children.
661 */
662 for (p = list; p; p = p->next)
663 commit_list_insert(p->item, &rlist);
664
665 for (p = bottom; p; p = p->next)
666 p->item->object.flags |= TMP_MARK;
667
668 /*
669 * Mark the ones that can reach bottom commits in "list",
670 * in a bottom-up fashion.
671 */
672 do {
673 made_progress = 0;
674 for (p = rlist; p; p = p->next) {
675 struct commit *c = p->item;
676 struct commit_list *parents;
677 if (c->object.flags & (TMP_MARK | UNINTERESTING))
678 continue;
679 for (parents = c->parents;
680 parents;
681 parents = parents->next) {
682 if (!(parents->item->object.flags & TMP_MARK))
683 continue;
684 c->object.flags |= TMP_MARK;
685 made_progress = 1;
686 break;
687 }
688 }
689 } while (made_progress);
690
691 /*
692 * NEEDSWORK: decide if we want to remove parents that are
693 * not marked with TMP_MARK from commit->parents for commits
694 * in the resulting list. We may not want to do that, though.
695 */
696
697 /*
698 * The ones that are not marked with TMP_MARK are uninteresting
699 */
700 for (p = list; p; p = p->next) {
701 struct commit *c = p->item;
702 if (c->object.flags & TMP_MARK)
703 continue;
704 c->object.flags |= UNINTERESTING;
705 }
706
707 /* We are done with the TMP_MARK */
708 for (p = list; p; p = p->next)
709 p->item->object.flags &= ~TMP_MARK;
710 for (p = bottom; p; p = p->next)
711 p->item->object.flags &= ~TMP_MARK;
712 free_commit_list(rlist);
713}
714
715/*
716 * Before walking the history, keep the set of "negative" refs the
717 * caller has asked to exclude.
718 *
719 * This is used to compute "rev-list --ancestry-path A..B", as we need
720 * to filter the result of "A..B" further to the ones that can actually
721 * reach A.
722 */
723static struct commit_list *collect_bottom_commits(struct commit_list *list)
724{
725 struct commit_list *elem, *bottom = NULL;
726 for (elem = list; elem; elem = elem->next)
727 if (elem->item->object.flags & UNINTERESTING)
728 commit_list_insert(elem->item, &bottom);
729 return bottom;
730}
731
732static int limit_list(struct rev_info *revs)
733{
734 int slop = SLOP;
735 unsigned long date = ~0ul;
736 struct commit_list *list = revs->commits;
737 struct commit_list *newlist = NULL;
738 struct commit_list **p = &newlist;
739 struct commit_list *bottom = NULL;
740
741 if (revs->ancestry_path) {
742 bottom = collect_bottom_commits(list);
743 if (!bottom)
744 die("--ancestry-path given but there are no bottom commits");
745 }
746
747 while (list) {
748 struct commit_list *entry = list;
749 struct commit *commit = list->item;
750 struct object *obj = &commit->object;
751 show_early_output_fn_t show;
752
753 list = list->next;
754 free(entry);
755
756 if (revs->max_age != -1 && (commit->date < revs->max_age))
757 obj->flags |= UNINTERESTING;
758 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
759 return -1;
760 if (obj->flags & UNINTERESTING) {
761 mark_parents_uninteresting(commit);
762 if (revs->show_all)
763 p = &commit_list_insert(commit, p)->next;
764 slop = still_interesting(list, date, slop);
765 if (slop)
766 continue;
767 /* If showing all, add the whole pending list to the end */
768 if (revs->show_all)
769 *p = list;
770 break;
771 }
772 if (revs->min_age != -1 && (commit->date > revs->min_age))
773 continue;
774 date = commit->date;
775 p = &commit_list_insert(commit, p)->next;
776
777 show = show_early_output;
778 if (!show)
779 continue;
780
781 show(revs, newlist);
782 show_early_output = NULL;
783 }
784 if (revs->cherry_pick)
785 cherry_pick_list(newlist, revs);
786
787 if (bottom) {
788 limit_to_ancestry(bottom, newlist);
789 free_commit_list(bottom);
790 }
791
792 revs->commits = newlist;
793 return 0;
794}
795
796struct all_refs_cb {
797 int all_flags;
798 int warned_bad_reflog;
799 struct rev_info *all_revs;
800 const char *name_for_errormsg;
801};
802
803static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
804{
805 struct all_refs_cb *cb = cb_data;
806 struct object *object = get_reference(cb->all_revs, path, sha1,
807 cb->all_flags);
808 add_pending_object(cb->all_revs, object, path);
809 return 0;
810}
811
812static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
813 unsigned flags)
814{
815 cb->all_revs = revs;
816 cb->all_flags = flags;
817}
818
819static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
820 int (*for_each)(const char *, each_ref_fn, void *))
821{
822 struct all_refs_cb cb;
823 init_all_refs_cb(&cb, revs, flags);
824 for_each(submodule, handle_one_ref, &cb);
825}
826
827static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
828{
829 struct all_refs_cb *cb = cb_data;
830 if (!is_null_sha1(sha1)) {
831 struct object *o = parse_object(sha1);
832 if (o) {
833 o->flags |= cb->all_flags;
834 add_pending_object(cb->all_revs, o, "");
835 }
836 else if (!cb->warned_bad_reflog) {
837 warning("reflog of '%s' references pruned commits",
838 cb->name_for_errormsg);
839 cb->warned_bad_reflog = 1;
840 }
841 }
842}
843
844static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
845 const char *email, unsigned long timestamp, int tz,
846 const char *message, void *cb_data)
847{
848 handle_one_reflog_commit(osha1, cb_data);
849 handle_one_reflog_commit(nsha1, cb_data);
850 return 0;
851}
852
853static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
854{
855 struct all_refs_cb *cb = cb_data;
856 cb->warned_bad_reflog = 0;
857 cb->name_for_errormsg = path;
858 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
859 return 0;
860}
861
862static void handle_reflog(struct rev_info *revs, unsigned flags)
863{
864 struct all_refs_cb cb;
865 cb.all_revs = revs;
866 cb.all_flags = flags;
867 for_each_reflog(handle_one_reflog, &cb);
868}
869
870static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
871{
872 unsigned char sha1[20];
873 struct object *it;
874 struct commit *commit;
875 struct commit_list *parents;
876
877 if (*arg == '^') {
878 flags ^= UNINTERESTING;
879 arg++;
880 }
881 if (get_sha1(arg, sha1))
882 return 0;
883 while (1) {
884 it = get_reference(revs, arg, sha1, 0);
885 if (it->type != OBJ_TAG)
886 break;
887 if (!((struct tag*)it)->tagged)
888 return 0;
889 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
890 }
891 if (it->type != OBJ_COMMIT)
892 return 0;
893 commit = (struct commit *)it;
894 for (parents = commit->parents; parents; parents = parents->next) {
895 it = &parents->item->object;
896 it->flags |= flags;
897 add_pending_object(revs, it, arg);
898 }
899 return 1;
900}
901
902void init_revisions(struct rev_info *revs, const char *prefix)
903{
904 memset(revs, 0, sizeof(*revs));
905
906 revs->abbrev = DEFAULT_ABBREV;
907 revs->ignore_merges = 1;
908 revs->simplify_history = 1;
909 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
910 DIFF_OPT_SET(&revs->pruning, QUICK);
911 revs->pruning.add_remove = file_add_remove;
912 revs->pruning.change = file_change;
913 revs->lifo = 1;
914 revs->dense = 1;
915 revs->prefix = prefix;
916 revs->max_age = -1;
917 revs->min_age = -1;
918 revs->skip_count = -1;
919 revs->max_count = -1;
920
921 revs->commit_format = CMIT_FMT_DEFAULT;
922
923 revs->grep_filter.status_only = 1;
924 revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
925 revs->grep_filter.header_tail = &(revs->grep_filter.header_list);
926 revs->grep_filter.regflags = REG_NEWLINE;
927
928 diff_setup(&revs->diffopt);
929 if (prefix && !revs->diffopt.prefix) {
930 revs->diffopt.prefix = prefix;
931 revs->diffopt.prefix_length = strlen(prefix);
932 }
933}
934
935static void add_pending_commit_list(struct rev_info *revs,
936 struct commit_list *commit_list,
937 unsigned int flags)
938{
939 while (commit_list) {
940 struct object *object = &commit_list->item->object;
941 object->flags |= flags;
942 add_pending_object(revs, object, sha1_to_hex(object->sha1));
943 commit_list = commit_list->next;
944 }
945}
946
947static void prepare_show_merge(struct rev_info *revs)
948{
949 struct commit_list *bases;
950 struct commit *head, *other;
951 unsigned char sha1[20];
952 const char **prune = NULL;
953 int i, prune_num = 1; /* counting terminating NULL */
954
955 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
956 die("--merge without HEAD?");
957 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
958 die("--merge without MERGE_HEAD?");
959 add_pending_object(revs, &head->object, "HEAD");
960 add_pending_object(revs, &other->object, "MERGE_HEAD");
961 bases = get_merge_bases(head, other, 1);
962 add_pending_commit_list(revs, bases, UNINTERESTING);
963 free_commit_list(bases);
964 head->object.flags |= SYMMETRIC_LEFT;
965
966 if (!active_nr)
967 read_cache();
968 for (i = 0; i < active_nr; i++) {
969 struct cache_entry *ce = active_cache[i];
970 if (!ce_stage(ce))
971 continue;
972 if (ce_path_match(ce, &revs->prune_data)) {
973 prune_num++;
974 prune = xrealloc(prune, sizeof(*prune) * prune_num);
975 prune[prune_num-2] = ce->name;
976 prune[prune_num-1] = NULL;
977 }
978 while ((i+1 < active_nr) &&
979 ce_same_name(ce, active_cache[i+1]))
980 i++;
981 }
982 free_pathspec(&revs->prune_data);
983 init_pathspec(&revs->prune_data, prune);
984 revs->limited = 1;
985}
986
987int handle_revision_arg(const char *arg, struct rev_info *revs,
988 int flags,
989 int cant_be_filename)
990{
991 unsigned mode;
992 char *dotdot;
993 struct object *object;
994 unsigned char sha1[20];
995 int local_flags;
996
997 dotdot = strstr(arg, "..");
998 if (dotdot) {
999 unsigned char from_sha1[20];
1000 const char *next = dotdot + 2;
1001 const char *this = arg;
1002 int symmetric = *next == '.';
1003 unsigned int flags_exclude = flags ^ UNINTERESTING;
1004
1005 *dotdot = 0;
1006 next += symmetric;
1007
1008 if (!*next)
1009 next = "HEAD";
1010 if (dotdot == arg)
1011 this = "HEAD";
1012 if (!get_sha1(this, from_sha1) &&
1013 !get_sha1(next, sha1)) {
1014 struct commit *a, *b;
1015 struct commit_list *exclude;
1016
1017 a = lookup_commit_reference(from_sha1);
1018 b = lookup_commit_reference(sha1);
1019 if (!a || !b) {
1020 die(symmetric ?
1021 "Invalid symmetric difference expression %s...%s" :
1022 "Invalid revision range %s..%s",
1023 arg, next);
1024 }
1025
1026 if (!cant_be_filename) {
1027 *dotdot = '.';
1028 verify_non_filename(revs->prefix, arg);
1029 }
1030
1031 if (symmetric) {
1032 exclude = get_merge_bases(a, b, 1);
1033 add_pending_commit_list(revs, exclude,
1034 flags_exclude);
1035 free_commit_list(exclude);
1036 a->object.flags |= flags | SYMMETRIC_LEFT;
1037 } else
1038 a->object.flags |= flags_exclude;
1039 b->object.flags |= flags;
1040 add_pending_object(revs, &a->object, this);
1041 add_pending_object(revs, &b->object, next);
1042 return 0;
1043 }
1044 *dotdot = '.';
1045 }
1046 dotdot = strstr(arg, "^@");
1047 if (dotdot && !dotdot[2]) {
1048 *dotdot = 0;
1049 if (add_parents_only(revs, arg, flags))
1050 return 0;
1051 *dotdot = '^';
1052 }
1053 dotdot = strstr(arg, "^!");
1054 if (dotdot && !dotdot[2]) {
1055 *dotdot = 0;
1056 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
1057 *dotdot = '^';
1058 }
1059
1060 local_flags = 0;
1061 if (*arg == '^') {
1062 local_flags = UNINTERESTING;
1063 arg++;
1064 }
1065 if (get_sha1_with_mode(arg, sha1, &mode))
1066 return -1;
1067 if (!cant_be_filename)
1068 verify_non_filename(revs->prefix, arg);
1069 object = get_reference(revs, arg, sha1, flags ^ local_flags);
1070 add_pending_object_with_mode(revs, object, arg, mode);
1071 return 0;
1072}
1073
1074struct cmdline_pathspec {
1075 int alloc;
1076 int nr;
1077 const char **path;
1078};
1079
1080static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1081{
1082 while (*av) {
1083 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1084 prune->path[prune->nr++] = *(av++);
1085 }
1086}
1087
1088static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1089 struct cmdline_pathspec *prune)
1090{
1091 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1092 int len = sb->len;
1093 if (len && sb->buf[len - 1] == '\n')
1094 sb->buf[--len] = '\0';
1095 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1096 prune->path[prune->nr++] = xstrdup(sb->buf);
1097 }
1098}
1099
1100static void read_revisions_from_stdin(struct rev_info *revs,
1101 struct cmdline_pathspec *prune)
1102{
1103 struct strbuf sb;
1104 int seen_dashdash = 0;
1105
1106 strbuf_init(&sb, 1000);
1107 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1108 int len = sb.len;
1109 if (len && sb.buf[len - 1] == '\n')
1110 sb.buf[--len] = '\0';
1111 if (!len)
1112 break;
1113 if (sb.buf[0] == '-') {
1114 if (len == 2 && sb.buf[1] == '-') {
1115 seen_dashdash = 1;
1116 break;
1117 }
1118 die("options not supported in --stdin mode");
1119 }
1120 if (handle_revision_arg(sb.buf, revs, 0, 1))
1121 die("bad revision '%s'", sb.buf);
1122 }
1123 if (seen_dashdash)
1124 read_pathspec_from_stdin(revs, &sb, prune);
1125 strbuf_release(&sb);
1126}
1127
1128static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1129{
1130 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1131}
1132
1133static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1134{
1135 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1136}
1137
1138static void add_message_grep(struct rev_info *revs, const char *pattern)
1139{
1140 add_grep(revs, pattern, GREP_PATTERN_BODY);
1141}
1142
1143static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1144 int *unkc, const char **unkv)
1145{
1146 const char *arg = argv[0];
1147 const char *optarg;
1148 int argcount;
1149
1150 /* pseudo revision arguments */
1151 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1152 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1153 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1154 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1155 !strcmp(arg, "--bisect"))
1156 {
1157 unkv[(*unkc)++] = arg;
1158 return 1;
1159 }
1160
1161 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1162 revs->max_count = atoi(optarg);
1163 revs->no_walk = 0;
1164 return argcount;
1165 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1166 revs->skip_count = atoi(optarg);
1167 return argcount;
1168 } else if ((*arg == '-') && isdigit(arg[1])) {
1169 /* accept -<digit>, like traditional "head" */
1170 revs->max_count = atoi(arg + 1);
1171 revs->no_walk = 0;
1172 } else if (!strcmp(arg, "-n")) {
1173 if (argc <= 1)
1174 return error("-n requires an argument");
1175 revs->max_count = atoi(argv[1]);
1176 revs->no_walk = 0;
1177 return 2;
1178 } else if (!prefixcmp(arg, "-n")) {
1179 revs->max_count = atoi(arg + 2);
1180 revs->no_walk = 0;
1181 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1182 revs->max_age = atoi(optarg);
1183 return argcount;
1184 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1185 revs->max_age = approxidate(optarg);
1186 return argcount;
1187 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1188 revs->max_age = approxidate(optarg);
1189 return argcount;
1190 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1191 revs->min_age = atoi(optarg);
1192 return argcount;
1193 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1194 revs->min_age = approxidate(optarg);
1195 return argcount;
1196 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1197 revs->min_age = approxidate(optarg);
1198 return argcount;
1199 } else if (!strcmp(arg, "--first-parent")) {
1200 revs->first_parent_only = 1;
1201 } else if (!strcmp(arg, "--ancestry-path")) {
1202 revs->ancestry_path = 1;
1203 revs->simplify_history = 0;
1204 revs->limited = 1;
1205 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1206 init_reflog_walk(&revs->reflog_info);
1207 } else if (!strcmp(arg, "--default")) {
1208 if (argc <= 1)
1209 return error("bad --default argument");
1210 revs->def = argv[1];
1211 return 2;
1212 } else if (!strcmp(arg, "--merge")) {
1213 revs->show_merge = 1;
1214 } else if (!strcmp(arg, "--topo-order")) {
1215 revs->lifo = 1;
1216 revs->topo_order = 1;
1217 } else if (!strcmp(arg, "--simplify-merges")) {
1218 revs->simplify_merges = 1;
1219 revs->rewrite_parents = 1;
1220 revs->simplify_history = 0;
1221 revs->limited = 1;
1222 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1223 revs->simplify_merges = 1;
1224 revs->rewrite_parents = 1;
1225 revs->simplify_history = 0;
1226 revs->simplify_by_decoration = 1;
1227 revs->limited = 1;
1228 revs->prune = 1;
1229 load_ref_decorations(DECORATE_SHORT_REFS);
1230 } else if (!strcmp(arg, "--date-order")) {
1231 revs->lifo = 0;
1232 revs->topo_order = 1;
1233 } else if (!prefixcmp(arg, "--early-output")) {
1234 int count = 100;
1235 switch (arg[14]) {
1236 case '=':
1237 count = atoi(arg+15);
1238 /* Fallthrough */
1239 case 0:
1240 revs->topo_order = 1;
1241 revs->early_output = count;
1242 }
1243 } else if (!strcmp(arg, "--parents")) {
1244 revs->rewrite_parents = 1;
1245 revs->print_parents = 1;
1246 } else if (!strcmp(arg, "--dense")) {
1247 revs->dense = 1;
1248 } else if (!strcmp(arg, "--sparse")) {
1249 revs->dense = 0;
1250 } else if (!strcmp(arg, "--show-all")) {
1251 revs->show_all = 1;
1252 } else if (!strcmp(arg, "--remove-empty")) {
1253 revs->remove_empty_trees = 1;
1254 } else if (!strcmp(arg, "--merges")) {
1255 revs->merges_only = 1;
1256 } else if (!strcmp(arg, "--no-merges")) {
1257 revs->no_merges = 1;
1258 } else if (!strcmp(arg, "--boundary")) {
1259 revs->boundary = 1;
1260 } else if (!strcmp(arg, "--left-right")) {
1261 revs->left_right = 1;
1262 } else if (!strcmp(arg, "--count")) {
1263 revs->count = 1;
1264 } else if (!strcmp(arg, "--cherry-pick")) {
1265 revs->cherry_pick = 1;
1266 revs->limited = 1;
1267 } else if (!strcmp(arg, "--objects")) {
1268 revs->tag_objects = 1;
1269 revs->tree_objects = 1;
1270 revs->blob_objects = 1;
1271 } else if (!strcmp(arg, "--objects-edge")) {
1272 revs->tag_objects = 1;
1273 revs->tree_objects = 1;
1274 revs->blob_objects = 1;
1275 revs->edge_hint = 1;
1276 } else if (!strcmp(arg, "--unpacked")) {
1277 revs->unpacked = 1;
1278 } else if (!prefixcmp(arg, "--unpacked=")) {
1279 die("--unpacked=<packfile> no longer supported.");
1280 } else if (!strcmp(arg, "-r")) {
1281 revs->diff = 1;
1282 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1283 } else if (!strcmp(arg, "-t")) {
1284 revs->diff = 1;
1285 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1286 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1287 } else if (!strcmp(arg, "-m")) {
1288 revs->ignore_merges = 0;
1289 } else if (!strcmp(arg, "-c")) {
1290 revs->diff = 1;
1291 revs->dense_combined_merges = 0;
1292 revs->combine_merges = 1;
1293 } else if (!strcmp(arg, "--cc")) {
1294 revs->diff = 1;
1295 revs->dense_combined_merges = 1;
1296 revs->combine_merges = 1;
1297 } else if (!strcmp(arg, "-v")) {
1298 revs->verbose_header = 1;
1299 } else if (!strcmp(arg, "--pretty")) {
1300 revs->verbose_header = 1;
1301 revs->pretty_given = 1;
1302 get_commit_format(arg+8, revs);
1303 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
1304 /*
1305 * Detached form ("--pretty X" as opposed to "--pretty=X")
1306 * not allowed, since the argument is optional.
1307 */
1308 revs->verbose_header = 1;
1309 revs->pretty_given = 1;
1310 get_commit_format(arg+9, revs);
1311 } else if (!strcmp(arg, "--show-notes")) {
1312 revs->show_notes = 1;
1313 revs->show_notes_given = 1;
1314 } else if (!prefixcmp(arg, "--show-notes=")) {
1315 struct strbuf buf = STRBUF_INIT;
1316 revs->show_notes = 1;
1317 revs->show_notes_given = 1;
1318 if (!revs->notes_opt.extra_notes_refs)
1319 revs->notes_opt.extra_notes_refs = xcalloc(1, sizeof(struct string_list));
1320 if (!prefixcmp(arg+13, "refs/"))
1321 /* happy */;
1322 else if (!prefixcmp(arg+13, "notes/"))
1323 strbuf_addstr(&buf, "refs/");
1324 else
1325 strbuf_addstr(&buf, "refs/notes/");
1326 strbuf_addstr(&buf, arg+13);
1327 string_list_append(revs->notes_opt.extra_notes_refs,
1328 strbuf_detach(&buf, NULL));
1329 } else if (!strcmp(arg, "--no-notes")) {
1330 revs->show_notes = 0;
1331 revs->show_notes_given = 1;
1332 } else if (!strcmp(arg, "--standard-notes")) {
1333 revs->show_notes_given = 1;
1334 revs->notes_opt.suppress_default_notes = 0;
1335 } else if (!strcmp(arg, "--no-standard-notes")) {
1336 revs->notes_opt.suppress_default_notes = 1;
1337 } else if (!strcmp(arg, "--oneline")) {
1338 revs->verbose_header = 1;
1339 get_commit_format("oneline", revs);
1340 revs->pretty_given = 1;
1341 revs->abbrev_commit = 1;
1342 } else if (!strcmp(arg, "--graph")) {
1343 revs->topo_order = 1;
1344 revs->rewrite_parents = 1;
1345 revs->graph = graph_init(revs);
1346 } else if (!strcmp(arg, "--root")) {
1347 revs->show_root_diff = 1;
1348 } else if (!strcmp(arg, "--no-commit-id")) {
1349 revs->no_commit_id = 1;
1350 } else if (!strcmp(arg, "--always")) {
1351 revs->always_show_header = 1;
1352 } else if (!strcmp(arg, "--no-abbrev")) {
1353 revs->abbrev = 0;
1354 } else if (!strcmp(arg, "--abbrev")) {
1355 revs->abbrev = DEFAULT_ABBREV;
1356 } else if (!prefixcmp(arg, "--abbrev=")) {
1357 revs->abbrev = strtoul(arg + 9, NULL, 10);
1358 if (revs->abbrev < MINIMUM_ABBREV)
1359 revs->abbrev = MINIMUM_ABBREV;
1360 else if (revs->abbrev > 40)
1361 revs->abbrev = 40;
1362 } else if (!strcmp(arg, "--abbrev-commit")) {
1363 revs->abbrev_commit = 1;
1364 } else if (!strcmp(arg, "--full-diff")) {
1365 revs->diff = 1;
1366 revs->full_diff = 1;
1367 } else if (!strcmp(arg, "--full-history")) {
1368 revs->simplify_history = 0;
1369 } else if (!strcmp(arg, "--relative-date")) {
1370 revs->date_mode = DATE_RELATIVE;
1371 revs->date_mode_explicit = 1;
1372 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1373 revs->date_mode = parse_date_format(optarg);
1374 revs->date_mode_explicit = 1;
1375 return argcount;
1376 } else if (!strcmp(arg, "--log-size")) {
1377 revs->show_log_size = 1;
1378 }
1379 /*
1380 * Grepping the commit log
1381 */
1382 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1383 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1384 return argcount;
1385 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1386 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1387 return argcount;
1388 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1389 add_message_grep(revs, optarg);
1390 return argcount;
1391 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1392 revs->grep_filter.regflags |= REG_EXTENDED;
1393 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1394 revs->grep_filter.regflags |= REG_ICASE;
1395 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1396 revs->grep_filter.fixed = 1;
1397 } else if (!strcmp(arg, "--all-match")) {
1398 revs->grep_filter.all_match = 1;
1399 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
1400 if (strcmp(optarg, "none"))
1401 git_log_output_encoding = xstrdup(optarg);
1402 else
1403 git_log_output_encoding = "";
1404 return argcount;
1405 } else if (!strcmp(arg, "--reverse")) {
1406 revs->reverse ^= 1;
1407 } else if (!strcmp(arg, "--children")) {
1408 revs->children.name = "children";
1409 revs->limited = 1;
1410 } else {
1411 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1412 if (!opts)
1413 unkv[(*unkc)++] = arg;
1414 return opts;
1415 }
1416
1417 return 1;
1418}
1419
1420void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1421 const struct option *options,
1422 const char * const usagestr[])
1423{
1424 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1425 &ctx->cpidx, ctx->out);
1426 if (n <= 0) {
1427 error("unknown option `%s'", ctx->argv[0]);
1428 usage_with_options(usagestr, options);
1429 }
1430 ctx->argv += n;
1431 ctx->argc -= n;
1432}
1433
1434static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1435{
1436 return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
1437}
1438
1439static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1440{
1441 return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
1442}
1443
1444/*
1445 * Parse revision information, filling in the "rev_info" structure,
1446 * and removing the used arguments from the argument list.
1447 *
1448 * Returns the number of arguments left that weren't recognized
1449 * (which are also moved to the head of the argument list)
1450 */
1451int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
1452{
1453 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
1454 struct cmdline_pathspec prune_data;
1455 const char *submodule = NULL;
1456 const char *optarg;
1457 int argcount;
1458
1459 memset(&prune_data, 0, sizeof(prune_data));
1460 if (opt)
1461 submodule = opt->submodule;
1462
1463 /* First, search for "--" */
1464 seen_dashdash = 0;
1465 for (i = 1; i < argc; i++) {
1466 const char *arg = argv[i];
1467 if (strcmp(arg, "--"))
1468 continue;
1469 argv[i] = NULL;
1470 argc = i;
1471 if (argv[i + 1])
1472 append_prune_data(&prune_data, argv + i + 1);
1473 seen_dashdash = 1;
1474 break;
1475 }
1476
1477 /* Second, deal with arguments and options */
1478 flags = 0;
1479 read_from_stdin = 0;
1480 for (left = i = 1; i < argc; i++) {
1481 const char *arg = argv[i];
1482 if (*arg == '-') {
1483 int opts;
1484
1485 if (!strcmp(arg, "--all")) {
1486 handle_refs(submodule, revs, flags, for_each_ref_submodule);
1487 handle_refs(submodule, revs, flags, head_ref_submodule);
1488 continue;
1489 }
1490 if (!strcmp(arg, "--branches")) {
1491 handle_refs(submodule, revs, flags, for_each_branch_ref_submodule);
1492 continue;
1493 }
1494 if (!strcmp(arg, "--bisect")) {
1495 handle_refs(submodule, revs, flags, for_each_bad_bisect_ref);
1496 handle_refs(submodule, revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);
1497 revs->bisect = 1;
1498 continue;
1499 }
1500 if (!strcmp(arg, "--tags")) {
1501 handle_refs(submodule, revs, flags, for_each_tag_ref_submodule);
1502 continue;
1503 }
1504 if (!strcmp(arg, "--remotes")) {
1505 handle_refs(submodule, revs, flags, for_each_remote_ref_submodule);
1506 continue;
1507 }
1508 if ((argcount = parse_long_opt("glob", argv + i, &optarg))) {
1509 struct all_refs_cb cb;
1510 i += argcount - 1;
1511 init_all_refs_cb(&cb, revs, flags);
1512 for_each_glob_ref(handle_one_ref, optarg, &cb);
1513 continue;
1514 }
1515 if (!prefixcmp(arg, "--branches=")) {
1516 struct all_refs_cb cb;
1517 init_all_refs_cb(&cb, revs, flags);
1518 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
1519 continue;
1520 }
1521 if (!prefixcmp(arg, "--tags=")) {
1522 struct all_refs_cb cb;
1523 init_all_refs_cb(&cb, revs, flags);
1524 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
1525 continue;
1526 }
1527 if (!prefixcmp(arg, "--remotes=")) {
1528 struct all_refs_cb cb;
1529 init_all_refs_cb(&cb, revs, flags);
1530 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
1531 continue;
1532 }
1533 if (!strcmp(arg, "--reflog")) {
1534 handle_reflog(revs, flags);
1535 continue;
1536 }
1537 if (!strcmp(arg, "--not")) {
1538 flags ^= UNINTERESTING;
1539 continue;
1540 }
1541 if (!strcmp(arg, "--no-walk")) {
1542 revs->no_walk = 1;
1543 continue;
1544 }
1545 if (!strcmp(arg, "--do-walk")) {
1546 revs->no_walk = 0;
1547 continue;
1548 }
1549 if (!strcmp(arg, "--stdin")) {
1550 if (revs->disable_stdin) {
1551 argv[left++] = arg;
1552 continue;
1553 }
1554 if (read_from_stdin++)
1555 die("--stdin given twice?");
1556 read_revisions_from_stdin(revs, &prune_data);
1557 continue;
1558 }
1559
1560 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1561 if (opts > 0) {
1562 i += opts - 1;
1563 continue;
1564 }
1565 if (opts < 0)
1566 exit(128);
1567 continue;
1568 }
1569
1570 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1571 int j;
1572 if (seen_dashdash || *arg == '^')
1573 die("bad revision '%s'", arg);
1574
1575 /* If we didn't have a "--":
1576 * (1) all filenames must exist;
1577 * (2) all rev-args must not be interpretable
1578 * as a valid filename.
1579 * but the latter we have checked in the main loop.
1580 */
1581 for (j = i; j < argc; j++)
1582 verify_filename(revs->prefix, argv[j]);
1583
1584 append_prune_data(&prune_data, argv + i);
1585 break;
1586 }
1587 else
1588 got_rev_arg = 1;
1589 }
1590
1591 if (prune_data.nr) {
1592 /*
1593 * If we need to introduce the magic "a lone ':' means no
1594 * pathspec whatsoever", here is the place to do so.
1595 *
1596 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
1597 * prune_data.nr = 0;
1598 * prune_data.alloc = 0;
1599 * free(prune_data.path);
1600 * prune_data.path = NULL;
1601 * } else {
1602 * terminate prune_data.alloc with NULL and
1603 * call init_pathspec() to set revs->prune_data here.
1604 * }
1605 */
1606 ALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc);
1607 prune_data.path[prune_data.nr++] = NULL;
1608 init_pathspec(&revs->prune_data,
1609 get_pathspec(revs->prefix, prune_data.path));
1610 }
1611
1612 if (revs->def == NULL)
1613 revs->def = opt ? opt->def : NULL;
1614 if (opt && opt->tweak)
1615 opt->tweak(revs, opt);
1616 if (revs->show_merge)
1617 prepare_show_merge(revs);
1618 if (revs->def && !revs->pending.nr && !got_rev_arg) {
1619 unsigned char sha1[20];
1620 struct object *object;
1621 unsigned mode;
1622 if (get_sha1_with_mode(revs->def, sha1, &mode))
1623 die("bad default revision '%s'", revs->def);
1624 object = get_reference(revs, revs->def, sha1, 0);
1625 add_pending_object_with_mode(revs, object, revs->def, mode);
1626 }
1627
1628 /* Did the user ask for any diff output? Run the diff! */
1629 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1630 revs->diff = 1;
1631
1632 /* Pickaxe, diff-filter and rename following need diffs */
1633 if (revs->diffopt.pickaxe ||
1634 revs->diffopt.filter ||
1635 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1636 revs->diff = 1;
1637
1638 if (revs->topo_order)
1639 revs->limited = 1;
1640
1641 if (revs->prune_data.nr) {
1642 diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning);
1643 /* Can't prune commits with rename following: the paths change.. */
1644 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1645 revs->prune = 1;
1646 if (!revs->full_diff)
1647 diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt);
1648 }
1649 if (revs->combine_merges)
1650 revs->ignore_merges = 0;
1651 revs->diffopt.abbrev = revs->abbrev;
1652 if (diff_setup_done(&revs->diffopt) < 0)
1653 die("diff_setup_done failed");
1654
1655 compile_grep_patterns(&revs->grep_filter);
1656
1657 if (revs->reverse && revs->reflog_info)
1658 die("cannot combine --reverse with --walk-reflogs");
1659 if (revs->rewrite_parents && revs->children.name)
1660 die("cannot combine --parents and --children");
1661
1662 /*
1663 * Limitations on the graph functionality
1664 */
1665 if (revs->reverse && revs->graph)
1666 die("cannot combine --reverse with --graph");
1667
1668 if (revs->reflog_info && revs->graph)
1669 die("cannot combine --walk-reflogs with --graph");
1670
1671 return left;
1672}
1673
1674static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1675{
1676 struct commit_list *l = xcalloc(1, sizeof(*l));
1677
1678 l->item = child;
1679 l->next = add_decoration(&revs->children, &parent->object, l);
1680}
1681
1682static int remove_duplicate_parents(struct commit *commit)
1683{
1684 struct commit_list **pp, *p;
1685 int surviving_parents;
1686
1687 /* Examine existing parents while marking ones we have seen... */
1688 pp = &commit->parents;
1689 while ((p = *pp) != NULL) {
1690 struct commit *parent = p->item;
1691 if (parent->object.flags & TMP_MARK) {
1692 *pp = p->next;
1693 continue;
1694 }
1695 parent->object.flags |= TMP_MARK;
1696 pp = &p->next;
1697 }
1698 /* count them while clearing the temporary mark */
1699 surviving_parents = 0;
1700 for (p = commit->parents; p; p = p->next) {
1701 p->item->object.flags &= ~TMP_MARK;
1702 surviving_parents++;
1703 }
1704 return surviving_parents;
1705}
1706
1707struct merge_simplify_state {
1708 struct commit *simplified;
1709};
1710
1711static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1712{
1713 struct merge_simplify_state *st;
1714
1715 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1716 if (!st) {
1717 st = xcalloc(1, sizeof(*st));
1718 add_decoration(&revs->merge_simplification, &commit->object, st);
1719 }
1720 return st;
1721}
1722
1723static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1724{
1725 struct commit_list *p;
1726 struct merge_simplify_state *st, *pst;
1727 int cnt;
1728
1729 st = locate_simplify_state(revs, commit);
1730
1731 /*
1732 * Have we handled this one?
1733 */
1734 if (st->simplified)
1735 return tail;
1736
1737 /*
1738 * An UNINTERESTING commit simplifies to itself, so does a
1739 * root commit. We do not rewrite parents of such commit
1740 * anyway.
1741 */
1742 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
1743 st->simplified = commit;
1744 return tail;
1745 }
1746
1747 /*
1748 * Do we know what commit all of our parents should be rewritten to?
1749 * Otherwise we are not ready to rewrite this one yet.
1750 */
1751 for (cnt = 0, p = commit->parents; p; p = p->next) {
1752 pst = locate_simplify_state(revs, p->item);
1753 if (!pst->simplified) {
1754 tail = &commit_list_insert(p->item, tail)->next;
1755 cnt++;
1756 }
1757 }
1758 if (cnt) {
1759 tail = &commit_list_insert(commit, tail)->next;
1760 return tail;
1761 }
1762
1763 /*
1764 * Rewrite our list of parents.
1765 */
1766 for (p = commit->parents; p; p = p->next) {
1767 pst = locate_simplify_state(revs, p->item);
1768 p->item = pst->simplified;
1769 }
1770 cnt = remove_duplicate_parents(commit);
1771
1772 /*
1773 * It is possible that we are a merge and one side branch
1774 * does not have any commit that touches the given paths;
1775 * in such a case, the immediate parents will be rewritten
1776 * to different commits.
1777 *
1778 * o----X X: the commit we are looking at;
1779 * / / o: a commit that touches the paths;
1780 * ---o----'
1781 *
1782 * Further reduce the parents by removing redundant parents.
1783 */
1784 if (1 < cnt) {
1785 struct commit_list *h = reduce_heads(commit->parents);
1786 cnt = commit_list_count(h);
1787 free_commit_list(commit->parents);
1788 commit->parents = h;
1789 }
1790
1791 /*
1792 * A commit simplifies to itself if it is a root, if it is
1793 * UNINTERESTING, if it touches the given paths, or if it is a
1794 * merge and its parents simplifies to more than one commits
1795 * (the first two cases are already handled at the beginning of
1796 * this function).
1797 *
1798 * Otherwise, it simplifies to what its sole parent simplifies to.
1799 */
1800 if (!cnt ||
1801 (commit->object.flags & UNINTERESTING) ||
1802 !(commit->object.flags & TREESAME) ||
1803 (1 < cnt))
1804 st->simplified = commit;
1805 else {
1806 pst = locate_simplify_state(revs, commit->parents->item);
1807 st->simplified = pst->simplified;
1808 }
1809 return tail;
1810}
1811
1812static void simplify_merges(struct rev_info *revs)
1813{
1814 struct commit_list *list;
1815 struct commit_list *yet_to_do, **tail;
1816
1817 if (!revs->topo_order)
1818 sort_in_topological_order(&revs->commits, revs->lifo);
1819 if (!revs->prune)
1820 return;
1821
1822 /* feed the list reversed */
1823 yet_to_do = NULL;
1824 for (list = revs->commits; list; list = list->next)
1825 commit_list_insert(list->item, &yet_to_do);
1826 while (yet_to_do) {
1827 list = yet_to_do;
1828 yet_to_do = NULL;
1829 tail = &yet_to_do;
1830 while (list) {
1831 struct commit *commit = list->item;
1832 struct commit_list *next = list->next;
1833 free(list);
1834 list = next;
1835 tail = simplify_one(revs, commit, tail);
1836 }
1837 }
1838
1839 /* clean up the result, removing the simplified ones */
1840 list = revs->commits;
1841 revs->commits = NULL;
1842 tail = &revs->commits;
1843 while (list) {
1844 struct commit *commit = list->item;
1845 struct commit_list *next = list->next;
1846 struct merge_simplify_state *st;
1847 free(list);
1848 list = next;
1849 st = locate_simplify_state(revs, commit);
1850 if (st->simplified == commit)
1851 tail = &commit_list_insert(commit, tail)->next;
1852 }
1853}
1854
1855static void set_children(struct rev_info *revs)
1856{
1857 struct commit_list *l;
1858 for (l = revs->commits; l; l = l->next) {
1859 struct commit *commit = l->item;
1860 struct commit_list *p;
1861
1862 for (p = commit->parents; p; p = p->next)
1863 add_child(revs, p->item, commit);
1864 }
1865}
1866
1867int prepare_revision_walk(struct rev_info *revs)
1868{
1869 int nr = revs->pending.nr;
1870 struct object_array_entry *e, *list;
1871
1872 e = list = revs->pending.objects;
1873 revs->pending.nr = 0;
1874 revs->pending.alloc = 0;
1875 revs->pending.objects = NULL;
1876 while (--nr >= 0) {
1877 struct commit *commit = handle_commit(revs, e->item, e->name);
1878 if (commit) {
1879 if (!(commit->object.flags & SEEN)) {
1880 commit->object.flags |= SEEN;
1881 commit_list_insert_by_date(commit, &revs->commits);
1882 }
1883 }
1884 e++;
1885 }
1886 free(list);
1887
1888 if (revs->no_walk)
1889 return 0;
1890 if (revs->limited)
1891 if (limit_list(revs) < 0)
1892 return -1;
1893 if (revs->topo_order)
1894 sort_in_topological_order(&revs->commits, revs->lifo);
1895 if (revs->simplify_merges)
1896 simplify_merges(revs);
1897 if (revs->children.name)
1898 set_children(revs);
1899 return 0;
1900}
1901
1902enum rewrite_result {
1903 rewrite_one_ok,
1904 rewrite_one_noparents,
1905 rewrite_one_error
1906};
1907
1908static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
1909{
1910 struct commit_list *cache = NULL;
1911
1912 for (;;) {
1913 struct commit *p = *pp;
1914 if (!revs->limited)
1915 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
1916 return rewrite_one_error;
1917 if (p->parents && p->parents->next)
1918 return rewrite_one_ok;
1919 if (p->object.flags & UNINTERESTING)
1920 return rewrite_one_ok;
1921 if (!(p->object.flags & TREESAME))
1922 return rewrite_one_ok;
1923 if (!p->parents)
1924 return rewrite_one_noparents;
1925 *pp = p->parents->item;
1926 }
1927}
1928
1929static int rewrite_parents(struct rev_info *revs, struct commit *commit)
1930{
1931 struct commit_list **pp = &commit->parents;
1932 while (*pp) {
1933 struct commit_list *parent = *pp;
1934 switch (rewrite_one(revs, &parent->item)) {
1935 case rewrite_one_ok:
1936 break;
1937 case rewrite_one_noparents:
1938 *pp = parent->next;
1939 continue;
1940 case rewrite_one_error:
1941 return -1;
1942 }
1943 pp = &parent->next;
1944 }
1945 remove_duplicate_parents(commit);
1946 return 0;
1947}
1948
1949static int commit_match(struct commit *commit, struct rev_info *opt)
1950{
1951 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
1952 return 1;
1953 return grep_buffer(&opt->grep_filter,
1954 NULL, /* we say nothing, not even filename */
1955 commit->buffer, strlen(commit->buffer));
1956}
1957
1958static inline int want_ancestry(struct rev_info *revs)
1959{
1960 return (revs->rewrite_parents || revs->children.name);
1961}
1962
1963enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
1964{
1965 if (commit->object.flags & SHOWN)
1966 return commit_ignore;
1967 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
1968 return commit_ignore;
1969 if (revs->show_all)
1970 return commit_show;
1971 if (commit->object.flags & UNINTERESTING)
1972 return commit_ignore;
1973 if (revs->min_age != -1 && (commit->date > revs->min_age))
1974 return commit_ignore;
1975 if (revs->no_merges && commit->parents && commit->parents->next)
1976 return commit_ignore;
1977 if (revs->merges_only && !(commit->parents && commit->parents->next))
1978 return commit_ignore;
1979 if (!commit_match(commit, revs))
1980 return commit_ignore;
1981 if (revs->prune && revs->dense) {
1982 /* Commit without changes? */
1983 if (commit->object.flags & TREESAME) {
1984 /* drop merges unless we want parenthood */
1985 if (!want_ancestry(revs))
1986 return commit_ignore;
1987 /* non-merge - always ignore it */
1988 if (!commit->parents || !commit->parents->next)
1989 return commit_ignore;
1990 }
1991 }
1992 return commit_show;
1993}
1994
1995enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1996{
1997 enum commit_action action = get_commit_action(revs, commit);
1998
1999 if (action == commit_show &&
2000 !revs->show_all &&
2001 revs->prune && revs->dense && want_ancestry(revs)) {
2002 if (rewrite_parents(revs, commit) < 0)
2003 return commit_error;
2004 }
2005 return action;
2006}
2007
2008static struct commit *get_revision_1(struct rev_info *revs)
2009{
2010 if (!revs->commits)
2011 return NULL;
2012
2013 do {
2014 struct commit_list *entry = revs->commits;
2015 struct commit *commit = entry->item;
2016
2017 revs->commits = entry->next;
2018 free(entry);
2019
2020 if (revs->reflog_info) {
2021 fake_reflog_parent(revs->reflog_info, commit);
2022 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
2023 }
2024
2025 /*
2026 * If we haven't done the list limiting, we need to look at
2027 * the parents here. We also need to do the date-based limiting
2028 * that we'd otherwise have done in limit_list().
2029 */
2030 if (!revs->limited) {
2031 if (revs->max_age != -1 &&
2032 (commit->date < revs->max_age))
2033 continue;
2034 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
2035 die("Failed to traverse parents of commit %s",
2036 sha1_to_hex(commit->object.sha1));
2037 }
2038
2039 switch (simplify_commit(revs, commit)) {
2040 case commit_ignore:
2041 continue;
2042 case commit_error:
2043 die("Failed to simplify parents of commit %s",
2044 sha1_to_hex(commit->object.sha1));
2045 default:
2046 return commit;
2047 }
2048 } while (revs->commits);
2049 return NULL;
2050}
2051
2052static void gc_boundary(struct object_array *array)
2053{
2054 unsigned nr = array->nr;
2055 unsigned alloc = array->alloc;
2056 struct object_array_entry *objects = array->objects;
2057
2058 if (alloc <= nr) {
2059 unsigned i, j;
2060 for (i = j = 0; i < nr; i++) {
2061 if (objects[i].item->flags & SHOWN)
2062 continue;
2063 if (i != j)
2064 objects[j] = objects[i];
2065 j++;
2066 }
2067 for (i = j; i < nr; i++)
2068 objects[i].item = NULL;
2069 array->nr = j;
2070 }
2071}
2072
2073static void create_boundary_commit_list(struct rev_info *revs)
2074{
2075 unsigned i;
2076 struct commit *c;
2077 struct object_array *array = &revs->boundary_commits;
2078 struct object_array_entry *objects = array->objects;
2079
2080 /*
2081 * If revs->commits is non-NULL at this point, an error occurred in
2082 * get_revision_1(). Ignore the error and continue printing the
2083 * boundary commits anyway. (This is what the code has always
2084 * done.)
2085 */
2086 if (revs->commits) {
2087 free_commit_list(revs->commits);
2088 revs->commits = NULL;
2089 }
2090
2091 /*
2092 * Put all of the actual boundary commits from revs->boundary_commits
2093 * into revs->commits
2094 */
2095 for (i = 0; i < array->nr; i++) {
2096 c = (struct commit *)(objects[i].item);
2097 if (!c)
2098 continue;
2099 if (!(c->object.flags & CHILD_SHOWN))
2100 continue;
2101 if (c->object.flags & (SHOWN | BOUNDARY))
2102 continue;
2103 c->object.flags |= BOUNDARY;
2104 commit_list_insert(c, &revs->commits);
2105 }
2106
2107 /*
2108 * If revs->topo_order is set, sort the boundary commits
2109 * in topological order
2110 */
2111 sort_in_topological_order(&revs->commits, revs->lifo);
2112}
2113
2114static struct commit *get_revision_internal(struct rev_info *revs)
2115{
2116 struct commit *c = NULL;
2117 struct commit_list *l;
2118
2119 if (revs->boundary == 2) {
2120 /*
2121 * All of the normal commits have already been returned,
2122 * and we are now returning boundary commits.
2123 * create_boundary_commit_list() has populated
2124 * revs->commits with the remaining commits to return.
2125 */
2126 c = pop_commit(&revs->commits);
2127 if (c)
2128 c->object.flags |= SHOWN;
2129 return c;
2130 }
2131
2132 /*
2133 * Now pick up what they want to give us
2134 */
2135 c = get_revision_1(revs);
2136 if (c) {
2137 while (0 < revs->skip_count) {
2138 revs->skip_count--;
2139 c = get_revision_1(revs);
2140 if (!c)
2141 break;
2142 }
2143 }
2144
2145 /*
2146 * Check the max_count.
2147 */
2148 switch (revs->max_count) {
2149 case -1:
2150 break;
2151 case 0:
2152 c = NULL;
2153 break;
2154 default:
2155 revs->max_count--;
2156 }
2157
2158 if (c)
2159 c->object.flags |= SHOWN;
2160
2161 if (!revs->boundary) {
2162 return c;
2163 }
2164
2165 if (!c) {
2166 /*
2167 * get_revision_1() runs out the commits, and
2168 * we are done computing the boundaries.
2169 * switch to boundary commits output mode.
2170 */
2171 revs->boundary = 2;
2172
2173 /*
2174 * Update revs->commits to contain the list of
2175 * boundary commits.
2176 */
2177 create_boundary_commit_list(revs);
2178
2179 return get_revision_internal(revs);
2180 }
2181
2182 /*
2183 * boundary commits are the commits that are parents of the
2184 * ones we got from get_revision_1() but they themselves are
2185 * not returned from get_revision_1(). Before returning
2186 * 'c', we need to mark its parents that they could be boundaries.
2187 */
2188
2189 for (l = c->parents; l; l = l->next) {
2190 struct object *p;
2191 p = &(l->item->object);
2192 if (p->flags & (CHILD_SHOWN | SHOWN))
2193 continue;
2194 p->flags |= CHILD_SHOWN;
2195 gc_boundary(&revs->boundary_commits);
2196 add_object_array(p, NULL, &revs->boundary_commits);
2197 }
2198
2199 return c;
2200}
2201
2202struct commit *get_revision(struct rev_info *revs)
2203{
2204 struct commit *c;
2205 struct commit_list *reversed;
2206
2207 if (revs->reverse) {
2208 reversed = NULL;
2209 while ((c = get_revision_internal(revs))) {
2210 commit_list_insert(c, &reversed);
2211 }
2212 revs->commits = reversed;
2213 revs->reverse = 0;
2214 revs->reverse_output_stage = 1;
2215 }
2216
2217 if (revs->reverse_output_stage)
2218 return pop_commit(&revs->commits);
2219
2220 c = get_revision_internal(revs);
2221 if (c && revs->graph)
2222 graph_update(revs->graph, c);
2223 return c;
2224}