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