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