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