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