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