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