Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
[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"
894a9d33 15#include "string-list.h"
ae563542 16
cdcefbc9
LT
17volatile show_early_output_fn_t show_early_output;
18
cf2ab916 19char *path_name(const struct name_path *path, const char *name)
ae563542 20{
cf2ab916 21 const struct name_path *p;
ae563542
LT
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
1f1e895f
LT
43void add_object(struct object *obj,
44 struct object_array *p,
45 struct name_path *path,
46 const char *name)
ae563542 47{
1f1e895f 48 add_object_array(obj, path_name(path, name), p);
ae563542
LT
49}
50
51static void mark_blob_uninteresting(struct blob *blob)
52{
c1ee9013
MK
53 if (!blob)
54 return;
ae563542
LT
55 if (blob->object.flags & UNINTERESTING)
56 return;
57 blob->object.flags |= UNINTERESTING;
58}
59
60void mark_tree_uninteresting(struct tree *tree)
61{
f75e53ed 62 struct tree_desc desc;
4c068a98 63 struct name_entry entry;
ae563542 64 struct object *obj = &tree->object;
ae563542 65
c1ee9013
MK
66 if (!tree)
67 return;
ae563542
LT
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));
f75e53ed 75
6fda5e51 76 init_tree_desc(&desc, tree->buffer, tree->size);
4c068a98 77 while (tree_entry(&desc, &entry)) {
4d1012c3
LT
78 switch (object_type(entry.mode)) {
79 case OBJ_TREE:
4c068a98 80 mark_tree_uninteresting(lookup_tree(entry.sha1));
4d1012c3
LT
81 break;
82 case OBJ_BLOB:
4c068a98 83 mark_blob_uninteresting(lookup_blob(entry.sha1));
4d1012c3
LT
84 break;
85 default:
86 /* Subproject commit - not in this repository */
87 break;
88 }
ae563542 89 }
f75e53ed
LT
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;
ae563542
LT
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;
d2c4af73
MU
105 if (!(commit->object.flags & UNINTERESTING)) {
106 commit->object.flags |= UNINTERESTING;
ae563542 107
d2c4af73
MU
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 }
ae563542
LT
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
2d93b9fa 134static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
ae563542 135{
aa27e461 136 if (revs->no_walk && (obj->flags & UNINTERESTING))
f222abde 137 revs->no_walk = 0;
105e4733
JH
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 }
bb6c2fba 152 add_object_array_with_mode(obj, name, &revs->pending, mode);
ae563542
LT
153}
154
2d93b9fa
JH
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
3384a2df
JH
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
cd2bdc53 172static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
ae563542
LT
173{
174 struct object *object;
175
176 object = parse_object(sha1);
177 if (!object)
178 die("bad object %s", name);
cd2bdc53
LT
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;
ae563542
LT
186
187 /*
188 * Tag object? Look what it points to..
189 */
1974632c 190 while (object->type == OBJ_TAG) {
ae563542 191 struct tag *tag = (struct tag *) object;
cd2bdc53 192 if (revs->tag_objects && !(flags & UNINTERESTING))
ae563542 193 add_pending_object(revs, object, tag->tag);
9684afd9
MK
194 if (!tag->tagged)
195 die("bad tag");
ae563542 196 object = parse_object(tag->tagged->sha1);
aeeae1b7
JH
197 if (!object) {
198 if (flags & UNINTERESTING)
199 return NULL;
ae563542 200 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
aeeae1b7 201 }
ae563542
LT
202 }
203
204 /*
205 * Commit object? Just return it, we'll do all the complex
206 * reachability crud.
207 */
1974632c 208 if (object->type == OBJ_COMMIT) {
ae563542 209 struct commit *commit = (struct commit *)object;
ae563542
LT
210 if (parse_commit(commit) < 0)
211 die("unable to parse commit %s", name);
d9a83684 212 if (flags & UNINTERESTING) {
4262c1b0 213 commit->object.flags |= UNINTERESTING;
ae563542 214 mark_parents_uninteresting(commit);
d9a83684
LT
215 revs->limited = 1;
216 }
0f3a290b
LT
217 if (revs->show_source && !commit->util)
218 commit->util = (void *) name;
ae563542
LT
219 return commit;
220 }
221
222 /*
3ea3c215 223 * Tree object? Either mark it uninteresting, or add it
ae563542
LT
224 * to the list of objects to look at later..
225 */
1974632c 226 if (object->type == OBJ_TREE) {
ae563542
LT
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 */
1974632c 241 if (object->type == OBJ_BLOB) {
ae563542
LT
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
a4a88b2b
LT
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
0a4ba7f8
JH
268/*
269 * The goal is to get REV_TREE_NEW as the result only if the
ceff8e7a
LT
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.
0a4ba7f8 276 */
8efdc326 277static int tree_difference = REV_TREE_SAME;
a4a88b2b
LT
278
279static void file_add_remove(struct diff_options *options,
280 int addremove, unsigned mode,
281 const unsigned char *sha1,
e3d42c47 282 const char *fullpath, unsigned dirty_submodule)
a4a88b2b 283{
ceff8e7a 284 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
a4a88b2b 285
ceff8e7a 286 tree_difference |= diff;
dd47aa31 287 if (tree_difference == REV_TREE_DIFFERENT)
8f67f8ae 288 DIFF_OPT_SET(options, HAS_CHANGES);
a4a88b2b
LT
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,
e3d42c47
JL
295 const char *fullpath,
296 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
a4a88b2b 297{
8efdc326 298 tree_difference = REV_TREE_DIFFERENT;
8f67f8ae 299 DIFF_OPT_SET(options, HAS_CHANGES);
a4a88b2b
LT
300}
301
3a5e8608 302static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
a4a88b2b 303{
3a5e8608
LT
304 struct tree *t1 = parent->tree;
305 struct tree *t2 = commit->tree;
306
a4a88b2b 307 if (!t1)
8efdc326 308 return REV_TREE_NEW;
ceff8e7a
LT
309 if (!t2)
310 return REV_TREE_OLD;
78892e32
LT
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 */
afe069d1 326 if (!revs->prune_data.nr)
78892e32
LT
327 return REV_TREE_SAME;
328 }
ceff8e7a 329
8efdc326 330 tree_difference = REV_TREE_SAME;
8f67f8ae 331 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
c4e05b1a 332 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
cd2bdc53 333 &revs->pruning) < 0)
8efdc326 334 return REV_TREE_DIFFERENT;
a4a88b2b
LT
335 return tree_difference;
336}
337
3a5e8608 338static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
a4a88b2b
LT
339{
340 int retval;
341 void *tree;
6fda5e51 342 unsigned long size;
a4a88b2b 343 struct tree_desc empty, real;
3a5e8608 344 struct tree *t1 = commit->tree;
a4a88b2b
LT
345
346 if (!t1)
347 return 0;
348
6fda5e51 349 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
a4a88b2b
LT
350 if (!tree)
351 return 0;
6fda5e51
LT
352 init_tree_desc(&real, tree, size);
353 init_tree_desc(&empty, "", 0);
a4a88b2b 354
0a4ba7f8 355 tree_difference = REV_TREE_SAME;
8f67f8ae 356 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
cd2bdc53 357 retval = diff_tree(&empty, &real, "", &revs->pruning);
a4a88b2b
LT
358 free(tree);
359
0a4ba7f8 360 return retval >= 0 && (tree_difference == REV_TREE_SAME);
a4a88b2b
LT
361}
362
363static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
364{
365 struct commit_list **pp, *parent;
6631c736 366 int tree_changed = 0, tree_same = 0;
a4a88b2b 367
53b2c823
LT
368 /*
369 * If we don't do pruning, everything is interesting
370 */
7dc0fe3b 371 if (!revs->prune)
53b2c823 372 return;
53b2c823 373
a4a88b2b
LT
374 if (!commit->tree)
375 return;
376
377 if (!commit->parents) {
3a5e8608 378 if (rev_same_tree_as_empty(revs, commit))
7dc0fe3b 379 commit->object.flags |= TREESAME;
a4a88b2b
LT
380 return;
381 }
382
53b2c823
LT
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 */
7dc0fe3b 387 if (!revs->dense && !commit->parents->next)
53b2c823 388 return;
53b2c823 389
a4a88b2b
LT
390 pp = &commit->parents;
391 while ((parent = *pp) != NULL) {
392 struct commit *p = parent->item;
393
cc0e6c5a
AR
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));
3a5e8608 398 switch (rev_compare_tree(revs, p, commit)) {
8efdc326 399 case REV_TREE_SAME:
6631c736 400 tree_same = 1;
9202434c 401 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
f3219fbb
JH
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 }
a4a88b2b
LT
411 parent->next = NULL;
412 commit->parents = parent;
7dc0fe3b 413 commit->object.flags |= TREESAME;
a4a88b2b
LT
414 return;
415
8efdc326
FK
416 case REV_TREE_NEW:
417 if (revs->remove_empty_trees &&
3a5e8608 418 rev_same_tree_as_empty(revs, p)) {
c348f31a
JH
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.
a41e109c 426 */
cc0e6c5a
AR
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));
c348f31a 431 p->parents = NULL;
a4a88b2b
LT
432 }
433 /* fallthrough */
ceff8e7a 434 case REV_TREE_OLD:
8efdc326 435 case REV_TREE_DIFFERENT:
f3219fbb 436 tree_changed = 1;
a4a88b2b
LT
437 pp = &parent->next;
438 continue;
439 }
440 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
441 }
6631c736 442 if (tree_changed && !tree_same)
7dc0fe3b
LT
443 return;
444 commit->object.flags |= TREESAME;
a4a88b2b
LT
445}
446
47e44ed1 447static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
fce87ae5
AG
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)
47e44ed1 453 new_entry = commit_list_insert_by_date(p, &cached_base->next);
fce87ae5 454 else
47e44ed1 455 new_entry = commit_list_insert_by_date(p, head);
fce87ae5
AG
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)
a4a88b2b
LT
463{
464 struct commit_list *parent = commit->parents;
577ed5c2 465 unsigned left_flag;
fce87ae5 466 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
a4a88b2b 467
3381c790 468 if (commit->object.flags & ADDED)
cc0e6c5a 469 return 0;
3381c790
LT
470 commit->object.flags |= ADDED;
471
a4a88b2b
LT
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;
aeeae1b7
JH
488 if (p)
489 p->object.flags |= UNINTERESTING;
cc0e6c5a 490 if (parse_commit(p) < 0)
aeeae1b7 491 continue;
a4a88b2b
LT
492 if (p->parents)
493 mark_parents_uninteresting(p);
494 if (p->object.flags & SEEN)
495 continue;
496 p->object.flags |= SEEN;
47e44ed1 497 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
a4a88b2b 498 }
cc0e6c5a 499 return 0;
a4a88b2b
LT
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 */
53b2c823 507 try_to_simplify_commit(revs, commit);
a4a88b2b 508
ba1d4505 509 if (revs->no_walk)
cc0e6c5a 510 return 0;
ba1d4505 511
577ed5c2 512 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
0053e902 513
d9c292e8 514 for (parent = commit->parents; parent; parent = parent->next) {
a4a88b2b
LT
515 struct commit *p = parent->item;
516
cc0e6c5a
AR
517 if (parse_commit(p) < 0)
518 return -1;
0f3a290b
LT
519 if (revs->show_source && !p->util)
520 p->util = commit->util;
577ed5c2 521 p->object.flags |= left_flag;
ad1012eb
LH
522 if (!(p->object.flags & SEEN)) {
523 p->object.flags |= SEEN;
47e44ed1 524 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
ad1012eb 525 }
60d30b02 526 if (revs->first_parent_only)
d9c292e8 527 break;
a4a88b2b 528 }
cc0e6c5a 529 return 0;
a4a88b2b
LT
530}
531
36d56de6 532static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
d7a17cad
JH
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
36c07975
TR
551 if (!left_count || !right_count)
552 return;
553
d7a17cad
JH
554 left_first = left_count < right_count;
555 init_patch_ids(&ids);
66f13625 556 ids.diffopts.pathspec = revs->diffopt.pathspec;
d7a17cad
JH
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
7d004199
LT
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)
3131b713 620{
7d004199
LT
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;
3131b713
LT
643}
644
ebdc94f3
JH
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
cc0e6c5a 732static int limit_list(struct rev_info *revs)
a4a88b2b 733{
7d004199
LT
734 int slop = SLOP;
735 unsigned long date = ~0ul;
a4a88b2b
LT
736 struct commit_list *list = revs->commits;
737 struct commit_list *newlist = NULL;
738 struct commit_list **p = &newlist;
ebdc94f3
JH
739 struct commit_list *bottom = NULL;
740
741 if (revs->ancestry_path) {
742 bottom = collect_bottom_commits(list);
743 if (!bottom)
97b03c35 744 die("--ancestry-path given but there are no bottom commits");
ebdc94f3 745 }
a4a88b2b
LT
746
747 while (list) {
748 struct commit_list *entry = list;
749 struct commit *commit = list->item;
750 struct object *obj = &commit->object;
cdcefbc9 751 show_early_output_fn_t show;
a4a88b2b
LT
752
753 list = list->next;
754 free(entry);
755
756 if (revs->max_age != -1 && (commit->date < revs->max_age))
757 obj->flags |= UNINTERESTING;
fce87ae5 758 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
cc0e6c5a 759 return -1;
a4a88b2b
LT
760 if (obj->flags & UNINTERESTING) {
761 mark_parents_uninteresting(commit);
7d004199
LT
762 if (revs->show_all)
763 p = &commit_list_insert(commit, p)->next;
764 slop = still_interesting(list, date, slop);
765 if (slop)
3131b713 766 continue;
7d004199
LT
767 /* If showing all, add the whole pending list to the end */
768 if (revs->show_all)
769 *p = list;
770 break;
a4a88b2b
LT
771 }
772 if (revs->min_age != -1 && (commit->date > revs->min_age))
773 continue;
7d004199 774 date = commit->date;
a4a88b2b 775 p = &commit_list_insert(commit, p)->next;
cdcefbc9
LT
776
777 show = show_early_output;
778 if (!show)
779 continue;
780
781 show(revs, newlist);
782 show_early_output = NULL;
a4a88b2b 783 }
d7a17cad 784 if (revs->cherry_pick)
36d56de6 785 cherry_pick_list(newlist, revs);
d7a17cad 786
ebdc94f3
JH
787 if (bottom) {
788 limit_to_ancestry(bottom, newlist);
789 free_commit_list(bottom);
790 }
791
a4a88b2b 792 revs->commits = newlist;
cc0e6c5a 793 return 0;
a4a88b2b
LT
794}
795
63049292
JH
796struct all_refs_cb {
797 int all_flags;
71b03b42 798 int warned_bad_reflog;
63049292
JH
799 struct rev_info *all_revs;
800 const char *name_for_errormsg;
801};
ae563542 802
8da19775 803static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
ae563542 804{
63049292
JH
805 struct all_refs_cb *cb = cb_data;
806 struct object *object = get_reference(cb->all_revs, path, sha1,
807 cb->all_flags);
3d1efd8f 808 add_pending_object(cb->all_revs, object, path);
ae563542
LT
809 return 0;
810}
811
d08bae7e
IL
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
9ef6aeb0
HV
819static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
820 int (*for_each)(const char *, each_ref_fn, void *))
ae563542 821{
63049292 822 struct all_refs_cb cb;
d08bae7e 823 init_all_refs_cb(&cb, revs, flags);
9ef6aeb0 824 for_each(submodule, handle_one_ref, &cb);
63049292
JH
825}
826
71b03b42 827static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
63049292
JH
828{
829 struct all_refs_cb *cb = cb_data;
71b03b42
SP
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) {
46efd2d9 837 warning("reflog of '%s' references pruned commits",
71b03b42
SP
838 cb->name_for_errormsg);
839 cb->warned_bad_reflog = 1;
840 }
63049292 841 }
71b03b42
SP
842}
843
883d60fa
JS
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)
71b03b42
SP
847{
848 handle_one_reflog_commit(osha1, cb_data);
849 handle_one_reflog_commit(nsha1, cb_data);
63049292
JH
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;
71b03b42 856 cb->warned_bad_reflog = 0;
63049292
JH
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;
25b51e2c 867 for_each_reflog(handle_one_reflog, &cb);
ae563542
LT
868}
869
ea4a19e1
JH
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);
1974632c 885 if (it->type != OBJ_TAG)
ea4a19e1 886 break;
9684afd9
MK
887 if (!((struct tag*)it)->tagged)
888 return 0;
e702496e 889 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
ea4a19e1 890 }
1974632c 891 if (it->type != OBJ_COMMIT)
ea4a19e1
JH
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
db6296a5 902void init_revisions(struct rev_info *revs, const char *prefix)
8efdc326
FK
903{
904 memset(revs, 0, sizeof(*revs));
8e8f9987 905
6b9c58f4 906 revs->abbrev = DEFAULT_ABBREV;
8e8f9987 907 revs->ignore_merges = 1;
9202434c 908 revs->simplify_history = 1;
8f67f8ae 909 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
90b19941 910 DIFF_OPT_SET(&revs->pruning, QUICK);
cd2bdc53
LT
911 revs->pruning.add_remove = file_add_remove;
912 revs->pruning.change = file_change;
8efdc326
FK
913 revs->lifo = 1;
914 revs->dense = 1;
db6296a5 915 revs->prefix = prefix;
8efdc326
FK
916 revs->max_age = -1;
917 revs->min_age = -1;
d5db6c9e 918 revs->skip_count = -1;
8efdc326
FK
919 revs->max_count = -1;
920
cd2bdc53
LT
921 revs->commit_format = CMIT_FMT_DEFAULT;
922
0843acfd
JK
923 revs->grep_filter.status_only = 1;
924 revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
80235ba7 925 revs->grep_filter.header_tail = &(revs->grep_filter.header_list);
0843acfd
JK
926 revs->grep_filter.regflags = REG_NEWLINE;
927
cd2bdc53 928 diff_setup(&revs->diffopt);
c0cb4a06 929 if (prefix && !revs->diffopt.prefix) {
cd676a51
JH
930 revs->diffopt.prefix = prefix;
931 revs->diffopt.prefix_length = strlen(prefix);
932 }
8efdc326
FK
933}
934
0d2c9d67
RS
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
ae3e5e1e
JH
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);
e82447b1
JH
962 add_pending_commit_list(revs, bases, UNINTERESTING);
963 free_commit_list(bases);
964 head->object.flags |= SYMMETRIC_LEFT;
ae3e5e1e
JH
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;
eb9cb55b 972 if (ce_path_match(ce, &revs->prune_data)) {
ae3e5e1e
JH
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 }
afe069d1
NTND
982 free_pathspec(&revs->prune_data);
983 init_pathspec(&revs->prune_data, prune);
e82447b1 984 revs->limited = 1;
ae3e5e1e
JH
985}
986
5d6f0935
JH
987int handle_revision_arg(const char *arg, struct rev_info *revs,
988 int flags,
989 int cant_be_filename)
990{
bb6c2fba 991 unsigned mode;
5d6f0935
JH
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);
577ed5c2 1036 a->object.flags |= flags | SYMMETRIC_LEFT;
5d6f0935
JH
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 }
62476c8e
JH
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
5d6f0935
JH
1060 local_flags = 0;
1061 if (*arg == '^') {
1062 local_flags = UNINTERESTING;
1063 arg++;
1064 }
bb6c2fba 1065 if (get_sha1_with_mode(arg, sha1, &mode))
5d6f0935
JH
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);
bb6c2fba 1070 add_pending_object_with_mode(revs, object, arg, mode);
5d6f0935
JH
1071 return 0;
1072}
1073
4da5af31
JH
1074struct cmdline_pathspec {
1075 int alloc;
1076 int nr;
1077 const char **path;
1078};
1fc561d1 1079
4da5af31
JH
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}
60da8b15 1087
4da5af31
JH
1088static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1089 struct cmdline_pathspec *prune)
1090{
60da8b15
JH
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';
4da5af31
JH
1095 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1096 prune->path[prune->nr++] = xstrdup(sb->buf);
60da8b15 1097 }
60da8b15
JH
1098}
1099
4da5af31
JH
1100static void read_revisions_from_stdin(struct rev_info *revs,
1101 struct cmdline_pathspec *prune)
1fc561d1 1102{
63d564b3 1103 struct strbuf sb;
60da8b15 1104 int seen_dashdash = 0;
1fc561d1 1105
63d564b3
JH
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';
1fc561d1
AB
1111 if (!len)
1112 break;
60da8b15
JH
1113 if (sb.buf[0] == '-') {
1114 if (len == 2 && sb.buf[1] == '-') {
1115 seen_dashdash = 1;
1116 break;
1117 }
1fc561d1 1118 die("options not supported in --stdin mode");
60da8b15 1119 }
63d564b3
JH
1120 if (handle_revision_arg(sb.buf, revs, 0, 1))
1121 die("bad revision '%s'", sb.buf);
1fc561d1 1122 }
60da8b15
JH
1123 if (seen_dashdash)
1124 read_pathspec_from_stdin(revs, &sb, prune);
63d564b3 1125 strbuf_release(&sb);
1fc561d1
AB
1126}
1127
2d10c555 1128static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
bd95fcd3 1129{
0843acfd 1130 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
2d10c555
JH
1131}
1132
a4d7d2c6 1133static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
2d10c555 1134{
a4d7d2c6 1135 append_header_grep_pattern(&revs->grep_filter, field, pattern);
bd95fcd3
JH
1136}
1137
1138static void add_message_grep(struct rev_info *revs, const char *pattern)
1139{
2d10c555 1140 add_grep(revs, pattern, GREP_PATTERN_BODY);
bd95fcd3
JH
1141}
1142
6b61ec05
PH
1143static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1144 int *unkc, const char **unkv)
02e54220
PH
1145{
1146 const char *arg = argv[0];
7d7b86f7
MM
1147 const char *optarg;
1148 int argcount;
02e54220
PH
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") ||
ad3f9a71
LT
1154 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1155 !strcmp(arg, "--bisect"))
02e54220
PH
1156 {
1157 unkv[(*unkc)++] = arg;
0fe8c138 1158 return 1;
02e54220
PH
1159 }
1160
7d7b86f7
MM
1161 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1162 revs->max_count = atoi(optarg);
5853caec 1163 revs->no_walk = 0;
7d7b86f7
MM
1164 return argcount;
1165 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1166 revs->skip_count = atoi(optarg);
1167 return argcount;
02e54220
PH
1168 } else if ((*arg == '-') && isdigit(arg[1])) {
1169 /* accept -<digit>, like traditional "head" */
1170 revs->max_count = atoi(arg + 1);
5853caec 1171 revs->no_walk = 0;
02e54220
PH
1172 } else if (!strcmp(arg, "-n")) {
1173 if (argc <= 1)
1174 return error("-n requires an argument");
1175 revs->max_count = atoi(argv[1]);
5853caec 1176 revs->no_walk = 0;
02e54220
PH
1177 return 2;
1178 } else if (!prefixcmp(arg, "-n")) {
1179 revs->max_count = atoi(arg + 2);
5853caec 1180 revs->no_walk = 0;
7d7b86f7
MM
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;
02e54220
PH
1199 } else if (!strcmp(arg, "--first-parent")) {
1200 revs->first_parent_only = 1;
ebdc94f3
JH
1201 } else if (!strcmp(arg, "--ancestry-path")) {
1202 revs->ancestry_path = 1;
cb7529e1 1203 revs->simplify_history = 0;
ebdc94f3 1204 revs->limited = 1;
02e54220
PH
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;
6546b593
JH
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;
78892e32
LT
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;
33e7018c 1229 load_ref_decorations(DECORATE_SHORT_REFS);
02e54220
PH
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;
b8e8db28
LT
1254 } else if (!strcmp(arg, "--merges")) {
1255 revs->merges_only = 1;
02e54220
PH
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;
f69c5018
TR
1262 } else if (!strcmp(arg, "--count")) {
1263 revs->count = 1;
02e54220
PH
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;
03a9683d
JH
1278 } else if (!prefixcmp(arg, "--unpacked=")) {
1279 die("--unpacked=<packfile> no longer supported.");
02e54220
PH
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;
66b2ed09 1301 revs->pretty_given = 1;
02e54220 1302 get_commit_format(arg+8, revs);
3a4c1a5e 1303 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
7d7b86f7
MM
1304 /*
1305 * Detached form ("--pretty X" as opposed to "--pretty=X")
1306 * not allowed, since the argument is optional.
1307 */
02e54220 1308 revs->verbose_header = 1;
66b2ed09 1309 revs->pretty_given = 1;
02e54220 1310 get_commit_format(arg+9, revs);
66b2ed09
JH
1311 } else if (!strcmp(arg, "--show-notes")) {
1312 revs->show_notes = 1;
1313 revs->show_notes_given = 1;
894a9d33
TR
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);
1d2f80fa
JP
1327 string_list_append(revs->notes_opt.extra_notes_refs,
1328 strbuf_detach(&buf, NULL));
66b2ed09
JH
1329 } else if (!strcmp(arg, "--no-notes")) {
1330 revs->show_notes = 0;
1331 revs->show_notes_given = 1;
894a9d33
TR
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;
de84accc
NS
1337 } else if (!strcmp(arg, "--oneline")) {
1338 revs->verbose_header = 1;
1339 get_commit_format("oneline", revs);
7dccadf3 1340 revs->pretty_given = 1;
de84accc 1341 revs->abbrev_commit = 1;
02e54220
PH
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;
f4ea32f0 1371 revs->date_mode_explicit = 1;
7d7b86f7
MM
1372 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1373 revs->date_mode = parse_date_format(optarg);
f4ea32f0 1374 revs->date_mode_explicit = 1;
7d7b86f7 1375 return argcount;
02e54220
PH
1376 } else if (!strcmp(arg, "--log-size")) {
1377 revs->show_log_size = 1;
1378 }
1379 /*
1380 * Grepping the commit log
1381 */
7d7b86f7
MM
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;
02e54220 1391 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
0843acfd 1392 revs->grep_filter.regflags |= REG_EXTENDED;
02e54220 1393 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
0843acfd 1394 revs->grep_filter.regflags |= REG_ICASE;
02e54220 1395 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
0843acfd 1396 revs->grep_filter.fixed = 1;
02e54220 1397 } else if (!strcmp(arg, "--all-match")) {
0843acfd 1398 revs->grep_filter.all_match = 1;
7d7b86f7
MM
1399 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
1400 if (strcmp(optarg, "none"))
1401 git_log_output_encoding = xstrdup(optarg);
02e54220
PH
1402 else
1403 git_log_output_encoding = "";
7d7b86f7 1404 return argcount;
02e54220
PH
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
6b61ec05
PH
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
9ef6aeb0 1434static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
ad3f9a71 1435{
9ef6aeb0 1436 return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
ad3f9a71
LT
1437}
1438
9ef6aeb0 1439static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
ad3f9a71 1440{
9ef6aeb0 1441 return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
ad3f9a71
LT
1442}
1443
ae563542
LT
1444/*
1445 * Parse revision information, filling in the "rev_info" structure,
1446 * and removing the used arguments from the argument list.
1447 *
765ac8ec
LT
1448 * Returns the number of arguments left that weren't recognized
1449 * (which are also moved to the head of the argument list)
ae563542 1450 */
32962c9b 1451int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
ae563542 1452{
8fcaca3f 1453 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
4da5af31 1454 struct cmdline_pathspec prune_data;
9ef6aeb0 1455 const char *submodule = NULL;
5adba90d
MM
1456 const char *optarg;
1457 int argcount;
9ef6aeb0 1458
4da5af31 1459 memset(&prune_data, 0, sizeof(prune_data));
9ef6aeb0
HV
1460 if (opt)
1461 submodule = opt->submodule;
ae563542 1462
ae563542
LT
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;
a65f2005 1471 if (argv[i + 1])
4da5af31 1472 append_prune_data(&prune_data, argv + i + 1);
ae563542
LT
1473 seen_dashdash = 1;
1474 break;
1475 }
1476
02e54220
PH
1477 /* Second, deal with arguments and options */
1478 flags = 0;
8b3dce56 1479 read_from_stdin = 0;
02e54220 1480 for (left = i = 1; i < argc; i++) {
ae563542 1481 const char *arg = argv[i];
ae563542 1482 if (*arg == '-') {
cd2bdc53 1483 int opts;
02e54220 1484
ae563542 1485 if (!strcmp(arg, "--all")) {
9ef6aeb0
HV
1486 handle_refs(submodule, revs, flags, for_each_ref_submodule);
1487 handle_refs(submodule, revs, flags, head_ref_submodule);
a5aa930d
UKK
1488 continue;
1489 }
1490 if (!strcmp(arg, "--branches")) {
9ef6aeb0 1491 handle_refs(submodule, revs, flags, for_each_branch_ref_submodule);
a5aa930d
UKK
1492 continue;
1493 }
ad3f9a71 1494 if (!strcmp(arg, "--bisect")) {
9ef6aeb0
HV
1495 handle_refs(submodule, revs, flags, for_each_bad_bisect_ref);
1496 handle_refs(submodule, revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);
ad3f9a71
LT
1497 revs->bisect = 1;
1498 continue;
1499 }
a5aa930d 1500 if (!strcmp(arg, "--tags")) {
9ef6aeb0 1501 handle_refs(submodule, revs, flags, for_each_tag_ref_submodule);
a5aa930d
UKK
1502 continue;
1503 }
1504 if (!strcmp(arg, "--remotes")) {
9ef6aeb0 1505 handle_refs(submodule, revs, flags, for_each_remote_ref_submodule);
ae563542
LT
1506 continue;
1507 }
5adba90d 1508 if ((argcount = parse_long_opt("glob", argv + i, &optarg))) {
d08bae7e 1509 struct all_refs_cb cb;
5adba90d 1510 i += argcount - 1;
d08bae7e 1511 init_all_refs_cb(&cb, revs, flags);
5adba90d 1512 for_each_glob_ref(handle_one_ref, optarg, &cb);
d08bae7e
IL
1513 continue;
1514 }
b09fe971
IL
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 }
63049292
JH
1533 if (!strcmp(arg, "--reflog")) {
1534 handle_reflog(revs, flags);
1535 continue;
1536 }
ae563542
LT
1537 if (!strcmp(arg, "--not")) {
1538 flags ^= UNINTERESTING;
1539 continue;
1540 }
8e64006e
JS
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 }
8b3dce56
JH
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?");
60da8b15 1556 read_revisions_from_stdin(revs, &prune_data);
8b3dce56
JH
1557 continue;
1558 }
2d10c555 1559
02e54220 1560 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
cd2bdc53 1561 if (opts > 0) {
cd2bdc53
LT
1562 i += opts - 1;
1563 continue;
1564 }
02e54220
PH
1565 if (opts < 0)
1566 exit(128);
ae563542
LT
1567 continue;
1568 }
ae563542 1569
5d6f0935
JH
1570 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1571 int j;
1572 if (seen_dashdash || *arg == '^')
ae563542
LT
1573 die("bad revision '%s'", arg);
1574
ea92f41f
JH
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 */
e23d0b4a
LT
1581 for (j = i; j < argc; j++)
1582 verify_filename(revs->prefix, argv[j]);
1583
60da8b15 1584 append_prune_data(&prune_data, argv + i);
ae563542
LT
1585 break;
1586 }
8fcaca3f
DO
1587 else
1588 got_rev_arg = 1;
ae563542 1589 }
5d6f0935 1590
4da5af31
JH
1591 if (prune_data.nr) {
1592 ALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc);
1593 prune_data.path[prune_data.nr++] = NULL;
25197ebe
JH
1594 init_pathspec(&revs->prune_data,
1595 get_pathspec(revs->prefix, prune_data.path));
4da5af31 1596 }
5486ef0e 1597
02e54220 1598 if (revs->def == NULL)
32962c9b 1599 revs->def = opt ? opt->def : NULL;
b4490059
JH
1600 if (opt && opt->tweak)
1601 opt->tweak(revs, opt);
02e54220 1602 if (revs->show_merge)
ae3e5e1e 1603 prepare_show_merge(revs);
8fcaca3f 1604 if (revs->def && !revs->pending.nr && !got_rev_arg) {
ae563542 1605 unsigned char sha1[20];
cd2bdc53 1606 struct object *object;
bb6c2fba 1607 unsigned mode;
02e54220
PH
1608 if (get_sha1_with_mode(revs->def, sha1, &mode))
1609 die("bad default revision '%s'", revs->def);
1610 object = get_reference(revs, revs->def, sha1, 0);
1611 add_pending_object_with_mode(revs, object, revs->def, mode);
ae563542 1612 }
8efdc326 1613
b7bb760d
LT
1614 /* Did the user ask for any diff output? Run the diff! */
1615 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1616 revs->diff = 1;
1617
0faf2da7
AL
1618 /* Pickaxe, diff-filter and rename following need diffs */
1619 if (revs->diffopt.pickaxe ||
1620 revs->diffopt.filter ||
1621 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
b7bb760d
LT
1622 revs->diff = 1;
1623
9dad9d2e 1624 if (revs->topo_order)
53069686
JH
1625 revs->limited = 1;
1626
afe069d1
NTND
1627 if (revs->prune_data.nr) {
1628 diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning);
750f7b66 1629 /* Can't prune commits with rename following: the paths change.. */
8f67f8ae 1630 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
53b2c823 1631 revs->prune = 1;
cd2bdc53 1632 if (!revs->full_diff)
afe069d1 1633 diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt);
8efdc326 1634 }
b4490059 1635 if (revs->combine_merges)
cd2bdc53 1636 revs->ignore_merges = 0;
cd2bdc53 1637 revs->diffopt.abbrev = revs->abbrev;
72ee96c0
JH
1638 if (diff_setup_done(&revs->diffopt) < 0)
1639 die("diff_setup_done failed");
8efdc326 1640
0843acfd 1641 compile_grep_patterns(&revs->grep_filter);
bd95fcd3 1642
d56651c0
SP
1643 if (revs->reverse && revs->reflog_info)
1644 die("cannot combine --reverse with --walk-reflogs");
8bb65883 1645 if (revs->rewrite_parents && revs->children.name)
f35f5603 1646 die("cannot combine --parents and --children");
d56651c0 1647
7fefda5c
AS
1648 /*
1649 * Limitations on the graph functionality
1650 */
1651 if (revs->reverse && revs->graph)
1652 die("cannot combine --reverse with --graph");
1653
1654 if (revs->reflog_info && revs->graph)
1655 die("cannot combine --walk-reflogs with --graph");
1656
ae563542
LT
1657 return left;
1658}
a4a88b2b 1659
f35f5603
JH
1660static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1661{
1662 struct commit_list *l = xcalloc(1, sizeof(*l));
1663
1664 l->item = child;
1665 l->next = add_decoration(&revs->children, &parent->object, l);
1666}
1667
6546b593
JH
1668static int remove_duplicate_parents(struct commit *commit)
1669{
1670 struct commit_list **pp, *p;
1671 int surviving_parents;
1672
1673 /* Examine existing parents while marking ones we have seen... */
1674 pp = &commit->parents;
1675 while ((p = *pp) != NULL) {
1676 struct commit *parent = p->item;
1677 if (parent->object.flags & TMP_MARK) {
1678 *pp = p->next;
1679 continue;
1680 }
1681 parent->object.flags |= TMP_MARK;
1682 pp = &p->next;
1683 }
1684 /* count them while clearing the temporary mark */
1685 surviving_parents = 0;
1686 for (p = commit->parents; p; p = p->next) {
1687 p->item->object.flags &= ~TMP_MARK;
1688 surviving_parents++;
1689 }
1690 return surviving_parents;
1691}
1692
faf0156b
JH
1693struct merge_simplify_state {
1694 struct commit *simplified;
1695};
1696
1697static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1698{
1699 struct merge_simplify_state *st;
1700
1701 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1702 if (!st) {
1703 st = xcalloc(1, sizeof(*st));
1704 add_decoration(&revs->merge_simplification, &commit->object, st);
1705 }
1706 return st;
1707}
1708
1709static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
6546b593
JH
1710{
1711 struct commit_list *p;
faf0156b 1712 struct merge_simplify_state *st, *pst;
6546b593
JH
1713 int cnt;
1714
faf0156b
JH
1715 st = locate_simplify_state(revs, commit);
1716
6546b593 1717 /*
6546b593
JH
1718 * Have we handled this one?
1719 */
faf0156b 1720 if (st->simplified)
6546b593
JH
1721 return tail;
1722
1723 /*
1724 * An UNINTERESTING commit simplifies to itself, so does a
1725 * root commit. We do not rewrite parents of such commit
1726 * anyway.
1727 */
1728 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
faf0156b 1729 st->simplified = commit;
6546b593
JH
1730 return tail;
1731 }
1732
1733 /*
1734 * Do we know what commit all of our parents should be rewritten to?
1735 * Otherwise we are not ready to rewrite this one yet.
1736 */
1737 for (cnt = 0, p = commit->parents; p; p = p->next) {
faf0156b
JH
1738 pst = locate_simplify_state(revs, p->item);
1739 if (!pst->simplified) {
6546b593
JH
1740 tail = &commit_list_insert(p->item, tail)->next;
1741 cnt++;
1742 }
1743 }
53030f8d
JH
1744 if (cnt) {
1745 tail = &commit_list_insert(commit, tail)->next;
6546b593 1746 return tail;
53030f8d 1747 }
6546b593
JH
1748
1749 /*
1750 * Rewrite our list of parents.
1751 */
faf0156b
JH
1752 for (p = commit->parents; p; p = p->next) {
1753 pst = locate_simplify_state(revs, p->item);
1754 p->item = pst->simplified;
1755 }
6546b593
JH
1756 cnt = remove_duplicate_parents(commit);
1757
1758 /*
1759 * It is possible that we are a merge and one side branch
1760 * does not have any commit that touches the given paths;
1761 * in such a case, the immediate parents will be rewritten
1762 * to different commits.
1763 *
1764 * o----X X: the commit we are looking at;
1765 * / / o: a commit that touches the paths;
1766 * ---o----'
1767 *
1768 * Further reduce the parents by removing redundant parents.
1769 */
1770 if (1 < cnt) {
1771 struct commit_list *h = reduce_heads(commit->parents);
1772 cnt = commit_list_count(h);
1773 free_commit_list(commit->parents);
1774 commit->parents = h;
1775 }
1776
1777 /*
1778 * A commit simplifies to itself if it is a root, if it is
1779 * UNINTERESTING, if it touches the given paths, or if it is a
1780 * merge and its parents simplifies to more than one commits
1781 * (the first two cases are already handled at the beginning of
1782 * this function).
1783 *
1784 * Otherwise, it simplifies to what its sole parent simplifies to.
1785 */
1786 if (!cnt ||
1787 (commit->object.flags & UNINTERESTING) ||
1788 !(commit->object.flags & TREESAME) ||
1789 (1 < cnt))
faf0156b
JH
1790 st->simplified = commit;
1791 else {
1792 pst = locate_simplify_state(revs, commit->parents->item);
1793 st->simplified = pst->simplified;
1794 }
6546b593
JH
1795 return tail;
1796}
1797
1798static void simplify_merges(struct rev_info *revs)
1799{
1800 struct commit_list *list;
1801 struct commit_list *yet_to_do, **tail;
1802
5eac739e
JH
1803 if (!revs->topo_order)
1804 sort_in_topological_order(&revs->commits, revs->lifo);
1805 if (!revs->prune)
1806 return;
65347030 1807
6546b593
JH
1808 /* feed the list reversed */
1809 yet_to_do = NULL;
1810 for (list = revs->commits; list; list = list->next)
1811 commit_list_insert(list->item, &yet_to_do);
1812 while (yet_to_do) {
1813 list = yet_to_do;
1814 yet_to_do = NULL;
1815 tail = &yet_to_do;
1816 while (list) {
1817 struct commit *commit = list->item;
1818 struct commit_list *next = list->next;
1819 free(list);
1820 list = next;
faf0156b 1821 tail = simplify_one(revs, commit, tail);
6546b593
JH
1822 }
1823 }
1824
1825 /* clean up the result, removing the simplified ones */
1826 list = revs->commits;
1827 revs->commits = NULL;
1828 tail = &revs->commits;
1829 while (list) {
1830 struct commit *commit = list->item;
1831 struct commit_list *next = list->next;
faf0156b 1832 struct merge_simplify_state *st;
6546b593
JH
1833 free(list);
1834 list = next;
faf0156b
JH
1835 st = locate_simplify_state(revs, commit);
1836 if (st->simplified == commit)
6546b593
JH
1837 tail = &commit_list_insert(commit, tail)->next;
1838 }
6546b593
JH
1839}
1840
f35f5603
JH
1841static void set_children(struct rev_info *revs)
1842{
1843 struct commit_list *l;
1844 for (l = revs->commits; l; l = l->next) {
1845 struct commit *commit = l->item;
1846 struct commit_list *p;
1847
1848 for (p = commit->parents; p; p = p->next)
1849 add_child(revs, p->item, commit);
1850 }
1851}
1852
cc0e6c5a 1853int prepare_revision_walk(struct rev_info *revs)
a4a88b2b 1854{
1f1e895f 1855 int nr = revs->pending.nr;
94d23673 1856 struct object_array_entry *e, *list;
cd2bdc53 1857
94d23673 1858 e = list = revs->pending.objects;
1f1e895f
LT
1859 revs->pending.nr = 0;
1860 revs->pending.alloc = 0;
1861 revs->pending.objects = NULL;
1862 while (--nr >= 0) {
94d23673 1863 struct commit *commit = handle_commit(revs, e->item, e->name);
cd2bdc53
LT
1864 if (commit) {
1865 if (!(commit->object.flags & SEEN)) {
1866 commit->object.flags |= SEEN;
47e44ed1 1867 commit_list_insert_by_date(commit, &revs->commits);
cd2bdc53
LT
1868 }
1869 }
94d23673 1870 e++;
cd2bdc53 1871 }
94d23673 1872 free(list);
cd2bdc53 1873
ba1d4505 1874 if (revs->no_walk)
cc0e6c5a 1875 return 0;
a4a88b2b 1876 if (revs->limited)
cc0e6c5a
AR
1877 if (limit_list(revs) < 0)
1878 return -1;
a4a88b2b 1879 if (revs->topo_order)
23c17d4a 1880 sort_in_topological_order(&revs->commits, revs->lifo);
6546b593
JH
1881 if (revs->simplify_merges)
1882 simplify_merges(revs);
f35f5603
JH
1883 if (revs->children.name)
1884 set_children(revs);
cc0e6c5a 1885 return 0;
a4a88b2b
LT
1886}
1887
cc0e6c5a
AR
1888enum rewrite_result {
1889 rewrite_one_ok,
1890 rewrite_one_noparents,
4b05548f 1891 rewrite_one_error
cc0e6c5a
AR
1892};
1893
1894static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
765ac8ec 1895{
fce87ae5
AG
1896 struct commit_list *cache = NULL;
1897
765ac8ec
LT
1898 for (;;) {
1899 struct commit *p = *pp;
3381c790 1900 if (!revs->limited)
fce87ae5 1901 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
cc0e6c5a 1902 return rewrite_one_error;
6631c736 1903 if (p->parents && p->parents->next)
cc0e6c5a 1904 return rewrite_one_ok;
7dc0fe3b
LT
1905 if (p->object.flags & UNINTERESTING)
1906 return rewrite_one_ok;
1907 if (!(p->object.flags & TREESAME))
cc0e6c5a 1908 return rewrite_one_ok;
765ac8ec 1909 if (!p->parents)
cc0e6c5a 1910 return rewrite_one_noparents;
765ac8ec
LT
1911 *pp = p->parents->item;
1912 }
1913}
1914
cc0e6c5a 1915static int rewrite_parents(struct rev_info *revs, struct commit *commit)
765ac8ec
LT
1916{
1917 struct commit_list **pp = &commit->parents;
1918 while (*pp) {
1919 struct commit_list *parent = *pp;
cc0e6c5a
AR
1920 switch (rewrite_one(revs, &parent->item)) {
1921 case rewrite_one_ok:
1922 break;
1923 case rewrite_one_noparents:
765ac8ec
LT
1924 *pp = parent->next;
1925 continue;
cc0e6c5a
AR
1926 case rewrite_one_error:
1927 return -1;
765ac8ec
LT
1928 }
1929 pp = &parent->next;
1930 }
11d65967 1931 remove_duplicate_parents(commit);
cc0e6c5a 1932 return 0;
765ac8ec
LT
1933}
1934
8ecae9b0
JH
1935static int commit_match(struct commit *commit, struct rev_info *opt)
1936{
80235ba7 1937 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
8ecae9b0 1938 return 1;
0843acfd 1939 return grep_buffer(&opt->grep_filter,
2d10c555
JH
1940 NULL, /* we say nothing, not even filename */
1941 commit->buffer, strlen(commit->buffer));
8ecae9b0
JH
1942}
1943
f35f5603
JH
1944static inline int want_ancestry(struct rev_info *revs)
1945{
8bb65883 1946 return (revs->rewrite_parents || revs->children.name);
f35f5603
JH
1947}
1948
beb5af43 1949enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
252a7c02
LT
1950{
1951 if (commit->object.flags & SHOWN)
1952 return commit_ignore;
4d6acb70 1953 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
252a7c02 1954 return commit_ignore;
3131b713
LT
1955 if (revs->show_all)
1956 return commit_show;
252a7c02
LT
1957 if (commit->object.flags & UNINTERESTING)
1958 return commit_ignore;
1959 if (revs->min_age != -1 && (commit->date > revs->min_age))
1960 return commit_ignore;
1961 if (revs->no_merges && commit->parents && commit->parents->next)
1962 return commit_ignore;
b8e8db28
LT
1963 if (revs->merges_only && !(commit->parents && commit->parents->next))
1964 return commit_ignore;
252a7c02
LT
1965 if (!commit_match(commit, revs))
1966 return commit_ignore;
53b2c823 1967 if (revs->prune && revs->dense) {
252a7c02 1968 /* Commit without changes? */
7dc0fe3b 1969 if (commit->object.flags & TREESAME) {
252a7c02 1970 /* drop merges unless we want parenthood */
f35f5603 1971 if (!want_ancestry(revs))
252a7c02
LT
1972 return commit_ignore;
1973 /* non-merge - always ignore it */
1974 if (!commit->parents || !commit->parents->next)
1975 return commit_ignore;
1976 }
252a7c02
LT
1977 }
1978 return commit_show;
1979}
1980
beb5af43
AS
1981enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1982{
1983 enum commit_action action = get_commit_action(revs, commit);
1984
1985 if (action == commit_show &&
1986 !revs->show_all &&
1987 revs->prune && revs->dense && want_ancestry(revs)) {
1988 if (rewrite_parents(revs, commit) < 0)
1989 return commit_error;
1990 }
1991 return action;
1992}
1993
d5db6c9e 1994static struct commit *get_revision_1(struct rev_info *revs)
a4a88b2b 1995{
d5db6c9e 1996 if (!revs->commits)
a4a88b2b 1997 return NULL;
a4a88b2b 1998
765ac8ec 1999 do {
cb115748
LT
2000 struct commit_list *entry = revs->commits;
2001 struct commit *commit = entry->item;
ea5ed3ab 2002
cb115748
LT
2003 revs->commits = entry->next;
2004 free(entry);
2a0925be 2005
ffa1eeae 2006 if (revs->reflog_info) {
8860fd42 2007 fake_reflog_parent(revs->reflog_info, commit);
ffa1eeae
JK
2008 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
2009 }
8860fd42 2010
2a0925be
LT
2011 /*
2012 * If we haven't done the list limiting, we need to look at
be7db6e5
LT
2013 * the parents here. We also need to do the date-based limiting
2014 * that we'd otherwise have done in limit_list().
2a0925be 2015 */
be7db6e5 2016 if (!revs->limited) {
744f4985 2017 if (revs->max_age != -1 &&
86ab4906
JH
2018 (commit->date < revs->max_age))
2019 continue;
fce87ae5 2020 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
ed62089c
JH
2021 die("Failed to traverse parents of commit %s",
2022 sha1_to_hex(commit->object.sha1));
be7db6e5 2023 }
744f4985 2024
252a7c02
LT
2025 switch (simplify_commit(revs, commit)) {
2026 case commit_ignore:
8ecae9b0 2027 continue;
252a7c02 2028 case commit_error:
ed62089c
JH
2029 die("Failed to simplify parents of commit %s",
2030 sha1_to_hex(commit->object.sha1));
252a7c02
LT
2031 default:
2032 return commit;
384e99a4 2033 }
765ac8ec
LT
2034 } while (revs->commits);
2035 return NULL;
2036}
d5db6c9e 2037
86ab4906
JH
2038static void gc_boundary(struct object_array *array)
2039{
2040 unsigned nr = array->nr;
2041 unsigned alloc = array->alloc;
2042 struct object_array_entry *objects = array->objects;
2043
2044 if (alloc <= nr) {
2045 unsigned i, j;
2046 for (i = j = 0; i < nr; i++) {
2047 if (objects[i].item->flags & SHOWN)
2048 continue;
2049 if (i != j)
2050 objects[j] = objects[i];
2051 j++;
2052 }
892ae6bf 2053 for (i = j; i < nr; i++)
86ab4906
JH
2054 objects[i].item = NULL;
2055 array->nr = j;
2056 }
2057}
2058
4603ec0f
AS
2059static void create_boundary_commit_list(struct rev_info *revs)
2060{
2061 unsigned i;
2062 struct commit *c;
2063 struct object_array *array = &revs->boundary_commits;
2064 struct object_array_entry *objects = array->objects;
2065
2066 /*
2067 * If revs->commits is non-NULL at this point, an error occurred in
2068 * get_revision_1(). Ignore the error and continue printing the
2069 * boundary commits anyway. (This is what the code has always
2070 * done.)
2071 */
2072 if (revs->commits) {
2073 free_commit_list(revs->commits);
2074 revs->commits = NULL;
2075 }
2076
2077 /*
2078 * Put all of the actual boundary commits from revs->boundary_commits
2079 * into revs->commits
2080 */
2081 for (i = 0; i < array->nr; i++) {
2082 c = (struct commit *)(objects[i].item);
2083 if (!c)
2084 continue;
2085 if (!(c->object.flags & CHILD_SHOWN))
2086 continue;
2087 if (c->object.flags & (SHOWN | BOUNDARY))
2088 continue;
2089 c->object.flags |= BOUNDARY;
2090 commit_list_insert(c, &revs->commits);
2091 }
2092
2093 /*
2094 * If revs->topo_order is set, sort the boundary commits
2095 * in topological order
2096 */
2097 sort_in_topological_order(&revs->commits, revs->lifo);
2098}
2099
7fefda5c 2100static struct commit *get_revision_internal(struct rev_info *revs)
d5db6c9e
JH
2101{
2102 struct commit *c = NULL;
86ab4906
JH
2103 struct commit_list *l;
2104
2105 if (revs->boundary == 2) {
4603ec0f
AS
2106 /*
2107 * All of the normal commits have already been returned,
2108 * and we are now returning boundary commits.
2109 * create_boundary_commit_list() has populated
2110 * revs->commits with the remaining commits to return.
2111 */
2112 c = pop_commit(&revs->commits);
2113 if (c)
2114 c->object.flags |= SHOWN;
9c5e66e9
JS
2115 return c;
2116 }
2117
86ab4906
JH
2118 /*
2119 * Now pick up what they want to give us
2120 */
8839ac94
JH
2121 c = get_revision_1(revs);
2122 if (c) {
2123 while (0 < revs->skip_count) {
2124 revs->skip_count--;
2125 c = get_revision_1(revs);
2126 if (!c)
2127 break;
2128 }
86ab4906
JH
2129 }
2130
2131 /*
2132 * Check the max_count.
2133 */
d5db6c9e
JH
2134 switch (revs->max_count) {
2135 case -1:
2136 break;
2137 case 0:
86ab4906
JH
2138 c = NULL;
2139 break;
d5db6c9e
JH
2140 default:
2141 revs->max_count--;
2142 }
86ab4906 2143
c33d8593
JH
2144 if (c)
2145 c->object.flags |= SHOWN;
2146
2147 if (!revs->boundary) {
d5db6c9e 2148 return c;
c33d8593 2149 }
86ab4906
JH
2150
2151 if (!c) {
2152 /*
2153 * get_revision_1() runs out the commits, and
2154 * we are done computing the boundaries.
2155 * switch to boundary commits output mode.
2156 */
2157 revs->boundary = 2;
4603ec0f
AS
2158
2159 /*
2160 * Update revs->commits to contain the list of
2161 * boundary commits.
2162 */
2163 create_boundary_commit_list(revs);
2164
3c68d67b 2165 return get_revision_internal(revs);
86ab4906
JH
2166 }
2167
2168 /*
2169 * boundary commits are the commits that are parents of the
2170 * ones we got from get_revision_1() but they themselves are
2171 * not returned from get_revision_1(). Before returning
2172 * 'c', we need to mark its parents that they could be boundaries.
2173 */
2174
2175 for (l = c->parents; l; l = l->next) {
2176 struct object *p;
2177 p = &(l->item->object);
c33d8593 2178 if (p->flags & (CHILD_SHOWN | SHOWN))
86ab4906
JH
2179 continue;
2180 p->flags |= CHILD_SHOWN;
2181 gc_boundary(&revs->boundary_commits);
2182 add_object_array(p, NULL, &revs->boundary_commits);
2183 }
2184
2185 return c;
d5db6c9e 2186}
7fefda5c
AS
2187
2188struct commit *get_revision(struct rev_info *revs)
2189{
498bcd31
TR
2190 struct commit *c;
2191 struct commit_list *reversed;
2192
2193 if (revs->reverse) {
2194 reversed = NULL;
2195 while ((c = get_revision_internal(revs))) {
2196 commit_list_insert(c, &reversed);
2197 }
2198 revs->commits = reversed;
2199 revs->reverse = 0;
2200 revs->reverse_output_stage = 1;
2201 }
2202
2203 if (revs->reverse_output_stage)
2204 return pop_commit(&revs->commits);
2205
2206 c = get_revision_internal(revs);
7fefda5c
AS
2207 if (c && revs->graph)
2208 graph_update(revs->graph, c);
2209 return c;
2210}