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