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