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