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