Merge git://git.kernel.org/pub/scm/gitk/gitk
[git/git.git] / revision.c
CommitLineData
ae563542
LT
1#include "cache.h"
2#include "tag.h"
3#include "blob.h"
4#include "tree.h"
5#include "commit.h"
a4a88b2b 6#include "diff.h"
ae563542
LT
7#include "refs.h"
8#include "revision.h"
9
10static char *path_name(struct name_path *path, const char *name)
11{
12 struct name_path *p;
13 char *n, *m;
14 int nlen = strlen(name);
15 int len = nlen + 1;
16
17 for (p = path; p; p = p->up) {
18 if (p->elem_len)
19 len += p->elem_len + 1;
20 }
21 n = xmalloc(len);
22 m = n + len - (nlen + 1);
23 strcpy(m, name);
24 for (p = path; p; p = p->up) {
25 if (p->elem_len) {
26 m -= p->elem_len + 1;
27 memcpy(m, p->elem, p->elem_len);
28 m[p->elem_len] = '/';
29 }
30 }
31 return n;
32}
33
34struct object_list **add_object(struct object *obj,
35 struct object_list **p,
36 struct name_path *path,
37 const char *name)
38{
39 struct object_list *entry = xmalloc(sizeof(*entry));
40 entry->item = obj;
41 entry->next = *p;
42 entry->name = path_name(path, name);
43 *p = entry;
44 return &entry->next;
45}
46
47static void mark_blob_uninteresting(struct blob *blob)
48{
49 if (blob->object.flags & UNINTERESTING)
50 return;
51 blob->object.flags |= UNINTERESTING;
52}
53
54void mark_tree_uninteresting(struct tree *tree)
55{
56 struct object *obj = &tree->object;
57 struct tree_entry_list *entry;
58
59 if (obj->flags & UNINTERESTING)
60 return;
61 obj->flags |= UNINTERESTING;
62 if (!has_sha1_file(obj->sha1))
63 return;
64 if (parse_tree(tree) < 0)
65 die("bad tree %s", sha1_to_hex(obj->sha1));
66 entry = tree->entries;
67 tree->entries = NULL;
68 while (entry) {
69 struct tree_entry_list *next = entry->next;
70 if (entry->directory)
71 mark_tree_uninteresting(entry->item.tree);
72 else
73 mark_blob_uninteresting(entry->item.blob);
74 free(entry);
75 entry = next;
76 }
77}
78
79void mark_parents_uninteresting(struct commit *commit)
80{
81 struct commit_list *parents = commit->parents;
82
83 while (parents) {
84 struct commit *commit = parents->item;
d2c4af73
MU
85 if (!(commit->object.flags & UNINTERESTING)) {
86 commit->object.flags |= UNINTERESTING;
ae563542 87
d2c4af73
MU
88 /*
89 * Normally we haven't parsed the parent
90 * yet, so we won't have a parent of a parent
91 * here. However, it may turn out that we've
92 * reached this commit some other way (where it
93 * wasn't uninteresting), in which case we need
94 * to mark its parents recursively too..
95 */
96 if (commit->parents)
97 mark_parents_uninteresting(commit);
98 }
ae563542
LT
99
100 /*
101 * A missing commit is ok iff its parent is marked
102 * uninteresting.
103 *
104 * We just mark such a thing parsed, so that when
105 * it is popped next time around, we won't be trying
106 * to parse it and get an error.
107 */
108 if (!has_sha1_file(commit->object.sha1))
109 commit->object.parsed = 1;
110 parents = parents->next;
111 }
112}
113
114static void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
115{
116 add_object(obj, &revs->pending_objects, NULL, name);
117}
118
119static struct commit *get_commit_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
120{
121 struct object *object;
122
123 object = parse_object(sha1);
124 if (!object)
125 die("bad object %s", name);
126
127 /*
128 * Tag object? Look what it points to..
129 */
130 while (object->type == tag_type) {
131 struct tag *tag = (struct tag *) object;
132 object->flags |= flags;
133 if (revs->tag_objects && !(object->flags & UNINTERESTING))
134 add_pending_object(revs, object, tag->tag);
135 object = parse_object(tag->tagged->sha1);
136 if (!object)
137 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
138 }
139
140 /*
141 * Commit object? Just return it, we'll do all the complex
142 * reachability crud.
143 */
144 if (object->type == commit_type) {
145 struct commit *commit = (struct commit *)object;
146 object->flags |= flags;
147 if (parse_commit(commit) < 0)
148 die("unable to parse commit %s", name);
d9a83684 149 if (flags & UNINTERESTING) {
ae563542 150 mark_parents_uninteresting(commit);
d9a83684
LT
151 revs->limited = 1;
152 }
ae563542
LT
153 return commit;
154 }
155
156 /*
157 * Tree object? Either mark it uniniteresting, or add it
158 * to the list of objects to look at later..
159 */
160 if (object->type == tree_type) {
161 struct tree *tree = (struct tree *)object;
162 if (!revs->tree_objects)
163 return NULL;
164 if (flags & UNINTERESTING) {
165 mark_tree_uninteresting(tree);
166 return NULL;
167 }
168 add_pending_object(revs, object, "");
169 return NULL;
170 }
171
172 /*
173 * Blob object? You know the drill by now..
174 */
175 if (object->type == blob_type) {
176 struct blob *blob = (struct blob *)object;
177 if (!revs->blob_objects)
178 return NULL;
179 if (flags & UNINTERESTING) {
180 mark_blob_uninteresting(blob);
181 return NULL;
182 }
183 add_pending_object(revs, object, "");
184 return NULL;
185 }
186 die("%s is unknown object", name);
187}
188
a4a88b2b
LT
189static int everybody_uninteresting(struct commit_list *orig)
190{
191 struct commit_list *list = orig;
192 while (list) {
193 struct commit *commit = list->item;
194 list = list->next;
195 if (commit->object.flags & UNINTERESTING)
196 continue;
197 return 0;
198 }
199 return 1;
200}
201
8efdc326 202static int tree_difference = REV_TREE_SAME;
a4a88b2b
LT
203
204static void file_add_remove(struct diff_options *options,
205 int addremove, unsigned mode,
206 const unsigned char *sha1,
207 const char *base, const char *path)
208{
8efdc326 209 int diff = REV_TREE_DIFFERENT;
a4a88b2b
LT
210
211 /*
8efdc326
FK
212 * Is it an add of a new file? It means that the old tree
213 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
214 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
215 * (and if it already was "REV_TREE_NEW", we'll keep it
216 * "REV_TREE_NEW" of course).
a4a88b2b
LT
217 */
218 if (addremove == '+') {
219 diff = tree_difference;
8efdc326 220 if (diff != REV_TREE_SAME)
a4a88b2b 221 return;
8efdc326 222 diff = REV_TREE_NEW;
a4a88b2b
LT
223 }
224 tree_difference = diff;
225}
226
227static void file_change(struct diff_options *options,
228 unsigned old_mode, unsigned new_mode,
229 const unsigned char *old_sha1,
230 const unsigned char *new_sha1,
231 const char *base, const char *path)
232{
8efdc326 233 tree_difference = REV_TREE_DIFFERENT;
a4a88b2b
LT
234}
235
236static struct diff_options diff_opt = {
237 .recursive = 1,
238 .add_remove = file_add_remove,
239 .change = file_change,
240};
241
8efdc326 242int rev_compare_tree(struct tree *t1, struct tree *t2)
a4a88b2b
LT
243{
244 if (!t1)
8efdc326 245 return REV_TREE_NEW;
a4a88b2b 246 if (!t2)
8efdc326
FK
247 return REV_TREE_DIFFERENT;
248 tree_difference = REV_TREE_SAME;
a4a88b2b 249 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "", &diff_opt) < 0)
8efdc326 250 return REV_TREE_DIFFERENT;
a4a88b2b
LT
251 return tree_difference;
252}
253
8efdc326 254int rev_same_tree_as_empty(struct tree *t1)
a4a88b2b
LT
255{
256 int retval;
257 void *tree;
258 struct tree_desc empty, real;
259
260 if (!t1)
261 return 0;
262
263 tree = read_object_with_reference(t1->object.sha1, "tree", &real.size, NULL);
264 if (!tree)
265 return 0;
266 real.buf = tree;
267
268 empty.buf = "";
269 empty.size = 0;
270
271 tree_difference = 0;
272 retval = diff_tree(&empty, &real, "", &diff_opt);
273 free(tree);
274
275 return retval >= 0 && !tree_difference;
276}
277
278static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
279{
280 struct commit_list **pp, *parent;
f3219fbb 281 int tree_changed = 0;
a4a88b2b
LT
282
283 if (!commit->tree)
284 return;
285
286 if (!commit->parents) {
8efdc326 287 if (!rev_same_tree_as_empty(commit->tree))
a4a88b2b
LT
288 commit->object.flags |= TREECHANGE;
289 return;
290 }
291
292 pp = &commit->parents;
293 while ((parent = *pp) != NULL) {
294 struct commit *p = parent->item;
295
a4a88b2b 296 parse_commit(p);
8efdc326
FK
297 switch (rev_compare_tree(p->tree, commit->tree)) {
298 case REV_TREE_SAME:
f3219fbb
JH
299 if (p->object.flags & UNINTERESTING) {
300 /* Even if a merge with an uninteresting
301 * side branch brought the entire change
302 * we are interested in, we do not want
303 * to lose the other branches of this
304 * merge, so we just keep going.
305 */
306 pp = &parent->next;
307 continue;
308 }
a4a88b2b
LT
309 parent->next = NULL;
310 commit->parents = parent;
311 return;
312
8efdc326
FK
313 case REV_TREE_NEW:
314 if (revs->remove_empty_trees &&
315 rev_same_tree_as_empty(p->tree)) {
c348f31a
JH
316 /* We are adding all the specified
317 * paths from this parent, so the
318 * history beyond this parent is not
319 * interesting. Remove its parents
320 * (they are grandparents for us).
321 * IOW, we pretend this parent is a
322 * "root" commit.
a41e109c 323 */
c348f31a
JH
324 parse_commit(p);
325 p->parents = NULL;
a4a88b2b
LT
326 }
327 /* fallthrough */
8efdc326 328 case REV_TREE_DIFFERENT:
f3219fbb 329 tree_changed = 1;
a4a88b2b
LT
330 pp = &parent->next;
331 continue;
332 }
333 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
334 }
f3219fbb
JH
335 if (tree_changed)
336 commit->object.flags |= TREECHANGE;
a4a88b2b
LT
337}
338
339static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
340{
341 struct commit_list *parent = commit->parents;
342
343 /*
344 * If the commit is uninteresting, don't try to
345 * prune parents - we want the maximal uninteresting
346 * set.
347 *
348 * Normally we haven't parsed the parent
349 * yet, so we won't have a parent of a parent
350 * here. However, it may turn out that we've
351 * reached this commit some other way (where it
352 * wasn't uninteresting), in which case we need
353 * to mark its parents recursively too..
354 */
355 if (commit->object.flags & UNINTERESTING) {
356 while (parent) {
357 struct commit *p = parent->item;
358 parent = parent->next;
359 parse_commit(p);
360 p->object.flags |= UNINTERESTING;
361 if (p->parents)
362 mark_parents_uninteresting(p);
363 if (p->object.flags & SEEN)
364 continue;
365 p->object.flags |= SEEN;
366 insert_by_date(p, list);
367 }
368 return;
369 }
370
371 /*
372 * Ok, the commit wasn't uninteresting. Try to
373 * simplify the commit history and find the parent
374 * that has no differences in the path set if one exists.
375 */
8efdc326
FK
376 if (revs->prune_fn)
377 revs->prune_fn(revs, commit);
a4a88b2b
LT
378
379 parent = commit->parents;
380 while (parent) {
381 struct commit *p = parent->item;
382
383 parent = parent->next;
384
385 parse_commit(p);
386 if (p->object.flags & SEEN)
387 continue;
388 p->object.flags |= SEEN;
389 insert_by_date(p, list);
390 }
391}
392
393static void limit_list(struct rev_info *revs)
394{
395 struct commit_list *list = revs->commits;
396 struct commit_list *newlist = NULL;
397 struct commit_list **p = &newlist;
398
399 while (list) {
400 struct commit_list *entry = list;
401 struct commit *commit = list->item;
402 struct object *obj = &commit->object;
403
404 list = list->next;
405 free(entry);
406
407 if (revs->max_age != -1 && (commit->date < revs->max_age))
408 obj->flags |= UNINTERESTING;
409 if (revs->unpacked && has_sha1_pack(obj->sha1))
410 obj->flags |= UNINTERESTING;
411 add_parents_to_list(revs, commit, &list);
412 if (obj->flags & UNINTERESTING) {
413 mark_parents_uninteresting(commit);
414 if (everybody_uninteresting(list))
415 break;
416 continue;
417 }
418 if (revs->min_age != -1 && (commit->date > revs->min_age))
419 continue;
420 p = &commit_list_insert(commit, p)->next;
421 }
384e99a4
JH
422 if (revs->boundary) {
423 list = newlist;
424 while (list) {
425 struct commit *commit = list->item;
426 struct object *obj = &commit->object;
427 struct commit_list *parent = commit->parents;
428 if (obj->flags & (UNINTERESTING|BOUNDARY)) {
429 list = list->next;
430 continue;
431 }
432 while (parent) {
433 struct commit *pcommit = parent->item;
434 parent = parent->next;
435 if (!(pcommit->object.flags & UNINTERESTING))
436 continue;
437 pcommit->object.flags |= BOUNDARY;
438 p = &commit_list_insert(pcommit, p)->next;
439 }
440 list = list->next;
441 }
442 }
a4a88b2b
LT
443 revs->commits = newlist;
444}
445
ae563542
LT
446static void add_one_commit(struct commit *commit, struct rev_info *revs)
447{
448 if (!commit || (commit->object.flags & SEEN))
449 return;
450 commit->object.flags |= SEEN;
451 commit_list_insert(commit, &revs->commits);
452}
453
454static int all_flags;
455static struct rev_info *all_revs;
456
457static int handle_one_ref(const char *path, const unsigned char *sha1)
458{
459 struct commit *commit = get_commit_reference(all_revs, path, sha1, all_flags);
460 add_one_commit(commit, all_revs);
461 return 0;
462}
463
464static void handle_all(struct rev_info *revs, unsigned flags)
465{
466 all_revs = revs;
467 all_flags = flags;
468 for_each_ref(handle_one_ref);
469}
470
8efdc326
FK
471void init_revisions(struct rev_info *revs)
472{
473 memset(revs, 0, sizeof(*revs));
474 revs->lifo = 1;
475 revs->dense = 1;
476 revs->prefix = setup_git_directory();
477 revs->max_age = -1;
478 revs->min_age = -1;
479 revs->max_count = -1;
480
481 revs->prune_fn = NULL;
482 revs->prune_data = NULL;
483
484 revs->topo_setter = topo_sort_default_setter;
485 revs->topo_getter = topo_sort_default_getter;
486}
487
ae563542
LT
488/*
489 * Parse revision information, filling in the "rev_info" structure,
490 * and removing the used arguments from the argument list.
491 *
765ac8ec
LT
492 * Returns the number of arguments left that weren't recognized
493 * (which are also moved to the head of the argument list)
ae563542 494 */
a4a88b2b 495int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
ae563542
LT
496{
497 int i, flags, seen_dashdash;
765ac8ec 498 const char **unrecognized = argv + 1;
ae563542
LT
499 int left = 1;
500
8efdc326 501 init_revisions(revs);
ae563542
LT
502
503 /* First, search for "--" */
504 seen_dashdash = 0;
505 for (i = 1; i < argc; i++) {
506 const char *arg = argv[i];
507 if (strcmp(arg, "--"))
508 continue;
509 argv[i] = NULL;
510 argc = i;
8efdc326 511 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
ae563542
LT
512 seen_dashdash = 1;
513 break;
514 }
515
516 flags = 0;
517 for (i = 1; i < argc; i++) {
518 struct commit *commit;
519 const char *arg = argv[i];
520 unsigned char sha1[20];
521 char *dotdot;
522 int local_flags;
523
524 if (*arg == '-') {
525 if (!strncmp(arg, "--max-count=", 12)) {
526 revs->max_count = atoi(arg + 12);
527 continue;
528 }
64bc6e3d
JH
529 /* accept -<digit>, like traditilnal "head" */
530 if ((*arg == '-') && isdigit(arg[1])) {
531 revs->max_count = atoi(arg + 1);
532 continue;
533 }
534 if (!strcmp(arg, "-n")) {
535 if (argc <= i + 1)
536 die("-n requires an argument");
537 revs->max_count = atoi(argv[++i]);
538 continue;
539 }
540 if (!strncmp(arg,"-n",2)) {
541 revs->max_count = atoi(arg + 2);
542 continue;
543 }
ae563542
LT
544 if (!strncmp(arg, "--max-age=", 10)) {
545 revs->max_age = atoi(arg + 10);
d9a83684 546 revs->limited = 1;
ae563542
LT
547 continue;
548 }
549 if (!strncmp(arg, "--min-age=", 10)) {
550 revs->min_age = atoi(arg + 10);
d9a83684 551 revs->limited = 1;
ae563542
LT
552 continue;
553 }
fd751667
JH
554 if (!strncmp(arg, "--since=", 8)) {
555 revs->max_age = approxidate(arg + 8);
556 revs->limited = 1;
557 continue;
558 }
559 if (!strncmp(arg, "--after=", 8)) {
560 revs->max_age = approxidate(arg + 8);
561 revs->limited = 1;
562 continue;
563 }
564 if (!strncmp(arg, "--before=", 9)) {
565 revs->min_age = approxidate(arg + 9);
566 revs->limited = 1;
567 continue;
568 }
569 if (!strncmp(arg, "--until=", 8)) {
570 revs->min_age = approxidate(arg + 8);
571 revs->limited = 1;
572 continue;
573 }
ae563542
LT
574 if (!strcmp(arg, "--all")) {
575 handle_all(revs, flags);
576 continue;
577 }
578 if (!strcmp(arg, "--not")) {
579 flags ^= UNINTERESTING;
580 continue;
581 }
582 if (!strcmp(arg, "--default")) {
583 if (++i >= argc)
584 die("bad --default argument");
585 def = argv[i];
586 continue;
587 }
588 if (!strcmp(arg, "--topo-order")) {
589 revs->topo_order = 1;
d9a83684 590 revs->limited = 1;
ae563542
LT
591 continue;
592 }
593 if (!strcmp(arg, "--date-order")) {
594 revs->lifo = 0;
595 revs->topo_order = 1;
d9a83684 596 revs->limited = 1;
ae563542
LT
597 continue;
598 }
599 if (!strcmp(arg, "--dense")) {
600 revs->dense = 1;
601 continue;
602 }
603 if (!strcmp(arg, "--sparse")) {
604 revs->dense = 0;
605 continue;
606 }
607 if (!strcmp(arg, "--remove-empty")) {
608 revs->remove_empty_trees = 1;
609 continue;
610 }
5cdeae71 611 if (!strcmp(arg, "--no-merges")) {
765ac8ec
LT
612 revs->no_merges = 1;
613 continue;
614 }
384e99a4
JH
615 if (!strcmp(arg, "--boundary")) {
616 revs->boundary = 1;
617 continue;
618 }
ae563542
LT
619 if (!strcmp(arg, "--objects")) {
620 revs->tag_objects = 1;
621 revs->tree_objects = 1;
622 revs->blob_objects = 1;
623 continue;
624 }
625 if (!strcmp(arg, "--objects-edge")) {
626 revs->tag_objects = 1;
627 revs->tree_objects = 1;
628 revs->blob_objects = 1;
629 revs->edge_hint = 1;
630 continue;
631 }
d9a83684
LT
632 if (!strcmp(arg, "--unpacked")) {
633 revs->unpacked = 1;
634 revs->limited = 1;
635 continue;
636 }
ae563542
LT
637 *unrecognized++ = arg;
638 left++;
639 continue;
640 }
641 dotdot = strstr(arg, "..");
642 if (dotdot) {
643 unsigned char from_sha1[20];
0c8b106b
JH
644 const char *next = dotdot + 2;
645 const char *this = arg;
ae563542
LT
646 *dotdot = 0;
647 if (!*next)
0c8b106b 648 next = "HEAD";
ce4a7063 649 if (dotdot == arg)
0c8b106b 650 this = "HEAD";
ce4a7063
JH
651 if (!get_sha1(this, from_sha1) &&
652 !get_sha1(next, sha1)) {
ae563542
LT
653 struct commit *exclude;
654 struct commit *include;
655
ce4a7063 656 exclude = get_commit_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
ae563542
LT
657 include = get_commit_reference(revs, next, sha1, flags);
658 if (!exclude || !include)
659 die("Invalid revision range %s..%s", arg, next);
660 add_one_commit(exclude, revs);
661 add_one_commit(include, revs);
662 continue;
663 }
664 *dotdot = '.';
665 }
666 local_flags = 0;
667 if (*arg == '^') {
668 local_flags = UNINTERESTING;
669 arg++;
670 }
671 if (get_sha1(arg, sha1) < 0) {
672 struct stat st;
673 int j;
674
675 if (seen_dashdash || local_flags)
676 die("bad revision '%s'", arg);
677
678 /* If we didn't have a "--", all filenames must exist */
679 for (j = i; j < argc; j++) {
680 if (lstat(argv[j], &st) < 0)
fb18a2ed 681 die("'%s': %s", argv[j], strerror(errno));
ae563542 682 }
8efdc326 683 revs->prune_data = get_pathspec(revs->prefix, argv + i);
ae563542
LT
684 break;
685 }
686 commit = get_commit_reference(revs, arg, sha1, flags ^ local_flags);
687 add_one_commit(commit, revs);
688 }
689 if (def && !revs->commits) {
690 unsigned char sha1[20];
691 struct commit *commit;
692 if (get_sha1(def, sha1) < 0)
693 die("bad default revision '%s'", def);
694 commit = get_commit_reference(revs, def, sha1, 0);
695 add_one_commit(commit, revs);
696 }
8efdc326
FK
697
698 if (revs->prune_data) {
699 diff_tree_setup_paths(revs->prune_data);
700 revs->prune_fn = try_to_simplify_commit;
d9a83684 701 revs->limited = 1;
8efdc326
FK
702 }
703
ae563542
LT
704 return left;
705}
a4a88b2b
LT
706
707void prepare_revision_walk(struct rev_info *revs)
708{
a4a88b2b
LT
709 sort_by_date(&revs->commits);
710 if (revs->limited)
711 limit_list(revs);
712 if (revs->topo_order)
8efdc326
FK
713 sort_in_topological_order_fn(&revs->commits, revs->lifo,
714 revs->topo_setter,
715 revs->topo_getter);
a4a88b2b
LT
716}
717
765ac8ec
LT
718static int rewrite_one(struct commit **pp)
719{
720 for (;;) {
721 struct commit *p = *pp;
722 if (p->object.flags & (TREECHANGE | UNINTERESTING))
723 return 0;
724 if (!p->parents)
725 return -1;
726 *pp = p->parents->item;
727 }
728}
729
730static void rewrite_parents(struct commit *commit)
731{
732 struct commit_list **pp = &commit->parents;
733 while (*pp) {
734 struct commit_list *parent = *pp;
735 if (rewrite_one(&parent->item) < 0) {
736 *pp = parent->next;
737 continue;
738 }
739 pp = &parent->next;
740 }
741}
742
a4a88b2b
LT
743struct commit *get_revision(struct rev_info *revs)
744{
765ac8ec 745 struct commit_list *list = revs->commits;
765ac8ec
LT
746
747 if (!list)
a4a88b2b 748 return NULL;
a4a88b2b 749
765ac8ec 750 /* Check the max_count ... */
765ac8ec
LT
751 switch (revs->max_count) {
752 case -1:
753 break;
754 case 0:
755 return NULL;
756 default:
757 revs->max_count--;
758 }
a4a88b2b 759
765ac8ec 760 do {
ea5ed3ab
LT
761 struct commit *commit = revs->commits->item;
762
384e99a4
JH
763 if (commit->object.flags & SHOWN)
764 goto next;
765 if (!(commit->object.flags & BOUNDARY) &&
766 (commit->object.flags & UNINTERESTING))
ea5ed3ab 767 goto next;
765ac8ec 768 if (revs->min_age != -1 && (commit->date > revs->min_age))
ea5ed3ab 769 goto next;
765ac8ec
LT
770 if (revs->max_age != -1 && (commit->date < revs->max_age))
771 return NULL;
384e99a4
JH
772 if (revs->no_merges &&
773 commit->parents && commit->parents->next)
ea5ed3ab 774 goto next;
8efdc326 775 if (revs->prune_fn && revs->dense) {
765ac8ec 776 if (!(commit->object.flags & TREECHANGE))
ea5ed3ab 777 goto next;
765ac8ec
LT
778 rewrite_parents(commit);
779 }
ea5ed3ab 780 /* More to go? */
384e99a4
JH
781 if (revs->max_count) {
782 if (commit->object.flags & BOUNDARY) {
783 /* this is already uninteresting,
784 * so there is no point popping its
785 * parents into the list.
786 */
787 struct commit_list *it = revs->commits;
788 revs->commits = it->next;
789 free(it);
790 }
791 else
792 pop_most_recent_commit(&revs->commits, SEEN);
793 }
765ac8ec
LT
794 commit->object.flags |= SHOWN;
795 return commit;
ea5ed3ab
LT
796next:
797 pop_most_recent_commit(&revs->commits, SEEN);
765ac8ec
LT
798 } while (revs->commits);
799 return NULL;
800}