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