revision.c: stricter parsing of '--early-output'
[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"
12da1d1f 16#include "line-log.h"
d72fbe81 17#include "mailmap.h"
53d00b39 18#include "commit-slab.h"
429bb40a 19#include "dir.h"
4fe10219 20#include "cache-tree.h"
cb46d630 21#include "bisect.h"
ae563542 22
cdcefbc9
LT
23volatile show_early_output_fn_t show_early_output;
24
cb46d630
AD
25static const char *term_bad;
26static const char *term_good;
27
de1e67d0 28void show_object_with_name(FILE *out, struct object *obj, const char *name)
ae563542 29{
de1e67d0 30 const char *p;
91f17516 31
f2fd0760 32 fprintf(out, "%s ", oid_to_hex(&obj->oid));
f9fb9d0e
JK
33 for (p = name; *p && *p != '\n'; p++)
34 fputc(*p, out);
beba25ab 35 fputc('\n', out);
91f17516
JH
36}
37
ae563542
LT
38static void mark_blob_uninteresting(struct blob *blob)
39{
c1ee9013
MK
40 if (!blob)
41 return;
ae563542
LT
42 if (blob->object.flags & UNINTERESTING)
43 return;
44 blob->object.flags |= UNINTERESTING;
45}
46
2ac5e447 47static void mark_tree_contents_uninteresting(struct tree *tree)
ae563542 48{
f75e53ed 49 struct tree_desc desc;
4c068a98 50 struct name_entry entry;
ae563542 51 struct object *obj = &tree->object;
ae563542 52
f2fd0760 53 if (!has_object_file(&obj->oid))
ae563542
LT
54 return;
55 if (parse_tree(tree) < 0)
f2fd0760 56 die("bad tree %s", oid_to_hex(&obj->oid));
f75e53ed 57
6fda5e51 58 init_tree_desc(&desc, tree->buffer, tree->size);
4c068a98 59 while (tree_entry(&desc, &entry)) {
4d1012c3
LT
60 switch (object_type(entry.mode)) {
61 case OBJ_TREE:
7d924c91 62 mark_tree_uninteresting(lookup_tree(entry.oid->hash));
4d1012c3
LT
63 break;
64 case OBJ_BLOB:
7d924c91 65 mark_blob_uninteresting(lookup_blob(entry.oid->hash));
4d1012c3
LT
66 break;
67 default:
68 /* Subproject commit - not in this repository */
69 break;
70 }
ae563542 71 }
f75e53ed
LT
72
73 /*
74 * We don't care about the tree any more
75 * after it has been marked uninteresting.
76 */
6e454b9a 77 free_tree_buffer(tree);
ae563542
LT
78}
79
2ac5e447
JH
80void mark_tree_uninteresting(struct tree *tree)
81{
a2678df3 82 struct object *obj;
2ac5e447
JH
83
84 if (!tree)
85 return;
a2678df3
SN
86
87 obj = &tree->object;
2ac5e447
JH
88 if (obj->flags & UNINTERESTING)
89 return;
90 obj->flags |= UNINTERESTING;
91 mark_tree_contents_uninteresting(tree);
ae563542
LT
92}
93
94void mark_parents_uninteresting(struct commit *commit)
95{
941ba8db
NTND
96 struct commit_list *parents = NULL, *l;
97
98 for (l = commit->parents; l; l = l->next)
99 commit_list_insert(l->item, &parents);
ae563542
LT
100
101 while (parents) {
e510ab89 102 struct commit *commit = pop_commit(&parents);
941ba8db
NTND
103
104 while (commit) {
105 /*
106 * A missing commit is ok iff its parent is marked
107 * uninteresting.
108 *
109 * We just mark such a thing parsed, so that when
110 * it is popped next time around, we won't be trying
111 * to parse it and get an error.
112 */
f2fd0760 113 if (!has_object_file(&commit->object.oid))
941ba8db
NTND
114 commit->object.parsed = 1;
115
116 if (commit->object.flags & UNINTERESTING)
117 break;
118
d2c4af73 119 commit->object.flags |= UNINTERESTING;
ae563542 120
d2c4af73
MU
121 /*
122 * Normally we haven't parsed the parent
123 * yet, so we won't have a parent of a parent
124 * here. However, it may turn out that we've
125 * reached this commit some other way (where it
126 * wasn't uninteresting), in which case we need
127 * to mark its parents recursively too..
128 */
941ba8db
NTND
129 if (!commit->parents)
130 break;
ae563542 131
941ba8db
NTND
132 for (l = commit->parents->next; l; l = l->next)
133 commit_list_insert(l->item, &parents);
134 commit = commit->parents->item;
135 }
ae563542
LT
136 }
137}
138
20739490 139static void add_pending_object_with_path(struct rev_info *revs,
ff5f5f26 140 struct object *obj,
20739490
JK
141 const char *name, unsigned mode,
142 const char *path)
ae563542 143{
cc243c3c
JH
144 if (!obj)
145 return;
aa27e461 146 if (revs->no_walk && (obj->flags & UNINTERESTING))
f222abde 147 revs->no_walk = 0;
105e4733
JH
148 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
149 struct strbuf buf = STRBUF_INIT;
cf99a761 150 int len = interpret_branch_name(name, 0, &buf);
105e4733
JH
151 int st;
152
153 if (0 < len && name[len] && buf.len)
154 strbuf_addstr(&buf, name + len);
155 st = add_reflog_for_walk(revs->reflog_info,
156 (struct commit *)obj,
157 buf.buf[0] ? buf.buf: name);
158 strbuf_release(&buf);
159 if (st)
160 return;
161 }
20739490
JK
162 add_object_array_with_path(obj, name, &revs->pending, mode, path);
163}
164
165static void add_pending_object_with_mode(struct rev_info *revs,
166 struct object *obj,
167 const char *name, unsigned mode)
168{
169 add_pending_object_with_path(revs, obj, name, mode, NULL);
ae563542
LT
170}
171
ff5f5f26
MH
172void add_pending_object(struct rev_info *revs,
173 struct object *obj, const char *name)
2d93b9fa
JH
174{
175 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
176}
177
3384a2df
JH
178void add_head_to_pending(struct rev_info *revs)
179{
180 unsigned char sha1[20];
181 struct object *obj;
182 if (get_sha1("HEAD", sha1))
183 return;
184 obj = parse_object(sha1);
185 if (!obj)
186 return;
187 add_pending_object(revs, obj, "HEAD");
188}
189
ff5f5f26
MH
190static struct object *get_reference(struct rev_info *revs, const char *name,
191 const unsigned char *sha1,
192 unsigned int flags)
ae563542
LT
193{
194 struct object *object;
195
196 object = parse_object(sha1);
cc243c3c
JH
197 if (!object) {
198 if (revs->ignore_missing)
199 return object;
ae563542 200 die("bad object %s", name);
cc243c3c 201 }
cd2bdc53
LT
202 object->flags |= flags;
203 return object;
204}
205
26c3177e
RS
206void add_pending_sha1(struct rev_info *revs, const char *name,
207 const unsigned char *sha1, unsigned int flags)
208{
209 struct object *object = get_reference(revs, name, sha1, flags);
210 add_pending_object(revs, object, name);
211}
212
ff5f5f26 213static struct commit *handle_commit(struct rev_info *revs,
20739490 214 struct object_array_entry *entry)
cd2bdc53 215{
20739490
JK
216 struct object *object = entry->item;
217 const char *name = entry->name;
218 const char *path = entry->path;
219 unsigned int mode = entry->mode;
cd2bdc53 220 unsigned long flags = object->flags;
ae563542
LT
221
222 /*
223 * Tag object? Look what it points to..
224 */
1974632c 225 while (object->type == OBJ_TAG) {
ae563542 226 struct tag *tag = (struct tag *) object;
cd2bdc53 227 if (revs->tag_objects && !(flags & UNINTERESTING))
ae563542 228 add_pending_object(revs, object, tag->tag);
9684afd9
MK
229 if (!tag->tagged)
230 die("bad tag");
ed1c9977 231 object = parse_object(tag->tagged->oid.hash);
aeeae1b7
JH
232 if (!object) {
233 if (flags & UNINTERESTING)
234 return NULL;
f2fd0760 235 die("bad object %s", oid_to_hex(&tag->tagged->oid));
aeeae1b7 236 }
a7435286 237 object->flags |= flags;
20739490
JK
238 /*
239 * We'll handle the tagged object by looping or dropping
240 * through to the non-tag handlers below. Do not
728350b7 241 * propagate path data from the tag's pending entry.
20739490 242 */
20739490
JK
243 path = NULL;
244 mode = 0;
ae563542
LT
245 }
246
247 /*
248 * Commit object? Just return it, we'll do all the complex
249 * reachability crud.
250 */
1974632c 251 if (object->type == OBJ_COMMIT) {
ae563542 252 struct commit *commit = (struct commit *)object;
ae563542
LT
253 if (parse_commit(commit) < 0)
254 die("unable to parse commit %s", name);
d9a83684 255 if (flags & UNINTERESTING) {
ae563542 256 mark_parents_uninteresting(commit);
d9a83684
LT
257 revs->limited = 1;
258 }
0f3a290b 259 if (revs->show_source && !commit->util)
1da1e07c 260 commit->util = xstrdup(name);
ae563542
LT
261 return commit;
262 }
263
264 /*
3ea3c215 265 * Tree object? Either mark it uninteresting, or add it
ae563542
LT
266 * to the list of objects to look at later..
267 */
1974632c 268 if (object->type == OBJ_TREE) {
ae563542
LT
269 struct tree *tree = (struct tree *)object;
270 if (!revs->tree_objects)
271 return NULL;
272 if (flags & UNINTERESTING) {
2ac5e447 273 mark_tree_contents_uninteresting(tree);
ae563542
LT
274 return NULL;
275 }
20739490 276 add_pending_object_with_path(revs, object, name, mode, path);
ae563542
LT
277 return NULL;
278 }
279
280 /*
281 * Blob object? You know the drill by now..
282 */
1974632c 283 if (object->type == OBJ_BLOB) {
ae563542
LT
284 if (!revs->blob_objects)
285 return NULL;
a7435286 286 if (flags & UNINTERESTING)
ae563542 287 return NULL;
20739490 288 add_pending_object_with_path(revs, object, name, mode, path);
ae563542
LT
289 return NULL;
290 }
291 die("%s is unknown object", name);
292}
293
b6e8a3b5
JK
294static int everybody_uninteresting(struct commit_list *orig,
295 struct commit **interesting_cache)
a4a88b2b
LT
296{
297 struct commit_list *list = orig;
b6e8a3b5
JK
298
299 if (*interesting_cache) {
300 struct commit *commit = *interesting_cache;
301 if (!(commit->object.flags & UNINTERESTING))
302 return 0;
303 }
304
a4a88b2b
LT
305 while (list) {
306 struct commit *commit = list->item;
307 list = list->next;
308 if (commit->object.flags & UNINTERESTING)
309 continue;
ae40ebda
SB
310
311 *interesting_cache = commit;
a4a88b2b
LT
312 return 0;
313 }
314 return 1;
315}
316
4d826608
KB
317/*
318 * A definition of "relevant" commit that we can use to simplify limited graphs
319 * by eliminating side branches.
320 *
321 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
322 * in our list), or that is a specified BOTTOM commit. Then after computing
323 * a limited list, during processing we can generally ignore boundary merges
324 * coming from outside the graph, (ie from irrelevant parents), and treat
325 * those merges as if they were single-parent. TREESAME is defined to consider
326 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
327 * we don't care if we were !TREESAME to non-graph parents.
328 *
329 * Treating bottom commits as relevant ensures that a limited graph's
330 * connection to the actual bottom commit is not viewed as a side branch, but
331 * treated as part of the graph. For example:
332 *
333 * ....Z...A---X---o---o---B
334 * . /
335 * W---Y
336 *
337 * When computing "A..B", the A-X connection is at least as important as
338 * Y-X, despite A being flagged UNINTERESTING.
339 *
340 * And when computing --ancestry-path "A..B", the A-X connection is more
341 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
342 */
343static inline int relevant_commit(struct commit *commit)
344{
345 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
346}
347
348/*
349 * Return a single relevant commit from a parent list. If we are a TREESAME
350 * commit, and this selects one of our parents, then we can safely simplify to
351 * that parent.
352 */
353static struct commit *one_relevant_parent(const struct rev_info *revs,
354 struct commit_list *orig)
355{
356 struct commit_list *list = orig;
357 struct commit *relevant = NULL;
358
359 if (!orig)
360 return NULL;
361
362 /*
363 * For 1-parent commits, or if first-parent-only, then return that
364 * first parent (even if not "relevant" by the above definition).
365 * TREESAME will have been set purely on that parent.
366 */
367 if (revs->first_parent_only || !orig->next)
368 return orig->item;
369
370 /*
371 * For multi-parent commits, identify a sole relevant parent, if any.
372 * If we have only one relevant parent, then TREESAME will be set purely
373 * with regard to that parent, and we can simplify accordingly.
374 *
375 * If we have more than one relevant parent, or no relevant parents
376 * (and multiple irrelevant ones), then we can't select a parent here
377 * and return NULL.
378 */
379 while (list) {
380 struct commit *commit = list->item;
381 list = list->next;
382 if (relevant_commit(commit)) {
383 if (relevant)
384 return NULL;
385 relevant = commit;
386 }
387 }
388 return relevant;
389}
390
0a4ba7f8
JH
391/*
392 * The goal is to get REV_TREE_NEW as the result only if the
ceff8e7a
LT
393 * diff consists of all '+' (and no other changes), REV_TREE_OLD
394 * if the whole diff is removal of old data, and otherwise
395 * REV_TREE_DIFFERENT (of course if the trees are the same we
396 * want REV_TREE_SAME).
397 * That means that once we get to REV_TREE_DIFFERENT, we do not
398 * have to look any further.
0a4ba7f8 399 */
8efdc326 400static int tree_difference = REV_TREE_SAME;
a4a88b2b
LT
401
402static void file_add_remove(struct diff_options *options,
403 int addremove, unsigned mode,
404 const unsigned char *sha1,
e5450100 405 int sha1_valid,
e3d42c47 406 const char *fullpath, unsigned dirty_submodule)
a4a88b2b 407{
ceff8e7a 408 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
a4a88b2b 409
ceff8e7a 410 tree_difference |= diff;
dd47aa31 411 if (tree_difference == REV_TREE_DIFFERENT)
8f67f8ae 412 DIFF_OPT_SET(options, HAS_CHANGES);
a4a88b2b
LT
413}
414
415static void file_change(struct diff_options *options,
416 unsigned old_mode, unsigned new_mode,
417 const unsigned char *old_sha1,
418 const unsigned char *new_sha1,
e5450100 419 int old_sha1_valid, int new_sha1_valid,
e3d42c47
JL
420 const char *fullpath,
421 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
a4a88b2b 422{
8efdc326 423 tree_difference = REV_TREE_DIFFERENT;
8f67f8ae 424 DIFF_OPT_SET(options, HAS_CHANGES);
a4a88b2b
LT
425}
426
ff5f5f26
MH
427static int rev_compare_tree(struct rev_info *revs,
428 struct commit *parent, struct commit *commit)
a4a88b2b 429{
3a5e8608
LT
430 struct tree *t1 = parent->tree;
431 struct tree *t2 = commit->tree;
432
a4a88b2b 433 if (!t1)
8efdc326 434 return REV_TREE_NEW;
ceff8e7a
LT
435 if (!t2)
436 return REV_TREE_OLD;
78892e32
LT
437
438 if (revs->simplify_by_decoration) {
439 /*
440 * If we are simplifying by decoration, then the commit
441 * is worth showing if it has a tag pointing at it.
442 */
2608c249 443 if (get_name_decoration(&commit->object))
78892e32
LT
444 return REV_TREE_DIFFERENT;
445 /*
446 * A commit that is not pointed by a tag is uninteresting
447 * if we are not limited by path. This means that you will
448 * see the usual "commits that touch the paths" plus any
449 * tagged commit by specifying both --simplify-by-decoration
450 * and pathspec.
451 */
afe069d1 452 if (!revs->prune_data.nr)
78892e32
LT
453 return REV_TREE_SAME;
454 }
ceff8e7a 455
8efdc326 456 tree_difference = REV_TREE_SAME;
8f67f8ae 457 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
ed1c9977 458 if (diff_tree_sha1(t1->object.oid.hash, t2->object.oid.hash, "",
cd2bdc53 459 &revs->pruning) < 0)
8efdc326 460 return REV_TREE_DIFFERENT;
a4a88b2b
LT
461 return tree_difference;
462}
463
3a5e8608 464static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
a4a88b2b
LT
465{
466 int retval;
3a5e8608 467 struct tree *t1 = commit->tree;
a4a88b2b
LT
468
469 if (!t1)
470 return 0;
471
0a4ba7f8 472 tree_difference = REV_TREE_SAME;
8f67f8ae 473 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
ed1c9977 474 retval = diff_tree_sha1(NULL, t1->object.oid.hash, "", &revs->pruning);
a4a88b2b 475
0a4ba7f8 476 return retval >= 0 && (tree_difference == REV_TREE_SAME);
a4a88b2b
LT
477}
478
d0af663e
KB
479struct treesame_state {
480 unsigned int nparents;
481 unsigned char treesame[FLEX_ARRAY];
482};
483
484static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
485{
486 unsigned n = commit_list_count(commit->parents);
50a6c8ef 487 struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
d0af663e
KB
488 st->nparents = n;
489 add_decoration(&revs->treesame, &commit->object, st);
490 return st;
491}
492
493/*
494 * Must be called immediately after removing the nth_parent from a commit's
495 * parent list, if we are maintaining the per-parent treesame[] decoration.
496 * This does not recalculate the master TREESAME flag - update_treesame()
497 * should be called to update it after a sequence of treesame[] modifications
498 * that may have affected it.
499 */
500static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
501{
502 struct treesame_state *st;
503 int old_same;
504
505 if (!commit->parents) {
506 /*
507 * Have just removed the only parent from a non-merge.
508 * Different handling, as we lack decoration.
509 */
510 if (nth_parent != 0)
511 die("compact_treesame %u", nth_parent);
512 old_same = !!(commit->object.flags & TREESAME);
513 if (rev_same_tree_as_empty(revs, commit))
514 commit->object.flags |= TREESAME;
515 else
516 commit->object.flags &= ~TREESAME;
517 return old_same;
518 }
519
520 st = lookup_decoration(&revs->treesame, &commit->object);
521 if (!st || nth_parent >= st->nparents)
522 die("compact_treesame %u", nth_parent);
523
524 old_same = st->treesame[nth_parent];
525 memmove(st->treesame + nth_parent,
526 st->treesame + nth_parent + 1,
527 st->nparents - nth_parent - 1);
528
529 /*
530 * If we've just become a non-merge commit, update TREESAME
531 * immediately, and remove the no-longer-needed decoration.
532 * If still a merge, defer update until update_treesame().
533 */
534 if (--st->nparents == 1) {
535 if (commit->parents->next)
536 die("compact_treesame parents mismatch");
537 if (st->treesame[0] && revs->dense)
538 commit->object.flags |= TREESAME;
539 else
540 commit->object.flags &= ~TREESAME;
541 free(add_decoration(&revs->treesame, &commit->object, NULL));
542 }
543
544 return old_same;
545}
546
547static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
548{
549 if (commit->parents && commit->parents->next) {
550 unsigned n;
551 struct treesame_state *st;
4d826608
KB
552 struct commit_list *p;
553 unsigned relevant_parents;
554 unsigned relevant_change, irrelevant_change;
d0af663e
KB
555
556 st = lookup_decoration(&revs->treesame, &commit->object);
557 if (!st)
f2fd0760 558 die("update_treesame %s", oid_to_hex(&commit->object.oid));
4d826608
KB
559 relevant_parents = 0;
560 relevant_change = irrelevant_change = 0;
561 for (p = commit->parents, n = 0; p; n++, p = p->next) {
562 if (relevant_commit(p->item)) {
563 relevant_change |= !st->treesame[n];
564 relevant_parents++;
565 } else
566 irrelevant_change |= !st->treesame[n];
d0af663e 567 }
4d826608
KB
568 if (relevant_parents ? relevant_change : irrelevant_change)
569 commit->object.flags &= ~TREESAME;
570 else
571 commit->object.flags |= TREESAME;
d0af663e
KB
572 }
573
574 return commit->object.flags & TREESAME;
575}
576
4d826608
KB
577static inline int limiting_can_increase_treesame(const struct rev_info *revs)
578{
579 /*
580 * TREESAME is irrelevant unless prune && dense;
581 * if simplify_history is set, we can't have a mixture of TREESAME and
582 * !TREESAME INTERESTING parents (and we don't have treesame[]
583 * decoration anyway);
584 * if first_parent_only is set, then the TREESAME flag is locked
585 * against the first parent (and again we lack treesame[] decoration).
586 */
587 return revs->prune && revs->dense &&
588 !revs->simplify_history &&
589 !revs->first_parent_only;
590}
591
a4a88b2b
LT
592static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
593{
594 struct commit_list **pp, *parent;
d0af663e 595 struct treesame_state *ts = NULL;
4d826608
KB
596 int relevant_change = 0, irrelevant_change = 0;
597 int relevant_parents, nth_parent;
a4a88b2b 598
53b2c823
LT
599 /*
600 * If we don't do pruning, everything is interesting
601 */
7dc0fe3b 602 if (!revs->prune)
53b2c823 603 return;
53b2c823 604
a4a88b2b
LT
605 if (!commit->tree)
606 return;
607
608 if (!commit->parents) {
3a5e8608 609 if (rev_same_tree_as_empty(revs, commit))
7dc0fe3b 610 commit->object.flags |= TREESAME;
a4a88b2b
LT
611 return;
612 }
613
53b2c823
LT
614 /*
615 * Normal non-merge commit? If we don't want to make the
616 * history dense, we consider it always to be a change..
617 */
7dc0fe3b 618 if (!revs->dense && !commit->parents->next)
53b2c823 619 return;
53b2c823 620
4d826608 621 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
d0af663e
KB
622 (parent = *pp) != NULL;
623 pp = &parent->next, nth_parent++) {
a4a88b2b 624 struct commit *p = parent->item;
4d826608
KB
625 if (relevant_commit(p))
626 relevant_parents++;
a4a88b2b 627
d0af663e
KB
628 if (nth_parent == 1) {
629 /*
630 * This our second loop iteration - so we now know
631 * we're dealing with a merge.
632 *
633 * Do not compare with later parents when we care only about
634 * the first parent chain, in order to avoid derailing the
635 * traversal to follow a side branch that brought everything
636 * in the path we are limited to by the pathspec.
637 */
638 if (revs->first_parent_only)
639 break;
640 /*
641 * If this will remain a potentially-simplifiable
642 * merge, remember per-parent treesame if needed.
643 * Initialise the array with the comparison from our
644 * first iteration.
645 */
646 if (revs->treesame.name &&
647 !revs->simplify_history &&
648 !(commit->object.flags & UNINTERESTING)) {
649 ts = initialise_treesame(revs, commit);
4d826608 650 if (!(irrelevant_change || relevant_change))
d0af663e
KB
651 ts->treesame[0] = 1;
652 }
653 }
cc0e6c5a
AR
654 if (parse_commit(p) < 0)
655 die("cannot simplify commit %s (because of %s)",
f2fd0760 656 oid_to_hex(&commit->object.oid),
657 oid_to_hex(&p->object.oid));
3a5e8608 658 switch (rev_compare_tree(revs, p, commit)) {
8efdc326 659 case REV_TREE_SAME:
141efdba 660 if (!revs->simplify_history || !relevant_commit(p)) {
f3219fbb
JH
661 /* Even if a merge with an uninteresting
662 * side branch brought the entire change
663 * we are interested in, we do not want
664 * to lose the other branches of this
665 * merge, so we just keep going.
666 */
d0af663e
KB
667 if (ts)
668 ts->treesame[nth_parent] = 1;
f3219fbb
JH
669 continue;
670 }
a4a88b2b
LT
671 parent->next = NULL;
672 commit->parents = parent;
7dc0fe3b 673 commit->object.flags |= TREESAME;
a4a88b2b
LT
674 return;
675
8efdc326
FK
676 case REV_TREE_NEW:
677 if (revs->remove_empty_trees &&
3a5e8608 678 rev_same_tree_as_empty(revs, p)) {
c348f31a
JH
679 /* We are adding all the specified
680 * paths from this parent, so the
681 * history beyond this parent is not
682 * interesting. Remove its parents
683 * (they are grandparents for us).
684 * IOW, we pretend this parent is a
685 * "root" commit.
a41e109c 686 */
cc0e6c5a
AR
687 if (parse_commit(p) < 0)
688 die("cannot simplify commit %s (invalid %s)",
f2fd0760 689 oid_to_hex(&commit->object.oid),
690 oid_to_hex(&p->object.oid));
c348f31a 691 p->parents = NULL;
a4a88b2b
LT
692 }
693 /* fallthrough */
ceff8e7a 694 case REV_TREE_OLD:
8efdc326 695 case REV_TREE_DIFFERENT:
4d826608
KB
696 if (relevant_commit(p))
697 relevant_change = 1;
698 else
699 irrelevant_change = 1;
a4a88b2b
LT
700 continue;
701 }
f2fd0760 702 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
a4a88b2b 703 }
4d826608
KB
704
705 /*
706 * TREESAME is straightforward for single-parent commits. For merge
707 * commits, it is most useful to define it so that "irrelevant"
708 * parents cannot make us !TREESAME - if we have any relevant
709 * parents, then we only consider TREESAMEness with respect to them,
710 * allowing irrelevant merges from uninteresting branches to be
711 * simplified away. Only if we have only irrelevant parents do we
712 * base TREESAME on them. Note that this logic is replicated in
713 * update_treesame, which should be kept in sync.
714 */
715 if (relevant_parents ? !relevant_change : !irrelevant_change)
716 commit->object.flags |= TREESAME;
a4a88b2b
LT
717}
718
47e44ed1 719static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
fce87ae5
AG
720 struct commit_list *cached_base, struct commit_list **cache)
721{
722 struct commit_list *new_entry;
723
724 if (cached_base && p->date < cached_base->item->date)
47e44ed1 725 new_entry = commit_list_insert_by_date(p, &cached_base->next);
fce87ae5 726 else
47e44ed1 727 new_entry = commit_list_insert_by_date(p, head);
fce87ae5
AG
728
729 if (cache && (!*cache || p->date < (*cache)->item->date))
730 *cache = new_entry;
731}
732
733static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
734 struct commit_list **list, struct commit_list **cache_ptr)
a4a88b2b
LT
735{
736 struct commit_list *parent = commit->parents;
577ed5c2 737 unsigned left_flag;
fce87ae5 738 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
a4a88b2b 739
3381c790 740 if (commit->object.flags & ADDED)
cc0e6c5a 741 return 0;
3381c790
LT
742 commit->object.flags |= ADDED;
743
a330de31
VM
744 if (revs->include_check &&
745 !revs->include_check(commit, revs->include_check_data))
746 return 0;
747
a4a88b2b
LT
748 /*
749 * If the commit is uninteresting, don't try to
750 * prune parents - we want the maximal uninteresting
751 * set.
752 *
753 * Normally we haven't parsed the parent
754 * yet, so we won't have a parent of a parent
755 * here. However, it may turn out that we've
756 * reached this commit some other way (where it
757 * wasn't uninteresting), in which case we need
758 * to mark its parents recursively too..
759 */
760 if (commit->object.flags & UNINTERESTING) {
761 while (parent) {
762 struct commit *p = parent->item;
763 parent = parent->next;
aeeae1b7
JH
764 if (p)
765 p->object.flags |= UNINTERESTING;
ce4e7b2a 766 if (parse_commit_gently(p, 1) < 0)
aeeae1b7 767 continue;
a4a88b2b
LT
768 if (p->parents)
769 mark_parents_uninteresting(p);
770 if (p->object.flags & SEEN)
771 continue;
772 p->object.flags |= SEEN;
47e44ed1 773 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
a4a88b2b 774 }
cc0e6c5a 775 return 0;
a4a88b2b
LT
776 }
777
778 /*
779 * Ok, the commit wasn't uninteresting. Try to
780 * simplify the commit history and find the parent
781 * that has no differences in the path set if one exists.
782 */
53b2c823 783 try_to_simplify_commit(revs, commit);
a4a88b2b 784
ba1d4505 785 if (revs->no_walk)
cc0e6c5a 786 return 0;
ba1d4505 787
577ed5c2 788 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
0053e902 789
d9c292e8 790 for (parent = commit->parents; parent; parent = parent->next) {
a4a88b2b
LT
791 struct commit *p = parent->item;
792
daf7d867 793 if (parse_commit_gently(p, revs->ignore_missing_links) < 0)
cc0e6c5a 794 return -1;
0f3a290b
LT
795 if (revs->show_source && !p->util)
796 p->util = commit->util;
577ed5c2 797 p->object.flags |= left_flag;
ad1012eb
LH
798 if (!(p->object.flags & SEEN)) {
799 p->object.flags |= SEEN;
47e44ed1 800 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
ad1012eb 801 }
60d30b02 802 if (revs->first_parent_only)
d9c292e8 803 break;
a4a88b2b 804 }
cc0e6c5a 805 return 0;
a4a88b2b
LT
806}
807
36d56de6 808static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
d7a17cad
JH
809{
810 struct commit_list *p;
811 int left_count = 0, right_count = 0;
812 int left_first;
813 struct patch_ids ids;
adbbb31e 814 unsigned cherry_flag;
d7a17cad
JH
815
816 /* First count the commits on the left and on the right */
817 for (p = list; p; p = p->next) {
818 struct commit *commit = p->item;
819 unsigned flags = commit->object.flags;
820 if (flags & BOUNDARY)
821 ;
822 else if (flags & SYMMETRIC_LEFT)
823 left_count++;
824 else
825 right_count++;
826 }
827
36c07975
TR
828 if (!left_count || !right_count)
829 return;
830
d7a17cad
JH
831 left_first = left_count < right_count;
832 init_patch_ids(&ids);
66f13625 833 ids.diffopts.pathspec = revs->diffopt.pathspec;
d7a17cad
JH
834
835 /* Compute patch-ids for one side */
836 for (p = list; p; p = p->next) {
837 struct commit *commit = p->item;
838 unsigned flags = commit->object.flags;
839
840 if (flags & BOUNDARY)
841 continue;
842 /*
843 * If we have fewer left, left_first is set and we omit
844 * commits on the right branch in this loop. If we have
845 * fewer right, we skip the left ones.
846 */
847 if (left_first != !!(flags & SYMMETRIC_LEFT))
848 continue;
683f17ec 849 add_commit_patch_id(commit, &ids);
d7a17cad
JH
850 }
851
adbbb31e
MG
852 /* either cherry_mark or cherry_pick are true */
853 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
854
d7a17cad
JH
855 /* Check the other side */
856 for (p = list; p; p = p->next) {
857 struct commit *commit = p->item;
858 struct patch_id *id;
859 unsigned flags = commit->object.flags;
860
861 if (flags & BOUNDARY)
862 continue;
863 /*
864 * If we have fewer left, left_first is set and we omit
865 * commits on the left branch in this loop.
866 */
867 if (left_first == !!(flags & SYMMETRIC_LEFT))
868 continue;
869
870 /*
871 * Have we seen the same patch id?
872 */
873 id = has_commit_patch_id(commit, &ids);
874 if (!id)
875 continue;
d7a17cad 876
683f17ec
KW
877 commit->object.flags |= cherry_flag;
878 id->commit->object.flags |= cherry_flag;
d7a17cad
JH
879 }
880
881 free_patch_ids(&ids);
882}
883
7d004199
LT
884/* How many extra uninteresting commits we want to see.. */
885#define SLOP 5
886
b6e8a3b5
JK
887static int still_interesting(struct commit_list *src, unsigned long date, int slop,
888 struct commit **interesting_cache)
3131b713 889{
7d004199
LT
890 /*
891 * No source list at all? We're definitely done..
892 */
893 if (!src)
894 return 0;
895
896 /*
897 * Does the destination list contain entries with a date
898 * before the source list? Definitely _not_ done.
899 */
c19d1b4e 900 if (date <= src->item->date)
7d004199
LT
901 return SLOP;
902
903 /*
904 * Does the source list still have interesting commits in
905 * it? Definitely not done..
906 */
b6e8a3b5 907 if (!everybody_uninteresting(src, interesting_cache))
7d004199
LT
908 return SLOP;
909
910 /* Ok, we're closing in.. */
911 return slop-1;
3131b713
LT
912}
913
ebdc94f3
JH
914/*
915 * "rev-list --ancestry-path A..B" computes commits that are ancestors
916 * of B but not ancestors of A but further limits the result to those
917 * that are descendants of A. This takes the list of bottom commits and
918 * the result of "A..B" without --ancestry-path, and limits the latter
919 * further to the ones that can reach one of the commits in "bottom".
920 */
921static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
922{
923 struct commit_list *p;
924 struct commit_list *rlist = NULL;
925 int made_progress;
926
927 /*
928 * Reverse the list so that it will be likely that we would
929 * process parents before children.
930 */
931 for (p = list; p; p = p->next)
932 commit_list_insert(p->item, &rlist);
933
934 for (p = bottom; p; p = p->next)
935 p->item->object.flags |= TMP_MARK;
936
937 /*
938 * Mark the ones that can reach bottom commits in "list",
939 * in a bottom-up fashion.
940 */
941 do {
942 made_progress = 0;
943 for (p = rlist; p; p = p->next) {
944 struct commit *c = p->item;
945 struct commit_list *parents;
946 if (c->object.flags & (TMP_MARK | UNINTERESTING))
947 continue;
948 for (parents = c->parents;
949 parents;
950 parents = parents->next) {
951 if (!(parents->item->object.flags & TMP_MARK))
952 continue;
953 c->object.flags |= TMP_MARK;
954 made_progress = 1;
955 break;
956 }
957 }
958 } while (made_progress);
959
960 /*
961 * NEEDSWORK: decide if we want to remove parents that are
962 * not marked with TMP_MARK from commit->parents for commits
963 * in the resulting list. We may not want to do that, though.
964 */
965
966 /*
967 * The ones that are not marked with TMP_MARK are uninteresting
968 */
969 for (p = list; p; p = p->next) {
970 struct commit *c = p->item;
971 if (c->object.flags & TMP_MARK)
972 continue;
973 c->object.flags |= UNINTERESTING;
974 }
975
976 /* We are done with the TMP_MARK */
977 for (p = list; p; p = p->next)
978 p->item->object.flags &= ~TMP_MARK;
979 for (p = bottom; p; p = p->next)
980 p->item->object.flags &= ~TMP_MARK;
981 free_commit_list(rlist);
982}
983
984/*
985 * Before walking the history, keep the set of "negative" refs the
986 * caller has asked to exclude.
987 *
988 * This is used to compute "rev-list --ancestry-path A..B", as we need
989 * to filter the result of "A..B" further to the ones that can actually
990 * reach A.
991 */
7f34a46f 992static struct commit_list *collect_bottom_commits(struct commit_list *list)
ebdc94f3 993{
7f34a46f
KB
994 struct commit_list *elem, *bottom = NULL;
995 for (elem = list; elem; elem = elem->next)
996 if (elem->item->object.flags & BOTTOM)
997 commit_list_insert(elem->item, &bottom);
ebdc94f3
JH
998 return bottom;
999}
1000
60adf7d7
MG
1001/* Assumes either left_only or right_only is set */
1002static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1003{
1004 struct commit_list *p;
1005
1006 for (p = list; p; p = p->next) {
1007 struct commit *commit = p->item;
1008
1009 if (revs->right_only) {
1010 if (commit->object.flags & SYMMETRIC_LEFT)
1011 commit->object.flags |= SHOWN;
1012 } else /* revs->left_only is set */
1013 if (!(commit->object.flags & SYMMETRIC_LEFT))
1014 commit->object.flags |= SHOWN;
1015 }
1016}
1017
cc0e6c5a 1018static int limit_list(struct rev_info *revs)
a4a88b2b 1019{
7d004199
LT
1020 int slop = SLOP;
1021 unsigned long date = ~0ul;
a4a88b2b
LT
1022 struct commit_list *list = revs->commits;
1023 struct commit_list *newlist = NULL;
1024 struct commit_list **p = &newlist;
ebdc94f3 1025 struct commit_list *bottom = NULL;
b6e8a3b5 1026 struct commit *interesting_cache = NULL;
ebdc94f3
JH
1027
1028 if (revs->ancestry_path) {
7f34a46f 1029 bottom = collect_bottom_commits(list);
ebdc94f3 1030 if (!bottom)
97b03c35 1031 die("--ancestry-path given but there are no bottom commits");
ebdc94f3 1032 }
a4a88b2b
LT
1033
1034 while (list) {
e510ab89 1035 struct commit *commit = pop_commit(&list);
a4a88b2b 1036 struct object *obj = &commit->object;
cdcefbc9 1037 show_early_output_fn_t show;
a4a88b2b 1038
b6e8a3b5
JK
1039 if (commit == interesting_cache)
1040 interesting_cache = NULL;
1041
a4a88b2b
LT
1042 if (revs->max_age != -1 && (commit->date < revs->max_age))
1043 obj->flags |= UNINTERESTING;
fce87ae5 1044 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
cc0e6c5a 1045 return -1;
a4a88b2b
LT
1046 if (obj->flags & UNINTERESTING) {
1047 mark_parents_uninteresting(commit);
7d004199
LT
1048 if (revs->show_all)
1049 p = &commit_list_insert(commit, p)->next;
b6e8a3b5 1050 slop = still_interesting(list, date, slop, &interesting_cache);
7d004199 1051 if (slop)
3131b713 1052 continue;
7d004199
LT
1053 /* If showing all, add the whole pending list to the end */
1054 if (revs->show_all)
1055 *p = list;
1056 break;
a4a88b2b
LT
1057 }
1058 if (revs->min_age != -1 && (commit->date > revs->min_age))
1059 continue;
7d004199 1060 date = commit->date;
a4a88b2b 1061 p = &commit_list_insert(commit, p)->next;
cdcefbc9
LT
1062
1063 show = show_early_output;
1064 if (!show)
1065 continue;
1066
1067 show(revs, newlist);
1068 show_early_output = NULL;
a4a88b2b 1069 }
adbbb31e 1070 if (revs->cherry_pick || revs->cherry_mark)
36d56de6 1071 cherry_pick_list(newlist, revs);
d7a17cad 1072
60adf7d7
MG
1073 if (revs->left_only || revs->right_only)
1074 limit_left_right(newlist, revs);
1075
ebdc94f3
JH
1076 if (bottom) {
1077 limit_to_ancestry(bottom, newlist);
1078 free_commit_list(bottom);
1079 }
1080
4d826608
KB
1081 /*
1082 * Check if any commits have become TREESAME by some of their parents
1083 * becoming UNINTERESTING.
1084 */
1085 if (limiting_can_increase_treesame(revs))
1086 for (list = newlist; list; list = list->next) {
1087 struct commit *c = list->item;
1088 if (c->object.flags & (UNINTERESTING | TREESAME))
1089 continue;
1090 update_treesame(revs, c);
1091 }
1092
a4a88b2b 1093 revs->commits = newlist;
cc0e6c5a 1094 return 0;
a4a88b2b
LT
1095}
1096
df835d3a
MH
1097/*
1098 * Add an entry to refs->cmdline with the specified information.
1099 * *name is copied.
1100 */
281eee47
JH
1101static void add_rev_cmdline(struct rev_info *revs,
1102 struct object *item,
1103 const char *name,
1104 int whence,
1105 unsigned flags)
1106{
1107 struct rev_cmdline_info *info = &revs->cmdline;
1108 int nr = info->nr;
1109
1110 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1111 info->rev[nr].item = item;
df835d3a 1112 info->rev[nr].name = xstrdup(name);
281eee47
JH
1113 info->rev[nr].whence = whence;
1114 info->rev[nr].flags = flags;
1115 info->nr++;
1116}
1117
a765499a
KB
1118static void add_rev_cmdline_list(struct rev_info *revs,
1119 struct commit_list *commit_list,
1120 int whence,
1121 unsigned flags)
1122{
1123 while (commit_list) {
1124 struct object *object = &commit_list->item->object;
f2fd0760 1125 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
a765499a
KB
1126 whence, flags);
1127 commit_list = commit_list->next;
1128 }
1129}
1130
63049292
JH
1131struct all_refs_cb {
1132 int all_flags;
71b03b42 1133 int warned_bad_reflog;
63049292
JH
1134 struct rev_info *all_revs;
1135 const char *name_for_errormsg;
1136};
ae563542 1137
ff32d342 1138int ref_excluded(struct string_list *ref_excludes, const char *path)
e7b432c5
JH
1139{
1140 struct string_list_item *item;
1141
ff32d342 1142 if (!ref_excludes)
e7b432c5 1143 return 0;
ff32d342 1144 for_each_string_list_item(item, ref_excludes) {
eb07894f 1145 if (!wildmatch(item->string, path, 0, NULL))
e7b432c5
JH
1146 return 1;
1147 }
1148 return 0;
1149}
1150
a217dcbd
MH
1151static int handle_one_ref(const char *path, const struct object_id *oid,
1152 int flag, void *cb_data)
ae563542 1153{
63049292 1154 struct all_refs_cb *cb = cb_data;
e7b432c5
JH
1155 struct object *object;
1156
ff32d342 1157 if (ref_excluded(cb->all_revs->ref_excludes, path))
e7b432c5
JH
1158 return 0;
1159
a217dcbd 1160 object = get_reference(cb->all_revs, path, oid->hash, cb->all_flags);
281eee47 1161 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
a217dcbd 1162 add_pending_sha1(cb->all_revs, path, oid->hash, cb->all_flags);
ae563542
LT
1163 return 0;
1164}
1165
d08bae7e
IL
1166static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1167 unsigned flags)
1168{
1169 cb->all_revs = revs;
1170 cb->all_flags = flags;
1171}
1172
ff32d342 1173void clear_ref_exclusion(struct string_list **ref_excludes_p)
e7b432c5 1174{
ff32d342
JH
1175 if (*ref_excludes_p) {
1176 string_list_clear(*ref_excludes_p, 0);
1177 free(*ref_excludes_p);
e7b432c5 1178 }
ff32d342 1179 *ref_excludes_p = NULL;
e7b432c5
JH
1180}
1181
ff32d342 1182void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
e7b432c5 1183{
ff32d342
JH
1184 if (!*ref_excludes_p) {
1185 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1186 (*ref_excludes_p)->strdup_strings = 1;
e7b432c5 1187 }
ff32d342 1188 string_list_append(*ref_excludes_p, exclude);
e7b432c5
JH
1189}
1190
9ef6aeb0
HV
1191static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1192 int (*for_each)(const char *, each_ref_fn, void *))
ae563542 1193{
63049292 1194 struct all_refs_cb cb;
d08bae7e 1195 init_all_refs_cb(&cb, revs, flags);
a217dcbd 1196 for_each(submodule, handle_one_ref, &cb);
63049292
JH
1197}
1198
71b03b42 1199static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
63049292
JH
1200{
1201 struct all_refs_cb *cb = cb_data;
71b03b42
SP
1202 if (!is_null_sha1(sha1)) {
1203 struct object *o = parse_object(sha1);
1204 if (o) {
1205 o->flags |= cb->all_flags;
281eee47 1206 /* ??? CMDLINEFLAGS ??? */
71b03b42
SP
1207 add_pending_object(cb->all_revs, o, "");
1208 }
1209 else if (!cb->warned_bad_reflog) {
46efd2d9 1210 warning("reflog of '%s' references pruned commits",
71b03b42
SP
1211 cb->name_for_errormsg);
1212 cb->warned_bad_reflog = 1;
1213 }
63049292 1214 }
71b03b42
SP
1215}
1216
883d60fa
JS
1217static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
1218 const char *email, unsigned long timestamp, int tz,
1219 const char *message, void *cb_data)
71b03b42
SP
1220{
1221 handle_one_reflog_commit(osha1, cb_data);
1222 handle_one_reflog_commit(nsha1, cb_data);
63049292
JH
1223 return 0;
1224}
1225
a89caf4b
MH
1226static int handle_one_reflog(const char *path, const struct object_id *oid,
1227 int flag, void *cb_data)
63049292
JH
1228{
1229 struct all_refs_cb *cb = cb_data;
71b03b42 1230 cb->warned_bad_reflog = 0;
63049292
JH
1231 cb->name_for_errormsg = path;
1232 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1233 return 0;
1234}
1235
718ccc97 1236void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
63049292
JH
1237{
1238 struct all_refs_cb cb;
2b2a5be3 1239
63049292
JH
1240 cb.all_revs = revs;
1241 cb.all_flags = flags;
a89caf4b 1242 for_each_reflog(handle_one_reflog, &cb);
ae563542
LT
1243}
1244
4fe10219
JK
1245static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1246 struct strbuf *path)
1247{
1248 size_t baselen = path->len;
1249 int i;
1250
1251 if (it->entry_count >= 0) {
1252 struct tree *tree = lookup_tree(it->sha1);
1253 add_pending_object_with_path(revs, &tree->object, "",
1254 040000, path->buf);
1255 }
1256
1257 for (i = 0; i < it->subtree_nr; i++) {
1258 struct cache_tree_sub *sub = it->down[i];
1259 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1260 add_cache_tree(sub->cache_tree, revs, path);
1261 strbuf_setlen(path, baselen);
1262 }
1263
1264}
1265
1266void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
1267{
1268 int i;
1269
1270 read_cache();
1271 for (i = 0; i < active_nr; i++) {
1272 struct cache_entry *ce = active_cache[i];
1273 struct blob *blob;
1274
1275 if (S_ISGITLINK(ce->ce_mode))
1276 continue;
1277
99d1a986 1278 blob = lookup_blob(ce->oid.hash);
4fe10219
JK
1279 if (!blob)
1280 die("unable to add index blob to traversal");
1281 add_pending_object_with_path(revs, &blob->object, "",
1282 ce->ce_mode, ce->name);
1283 }
1284
1285 if (active_cache_tree) {
1286 struct strbuf path = STRBUF_INIT;
1287 add_cache_tree(active_cache_tree, revs, &path);
1288 strbuf_release(&path);
1289 }
1290}
1291
8779351d
VN
1292static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1293 int exclude_parent)
ea4a19e1
JH
1294{
1295 unsigned char sha1[20];
1296 struct object *it;
1297 struct commit *commit;
1298 struct commit_list *parents;
8779351d 1299 int parent_number;
281eee47 1300 const char *arg = arg_;
ea4a19e1
JH
1301
1302 if (*arg == '^') {
7f34a46f 1303 flags ^= UNINTERESTING | BOTTOM;
ea4a19e1
JH
1304 arg++;
1305 }
cd74e473 1306 if (get_sha1_committish(arg, sha1))
ea4a19e1
JH
1307 return 0;
1308 while (1) {
1309 it = get_reference(revs, arg, sha1, 0);
cc243c3c
JH
1310 if (!it && revs->ignore_missing)
1311 return 0;
1974632c 1312 if (it->type != OBJ_TAG)
ea4a19e1 1313 break;
9684afd9
MK
1314 if (!((struct tag*)it)->tagged)
1315 return 0;
ed1c9977 1316 hashcpy(sha1, ((struct tag*)it)->tagged->oid.hash);
ea4a19e1 1317 }
1974632c 1318 if (it->type != OBJ_COMMIT)
ea4a19e1
JH
1319 return 0;
1320 commit = (struct commit *)it;
8779351d
VN
1321 if (exclude_parent &&
1322 exclude_parent > commit_list_count(commit->parents))
1323 return 0;
1324 for (parents = commit->parents, parent_number = 1;
1325 parents;
1326 parents = parents->next, parent_number++) {
1327 if (exclude_parent && parent_number != exclude_parent)
1328 continue;
1329
ea4a19e1
JH
1330 it = &parents->item->object;
1331 it->flags |= flags;
281eee47 1332 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
ea4a19e1
JH
1333 add_pending_object(revs, it, arg);
1334 }
1335 return 1;
1336}
1337
db6296a5 1338void init_revisions(struct rev_info *revs, const char *prefix)
8efdc326
FK
1339{
1340 memset(revs, 0, sizeof(*revs));
8e8f9987 1341
6b9c58f4 1342 revs->abbrev = DEFAULT_ABBREV;
8e8f9987 1343 revs->ignore_merges = 1;
9202434c 1344 revs->simplify_history = 1;
8f67f8ae 1345 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
90b19941 1346 DIFF_OPT_SET(&revs->pruning, QUICK);
cd2bdc53
LT
1347 revs->pruning.add_remove = file_add_remove;
1348 revs->pruning.change = file_change;
08f704f2 1349 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
8efdc326 1350 revs->dense = 1;
db6296a5 1351 revs->prefix = prefix;
8efdc326
FK
1352 revs->max_age = -1;
1353 revs->min_age = -1;
d5db6c9e 1354 revs->skip_count = -1;
8efdc326 1355 revs->max_count = -1;
ad5aeede 1356 revs->max_parents = -1;
0893eec8 1357 revs->expand_tabs_in_log = -1;
8efdc326 1358
cd2bdc53 1359 revs->commit_format = CMIT_FMT_DEFAULT;
fe37a9c5 1360 revs->expand_tabs_in_log_default = 8;
cd2bdc53 1361
918d4e1c
JH
1362 init_grep_defaults();
1363 grep_init(&revs->grep_filter, prefix);
0843acfd 1364 revs->grep_filter.status_only = 1;
0843acfd
JK
1365 revs->grep_filter.regflags = REG_NEWLINE;
1366
cd2bdc53 1367 diff_setup(&revs->diffopt);
c0cb4a06 1368 if (prefix && !revs->diffopt.prefix) {
cd676a51
JH
1369 revs->diffopt.prefix = prefix;
1370 revs->diffopt.prefix_length = strlen(prefix);
1371 }
3a03cf6b
JK
1372
1373 revs->notes_opt.use_default_notes = -1;
8efdc326
FK
1374}
1375
0d2c9d67
RS
1376static void add_pending_commit_list(struct rev_info *revs,
1377 struct commit_list *commit_list,
1378 unsigned int flags)
1379{
1380 while (commit_list) {
1381 struct object *object = &commit_list->item->object;
1382 object->flags |= flags;
f2fd0760 1383 add_pending_object(revs, object, oid_to_hex(&object->oid));
0d2c9d67
RS
1384 commit_list = commit_list->next;
1385 }
1386}
1387
ae3e5e1e
JH
1388static void prepare_show_merge(struct rev_info *revs)
1389{
1390 struct commit_list *bases;
1391 struct commit *head, *other;
1392 unsigned char sha1[20];
1393 const char **prune = NULL;
1394 int i, prune_num = 1; /* counting terminating NULL */
1395
baf18fc2 1396 if (get_sha1("HEAD", sha1))
ae3e5e1e 1397 die("--merge without HEAD?");
baf18fc2
NTND
1398 head = lookup_commit_or_die(sha1, "HEAD");
1399 if (get_sha1("MERGE_HEAD", sha1))
ae3e5e1e 1400 die("--merge without MERGE_HEAD?");
baf18fc2 1401 other = lookup_commit_or_die(sha1, "MERGE_HEAD");
ae3e5e1e
JH
1402 add_pending_object(revs, &head->object, "HEAD");
1403 add_pending_object(revs, &other->object, "MERGE_HEAD");
2ce406cc 1404 bases = get_merge_bases(head, other);
7f34a46f
KB
1405 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1406 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
e82447b1
JH
1407 free_commit_list(bases);
1408 head->object.flags |= SYMMETRIC_LEFT;
ae3e5e1e
JH
1409
1410 if (!active_nr)
1411 read_cache();
1412 for (i = 0; i < active_nr; i++) {
9c5e6c80 1413 const struct cache_entry *ce = active_cache[i];
ae3e5e1e
JH
1414 if (!ce_stage(ce))
1415 continue;
429bb40a 1416 if (ce_path_match(ce, &revs->prune_data, NULL)) {
ae3e5e1e 1417 prune_num++;
2756ca43 1418 REALLOC_ARRAY(prune, prune_num);
ae3e5e1e
JH
1419 prune[prune_num-2] = ce->name;
1420 prune[prune_num-1] = NULL;
1421 }
1422 while ((i+1 < active_nr) &&
1423 ce_same_name(ce, active_cache[i+1]))
1424 i++;
1425 }
ed6e8038 1426 clear_pathspec(&revs->prune_data);
4a2d5ae2 1427 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
c6f1b920 1428 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
e82447b1 1429 revs->limited = 1;
ae3e5e1e
JH
1430}
1431
8e676e8b 1432int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
5d6f0935 1433{
249c8f4a 1434 struct object_context oc;
5d6f0935
JH
1435 char *dotdot;
1436 struct object *object;
1437 unsigned char sha1[20];
1438 int local_flags;
281eee47 1439 const char *arg = arg_;
8e676e8b 1440 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
d5f6b1d7 1441 unsigned get_sha1_flags = 0;
5d6f0935 1442
7f34a46f
KB
1443 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1444
5d6f0935
JH
1445 dotdot = strstr(arg, "..");
1446 if (dotdot) {
1447 unsigned char from_sha1[20];
1448 const char *next = dotdot + 2;
1449 const char *this = arg;
1450 int symmetric = *next == '.';
7f34a46f 1451 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
003c84f6 1452 static const char head_by_default[] = "HEAD";
281eee47 1453 unsigned int a_flags;
5d6f0935
JH
1454
1455 *dotdot = 0;
1456 next += symmetric;
1457
1458 if (!*next)
003c84f6 1459 next = head_by_default;
5d6f0935 1460 if (dotdot == arg)
003c84f6
JH
1461 this = head_by_default;
1462 if (this == head_by_default && next == head_by_default &&
1463 !symmetric) {
1464 /*
1465 * Just ".."? That is not a range but the
1466 * pathspec for the parent directory.
1467 */
1468 if (!cant_be_filename) {
1469 *dotdot = '.';
1470 return -1;
1471 }
1472 }
cd74e473
JH
1473 if (!get_sha1_committish(this, from_sha1) &&
1474 !get_sha1_committish(next, sha1)) {
895c5ba3 1475 struct object *a_obj, *b_obj;
5d6f0935
JH
1476
1477 if (!cant_be_filename) {
1478 *dotdot = '.';
1479 verify_non_filename(revs->prefix, arg);
1480 }
1481
895c5ba3
JH
1482 a_obj = parse_object(from_sha1);
1483 b_obj = parse_object(sha1);
1484 if (!a_obj || !b_obj) {
1485 missing:
1486 if (revs->ignore_missing)
1487 return 0;
1488 die(symmetric
1489 ? "Invalid symmetric difference expression %s"
1490 : "Invalid revision range %s", arg);
1491 }
1492
1493 if (!symmetric) {
1494 /* just A..B */
1495 a_flags = flags_exclude;
1496 } else {
1497 /* A...B -- find merge bases between the two */
1498 struct commit *a, *b;
1499 struct commit_list *exclude;
1500
1501 a = (a_obj->type == OBJ_COMMIT
1502 ? (struct commit *)a_obj
ed1c9977 1503 : lookup_commit_reference(a_obj->oid.hash));
895c5ba3
JH
1504 b = (b_obj->type == OBJ_COMMIT
1505 ? (struct commit *)b_obj
ed1c9977 1506 : lookup_commit_reference(b_obj->oid.hash));
895c5ba3
JH
1507 if (!a || !b)
1508 goto missing;
2ce406cc 1509 exclude = get_merge_bases(a, b);
a765499a
KB
1510 add_rev_cmdline_list(revs, exclude,
1511 REV_CMD_MERGE_BASE,
1512 flags_exclude);
5d6f0935
JH
1513 add_pending_commit_list(revs, exclude,
1514 flags_exclude);
1515 free_commit_list(exclude);
895c5ba3 1516
281eee47 1517 a_flags = flags | SYMMETRIC_LEFT;
895c5ba3
JH
1518 }
1519
1520 a_obj->flags |= a_flags;
1521 b_obj->flags |= flags;
1522 add_rev_cmdline(revs, a_obj, this,
281eee47 1523 REV_CMD_LEFT, a_flags);
895c5ba3 1524 add_rev_cmdline(revs, b_obj, next,
281eee47 1525 REV_CMD_RIGHT, flags);
895c5ba3
JH
1526 add_pending_object(revs, a_obj, this);
1527 add_pending_object(revs, b_obj, next);
5d6f0935
JH
1528 return 0;
1529 }
1530 *dotdot = '.';
1531 }
8779351d 1532
5d6f0935
JH
1533 dotdot = strstr(arg, "^@");
1534 if (dotdot && !dotdot[2]) {
1535 *dotdot = 0;
8779351d 1536 if (add_parents_only(revs, arg, flags, 0))
5d6f0935
JH
1537 return 0;
1538 *dotdot = '^';
1539 }
62476c8e
JH
1540 dotdot = strstr(arg, "^!");
1541 if (dotdot && !dotdot[2]) {
1542 *dotdot = 0;
8779351d
VN
1543 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0))
1544 *dotdot = '^';
1545 }
1546 dotdot = strstr(arg, "^-");
1547 if (dotdot) {
1548 int exclude_parent = 1;
1549
1550 if (dotdot[2]) {
1551 char *end;
1552 exclude_parent = strtoul(dotdot + 2, &end, 10);
1553 if (*end != '\0' || !exclude_parent)
1554 return -1;
1555 }
1556
1557 *dotdot = 0;
1558 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent))
62476c8e
JH
1559 *dotdot = '^';
1560 }
1561
5d6f0935
JH
1562 local_flags = 0;
1563 if (*arg == '^') {
7f34a46f 1564 local_flags = UNINTERESTING | BOTTOM;
5d6f0935
JH
1565 arg++;
1566 }
d5f6b1d7
JH
1567
1568 if (revarg_opt & REVARG_COMMITTISH)
1569 get_sha1_flags = GET_SHA1_COMMITTISH;
1570
1571 if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
cc243c3c 1572 return revs->ignore_missing ? 0 : -1;
5d6f0935
JH
1573 if (!cant_be_filename)
1574 verify_non_filename(revs->prefix, arg);
1575 object = get_reference(revs, arg, sha1, flags ^ local_flags);
281eee47 1576 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
249c8f4a 1577 add_pending_object_with_mode(revs, object, arg, oc.mode);
5d6f0935
JH
1578 return 0;
1579}
1580
4da5af31
JH
1581struct cmdline_pathspec {
1582 int alloc;
1583 int nr;
1584 const char **path;
1585};
1fc561d1 1586
4da5af31
JH
1587static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1588{
1589 while (*av) {
9e57ac55 1590 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
4da5af31
JH
1591 prune->path[prune->nr++] = *(av++);
1592 }
1593}
60da8b15 1594
4da5af31
JH
1595static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1596 struct cmdline_pathspec *prune)
1597{
6e8d46f9 1598 while (strbuf_getline(sb, stdin) != EOF) {
9e57ac55 1599 ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
4da5af31 1600 prune->path[prune->nr++] = xstrdup(sb->buf);
60da8b15 1601 }
60da8b15
JH
1602}
1603
4da5af31
JH
1604static void read_revisions_from_stdin(struct rev_info *revs,
1605 struct cmdline_pathspec *prune)
1fc561d1 1606{
63d564b3 1607 struct strbuf sb;
60da8b15 1608 int seen_dashdash = 0;
4c30d504
JK
1609 int save_warning;
1610
1611 save_warning = warn_on_object_refname_ambiguity;
1612 warn_on_object_refname_ambiguity = 0;
1fc561d1 1613
63d564b3 1614 strbuf_init(&sb, 1000);
6e8d46f9 1615 while (strbuf_getline(&sb, stdin) != EOF) {
63d564b3 1616 int len = sb.len;
1fc561d1
AB
1617 if (!len)
1618 break;
60da8b15
JH
1619 if (sb.buf[0] == '-') {
1620 if (len == 2 && sb.buf[1] == '-') {
1621 seen_dashdash = 1;
1622 break;
1623 }
1fc561d1 1624 die("options not supported in --stdin mode");
60da8b15 1625 }
31faeb20 1626 if (handle_revision_arg(sb.buf, revs, 0,
70d26c6e 1627 REVARG_CANNOT_BE_FILENAME))
63d564b3 1628 die("bad revision '%s'", sb.buf);
1fc561d1 1629 }
60da8b15
JH
1630 if (seen_dashdash)
1631 read_pathspec_from_stdin(revs, &sb, prune);
4c30d504 1632
63d564b3 1633 strbuf_release(&sb);
4c30d504 1634 warn_on_object_refname_ambiguity = save_warning;
1fc561d1
AB
1635}
1636
2d10c555 1637static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
bd95fcd3 1638{
0843acfd 1639 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
2d10c555
JH
1640}
1641
a4d7d2c6 1642static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
2d10c555 1643{
a4d7d2c6 1644 append_header_grep_pattern(&revs->grep_filter, field, pattern);
bd95fcd3
JH
1645}
1646
1647static void add_message_grep(struct rev_info *revs, const char *pattern)
1648{
2d10c555 1649 add_grep(revs, pattern, GREP_PATTERN_BODY);
bd95fcd3
JH
1650}
1651
6b61ec05
PH
1652static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1653 int *unkc, const char **unkv)
02e54220
PH
1654{
1655 const char *arg = argv[0];
7d7b86f7
MM
1656 const char *optarg;
1657 int argcount;
02e54220
PH
1658
1659 /* pseudo revision arguments */
1660 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1661 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1662 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
ad3f9a71 1663 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
59556548 1664 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
4fe10219 1665 !strcmp(arg, "--indexed-objects") ||
07768e03 1666 starts_with(arg, "--exclude=") ||
59556548
CC
1667 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1668 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
02e54220
PH
1669 {
1670 unkv[(*unkc)++] = arg;
0fe8c138 1671 return 1;
02e54220
PH
1672 }
1673
7d7b86f7
MM
1674 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1675 revs->max_count = atoi(optarg);
5853caec 1676 revs->no_walk = 0;
7d7b86f7
MM
1677 return argcount;
1678 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1679 revs->skip_count = atoi(optarg);
1680 return argcount;
02e54220 1681 } else if ((*arg == '-') && isdigit(arg[1])) {
e3fa568c
JH
1682 /* accept -<digit>, like traditional "head" */
1683 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1684 revs->max_count < 0)
1685 die("'%s': not a non-negative integer", arg + 1);
5853caec 1686 revs->no_walk = 0;
02e54220
PH
1687 } else if (!strcmp(arg, "-n")) {
1688 if (argc <= 1)
1689 return error("-n requires an argument");
1690 revs->max_count = atoi(argv[1]);
5853caec 1691 revs->no_walk = 0;
02e54220 1692 return 2;
59556548 1693 } else if (starts_with(arg, "-n")) {
02e54220 1694 revs->max_count = atoi(arg + 2);
5853caec 1695 revs->no_walk = 0;
7d7b86f7
MM
1696 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1697 revs->max_age = atoi(optarg);
1698 return argcount;
1699 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1700 revs->max_age = approxidate(optarg);
1701 return argcount;
1702 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1703 revs->max_age = approxidate(optarg);
1704 return argcount;
1705 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1706 revs->min_age = atoi(optarg);
1707 return argcount;
1708 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1709 revs->min_age = approxidate(optarg);
1710 return argcount;
1711 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1712 revs->min_age = approxidate(optarg);
1713 return argcount;
02e54220
PH
1714 } else if (!strcmp(arg, "--first-parent")) {
1715 revs->first_parent_only = 1;
ebdc94f3
JH
1716 } else if (!strcmp(arg, "--ancestry-path")) {
1717 revs->ancestry_path = 1;
cb7529e1 1718 revs->simplify_history = 0;
ebdc94f3 1719 revs->limited = 1;
02e54220
PH
1720 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1721 init_reflog_walk(&revs->reflog_info);
1722 } else if (!strcmp(arg, "--default")) {
1723 if (argc <= 1)
1724 return error("bad --default argument");
1725 revs->def = argv[1];
1726 return 2;
1727 } else if (!strcmp(arg, "--merge")) {
1728 revs->show_merge = 1;
1729 } else if (!strcmp(arg, "--topo-order")) {
08f704f2 1730 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
02e54220 1731 revs->topo_order = 1;
6546b593
JH
1732 } else if (!strcmp(arg, "--simplify-merges")) {
1733 revs->simplify_merges = 1;
a52f0071 1734 revs->topo_order = 1;
6546b593
JH
1735 revs->rewrite_parents = 1;
1736 revs->simplify_history = 0;
1737 revs->limited = 1;
78892e32
LT
1738 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1739 revs->simplify_merges = 1;
a52f0071 1740 revs->topo_order = 1;
78892e32
LT
1741 revs->rewrite_parents = 1;
1742 revs->simplify_history = 0;
1743 revs->simplify_by_decoration = 1;
1744 revs->limited = 1;
1745 revs->prune = 1;
33e7018c 1746 load_ref_decorations(DECORATE_SHORT_REFS);
02e54220 1747 } else if (!strcmp(arg, "--date-order")) {
08f704f2 1748 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
02e54220 1749 revs->topo_order = 1;
81c6b38b
JH
1750 } else if (!strcmp(arg, "--author-date-order")) {
1751 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
02e54220 1752 revs->topo_order = 1;
dffc651e
SG
1753 } else if (!strcmp(arg, "--early-output")) {
1754 revs->early_output = 100;
1755 revs->topo_order = 1;
1756 } else if (skip_prefix(arg, "--early-output=", &optarg)) {
1757 if (strtoul_ui(optarg, 10, &revs->early_output) < 0)
1758 die("'%s': not a non-negative integer", optarg);
1759 revs->topo_order = 1;
02e54220
PH
1760 } else if (!strcmp(arg, "--parents")) {
1761 revs->rewrite_parents = 1;
1762 revs->print_parents = 1;
1763 } else if (!strcmp(arg, "--dense")) {
1764 revs->dense = 1;
1765 } else if (!strcmp(arg, "--sparse")) {
1766 revs->dense = 0;
1767 } else if (!strcmp(arg, "--show-all")) {
1768 revs->show_all = 1;
1769 } else if (!strcmp(arg, "--remove-empty")) {
1770 revs->remove_empty_trees = 1;
b8e8db28 1771 } else if (!strcmp(arg, "--merges")) {
ad5aeede 1772 revs->min_parents = 2;
02e54220 1773 } else if (!strcmp(arg, "--no-merges")) {
ad5aeede 1774 revs->max_parents = 1;
59556548 1775 } else if (starts_with(arg, "--min-parents=")) {
ad5aeede 1776 revs->min_parents = atoi(arg+14);
9ada7aee 1777 } else if (!strcmp(arg, "--no-min-parents")) {
ad5aeede 1778 revs->min_parents = 0;
59556548 1779 } else if (starts_with(arg, "--max-parents=")) {
ad5aeede 1780 revs->max_parents = atoi(arg+14);
9ada7aee 1781 } else if (!strcmp(arg, "--no-max-parents")) {
ad5aeede 1782 revs->max_parents = -1;
02e54220
PH
1783 } else if (!strcmp(arg, "--boundary")) {
1784 revs->boundary = 1;
1785 } else if (!strcmp(arg, "--left-right")) {
1786 revs->left_right = 1;
60adf7d7 1787 } else if (!strcmp(arg, "--left-only")) {
24852d91 1788 if (revs->right_only)
94f605ec
MG
1789 die("--left-only is incompatible with --right-only"
1790 " or --cherry");
60adf7d7
MG
1791 revs->left_only = 1;
1792 } else if (!strcmp(arg, "--right-only")) {
24852d91
JH
1793 if (revs->left_only)
1794 die("--right-only is incompatible with --left-only");
60adf7d7 1795 revs->right_only = 1;
94f605ec
MG
1796 } else if (!strcmp(arg, "--cherry")) {
1797 if (revs->left_only)
1798 die("--cherry is incompatible with --left-only");
1799 revs->cherry_mark = 1;
1800 revs->right_only = 1;
ad5aeede 1801 revs->max_parents = 1;
94f605ec 1802 revs->limited = 1;
f69c5018
TR
1803 } else if (!strcmp(arg, "--count")) {
1804 revs->count = 1;
adbbb31e
MG
1805 } else if (!strcmp(arg, "--cherry-mark")) {
1806 if (revs->cherry_pick)
1807 die("--cherry-mark is incompatible with --cherry-pick");
1808 revs->cherry_mark = 1;
1809 revs->limited = 1; /* needs limit_list() */
02e54220 1810 } else if (!strcmp(arg, "--cherry-pick")) {
adbbb31e
MG
1811 if (revs->cherry_mark)
1812 die("--cherry-pick is incompatible with --cherry-mark");
02e54220
PH
1813 revs->cherry_pick = 1;
1814 revs->limited = 1;
1815 } else if (!strcmp(arg, "--objects")) {
1816 revs->tag_objects = 1;
1817 revs->tree_objects = 1;
1818 revs->blob_objects = 1;
1819 } else if (!strcmp(arg, "--objects-edge")) {
1820 revs->tag_objects = 1;
1821 revs->tree_objects = 1;
1822 revs->blob_objects = 1;
1823 revs->edge_hint = 1;
1684c1b2 1824 } else if (!strcmp(arg, "--objects-edge-aggressive")) {
1825 revs->tag_objects = 1;
1826 revs->tree_objects = 1;
1827 revs->blob_objects = 1;
1828 revs->edge_hint = 1;
1829 revs->edge_hint_aggressive = 1;
5a48d240
JH
1830 } else if (!strcmp(arg, "--verify-objects")) {
1831 revs->tag_objects = 1;
1832 revs->tree_objects = 1;
1833 revs->blob_objects = 1;
1834 revs->verify_objects = 1;
02e54220
PH
1835 } else if (!strcmp(arg, "--unpacked")) {
1836 revs->unpacked = 1;
59556548 1837 } else if (starts_with(arg, "--unpacked=")) {
03a9683d 1838 die("--unpacked=<packfile> no longer supported.");
02e54220
PH
1839 } else if (!strcmp(arg, "-r")) {
1840 revs->diff = 1;
1841 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1842 } else if (!strcmp(arg, "-t")) {
1843 revs->diff = 1;
1844 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1845 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1846 } else if (!strcmp(arg, "-m")) {
1847 revs->ignore_merges = 0;
1848 } else if (!strcmp(arg, "-c")) {
1849 revs->diff = 1;
1850 revs->dense_combined_merges = 0;
1851 revs->combine_merges = 1;
1852 } else if (!strcmp(arg, "--cc")) {
1853 revs->diff = 1;
1854 revs->dense_combined_merges = 1;
1855 revs->combine_merges = 1;
1856 } else if (!strcmp(arg, "-v")) {
1857 revs->verbose_header = 1;
1858 } else if (!strcmp(arg, "--pretty")) {
1859 revs->verbose_header = 1;
66b2ed09 1860 revs->pretty_given = 1;
ae18165f 1861 get_commit_format(NULL, revs);
59556548 1862 } else if (starts_with(arg, "--pretty=") || starts_with(arg, "--format=")) {
7d7b86f7
MM
1863 /*
1864 * Detached form ("--pretty X" as opposed to "--pretty=X")
1865 * not allowed, since the argument is optional.
1866 */
02e54220 1867 revs->verbose_header = 1;
66b2ed09 1868 revs->pretty_given = 1;
02e54220 1869 get_commit_format(arg+9, revs);
7cc13c71 1870 } else if (!strcmp(arg, "--expand-tabs")) {
fe37a9c5 1871 revs->expand_tabs_in_log = 8;
0893eec8
JH
1872 } else if (!strcmp(arg, "--no-expand-tabs")) {
1873 revs->expand_tabs_in_log = 0;
fe37a9c5
JH
1874 } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
1875 int val;
1876 if (strtol_i(arg, 10, &val) < 0 || val < 0)
1877 die("'%s': not a non-negative integer", arg);
1878 revs->expand_tabs_in_log = val;
7249e912 1879 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
66b2ed09
JH
1880 revs->show_notes = 1;
1881 revs->show_notes_given = 1;
3a03cf6b 1882 revs->notes_opt.use_default_notes = 1;
0c37f1fc
JH
1883 } else if (!strcmp(arg, "--show-signature")) {
1884 revs->show_signature = 1;
aa379999
MJ
1885 } else if (!strcmp(arg, "--no-show-signature")) {
1886 revs->show_signature = 0;
1b32dece
NTND
1887 } else if (!strcmp(arg, "--show-linear-break") ||
1888 starts_with(arg, "--show-linear-break=")) {
1889 if (starts_with(arg, "--show-linear-break="))
1890 revs->break_bar = xstrdup(arg + 20);
1891 else
1892 revs->break_bar = " ..........";
1893 revs->track_linear = 1;
1894 revs->track_first_time = 1;
59556548
CC
1895 } else if (starts_with(arg, "--show-notes=") ||
1896 starts_with(arg, "--notes=")) {
894a9d33
TR
1897 struct strbuf buf = STRBUF_INIT;
1898 revs->show_notes = 1;
1899 revs->show_notes_given = 1;
59556548 1900 if (starts_with(arg, "--show-notes")) {
7249e912
JK
1901 if (revs->notes_opt.use_default_notes < 0)
1902 revs->notes_opt.use_default_notes = 1;
1903 strbuf_addstr(&buf, arg+13);
1904 }
1905 else
1906 strbuf_addstr(&buf, arg+8);
c063f0a9 1907 expand_notes_ref(&buf);
304cc11c 1908 string_list_append(&revs->notes_opt.extra_notes_refs,
1d2f80fa 1909 strbuf_detach(&buf, NULL));
66b2ed09
JH
1910 } else if (!strcmp(arg, "--no-notes")) {
1911 revs->show_notes = 0;
1912 revs->show_notes_given = 1;
92e0d425
JK
1913 revs->notes_opt.use_default_notes = -1;
1914 /* we have been strdup'ing ourselves, so trick
1915 * string_list into free()ing strings */
1916 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1917 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1918 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
894a9d33
TR
1919 } else if (!strcmp(arg, "--standard-notes")) {
1920 revs->show_notes_given = 1;
3a03cf6b 1921 revs->notes_opt.use_default_notes = 1;
894a9d33 1922 } else if (!strcmp(arg, "--no-standard-notes")) {
3a03cf6b 1923 revs->notes_opt.use_default_notes = 0;
de84accc
NS
1924 } else if (!strcmp(arg, "--oneline")) {
1925 revs->verbose_header = 1;
1926 get_commit_format("oneline", revs);
7dccadf3 1927 revs->pretty_given = 1;
de84accc 1928 revs->abbrev_commit = 1;
02e54220
PH
1929 } else if (!strcmp(arg, "--graph")) {
1930 revs->topo_order = 1;
1931 revs->rewrite_parents = 1;
1932 revs->graph = graph_init(revs);
1933 } else if (!strcmp(arg, "--root")) {
1934 revs->show_root_diff = 1;
1935 } else if (!strcmp(arg, "--no-commit-id")) {
1936 revs->no_commit_id = 1;
1937 } else if (!strcmp(arg, "--always")) {
1938 revs->always_show_header = 1;
1939 } else if (!strcmp(arg, "--no-abbrev")) {
1940 revs->abbrev = 0;
1941 } else if (!strcmp(arg, "--abbrev")) {
1942 revs->abbrev = DEFAULT_ABBREV;
59556548 1943 } else if (starts_with(arg, "--abbrev=")) {
02e54220
PH
1944 revs->abbrev = strtoul(arg + 9, NULL, 10);
1945 if (revs->abbrev < MINIMUM_ABBREV)
1946 revs->abbrev = MINIMUM_ABBREV;
1947 else if (revs->abbrev > 40)
1948 revs->abbrev = 40;
1949 } else if (!strcmp(arg, "--abbrev-commit")) {
1950 revs->abbrev_commit = 1;
0c47695a
JS
1951 revs->abbrev_commit_given = 1;
1952 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1953 revs->abbrev_commit = 0;
02e54220
PH
1954 } else if (!strcmp(arg, "--full-diff")) {
1955 revs->diff = 1;
1956 revs->full_diff = 1;
1957 } else if (!strcmp(arg, "--full-history")) {
1958 revs->simplify_history = 0;
1959 } else if (!strcmp(arg, "--relative-date")) {
a5481a6c 1960 revs->date_mode.type = DATE_RELATIVE;
f4ea32f0 1961 revs->date_mode_explicit = 1;
7d7b86f7 1962 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
a5481a6c 1963 parse_date_format(optarg, &revs->date_mode);
f4ea32f0 1964 revs->date_mode_explicit = 1;
7d7b86f7 1965 return argcount;
02e54220
PH
1966 } else if (!strcmp(arg, "--log-size")) {
1967 revs->show_log_size = 1;
1968 }
1969 /*
1970 * Grepping the commit log
1971 */
7d7b86f7
MM
1972 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1973 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1974 return argcount;
1975 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1976 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1977 return argcount;
72fd13f7
NTND
1978 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
1979 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
1980 return argcount;
7d7b86f7
MM
1981 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1982 add_message_grep(revs, optarg);
1983 return argcount;
17bf35a3
JH
1984 } else if (!strcmp(arg, "--grep-debug")) {
1985 revs->grep_filter.debug = 1;
727b6fc3 1986 } else if (!strcmp(arg, "--basic-regexp")) {
8465541e 1987 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
02e54220 1988 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
8465541e 1989 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
02e54220 1990 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
0843acfd 1991 revs->grep_filter.regflags |= REG_ICASE;
accccde4 1992 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
02e54220 1993 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
8465541e 1994 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
727b6fc3 1995 } else if (!strcmp(arg, "--perl-regexp")) {
8465541e 1996 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
02e54220 1997 } else if (!strcmp(arg, "--all-match")) {
0843acfd 1998 revs->grep_filter.all_match = 1;
22dfa8a2
CJ
1999 } else if (!strcmp(arg, "--invert-grep")) {
2000 revs->invert_grep = 1;
7d7b86f7
MM
2001 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2002 if (strcmp(optarg, "none"))
2003 git_log_output_encoding = xstrdup(optarg);
02e54220
PH
2004 else
2005 git_log_output_encoding = "";
7d7b86f7 2006 return argcount;
02e54220
PH
2007 } else if (!strcmp(arg, "--reverse")) {
2008 revs->reverse ^= 1;
2009 } else if (!strcmp(arg, "--children")) {
2010 revs->children.name = "children";
2011 revs->limited = 1;
cc243c3c
JH
2012 } else if (!strcmp(arg, "--ignore-missing")) {
2013 revs->ignore_missing = 1;
02e54220 2014 } else {
a97262c6 2015 int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
02e54220
PH
2016 if (!opts)
2017 unkv[(*unkc)++] = arg;
2018 return opts;
2019 }
1b32dece
NTND
2020 if (revs->graph && revs->track_linear)
2021 die("--show-linear-break and --graph are incompatible");
02e54220
PH
2022
2023 return 1;
2024}
2025
6b61ec05
PH
2026void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2027 const struct option *options,
2028 const char * const usagestr[])
2029{
2030 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2031 &ctx->cpidx, ctx->out);
2032 if (n <= 0) {
2033 error("unknown option `%s'", ctx->argv[0]);
2034 usage_with_options(usagestr, options);
2035 }
2036 ctx->argv += n;
2037 ctx->argc -= n;
2038}
2039
cb46d630
AD
2040static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
2041 struct strbuf bisect_refs = STRBUF_INIT;
2042 int status;
2043 strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2044 status = for_each_ref_in_submodule(submodule, bisect_refs.buf, fn, cb_data);
2045 strbuf_release(&bisect_refs);
2046 return status;
2047}
2048
9ef6aeb0 2049static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
ad3f9a71 2050{
cb46d630 2051 return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
ad3f9a71
LT
2052}
2053
9ef6aeb0 2054static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
ad3f9a71 2055{
cb46d630 2056 return for_each_bisect_ref(submodule, fn, cb_data, term_good);
ad3f9a71
LT
2057}
2058
f6aca0dc
JN
2059static int handle_revision_pseudo_opt(const char *submodule,
2060 struct rev_info *revs,
2061 int argc, const char **argv, int *flags)
2062{
2063 const char *arg = argv[0];
2064 const char *optarg;
2065 int argcount;
2066
0fc63ec4
JN
2067 /*
2068 * NOTE!
2069 *
2070 * Commands like "git shortlog" will not accept the options below
2071 * unless parse_revision_opt queues them (as opposed to erroring
2072 * out).
2073 *
2074 * When implementing your new pseudo-option, remember to
2075 * register it in the list at the top of handle_revision_opt.
2076 */
f6aca0dc
JN
2077 if (!strcmp(arg, "--all")) {
2078 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2079 handle_refs(submodule, revs, *flags, head_ref_submodule);
ff32d342 2080 clear_ref_exclusion(&revs->ref_excludes);
f6aca0dc
JN
2081 } else if (!strcmp(arg, "--branches")) {
2082 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
ff32d342 2083 clear_ref_exclusion(&revs->ref_excludes);
f6aca0dc 2084 } else if (!strcmp(arg, "--bisect")) {
cb46d630 2085 read_bisect_terms(&term_bad, &term_good);
f6aca0dc 2086 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
7f34a46f 2087 handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
f6aca0dc
JN
2088 revs->bisect = 1;
2089 } else if (!strcmp(arg, "--tags")) {
2090 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
ff32d342 2091 clear_ref_exclusion(&revs->ref_excludes);
f6aca0dc
JN
2092 } else if (!strcmp(arg, "--remotes")) {
2093 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
ff32d342 2094 clear_ref_exclusion(&revs->ref_excludes);
f6aca0dc
JN
2095 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2096 struct all_refs_cb cb;
2097 init_all_refs_cb(&cb, revs, *flags);
a217dcbd 2098 for_each_glob_ref(handle_one_ref, optarg, &cb);
ff32d342 2099 clear_ref_exclusion(&revs->ref_excludes);
e7b432c5
JH
2100 return argcount;
2101 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
ff32d342 2102 add_ref_exclusion(&revs->ref_excludes, optarg);
f6aca0dc 2103 return argcount;
59556548 2104 } else if (starts_with(arg, "--branches=")) {
f6aca0dc
JN
2105 struct all_refs_cb cb;
2106 init_all_refs_cb(&cb, revs, *flags);
a217dcbd 2107 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
ff32d342 2108 clear_ref_exclusion(&revs->ref_excludes);
59556548 2109 } else if (starts_with(arg, "--tags=")) {
f6aca0dc
JN
2110 struct all_refs_cb cb;
2111 init_all_refs_cb(&cb, revs, *flags);
a217dcbd 2112 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
ff32d342 2113 clear_ref_exclusion(&revs->ref_excludes);
59556548 2114 } else if (starts_with(arg, "--remotes=")) {
f6aca0dc
JN
2115 struct all_refs_cb cb;
2116 init_all_refs_cb(&cb, revs, *flags);
a217dcbd 2117 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
ff32d342 2118 clear_ref_exclusion(&revs->ref_excludes);
f6aca0dc 2119 } else if (!strcmp(arg, "--reflog")) {
718ccc97 2120 add_reflogs_to_pending(revs, *flags);
4fe10219
JK
2121 } else if (!strcmp(arg, "--indexed-objects")) {
2122 add_index_objects_to_pending(revs, *flags);
f6aca0dc 2123 } else if (!strcmp(arg, "--not")) {
7f34a46f 2124 *flags ^= UNINTERESTING | BOTTOM;
f6aca0dc 2125 } else if (!strcmp(arg, "--no-walk")) {
ca92e59e 2126 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
59556548 2127 } else if (starts_with(arg, "--no-walk=")) {
ca92e59e
MZ
2128 /*
2129 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2130 * not allowed, since the argument is optional.
2131 */
2132 if (!strcmp(arg + 10, "sorted"))
2133 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2134 else if (!strcmp(arg + 10, "unsorted"))
2135 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2136 else
2137 return error("invalid argument to --no-walk");
f6aca0dc
JN
2138 } else if (!strcmp(arg, "--do-walk")) {
2139 revs->no_walk = 0;
2140 } else {
2141 return 0;
2142 }
2143
2144 return 1;
2145}
2146
ce113604
JK
2147static void NORETURN diagnose_missing_default(const char *def)
2148{
2149 unsigned char sha1[20];
2150 int flags;
2151 const char *refname;
2152
2153 refname = resolve_ref_unsafe(def, 0, sha1, &flags);
2154 if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2155 die(_("your current branch appears to be broken"));
2156
2157 skip_prefix(refname, "refs/heads/", &refname);
2158 die(_("your current branch '%s' does not have any commits yet"),
2159 refname);
2160}
2161
ae563542
LT
2162/*
2163 * Parse revision information, filling in the "rev_info" structure,
2164 * and removing the used arguments from the argument list.
2165 *
765ac8ec
LT
2166 * Returns the number of arguments left that weren't recognized
2167 * (which are also moved to the head of the argument list)
ae563542 2168 */
32962c9b 2169int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
ae563542 2170{
8e676e8b 2171 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
4da5af31 2172 struct cmdline_pathspec prune_data;
9ef6aeb0
HV
2173 const char *submodule = NULL;
2174
4da5af31 2175 memset(&prune_data, 0, sizeof(prune_data));
9ef6aeb0
HV
2176 if (opt)
2177 submodule = opt->submodule;
ae563542 2178
ae563542 2179 /* First, search for "--" */
6d5b93f2 2180 if (opt && opt->assume_dashdash) {
ae563542 2181 seen_dashdash = 1;
6d5b93f2
CB
2182 } else {
2183 seen_dashdash = 0;
2184 for (i = 1; i < argc; i++) {
2185 const char *arg = argv[i];
2186 if (strcmp(arg, "--"))
2187 continue;
2188 argv[i] = NULL;
2189 argc = i;
2190 if (argv[i + 1])
2191 append_prune_data(&prune_data, argv + i + 1);
2192 seen_dashdash = 1;
2193 break;
2194 }
ae563542
LT
2195 }
2196
02e54220
PH
2197 /* Second, deal with arguments and options */
2198 flags = 0;
d5f6b1d7
JH
2199 revarg_opt = opt ? opt->revarg_opt : 0;
2200 if (seen_dashdash)
2201 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
8b3dce56 2202 read_from_stdin = 0;
02e54220 2203 for (left = i = 1; i < argc; i++) {
ae563542 2204 const char *arg = argv[i];
ae563542 2205 if (*arg == '-') {
cd2bdc53 2206 int opts;
02e54220 2207
f6aca0dc
JN
2208 opts = handle_revision_pseudo_opt(submodule,
2209 revs, argc - i, argv + i,
2210 &flags);
2211 if (opts > 0) {
2212 i += opts - 1;
8e64006e
JS
2213 continue;
2214 }
f6aca0dc 2215
8b3dce56
JH
2216 if (!strcmp(arg, "--stdin")) {
2217 if (revs->disable_stdin) {
2218 argv[left++] = arg;
2219 continue;
2220 }
2221 if (read_from_stdin++)
2222 die("--stdin given twice?");
60da8b15 2223 read_revisions_from_stdin(revs, &prune_data);
8b3dce56
JH
2224 continue;
2225 }
2d10c555 2226
02e54220 2227 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
cd2bdc53 2228 if (opts > 0) {
cd2bdc53
LT
2229 i += opts - 1;
2230 continue;
2231 }
02e54220
PH
2232 if (opts < 0)
2233 exit(128);
ae563542
LT
2234 continue;
2235 }
ae563542 2236
8e676e8b
JH
2237
2238 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
5d6f0935
JH
2239 int j;
2240 if (seen_dashdash || *arg == '^')
ae563542
LT
2241 die("bad revision '%s'", arg);
2242
ea92f41f
JH
2243 /* If we didn't have a "--":
2244 * (1) all filenames must exist;
2245 * (2) all rev-args must not be interpretable
2246 * as a valid filename.
2247 * but the latter we have checked in the main loop.
2248 */
e23d0b4a 2249 for (j = i; j < argc; j++)
023e37c3 2250 verify_filename(revs->prefix, argv[j], j == i);
e23d0b4a 2251
60da8b15 2252 append_prune_data(&prune_data, argv + i);
ae563542
LT
2253 break;
2254 }
8fcaca3f
DO
2255 else
2256 got_rev_arg = 1;
ae563542 2257 }
5d6f0935 2258
4da5af31 2259 if (prune_data.nr) {
93e7d672
JH
2260 /*
2261 * If we need to introduce the magic "a lone ':' means no
2262 * pathspec whatsoever", here is the place to do so.
2263 *
2264 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2265 * prune_data.nr = 0;
2266 * prune_data.alloc = 0;
2267 * free(prune_data.path);
2268 * prune_data.path = NULL;
2269 * } else {
2270 * terminate prune_data.alloc with NULL and
2271 * call init_pathspec() to set revs->prune_data here.
2272 * }
2273 */
9e57ac55 2274 ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
4da5af31 2275 prune_data.path[prune_data.nr++] = NULL;
0fdc2ae5
NTND
2276 parse_pathspec(&revs->prune_data, 0, 0,
2277 revs->prefix, prune_data.path);
4da5af31 2278 }
5486ef0e 2279
02e54220 2280 if (revs->def == NULL)
32962c9b 2281 revs->def = opt ? opt->def : NULL;
b4490059
JH
2282 if (opt && opt->tweak)
2283 opt->tweak(revs, opt);
02e54220 2284 if (revs->show_merge)
ae3e5e1e 2285 prepare_show_merge(revs);
8fcaca3f 2286 if (revs->def && !revs->pending.nr && !got_rev_arg) {
ae563542 2287 unsigned char sha1[20];
cd2bdc53 2288 struct object *object;
249c8f4a 2289 struct object_context oc;
33bd598c 2290 if (get_sha1_with_context(revs->def, 0, sha1, &oc))
ce113604 2291 diagnose_missing_default(revs->def);
02e54220 2292 object = get_reference(revs, revs->def, sha1, 0);
249c8f4a 2293 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
ae563542 2294 }
8efdc326 2295
b7bb760d
LT
2296 /* Did the user ask for any diff output? Run the diff! */
2297 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2298 revs->diff = 1;
2299
0faf2da7
AL
2300 /* Pickaxe, diff-filter and rename following need diffs */
2301 if (revs->diffopt.pickaxe ||
2302 revs->diffopt.filter ||
2303 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
b7bb760d
LT
2304 revs->diff = 1;
2305
9dad9d2e 2306 if (revs->topo_order)
53069686
JH
2307 revs->limited = 1;
2308
afe069d1 2309 if (revs->prune_data.nr) {
bd1928df 2310 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
750f7b66 2311 /* Can't prune commits with rename following: the paths change.. */
8f67f8ae 2312 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
53b2c823 2313 revs->prune = 1;
cd2bdc53 2314 if (!revs->full_diff)
bd1928df
NTND
2315 copy_pathspec(&revs->diffopt.pathspec,
2316 &revs->prune_data);
8efdc326 2317 }
b4490059 2318 if (revs->combine_merges)
cd2bdc53 2319 revs->ignore_merges = 0;
cd2bdc53 2320 revs->diffopt.abbrev = revs->abbrev;
12da1d1f
TR
2321
2322 if (revs->line_level_traverse) {
2323 revs->limited = 1;
2324 revs->topo_order = 1;
2325 }
2326
28452655 2327 diff_setup_done(&revs->diffopt);
8efdc326 2328
918d4e1c
JH
2329 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2330 &revs->grep_filter);
0843acfd 2331 compile_grep_patterns(&revs->grep_filter);
bd95fcd3 2332
d56651c0
SP
2333 if (revs->reverse && revs->reflog_info)
2334 die("cannot combine --reverse with --walk-reflogs");
8bb65883 2335 if (revs->rewrite_parents && revs->children.name)
f35f5603 2336 die("cannot combine --parents and --children");
d56651c0 2337
7fefda5c
AS
2338 /*
2339 * Limitations on the graph functionality
2340 */
2341 if (revs->reverse && revs->graph)
2342 die("cannot combine --reverse with --graph");
2343
2344 if (revs->reflog_info && revs->graph)
2345 die("cannot combine --walk-reflogs with --graph");
695985f4
DJ
2346 if (revs->no_walk && revs->graph)
2347 die("cannot combine --no-walk with --graph");
baa6378f
JH
2348 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2349 die("cannot use --grep-reflog without --walk-reflogs");
7fefda5c 2350
f88851c6
KD
2351 if (revs->first_parent_only && revs->bisect)
2352 die(_("--first-parent is incompatible with --bisect"));
2353
0893eec8
JH
2354 if (revs->expand_tabs_in_log < 0)
2355 revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2356
ae563542
LT
2357 return left;
2358}
a4a88b2b 2359
f35f5603
JH
2360static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2361{
2362 struct commit_list *l = xcalloc(1, sizeof(*l));
2363
2364 l->item = child;
2365 l->next = add_decoration(&revs->children, &parent->object, l);
2366}
2367
d0af663e 2368static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
6546b593 2369{
d0af663e 2370 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
6546b593
JH
2371 struct commit_list **pp, *p;
2372 int surviving_parents;
2373
2374 /* Examine existing parents while marking ones we have seen... */
2375 pp = &commit->parents;
d0af663e 2376 surviving_parents = 0;
6546b593
JH
2377 while ((p = *pp) != NULL) {
2378 struct commit *parent = p->item;
2379 if (parent->object.flags & TMP_MARK) {
2380 *pp = p->next;
d0af663e
KB
2381 if (ts)
2382 compact_treesame(revs, commit, surviving_parents);
6546b593
JH
2383 continue;
2384 }
2385 parent->object.flags |= TMP_MARK;
d0af663e 2386 surviving_parents++;
6546b593
JH
2387 pp = &p->next;
2388 }
d0af663e 2389 /* clear the temporary mark */
6546b593
JH
2390 for (p = commit->parents; p; p = p->next) {
2391 p->item->object.flags &= ~TMP_MARK;
6546b593 2392 }
d0af663e 2393 /* no update_treesame() - removing duplicates can't affect TREESAME */
6546b593
JH
2394 return surviving_parents;
2395}
2396
faf0156b
JH
2397struct merge_simplify_state {
2398 struct commit *simplified;
2399};
2400
2401static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2402{
2403 struct merge_simplify_state *st;
2404
2405 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2406 if (!st) {
2407 st = xcalloc(1, sizeof(*st));
2408 add_decoration(&revs->merge_simplification, &commit->object, st);
2409 }
2410 return st;
2411}
2412
d0af663e
KB
2413static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2414{
2415 struct commit_list *h = reduce_heads(commit->parents);
2416 int i = 0, marked = 0;
2417 struct commit_list *po, *pn;
2418
2419 /* Want these for sanity-checking only */
2420 int orig_cnt = commit_list_count(commit->parents);
2421 int cnt = commit_list_count(h);
2422
2423 /*
2424 * Not ready to remove items yet, just mark them for now, based
2425 * on the output of reduce_heads(). reduce_heads outputs the reduced
2426 * set in its original order, so this isn't too hard.
2427 */
2428 po = commit->parents;
2429 pn = h;
2430 while (po) {
2431 if (pn && po->item == pn->item) {
2432 pn = pn->next;
2433 i++;
2434 } else {
2435 po->item->object.flags |= TMP_MARK;
2436 marked++;
2437 }
2438 po=po->next;
2439 }
2440
2441 if (i != cnt || cnt+marked != orig_cnt)
2442 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2443
2444 free_commit_list(h);
2445
2446 return marked;
2447}
2448
143f1eaf
KB
2449static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2450{
2451 struct commit_list *p;
2452 int marked = 0;
2453
2454 for (p = commit->parents; p; p = p->next) {
2455 struct commit *parent = p->item;
2456 if (!parent->parents && (parent->object.flags & TREESAME)) {
2457 parent->object.flags |= TMP_MARK;
2458 marked++;
2459 }
2460 }
2461
2462 return marked;
2463}
2464
9c129eab
KB
2465/*
2466 * Awkward naming - this means one parent we are TREESAME to.
2467 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2468 * empty tree). Better name suggestions?
2469 */
2470static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2471{
2472 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2473 struct commit *unmarked = NULL, *marked = NULL;
2474 struct commit_list *p;
2475 unsigned n;
2476
2477 for (p = commit->parents, n = 0; p; p = p->next, n++) {
2478 if (ts->treesame[n]) {
2479 if (p->item->object.flags & TMP_MARK) {
2480 if (!marked)
2481 marked = p->item;
2482 } else {
2483 if (!unmarked) {
2484 unmarked = p->item;
2485 break;
2486 }
2487 }
2488 }
2489 }
2490
2491 /*
2492 * If we are TREESAME to a marked-for-deletion parent, but not to any
2493 * unmarked parents, unmark the first TREESAME parent. This is the
2494 * parent that the default simplify_history==1 scan would have followed,
2495 * and it doesn't make sense to omit that path when asking for a
2496 * simplified full history. Retaining it improves the chances of
2497 * understanding odd missed merges that took an old version of a file.
2498 *
2499 * Example:
2500 *
2501 * I--------*X A modified the file, but mainline merge X used
2502 * \ / "-s ours", so took the version from I. X is
2503 * `-*A--' TREESAME to I and !TREESAME to A.
2504 *
2505 * Default log from X would produce "I". Without this check,
2506 * --full-history --simplify-merges would produce "I-A-X", showing
2507 * the merge commit X and that it changed A, but not making clear that
2508 * it had just taken the I version. With this check, the topology above
2509 * is retained.
2510 *
2511 * Note that it is possible that the simplification chooses a different
2512 * TREESAME parent from the default, in which case this test doesn't
2513 * activate, and we _do_ drop the default parent. Example:
2514 *
2515 * I------X A modified the file, but it was reverted in B,
2516 * \ / meaning mainline merge X is TREESAME to both
2517 * *A-*B parents.
2518 *
2519 * Default log would produce "I" by following the first parent;
2520 * --full-history --simplify-merges will produce "I-A-B". But this is a
2521 * reasonable result - it presents a logical full history leading from
2522 * I to X, and X is not an important merge.
2523 */
2524 if (!unmarked && marked) {
2525 marked->object.flags &= ~TMP_MARK;
2526 return 1;
2527 }
2528
2529 return 0;
2530}
2531
d0af663e
KB
2532static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2533{
2534 struct commit_list **pp, *p;
2535 int nth_parent, removed = 0;
2536
2537 pp = &commit->parents;
2538 nth_parent = 0;
2539 while ((p = *pp) != NULL) {
2540 struct commit *parent = p->item;
2541 if (parent->object.flags & TMP_MARK) {
2542 parent->object.flags &= ~TMP_MARK;
2543 *pp = p->next;
2544 free(p);
2545 removed++;
2546 compact_treesame(revs, commit, nth_parent);
2547 continue;
2548 }
2549 pp = &p->next;
2550 nth_parent++;
2551 }
2552
2553 /* Removing parents can only increase TREESAMEness */
2554 if (removed && !(commit->object.flags & TREESAME))
2555 update_treesame(revs, commit);
2556
2557 return nth_parent;
2558}
2559
faf0156b 2560static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
6546b593
JH
2561{
2562 struct commit_list *p;
4d826608 2563 struct commit *parent;
faf0156b 2564 struct merge_simplify_state *st, *pst;
6546b593
JH
2565 int cnt;
2566
faf0156b
JH
2567 st = locate_simplify_state(revs, commit);
2568
6546b593 2569 /*
6546b593
JH
2570 * Have we handled this one?
2571 */
faf0156b 2572 if (st->simplified)
6546b593
JH
2573 return tail;
2574
2575 /*
2576 * An UNINTERESTING commit simplifies to itself, so does a
2577 * root commit. We do not rewrite parents of such commit
2578 * anyway.
2579 */
2580 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
faf0156b 2581 st->simplified = commit;
6546b593
JH
2582 return tail;
2583 }
2584
2585 /*
6e513ba3
JH
2586 * Do we know what commit all of our parents that matter
2587 * should be rewritten to? Otherwise we are not ready to
2588 * rewrite this one yet.
6546b593
JH
2589 */
2590 for (cnt = 0, p = commit->parents; p; p = p->next) {
faf0156b
JH
2591 pst = locate_simplify_state(revs, p->item);
2592 if (!pst->simplified) {
6546b593
JH
2593 tail = &commit_list_insert(p->item, tail)->next;
2594 cnt++;
2595 }
6e513ba3
JH
2596 if (revs->first_parent_only)
2597 break;
6546b593 2598 }
53030f8d
JH
2599 if (cnt) {
2600 tail = &commit_list_insert(commit, tail)->next;
6546b593 2601 return tail;
53030f8d 2602 }
6546b593
JH
2603
2604 /*
d0af663e
KB
2605 * Rewrite our list of parents. Note that this cannot
2606 * affect our TREESAME flags in any way - a commit is
2607 * always TREESAME to its simplification.
6546b593 2608 */
faf0156b
JH
2609 for (p = commit->parents; p; p = p->next) {
2610 pst = locate_simplify_state(revs, p->item);
2611 p->item = pst->simplified;
6e513ba3
JH
2612 if (revs->first_parent_only)
2613 break;
faf0156b 2614 }
4b7f53da 2615
0290bf12 2616 if (revs->first_parent_only)
6e513ba3 2617 cnt = 1;
0290bf12 2618 else
d0af663e 2619 cnt = remove_duplicate_parents(revs, commit);
6546b593
JH
2620
2621 /*
2622 * It is possible that we are a merge and one side branch
2623 * does not have any commit that touches the given paths;
d0af663e
KB
2624 * in such a case, the immediate parent from that branch
2625 * will be rewritten to be the merge base.
6546b593
JH
2626 *
2627 * o----X X: the commit we are looking at;
2628 * / / o: a commit that touches the paths;
2629 * ---o----'
2630 *
143f1eaf
KB
2631 * Further, a merge of an independent branch that doesn't
2632 * touch the path will reduce to a treesame root parent:
2633 *
2634 * ----o----X X: the commit we are looking at;
2635 * / o: a commit that touches the paths;
2636 * r r: a root commit not touching the paths
2637 *
2638 * Detect and simplify both cases.
6546b593
JH
2639 */
2640 if (1 < cnt) {
d0af663e 2641 int marked = mark_redundant_parents(revs, commit);
143f1eaf 2642 marked += mark_treesame_root_parents(revs, commit);
9c129eab
KB
2643 if (marked)
2644 marked -= leave_one_treesame_to_parent(revs, commit);
d0af663e
KB
2645 if (marked)
2646 cnt = remove_marked_parents(revs, commit);
6546b593
JH
2647 }
2648
2649 /*
2650 * A commit simplifies to itself if it is a root, if it is
2651 * UNINTERESTING, if it touches the given paths, or if it is a
4d826608 2652 * merge and its parents don't simplify to one relevant commit
6546b593
JH
2653 * (the first two cases are already handled at the beginning of
2654 * this function).
2655 *
4d826608
KB
2656 * Otherwise, it simplifies to what its sole relevant parent
2657 * simplifies to.
6546b593
JH
2658 */
2659 if (!cnt ||
2660 (commit->object.flags & UNINTERESTING) ||
2661 !(commit->object.flags & TREESAME) ||
4d826608 2662 (parent = one_relevant_parent(revs, commit->parents)) == NULL)
faf0156b
JH
2663 st->simplified = commit;
2664 else {
4d826608 2665 pst = locate_simplify_state(revs, parent);
faf0156b
JH
2666 st->simplified = pst->simplified;
2667 }
6546b593
JH
2668 return tail;
2669}
2670
2671static void simplify_merges(struct rev_info *revs)
2672{
ab9d75a8 2673 struct commit_list *list, *next;
6546b593 2674 struct commit_list *yet_to_do, **tail;
ab9d75a8 2675 struct commit *commit;
6546b593 2676
5eac739e
JH
2677 if (!revs->prune)
2678 return;
65347030 2679
6546b593
JH
2680 /* feed the list reversed */
2681 yet_to_do = NULL;
ab9d75a8
JH
2682 for (list = revs->commits; list; list = next) {
2683 commit = list->item;
2684 next = list->next;
2685 /*
2686 * Do not free(list) here yet; the original list
2687 * is used later in this function.
2688 */
2689 commit_list_insert(commit, &yet_to_do);
2690 }
6546b593
JH
2691 while (yet_to_do) {
2692 list = yet_to_do;
2693 yet_to_do = NULL;
2694 tail = &yet_to_do;
2695 while (list) {
e510ab89 2696 commit = pop_commit(&list);
faf0156b 2697 tail = simplify_one(revs, commit, tail);
6546b593
JH
2698 }
2699 }
2700
2701 /* clean up the result, removing the simplified ones */
2702 list = revs->commits;
2703 revs->commits = NULL;
2704 tail = &revs->commits;
2705 while (list) {
faf0156b 2706 struct merge_simplify_state *st;
ab9d75a8 2707
e510ab89 2708 commit = pop_commit(&list);
faf0156b
JH
2709 st = locate_simplify_state(revs, commit);
2710 if (st->simplified == commit)
6546b593
JH
2711 tail = &commit_list_insert(commit, tail)->next;
2712 }
6546b593
JH
2713}
2714
f35f5603
JH
2715static void set_children(struct rev_info *revs)
2716{
2717 struct commit_list *l;
2718 for (l = revs->commits; l; l = l->next) {
2719 struct commit *commit = l->item;
2720 struct commit_list *p;
2721
2722 for (p = commit->parents; p; p = p->next)
2723 add_child(revs, p->item, commit);
2724 }
2725}
2726
bcc0a3ea
HV
2727void reset_revision_walk(void)
2728{
2729 clear_object_flags(SEEN | ADDED | SHOWN);
2730}
2731
cc0e6c5a 2732int prepare_revision_walk(struct rev_info *revs)
a4a88b2b 2733{
1da1e07c
JK
2734 int i;
2735 struct object_array old_pending;
2e7da8e9 2736 struct commit_list **next = &revs->commits;
cd2bdc53 2737
1da1e07c 2738 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
1f1e895f
LT
2739 revs->pending.nr = 0;
2740 revs->pending.alloc = 0;
2741 revs->pending.objects = NULL;
1da1e07c
JK
2742 for (i = 0; i < old_pending.nr; i++) {
2743 struct object_array_entry *e = old_pending.objects + i;
20739490 2744 struct commit *commit = handle_commit(revs, e);
cd2bdc53
LT
2745 if (commit) {
2746 if (!(commit->object.flags & SEEN)) {
2747 commit->object.flags |= SEEN;
2e7da8e9 2748 next = commit_list_append(commit, next);
cd2bdc53
LT
2749 }
2750 }
cd2bdc53 2751 }
4a43d374 2752 if (!revs->leak_pending)
1da1e07c 2753 object_array_clear(&old_pending);
cd2bdc53 2754
d0af663e 2755 /* Signal whether we need per-parent treesame decoration */
4d826608
KB
2756 if (revs->simplify_merges ||
2757 (revs->limited && limiting_can_increase_treesame(revs)))
d0af663e
KB
2758 revs->treesame.name = "treesame";
2759
ca92e59e
MZ
2760 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2761 commit_list_sort_by_date(&revs->commits);
ba1d4505 2762 if (revs->no_walk)
cc0e6c5a 2763 return 0;
a4a88b2b 2764 if (revs->limited)
cc0e6c5a
AR
2765 if (limit_list(revs) < 0)
2766 return -1;
a4a88b2b 2767 if (revs->topo_order)
08f704f2 2768 sort_in_topological_order(&revs->commits, revs->sort_order);
12da1d1f
TR
2769 if (revs->line_level_traverse)
2770 line_log_filter(revs);
6546b593
JH
2771 if (revs->simplify_merges)
2772 simplify_merges(revs);
f35f5603
JH
2773 if (revs->children.name)
2774 set_children(revs);
cc0e6c5a 2775 return 0;
a4a88b2b
LT
2776}
2777
cc0e6c5a 2778static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
765ac8ec 2779{
fce87ae5
AG
2780 struct commit_list *cache = NULL;
2781
765ac8ec
LT
2782 for (;;) {
2783 struct commit *p = *pp;
3381c790 2784 if (!revs->limited)
fce87ae5 2785 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
cc0e6c5a 2786 return rewrite_one_error;
7dc0fe3b
LT
2787 if (p->object.flags & UNINTERESTING)
2788 return rewrite_one_ok;
2789 if (!(p->object.flags & TREESAME))
cc0e6c5a 2790 return rewrite_one_ok;
765ac8ec 2791 if (!p->parents)
cc0e6c5a 2792 return rewrite_one_noparents;
4d826608
KB
2793 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2794 return rewrite_one_ok;
2795 *pp = p;
765ac8ec
LT
2796 }
2797}
2798
c7edcae0
BY
2799int rewrite_parents(struct rev_info *revs, struct commit *commit,
2800 rewrite_parent_fn_t rewrite_parent)
765ac8ec
LT
2801{
2802 struct commit_list **pp = &commit->parents;
2803 while (*pp) {
2804 struct commit_list *parent = *pp;
c7edcae0 2805 switch (rewrite_parent(revs, &parent->item)) {
cc0e6c5a
AR
2806 case rewrite_one_ok:
2807 break;
2808 case rewrite_one_noparents:
765ac8ec
LT
2809 *pp = parent->next;
2810 continue;
cc0e6c5a
AR
2811 case rewrite_one_error:
2812 return -1;
765ac8ec
LT
2813 }
2814 pp = &parent->next;
2815 }
d0af663e 2816 remove_duplicate_parents(revs, commit);
cc0e6c5a 2817 return 0;
765ac8ec
LT
2818}
2819
d72fbe81
AP
2820static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2821{
2822 char *person, *endp;
2823 size_t len, namelen, maillen;
2824 const char *name;
2825 const char *mail;
2826 struct ident_split ident;
2827
2828 person = strstr(buf->buf, what);
2829 if (!person)
2830 return 0;
2831
2832 person += strlen(what);
2833 endp = strchr(person, '\n');
2834 if (!endp)
2835 return 0;
2836
2837 len = endp - person;
2838
2839 if (split_ident_line(&ident, person, len))
2840 return 0;
2841
2842 mail = ident.mail_begin;
2843 maillen = ident.mail_end - ident.mail_begin;
2844 name = ident.name_begin;
2845 namelen = ident.name_end - ident.name_begin;
2846
2847 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2848 struct strbuf namemail = STRBUF_INIT;
2849
2850 strbuf_addf(&namemail, "%.*s <%.*s>",
2851 (int)namelen, name, (int)maillen, mail);
2852
2853 strbuf_splice(buf, ident.name_begin - buf->buf,
2854 ident.mail_end - ident.name_begin + 1,
2855 namemail.buf, namemail.len);
2856
2857 strbuf_release(&namemail);
2858
2859 return 1;
2860 }
2861
2862 return 0;
2863}
2864
8ecae9b0
JH
2865static int commit_match(struct commit *commit, struct rev_info *opt)
2866{
72fd13f7 2867 int retval;
04deccda 2868 const char *encoding;
b000c59b 2869 const char *message;
72fd13f7 2870 struct strbuf buf = STRBUF_INIT;
04deccda 2871
80235ba7 2872 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
8ecae9b0 2873 return 1;
baa6378f
JH
2874
2875 /* Prepend "fake" headers as needed */
2876 if (opt->grep_filter.use_reflog_filter) {
72fd13f7
NTND
2877 strbuf_addstr(&buf, "reflog ");
2878 get_reflog_message(&buf, opt->reflog_info);
2879 strbuf_addch(&buf, '\n');
72fd13f7 2880 }
baa6378f 2881
04deccda
JK
2882 /*
2883 * We grep in the user's output encoding, under the assumption that it
2884 * is the encoding they are most likely to write their grep pattern
2885 * for. In addition, it means we will match the "notes" encoding below,
2886 * so we will not end up with a buffer that has two different encodings
2887 * in it.
2888 */
2889 encoding = get_log_output_encoding();
5a10d236 2890 message = logmsg_reencode(commit, NULL, encoding);
04deccda 2891
baa6378f
JH
2892 /* Copy the commit to temporary if we are using "fake" headers */
2893 if (buf.len)
04deccda 2894 strbuf_addstr(&buf, message);
baa6378f 2895
df874fa8 2896 if (opt->grep_filter.header_list && opt->mailmap) {
d72fbe81 2897 if (!buf.len)
04deccda 2898 strbuf_addstr(&buf, message);
d72fbe81
AP
2899
2900 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2901 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2902 }
2903
38cfe915
NTND
2904 /* Append "fake" message parts as needed */
2905 if (opt->show_notes) {
2906 if (!buf.len)
04deccda 2907 strbuf_addstr(&buf, message);
ed1c9977 2908 format_display_notes(commit->object.oid.hash, &buf, encoding, 1);
38cfe915
NTND
2909 }
2910
b000c59b
JK
2911 /*
2912 * Find either in the original commit message, or in the temporary.
2913 * Note that we cast away the constness of "message" here. It is
2914 * const because it may come from the cached commit buffer. That's OK,
2915 * because we know that it is modifiable heap memory, and that while
2916 * grep_buffer may modify it for speed, it will restore any
2917 * changes before returning.
2918 */
72fd13f7
NTND
2919 if (buf.len)
2920 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2921 else
2922 retval = grep_buffer(&opt->grep_filter,
b000c59b 2923 (char *)message, strlen(message));
72fd13f7 2924 strbuf_release(&buf);
b66103c3 2925 unuse_commit_buffer(commit, message);
22dfa8a2 2926 return opt->invert_grep ? !retval : retval;
8ecae9b0
JH
2927}
2928
53d00b39 2929static inline int want_ancestry(const struct rev_info *revs)
f35f5603 2930{
8bb65883 2931 return (revs->rewrite_parents || revs->children.name);
f35f5603
JH
2932}
2933
beb5af43 2934enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
252a7c02
LT
2935{
2936 if (commit->object.flags & SHOWN)
2937 return commit_ignore;
ed1c9977 2938 if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))
252a7c02 2939 return commit_ignore;
3131b713
LT
2940 if (revs->show_all)
2941 return commit_show;
252a7c02
LT
2942 if (commit->object.flags & UNINTERESTING)
2943 return commit_ignore;
2944 if (revs->min_age != -1 && (commit->date > revs->min_age))
2945 return commit_ignore;
ad5aeede 2946 if (revs->min_parents || (revs->max_parents >= 0)) {
bf3418b0 2947 int n = commit_list_count(commit->parents);
ad5aeede
MG
2948 if ((n < revs->min_parents) ||
2949 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2950 return commit_ignore;
2951 }
252a7c02
LT
2952 if (!commit_match(commit, revs))
2953 return commit_ignore;
53b2c823 2954 if (revs->prune && revs->dense) {
252a7c02 2955 /* Commit without changes? */
7dc0fe3b 2956 if (commit->object.flags & TREESAME) {
bf3418b0
KB
2957 int n;
2958 struct commit_list *p;
252a7c02 2959 /* drop merges unless we want parenthood */
f35f5603 2960 if (!want_ancestry(revs))
252a7c02 2961 return commit_ignore;
bf3418b0
KB
2962 /*
2963 * If we want ancestry, then need to keep any merges
2964 * between relevant commits to tie together topology.
2965 * For consistency with TREESAME and simplification
2966 * use "relevant" here rather than just INTERESTING,
2967 * to treat bottom commit(s) as part of the topology.
2968 */
2969 for (n = 0, p = commit->parents; p; p = p->next)
2970 if (relevant_commit(p->item))
2971 if (++n >= 2)
2972 return commit_show;
2973 return commit_ignore;
252a7c02 2974 }
252a7c02
LT
2975 }
2976 return commit_show;
2977}
2978
0131c490
JH
2979define_commit_slab(saved_parents, struct commit_list *);
2980
2981#define EMPTY_PARENT_LIST ((struct commit_list *)-1)
2982
2983/*
2984 * You may only call save_parents() once per commit (this is checked
2985 * for non-root commits).
2986 */
2987static void save_parents(struct rev_info *revs, struct commit *commit)
2988{
2989 struct commit_list **pp;
2990
2991 if (!revs->saved_parents_slab) {
2992 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
2993 init_saved_parents(revs->saved_parents_slab);
2994 }
2995
2996 pp = saved_parents_at(revs->saved_parents_slab, commit);
2997
2998 /*
2999 * When walking with reflogs, we may visit the same commit
3000 * several times: once for each appearance in the reflog.
3001 *
3002 * In this case, save_parents() will be called multiple times.
3003 * We want to keep only the first set of parents. We need to
3004 * store a sentinel value for an empty (i.e., NULL) parent
3005 * list to distinguish it from a not-yet-saved list, however.
3006 */
3007 if (*pp)
3008 return;
3009 if (commit->parents)
3010 *pp = copy_commit_list(commit->parents);
3011 else
3012 *pp = EMPTY_PARENT_LIST;
3013}
3014
3015static void free_saved_parents(struct rev_info *revs)
3016{
3017 if (revs->saved_parents_slab)
3018 clear_saved_parents(revs->saved_parents_slab);
3019}
3020
3021struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3022{
3023 struct commit_list *parents;
3024
3025 if (!revs->saved_parents_slab)
3026 return commit->parents;
3027
3028 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3029 if (parents == EMPTY_PARENT_LIST)
3030 return NULL;
3031 return parents;
3032}
3033
beb5af43
AS
3034enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3035{
3036 enum commit_action action = get_commit_action(revs, commit);
3037
3038 if (action == commit_show &&
3039 !revs->show_all &&
3040 revs->prune && revs->dense && want_ancestry(revs)) {
53d00b39
TR
3041 /*
3042 * --full-diff on simplified parents is no good: it
3043 * will show spurious changes from the commits that
3044 * were elided. So we save the parents on the side
3045 * when --full-diff is in effect.
3046 */
3047 if (revs->full_diff)
3048 save_parents(revs, commit);
c7edcae0 3049 if (rewrite_parents(revs, commit, rewrite_one) < 0)
beb5af43
AS
3050 return commit_error;
3051 }
3052 return action;
3053}
3054
1b32dece
NTND
3055static void track_linear(struct rev_info *revs, struct commit *commit)
3056{
3057 if (revs->track_first_time) {
3058 revs->linear = 1;
3059 revs->track_first_time = 0;
3060 } else {
3061 struct commit_list *p;
3062 for (p = revs->previous_parents; p; p = p->next)
3063 if (p->item == NULL || /* first commit */
f2fd0760 3064 !oidcmp(&p->item->object.oid, &commit->object.oid))
1b32dece
NTND
3065 break;
3066 revs->linear = p != NULL;
3067 }
3068 if (revs->reverse) {
3069 if (revs->linear)
3070 commit->object.flags |= TRACK_LINEAR;
3071 }
3072 free_commit_list(revs->previous_parents);
3073 revs->previous_parents = copy_commit_list(commit->parents);
3074}
3075
d5db6c9e 3076static struct commit *get_revision_1(struct rev_info *revs)
a4a88b2b 3077{
d5db6c9e 3078 if (!revs->commits)
a4a88b2b 3079 return NULL;
a4a88b2b 3080
765ac8ec 3081 do {
e510ab89 3082 struct commit *commit = pop_commit(&revs->commits);
2a0925be 3083
ffa1eeae 3084 if (revs->reflog_info) {
838f9a15 3085 save_parents(revs, commit);
8860fd42 3086 fake_reflog_parent(revs->reflog_info, commit);
ffa1eeae
JK
3087 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3088 }
8860fd42 3089
2a0925be
LT
3090 /*
3091 * If we haven't done the list limiting, we need to look at
be7db6e5
LT
3092 * the parents here. We also need to do the date-based limiting
3093 * that we'd otherwise have done in limit_list().
2a0925be 3094 */
be7db6e5 3095 if (!revs->limited) {
744f4985 3096 if (revs->max_age != -1 &&
86ab4906
JH
3097 (commit->date < revs->max_age))
3098 continue;
2db1a43f
VM
3099 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3100 if (!revs->ignore_missing_links)
3101 die("Failed to traverse parents of commit %s",
f2fd0760 3102 oid_to_hex(&commit->object.oid));
2db1a43f 3103 }
be7db6e5 3104 }
744f4985 3105
252a7c02
LT
3106 switch (simplify_commit(revs, commit)) {
3107 case commit_ignore:
8ecae9b0 3108 continue;
252a7c02 3109 case commit_error:
ed62089c 3110 die("Failed to simplify parents of commit %s",
f2fd0760 3111 oid_to_hex(&commit->object.oid));
252a7c02 3112 default:
1b32dece
NTND
3113 if (revs->track_linear)
3114 track_linear(revs, commit);
252a7c02 3115 return commit;
384e99a4 3116 }
765ac8ec
LT
3117 } while (revs->commits);
3118 return NULL;
3119}
d5db6c9e 3120
be6754c6
MH
3121/*
3122 * Return true for entries that have not yet been shown. (This is an
3123 * object_array_each_func_t.)
3124 */
3125static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
86ab4906 3126{
be6754c6
MH
3127 return !(entry->item->flags & SHOWN);
3128}
86ab4906 3129
be6754c6
MH
3130/*
3131 * If array is on the verge of a realloc, garbage-collect any entries
3132 * that have already been shown to try to free up some space.
3133 */
3134static void gc_boundary(struct object_array *array)
3135{
3136 if (array->nr == array->alloc)
3137 object_array_filter(array, entry_unshown, NULL);
86ab4906
JH
3138}
3139
4603ec0f
AS
3140static void create_boundary_commit_list(struct rev_info *revs)
3141{
3142 unsigned i;
3143 struct commit *c;
3144 struct object_array *array = &revs->boundary_commits;
3145 struct object_array_entry *objects = array->objects;
3146
3147 /*
3148 * If revs->commits is non-NULL at this point, an error occurred in
3149 * get_revision_1(). Ignore the error and continue printing the
3150 * boundary commits anyway. (This is what the code has always
3151 * done.)
3152 */
3153 if (revs->commits) {
3154 free_commit_list(revs->commits);
3155 revs->commits = NULL;
3156 }
3157
3158 /*
3159 * Put all of the actual boundary commits from revs->boundary_commits
3160 * into revs->commits
3161 */
3162 for (i = 0; i < array->nr; i++) {
3163 c = (struct commit *)(objects[i].item);
3164 if (!c)
3165 continue;
3166 if (!(c->object.flags & CHILD_SHOWN))
3167 continue;
3168 if (c->object.flags & (SHOWN | BOUNDARY))
3169 continue;
3170 c->object.flags |= BOUNDARY;
3171 commit_list_insert(c, &revs->commits);
3172 }
3173
3174 /*
3175 * If revs->topo_order is set, sort the boundary commits
3176 * in topological order
3177 */
08f704f2 3178 sort_in_topological_order(&revs->commits, revs->sort_order);
4603ec0f
AS
3179}
3180
7fefda5c 3181static struct commit *get_revision_internal(struct rev_info *revs)
d5db6c9e
JH
3182{
3183 struct commit *c = NULL;
86ab4906
JH
3184 struct commit_list *l;
3185
3186 if (revs->boundary == 2) {
4603ec0f
AS
3187 /*
3188 * All of the normal commits have already been returned,
3189 * and we are now returning boundary commits.
3190 * create_boundary_commit_list() has populated
3191 * revs->commits with the remaining commits to return.
3192 */
3193 c = pop_commit(&revs->commits);
3194 if (c)
3195 c->object.flags |= SHOWN;
9c5e66e9
JS
3196 return c;
3197 }
3198
86ab4906 3199 /*
b72a1904
JK
3200 * If our max_count counter has reached zero, then we are done. We
3201 * don't simply return NULL because we still might need to show
3202 * boundary commits. But we want to avoid calling get_revision_1, which
3203 * might do a considerable amount of work finding the next commit only
3204 * for us to throw it away.
3205 *
3206 * If it is non-zero, then either we don't have a max_count at all
3207 * (-1), or it is still counting, in which case we decrement.
86ab4906 3208 */
b72a1904
JK
3209 if (revs->max_count) {
3210 c = get_revision_1(revs);
3211 if (c) {
9e57ac55 3212 while (revs->skip_count > 0) {
b72a1904
JK
3213 revs->skip_count--;
3214 c = get_revision_1(revs);
3215 if (!c)
3216 break;
3217 }
8839ac94 3218 }
86ab4906 3219
b72a1904
JK
3220 if (revs->max_count > 0)
3221 revs->max_count--;
d5db6c9e 3222 }
86ab4906 3223
c33d8593
JH
3224 if (c)
3225 c->object.flags |= SHOWN;
3226
9e57ac55 3227 if (!revs->boundary)
d5db6c9e 3228 return c;
86ab4906
JH
3229
3230 if (!c) {
3231 /*
3232 * get_revision_1() runs out the commits, and
3233 * we are done computing the boundaries.
3234 * switch to boundary commits output mode.
3235 */
3236 revs->boundary = 2;
4603ec0f
AS
3237
3238 /*
3239 * Update revs->commits to contain the list of
3240 * boundary commits.
3241 */
3242 create_boundary_commit_list(revs);
3243
3c68d67b 3244 return get_revision_internal(revs);
86ab4906
JH
3245 }
3246
3247 /*
3248 * boundary commits are the commits that are parents of the
3249 * ones we got from get_revision_1() but they themselves are
3250 * not returned from get_revision_1(). Before returning
3251 * 'c', we need to mark its parents that they could be boundaries.
3252 */
3253
3254 for (l = c->parents; l; l = l->next) {
3255 struct object *p;
3256 p = &(l->item->object);
c33d8593 3257 if (p->flags & (CHILD_SHOWN | SHOWN))
86ab4906
JH
3258 continue;
3259 p->flags |= CHILD_SHOWN;
3260 gc_boundary(&revs->boundary_commits);
3261 add_object_array(p, NULL, &revs->boundary_commits);
3262 }
3263
3264 return c;
d5db6c9e 3265}
7fefda5c
AS
3266
3267struct commit *get_revision(struct rev_info *revs)
3268{
498bcd31
TR
3269 struct commit *c;
3270 struct commit_list *reversed;
3271
3272 if (revs->reverse) {
3273 reversed = NULL;
9e57ac55 3274 while ((c = get_revision_internal(revs)))
498bcd31 3275 commit_list_insert(c, &reversed);
498bcd31
TR
3276 revs->commits = reversed;
3277 revs->reverse = 0;
3278 revs->reverse_output_stage = 1;
3279 }
3280
1b32dece
NTND
3281 if (revs->reverse_output_stage) {
3282 c = pop_commit(&revs->commits);
3283 if (revs->track_linear)
3284 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3285 return c;
3286 }
498bcd31
TR
3287
3288 c = get_revision_internal(revs);
7fefda5c
AS
3289 if (c && revs->graph)
3290 graph_update(revs->graph, c);
1b32dece 3291 if (!c) {
53d00b39 3292 free_saved_parents(revs);
1b32dece
NTND
3293 if (revs->previous_parents) {
3294 free_commit_list(revs->previous_parents);
3295 revs->previous_parents = NULL;
3296 }
3297 }
7fefda5c
AS
3298 return c;
3299}
1df2d656
MG
3300
3301char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3302{
3303 if (commit->object.flags & BOUNDARY)
3304 return "-";
3305 else if (commit->object.flags & UNINTERESTING)
3306 return "^";
adbbb31e
MG
3307 else if (commit->object.flags & PATCHSAME)
3308 return "=";
1df2d656
MG
3309 else if (!revs || revs->left_right) {
3310 if (commit->object.flags & SYMMETRIC_LEFT)
3311 return "<";
3312 else
3313 return ">";
3314 } else if (revs->graph)
3315 return "*";
adbbb31e
MG
3316 else if (revs->cherry_mark)
3317 return "+";
1df2d656
MG
3318 return "";
3319}
b1b47554
MG
3320
3321void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3322{
3323 char *mark = get_revision_mark(revs, commit);
3324 if (!strlen(mark))
3325 return;
3326 fputs(mark, stdout);
3327 putchar(' ');
3328}