Eighth batch for 2.20
[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"
ae563542 28
cdcefbc9
LT
29volatile show_early_output_fn_t show_early_output;
30
cb46d630
AD
31static const char *term_bad;
32static const char *term_good;
33
87be2523
NTND
34implement_shared_commit_slab(revision_sources, char *);
35
de1e67d0 36void show_object_with_name(FILE *out, struct object *obj, const char *name)
ae563542 37{
de1e67d0 38 const char *p;
91f17516 39
f2fd0760 40 fprintf(out, "%s ", oid_to_hex(&obj->oid));
f9fb9d0e
JK
41 for (p = name; *p && *p != '\n'; p++)
42 fputc(*p, out);
beba25ab 43 fputc('\n', out);
91f17516
JH
44}
45
ae563542
LT
46static void mark_blob_uninteresting(struct blob *blob)
47{
c1ee9013
MK
48 if (!blob)
49 return;
ae563542
LT
50 if (blob->object.flags & UNINTERESTING)
51 return;
52 blob->object.flags |= UNINTERESTING;
53}
54
b3c7eef9
NTND
55static void mark_tree_contents_uninteresting(struct repository *r,
56 struct tree *tree)
ae563542 57{
f75e53ed 58 struct tree_desc desc;
4c068a98 59 struct name_entry entry;
ae563542 60
a5411df0 61 if (parse_tree_gently(tree, 1) < 0)
ae563542 62 return;
f75e53ed 63
6fda5e51 64 init_tree_desc(&desc, tree->buffer, tree->size);
4c068a98 65 while (tree_entry(&desc, &entry)) {
4d1012c3
LT
66 switch (object_type(entry.mode)) {
67 case OBJ_TREE:
b3c7eef9 68 mark_tree_uninteresting(r, lookup_tree(r, entry.oid));
4d1012c3
LT
69 break;
70 case OBJ_BLOB:
b3c7eef9 71 mark_blob_uninteresting(lookup_blob(r, entry.oid));
4d1012c3
LT
72 break;
73 default:
74 /* Subproject commit - not in this repository */
75 break;
76 }
ae563542 77 }
f75e53ed
LT
78
79 /*
80 * We don't care about the tree any more
81 * after it has been marked uninteresting.
82 */
6e454b9a 83 free_tree_buffer(tree);
ae563542
LT
84}
85
b3c7eef9 86void mark_tree_uninteresting(struct repository *r, struct tree *tree)
2ac5e447 87{
a2678df3 88 struct object *obj;
2ac5e447
JH
89
90 if (!tree)
91 return;
a2678df3
SN
92
93 obj = &tree->object;
2ac5e447
JH
94 if (obj->flags & UNINTERESTING)
95 return;
96 obj->flags |= UNINTERESTING;
b3c7eef9 97 mark_tree_contents_uninteresting(r, tree);
ae563542
LT
98}
99
43fc643b
JK
100struct commit_stack {
101 struct commit **items;
102 size_t nr, alloc;
103};
104#define COMMIT_STACK_INIT { NULL, 0, 0 }
105
106static void commit_stack_push(struct commit_stack *stack, struct commit *commit)
107{
108 ALLOC_GROW(stack->items, stack->nr + 1, stack->alloc);
109 stack->items[stack->nr++] = commit;
110}
111
112static struct commit *commit_stack_pop(struct commit_stack *stack)
113{
114 return stack->nr ? stack->items[--stack->nr] : NULL;
115}
116
117static void commit_stack_clear(struct commit_stack *stack)
118{
119 FREE_AND_NULL(stack->items);
120 stack->nr = stack->alloc = 0;
121}
122
8702b30f
JK
123static void mark_one_parent_uninteresting(struct commit *commit,
124 struct commit_stack *pending)
125{
126 struct commit_list *l;
127
128 if (commit->object.flags & UNINTERESTING)
129 return;
130 commit->object.flags |= UNINTERESTING;
131
132 /*
133 * Normally we haven't parsed the parent
134 * yet, so we won't have a parent of a parent
135 * here. However, it may turn out that we've
136 * reached this commit some other way (where it
137 * wasn't uninteresting), in which case we need
138 * to mark its parents recursively too..
139 */
140 for (l = commit->parents; l; l = l->next)
141 commit_stack_push(pending, l->item);
142}
143
ae563542
LT
144void mark_parents_uninteresting(struct commit *commit)
145{
43fc643b
JK
146 struct commit_stack pending = COMMIT_STACK_INIT;
147 struct commit_list *l;
941ba8db
NTND
148
149 for (l = commit->parents; l; l = l->next)
8702b30f
JK
150 mark_one_parent_uninteresting(l->item, &pending);
151
152 while (pending.nr > 0)
153 mark_one_parent_uninteresting(commit_stack_pop(&pending),
154 &pending);
43fc643b
JK
155
156 commit_stack_clear(&pending);
ae563542
LT
157}
158
20739490 159static void add_pending_object_with_path(struct rev_info *revs,
ff5f5f26 160 struct object *obj,
20739490
JK
161 const char *name, unsigned mode,
162 const char *path)
ae563542 163{
cc243c3c
JH
164 if (!obj)
165 return;
aa27e461 166 if (revs->no_walk && (obj->flags & UNINTERESTING))
f222abde 167 revs->no_walk = 0;
105e4733
JH
168 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
169 struct strbuf buf = STRBUF_INIT;
0e9f62da 170 int len = interpret_branch_name(name, 0, &buf, 0);
105e4733
JH
171
172 if (0 < len && name[len] && buf.len)
173 strbuf_addstr(&buf, name + len);
d08565bf
JK
174 add_reflog_for_walk(revs->reflog_info,
175 (struct commit *)obj,
176 buf.buf[0] ? buf.buf: name);
105e4733 177 strbuf_release(&buf);
d08565bf 178 return; /* do not add the commit itself */
105e4733 179 }
20739490
JK
180 add_object_array_with_path(obj, name, &revs->pending, mode, path);
181}
182
183static void add_pending_object_with_mode(struct rev_info *revs,
184 struct object *obj,
185 const char *name, unsigned mode)
186{
187 add_pending_object_with_path(revs, obj, name, mode, NULL);
ae563542
LT
188}
189
ff5f5f26
MH
190void add_pending_object(struct rev_info *revs,
191 struct object *obj, const char *name)
2d93b9fa
JH
192{
193 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
194}
195
3384a2df
JH
196void add_head_to_pending(struct rev_info *revs)
197{
654b9a90 198 struct object_id oid;
3384a2df 199 struct object *obj;
654b9a90 200 if (get_oid("HEAD", &oid))
3384a2df 201 return;
b3c7eef9 202 obj = parse_object(revs->repo, &oid);
3384a2df
JH
203 if (!obj)
204 return;
205 add_pending_object(revs, obj, "HEAD");
206}
207
ff5f5f26 208static struct object *get_reference(struct rev_info *revs, const char *name,
654b9a90 209 const struct object_id *oid,
ff5f5f26 210 unsigned int flags)
ae563542
LT
211{
212 struct object *object;
213
b3c7eef9 214 object = parse_object(revs->repo, oid);
cc243c3c
JH
215 if (!object) {
216 if (revs->ignore_missing)
217 return object;
df11e196
JT
218 if (revs->exclude_promisor_objects && is_promisor_object(oid))
219 return NULL;
ae563542 220 die("bad object %s", name);
cc243c3c 221 }
cd2bdc53
LT
222 object->flags |= flags;
223 return object;
224}
225
a58a1b01 226void add_pending_oid(struct rev_info *revs, const char *name,
227 const struct object_id *oid, unsigned int flags)
26c3177e 228{
654b9a90 229 struct object *object = get_reference(revs, name, oid, flags);
26c3177e
RS
230 add_pending_object(revs, object, name);
231}
232
ff5f5f26 233static struct commit *handle_commit(struct rev_info *revs,
20739490 234 struct object_array_entry *entry)
cd2bdc53 235{
20739490
JK
236 struct object *object = entry->item;
237 const char *name = entry->name;
238 const char *path = entry->path;
239 unsigned int mode = entry->mode;
cd2bdc53 240 unsigned long flags = object->flags;
ae563542
LT
241
242 /*
243 * Tag object? Look what it points to..
244 */
1974632c 245 while (object->type == OBJ_TAG) {
ae563542 246 struct tag *tag = (struct tag *) object;
cd2bdc53 247 if (revs->tag_objects && !(flags & UNINTERESTING))
ae563542 248 add_pending_object(revs, object, tag->tag);
9684afd9
MK
249 if (!tag->tagged)
250 die("bad tag");
b3c7eef9 251 object = parse_object(revs->repo, &tag->tagged->oid);
aeeae1b7 252 if (!object) {
a3ba6bf1 253 if (revs->ignore_missing_links || (flags & UNINTERESTING))
aeeae1b7 254 return NULL;
dc0a13f6
JT
255 if (revs->exclude_promisor_objects &&
256 is_promisor_object(&tag->tagged->oid))
257 return NULL;
f2fd0760 258 die("bad object %s", oid_to_hex(&tag->tagged->oid));
aeeae1b7 259 }
a7435286 260 object->flags |= flags;
20739490
JK
261 /*
262 * We'll handle the tagged object by looping or dropping
263 * through to the non-tag handlers below. Do not
728350b7 264 * propagate path data from the tag's pending entry.
20739490 265 */
20739490
JK
266 path = NULL;
267 mode = 0;
ae563542
LT
268 }
269
270 /*
271 * Commit object? Just return it, we'll do all the complex
272 * reachability crud.
273 */
1974632c 274 if (object->type == OBJ_COMMIT) {
ae563542 275 struct commit *commit = (struct commit *)object;
87be2523 276
ae563542
LT
277 if (parse_commit(commit) < 0)
278 die("unable to parse commit %s", name);
d9a83684 279 if (flags & UNINTERESTING) {
ae563542 280 mark_parents_uninteresting(commit);
d9a83684
LT
281 revs->limited = 1;
282 }
87be2523
NTND
283 if (revs->sources) {
284 char **slot = revision_sources_at(revs->sources, commit);
285
286 if (!*slot)
287 *slot = xstrdup(name);
288 }
ae563542
LT
289 return commit;
290 }
291
292 /*
3ea3c215 293 * Tree object? Either mark it uninteresting, or add it
ae563542
LT
294 * to the list of objects to look at later..
295 */
1974632c 296 if (object->type == OBJ_TREE) {
ae563542
LT
297 struct tree *tree = (struct tree *)object;
298 if (!revs->tree_objects)
299 return NULL;
300 if (flags & UNINTERESTING) {
b3c7eef9 301 mark_tree_contents_uninteresting(revs->repo, tree);
ae563542
LT
302 return NULL;
303 }
20739490 304 add_pending_object_with_path(revs, object, name, mode, path);
ae563542
LT
305 return NULL;
306 }
307
308 /*
309 * Blob object? You know the drill by now..
310 */
1974632c 311 if (object->type == OBJ_BLOB) {
ae563542
LT
312 if (!revs->blob_objects)
313 return NULL;
a7435286 314 if (flags & UNINTERESTING)
ae563542 315 return NULL;
20739490 316 add_pending_object_with_path(revs, object, name, mode, path);
ae563542
LT
317 return NULL;
318 }
319 die("%s is unknown object", name);
320}
321
b6e8a3b5
JK
322static int everybody_uninteresting(struct commit_list *orig,
323 struct commit **interesting_cache)
a4a88b2b
LT
324{
325 struct commit_list *list = orig;
b6e8a3b5
JK
326
327 if (*interesting_cache) {
328 struct commit *commit = *interesting_cache;
329 if (!(commit->object.flags & UNINTERESTING))
330 return 0;
331 }
332
a4a88b2b
LT
333 while (list) {
334 struct commit *commit = list->item;
335 list = list->next;
336 if (commit->object.flags & UNINTERESTING)
337 continue;
ae40ebda
SB
338
339 *interesting_cache = commit;
a4a88b2b
LT
340 return 0;
341 }
342 return 1;
343}
344
4d826608
KB
345/*
346 * A definition of "relevant" commit that we can use to simplify limited graphs
347 * by eliminating side branches.
348 *
349 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
350 * in our list), or that is a specified BOTTOM commit. Then after computing
351 * a limited list, during processing we can generally ignore boundary merges
352 * coming from outside the graph, (ie from irrelevant parents), and treat
353 * those merges as if they were single-parent. TREESAME is defined to consider
354 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
355 * we don't care if we were !TREESAME to non-graph parents.
356 *
357 * Treating bottom commits as relevant ensures that a limited graph's
358 * connection to the actual bottom commit is not viewed as a side branch, but
359 * treated as part of the graph. For example:
360 *
361 * ....Z...A---X---o---o---B
362 * . /
363 * W---Y
364 *
365 * When computing "A..B", the A-X connection is at least as important as
366 * Y-X, despite A being flagged UNINTERESTING.
367 *
368 * And when computing --ancestry-path "A..B", the A-X connection is more
369 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
370 */
371static inline int relevant_commit(struct commit *commit)
372{
373 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
374}
375
376/*
377 * Return a single relevant commit from a parent list. If we are a TREESAME
378 * commit, and this selects one of our parents, then we can safely simplify to
379 * that parent.
380 */
381static struct commit *one_relevant_parent(const struct rev_info *revs,
382 struct commit_list *orig)
383{
384 struct commit_list *list = orig;
385 struct commit *relevant = NULL;
386
387 if (!orig)
388 return NULL;
389
390 /*
391 * For 1-parent commits, or if first-parent-only, then return that
392 * first parent (even if not "relevant" by the above definition).
393 * TREESAME will have been set purely on that parent.
394 */
395 if (revs->first_parent_only || !orig->next)
396 return orig->item;
397
398 /*
399 * For multi-parent commits, identify a sole relevant parent, if any.
400 * If we have only one relevant parent, then TREESAME will be set purely
401 * with regard to that parent, and we can simplify accordingly.
402 *
403 * If we have more than one relevant parent, or no relevant parents
404 * (and multiple irrelevant ones), then we can't select a parent here
405 * and return NULL.
406 */
407 while (list) {
408 struct commit *commit = list->item;
409 list = list->next;
410 if (relevant_commit(commit)) {
411 if (relevant)
412 return NULL;
413 relevant = commit;
414 }
415 }
416 return relevant;
417}
418
0a4ba7f8
JH
419/*
420 * The goal is to get REV_TREE_NEW as the result only if the
ceff8e7a
LT
421 * diff consists of all '+' (and no other changes), REV_TREE_OLD
422 * if the whole diff is removal of old data, and otherwise
423 * REV_TREE_DIFFERENT (of course if the trees are the same we
424 * want REV_TREE_SAME).
a937b37e
JK
425 *
426 * The only time we care about the distinction is when
427 * remove_empty_trees is in effect, in which case we care only about
428 * whether the whole change is REV_TREE_NEW, or if there's another type
429 * of change. Which means we can stop the diff early in either of these
430 * cases:
431 *
432 * 1. We're not using remove_empty_trees at all.
433 *
434 * 2. We saw anything except REV_TREE_NEW.
0a4ba7f8 435 */
8efdc326 436static int tree_difference = REV_TREE_SAME;
a4a88b2b
LT
437
438static void file_add_remove(struct diff_options *options,
439 int addremove, unsigned mode,
c26022ea
BW
440 const struct object_id *oid,
441 int oid_valid,
e3d42c47 442 const char *fullpath, unsigned dirty_submodule)
a4a88b2b 443{
ceff8e7a 444 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
a937b37e 445 struct rev_info *revs = options->change_fn_data;
a4a88b2b 446
ceff8e7a 447 tree_difference |= diff;
a937b37e 448 if (!revs->remove_empty_trees || tree_difference != REV_TREE_NEW)
0d1e0e78 449 options->flags.has_changes = 1;
a4a88b2b
LT
450}
451
452static void file_change(struct diff_options *options,
453 unsigned old_mode, unsigned new_mode,
94a0097a
BW
454 const struct object_id *old_oid,
455 const struct object_id *new_oid,
456 int old_oid_valid, int new_oid_valid,
e3d42c47
JL
457 const char *fullpath,
458 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
a4a88b2b 459{
8efdc326 460 tree_difference = REV_TREE_DIFFERENT;
0d1e0e78 461 options->flags.has_changes = 1;
a4a88b2b
LT
462}
463
ff5f5f26
MH
464static int rev_compare_tree(struct rev_info *revs,
465 struct commit *parent, struct commit *commit)
a4a88b2b 466{
2e27bd77
DS
467 struct tree *t1 = get_commit_tree(parent);
468 struct tree *t2 = get_commit_tree(commit);
3a5e8608 469
a4a88b2b 470 if (!t1)
8efdc326 471 return REV_TREE_NEW;
ceff8e7a
LT
472 if (!t2)
473 return REV_TREE_OLD;
78892e32
LT
474
475 if (revs->simplify_by_decoration) {
476 /*
477 * If we are simplifying by decoration, then the commit
478 * is worth showing if it has a tag pointing at it.
479 */
2608c249 480 if (get_name_decoration(&commit->object))
78892e32
LT
481 return REV_TREE_DIFFERENT;
482 /*
483 * A commit that is not pointed by a tag is uninteresting
484 * if we are not limited by path. This means that you will
485 * see the usual "commits that touch the paths" plus any
486 * tagged commit by specifying both --simplify-by-decoration
487 * and pathspec.
488 */
afe069d1 489 if (!revs->prune_data.nr)
78892e32
LT
490 return REV_TREE_SAME;
491 }
ceff8e7a 492
8efdc326 493 tree_difference = REV_TREE_SAME;
0d1e0e78 494 revs->pruning.flags.has_changes = 0;
66f414f8 495 if (diff_tree_oid(&t1->object.oid, &t2->object.oid, "",
cd2bdc53 496 &revs->pruning) < 0)
8efdc326 497 return REV_TREE_DIFFERENT;
a4a88b2b
LT
498 return tree_difference;
499}
500
3a5e8608 501static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
a4a88b2b
LT
502{
503 int retval;
2e27bd77 504 struct tree *t1 = get_commit_tree(commit);
a4a88b2b
LT
505
506 if (!t1)
507 return 0;
508
0a4ba7f8 509 tree_difference = REV_TREE_SAME;
0d1e0e78 510 revs->pruning.flags.has_changes = 0;
66f414f8 511 retval = diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
a4a88b2b 512
0a4ba7f8 513 return retval >= 0 && (tree_difference == REV_TREE_SAME);
a4a88b2b
LT
514}
515
d0af663e
KB
516struct treesame_state {
517 unsigned int nparents;
518 unsigned char treesame[FLEX_ARRAY];
519};
520
521static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
522{
523 unsigned n = commit_list_count(commit->parents);
50a6c8ef 524 struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
d0af663e
KB
525 st->nparents = n;
526 add_decoration(&revs->treesame, &commit->object, st);
527 return st;
528}
529
530/*
531 * Must be called immediately after removing the nth_parent from a commit's
532 * parent list, if we are maintaining the per-parent treesame[] decoration.
533 * This does not recalculate the master TREESAME flag - update_treesame()
534 * should be called to update it after a sequence of treesame[] modifications
535 * that may have affected it.
536 */
537static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
538{
539 struct treesame_state *st;
540 int old_same;
541
542 if (!commit->parents) {
543 /*
544 * Have just removed the only parent from a non-merge.
545 * Different handling, as we lack decoration.
546 */
547 if (nth_parent != 0)
548 die("compact_treesame %u", nth_parent);
549 old_same = !!(commit->object.flags & TREESAME);
550 if (rev_same_tree_as_empty(revs, commit))
551 commit->object.flags |= TREESAME;
552 else
553 commit->object.flags &= ~TREESAME;
554 return old_same;
555 }
556
557 st = lookup_decoration(&revs->treesame, &commit->object);
558 if (!st || nth_parent >= st->nparents)
559 die("compact_treesame %u", nth_parent);
560
561 old_same = st->treesame[nth_parent];
562 memmove(st->treesame + nth_parent,
563 st->treesame + nth_parent + 1,
564 st->nparents - nth_parent - 1);
565
566 /*
567 * If we've just become a non-merge commit, update TREESAME
568 * immediately, and remove the no-longer-needed decoration.
569 * If still a merge, defer update until update_treesame().
570 */
571 if (--st->nparents == 1) {
572 if (commit->parents->next)
573 die("compact_treesame parents mismatch");
574 if (st->treesame[0] && revs->dense)
575 commit->object.flags |= TREESAME;
576 else
577 commit->object.flags &= ~TREESAME;
578 free(add_decoration(&revs->treesame, &commit->object, NULL));
579 }
580
581 return old_same;
582}
583
584static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
585{
586 if (commit->parents && commit->parents->next) {
587 unsigned n;
588 struct treesame_state *st;
4d826608
KB
589 struct commit_list *p;
590 unsigned relevant_parents;
591 unsigned relevant_change, irrelevant_change;
d0af663e
KB
592
593 st = lookup_decoration(&revs->treesame, &commit->object);
594 if (!st)
f2fd0760 595 die("update_treesame %s", oid_to_hex(&commit->object.oid));
4d826608
KB
596 relevant_parents = 0;
597 relevant_change = irrelevant_change = 0;
598 for (p = commit->parents, n = 0; p; n++, p = p->next) {
599 if (relevant_commit(p->item)) {
600 relevant_change |= !st->treesame[n];
601 relevant_parents++;
602 } else
603 irrelevant_change |= !st->treesame[n];
d0af663e 604 }
4d826608
KB
605 if (relevant_parents ? relevant_change : irrelevant_change)
606 commit->object.flags &= ~TREESAME;
607 else
608 commit->object.flags |= TREESAME;
d0af663e
KB
609 }
610
611 return commit->object.flags & TREESAME;
612}
613
4d826608
KB
614static inline int limiting_can_increase_treesame(const struct rev_info *revs)
615{
616 /*
617 * TREESAME is irrelevant unless prune && dense;
618 * if simplify_history is set, we can't have a mixture of TREESAME and
619 * !TREESAME INTERESTING parents (and we don't have treesame[]
620 * decoration anyway);
621 * if first_parent_only is set, then the TREESAME flag is locked
622 * against the first parent (and again we lack treesame[] decoration).
623 */
624 return revs->prune && revs->dense &&
625 !revs->simplify_history &&
626 !revs->first_parent_only;
627}
628
a4a88b2b
LT
629static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
630{
631 struct commit_list **pp, *parent;
d0af663e 632 struct treesame_state *ts = NULL;
4d826608
KB
633 int relevant_change = 0, irrelevant_change = 0;
634 int relevant_parents, nth_parent;
a4a88b2b 635
53b2c823
LT
636 /*
637 * If we don't do pruning, everything is interesting
638 */
7dc0fe3b 639 if (!revs->prune)
53b2c823 640 return;
53b2c823 641
2e27bd77 642 if (!get_commit_tree(commit))
a4a88b2b
LT
643 return;
644
645 if (!commit->parents) {
3a5e8608 646 if (rev_same_tree_as_empty(revs, commit))
7dc0fe3b 647 commit->object.flags |= TREESAME;
a4a88b2b
LT
648 return;
649 }
650
53b2c823
LT
651 /*
652 * Normal non-merge commit? If we don't want to make the
653 * history dense, we consider it always to be a change..
654 */
7dc0fe3b 655 if (!revs->dense && !commit->parents->next)
53b2c823 656 return;
53b2c823 657
4d826608 658 for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
d0af663e
KB
659 (parent = *pp) != NULL;
660 pp = &parent->next, nth_parent++) {
a4a88b2b 661 struct commit *p = parent->item;
4d826608
KB
662 if (relevant_commit(p))
663 relevant_parents++;
a4a88b2b 664
d0af663e
KB
665 if (nth_parent == 1) {
666 /*
667 * This our second loop iteration - so we now know
668 * we're dealing with a merge.
669 *
670 * Do not compare with later parents when we care only about
671 * the first parent chain, in order to avoid derailing the
672 * traversal to follow a side branch that brought everything
673 * in the path we are limited to by the pathspec.
674 */
675 if (revs->first_parent_only)
676 break;
677 /*
678 * If this will remain a potentially-simplifiable
679 * merge, remember per-parent treesame if needed.
680 * Initialise the array with the comparison from our
681 * first iteration.
682 */
683 if (revs->treesame.name &&
684 !revs->simplify_history &&
685 !(commit->object.flags & UNINTERESTING)) {
686 ts = initialise_treesame(revs, commit);
4d826608 687 if (!(irrelevant_change || relevant_change))
d0af663e
KB
688 ts->treesame[0] = 1;
689 }
690 }
cc0e6c5a
AR
691 if (parse_commit(p) < 0)
692 die("cannot simplify commit %s (because of %s)",
f2fd0760 693 oid_to_hex(&commit->object.oid),
694 oid_to_hex(&p->object.oid));
3a5e8608 695 switch (rev_compare_tree(revs, p, commit)) {
8efdc326 696 case REV_TREE_SAME:
141efdba 697 if (!revs->simplify_history || !relevant_commit(p)) {
f3219fbb
JH
698 /* Even if a merge with an uninteresting
699 * side branch brought the entire change
700 * we are interested in, we do not want
701 * to lose the other branches of this
702 * merge, so we just keep going.
703 */
d0af663e
KB
704 if (ts)
705 ts->treesame[nth_parent] = 1;
f3219fbb
JH
706 continue;
707 }
a4a88b2b
LT
708 parent->next = NULL;
709 commit->parents = parent;
7dc0fe3b 710 commit->object.flags |= TREESAME;
a4a88b2b
LT
711 return;
712
8efdc326
FK
713 case REV_TREE_NEW:
714 if (revs->remove_empty_trees &&
3a5e8608 715 rev_same_tree_as_empty(revs, p)) {
c348f31a
JH
716 /* We are adding all the specified
717 * paths from this parent, so the
718 * history beyond this parent is not
719 * interesting. Remove its parents
720 * (they are grandparents for us).
721 * IOW, we pretend this parent is a
722 * "root" commit.
a41e109c 723 */
cc0e6c5a
AR
724 if (parse_commit(p) < 0)
725 die("cannot simplify commit %s (invalid %s)",
f2fd0760 726 oid_to_hex(&commit->object.oid),
727 oid_to_hex(&p->object.oid));
c348f31a 728 p->parents = NULL;
a4a88b2b
LT
729 }
730 /* fallthrough */
ceff8e7a 731 case REV_TREE_OLD:
8efdc326 732 case REV_TREE_DIFFERENT:
4d826608
KB
733 if (relevant_commit(p))
734 relevant_change = 1;
735 else
736 irrelevant_change = 1;
a4a88b2b
LT
737 continue;
738 }
f2fd0760 739 die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
a4a88b2b 740 }
4d826608
KB
741
742 /*
743 * TREESAME is straightforward for single-parent commits. For merge
744 * commits, it is most useful to define it so that "irrelevant"
745 * parents cannot make us !TREESAME - if we have any relevant
746 * parents, then we only consider TREESAMEness with respect to them,
747 * allowing irrelevant merges from uninteresting branches to be
748 * simplified away. Only if we have only irrelevant parents do we
749 * base TREESAME on them. Note that this logic is replicated in
750 * update_treesame, which should be kept in sync.
751 */
752 if (relevant_parents ? !relevant_change : !irrelevant_change)
753 commit->object.flags |= TREESAME;
a4a88b2b
LT
754}
755
47e44ed1 756static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
fce87ae5
AG
757 struct commit_list *cached_base, struct commit_list **cache)
758{
759 struct commit_list *new_entry;
760
761 if (cached_base && p->date < cached_base->item->date)
47e44ed1 762 new_entry = commit_list_insert_by_date(p, &cached_base->next);
fce87ae5 763 else
47e44ed1 764 new_entry = commit_list_insert_by_date(p, head);
fce87ae5
AG
765
766 if (cache && (!*cache || p->date < (*cache)->item->date))
767 *cache = new_entry;
768}
769
770static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
771 struct commit_list **list, struct commit_list **cache_ptr)
a4a88b2b
LT
772{
773 struct commit_list *parent = commit->parents;
577ed5c2 774 unsigned left_flag;
fce87ae5 775 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
a4a88b2b 776
3381c790 777 if (commit->object.flags & ADDED)
cc0e6c5a 778 return 0;
3381c790
LT
779 commit->object.flags |= ADDED;
780
a330de31
VM
781 if (revs->include_check &&
782 !revs->include_check(commit, revs->include_check_data))
783 return 0;
784
a4a88b2b
LT
785 /*
786 * If the commit is uninteresting, don't try to
787 * prune parents - we want the maximal uninteresting
788 * set.
789 *
790 * Normally we haven't parsed the parent
791 * yet, so we won't have a parent of a parent
792 * here. However, it may turn out that we've
793 * reached this commit some other way (where it
794 * wasn't uninteresting), in which case we need
795 * to mark its parents recursively too..
796 */
797 if (commit->object.flags & UNINTERESTING) {
798 while (parent) {
799 struct commit *p = parent->item;
800 parent = parent->next;
aeeae1b7
JH
801 if (p)
802 p->object.flags |= UNINTERESTING;
ce4e7b2a 803 if (parse_commit_gently(p, 1) < 0)
aeeae1b7 804 continue;
a4a88b2b
LT
805 if (p->parents)
806 mark_parents_uninteresting(p);
807 if (p->object.flags & SEEN)
808 continue;
809 p->object.flags |= SEEN;
47e44ed1 810 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
a4a88b2b 811 }
cc0e6c5a 812 return 0;
a4a88b2b
LT
813 }
814
815 /*
816 * Ok, the commit wasn't uninteresting. Try to
817 * simplify the commit history and find the parent
818 * that has no differences in the path set if one exists.
819 */
53b2c823 820 try_to_simplify_commit(revs, commit);
a4a88b2b 821
ba1d4505 822 if (revs->no_walk)
cc0e6c5a 823 return 0;
ba1d4505 824
577ed5c2 825 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
0053e902 826
d9c292e8 827 for (parent = commit->parents; parent; parent = parent->next) {
a4a88b2b 828 struct commit *p = parent->item;
df11e196
JT
829 int gently = revs->ignore_missing_links ||
830 revs->exclude_promisor_objects;
831 if (parse_commit_gently(p, gently) < 0) {
832 if (revs->exclude_promisor_objects &&
833 is_promisor_object(&p->object.oid)) {
834 if (revs->first_parent_only)
835 break;
836 continue;
837 }
cc0e6c5a 838 return -1;
df11e196 839 }
87be2523
NTND
840 if (revs->sources) {
841 char **slot = revision_sources_at(revs->sources, p);
842
843 if (!*slot)
844 *slot = *revision_sources_at(revs->sources, commit);
845 }
577ed5c2 846 p->object.flags |= left_flag;
ad1012eb
LH
847 if (!(p->object.flags & SEEN)) {
848 p->object.flags |= SEEN;
47e44ed1 849 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
ad1012eb 850 }
60d30b02 851 if (revs->first_parent_only)
d9c292e8 852 break;
a4a88b2b 853 }
cc0e6c5a 854 return 0;
a4a88b2b
LT
855}
856
36d56de6 857static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
d7a17cad
JH
858{
859 struct commit_list *p;
860 int left_count = 0, right_count = 0;
861 int left_first;
862 struct patch_ids ids;
adbbb31e 863 unsigned cherry_flag;
d7a17cad
JH
864
865 /* First count the commits on the left and on the right */
866 for (p = list; p; p = p->next) {
867 struct commit *commit = p->item;
868 unsigned flags = commit->object.flags;
869 if (flags & BOUNDARY)
870 ;
871 else if (flags & SYMMETRIC_LEFT)
872 left_count++;
873 else
874 right_count++;
875 }
876
36c07975
TR
877 if (!left_count || !right_count)
878 return;
879
d7a17cad 880 left_first = left_count < right_count;
2abf3503 881 init_patch_ids(revs->repo, &ids);
66f13625 882 ids.diffopts.pathspec = revs->diffopt.pathspec;
d7a17cad
JH
883
884 /* Compute patch-ids for one side */
885 for (p = list; p; p = p->next) {
886 struct commit *commit = p->item;
887 unsigned flags = commit->object.flags;
888
889 if (flags & BOUNDARY)
890 continue;
891 /*
892 * If we have fewer left, left_first is set and we omit
893 * commits on the right branch in this loop. If we have
894 * fewer right, we skip the left ones.
895 */
896 if (left_first != !!(flags & SYMMETRIC_LEFT))
897 continue;
683f17ec 898 add_commit_patch_id(commit, &ids);
d7a17cad
JH
899 }
900
adbbb31e
MG
901 /* either cherry_mark or cherry_pick are true */
902 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
903
d7a17cad
JH
904 /* Check the other side */
905 for (p = list; p; p = p->next) {
906 struct commit *commit = p->item;
907 struct patch_id *id;
908 unsigned flags = commit->object.flags;
909
910 if (flags & BOUNDARY)
911 continue;
912 /*
913 * If we have fewer left, left_first is set and we omit
914 * commits on the left branch in this loop.
915 */
916 if (left_first == !!(flags & SYMMETRIC_LEFT))
917 continue;
918
919 /*
920 * Have we seen the same patch id?
921 */
922 id = has_commit_patch_id(commit, &ids);
923 if (!id)
924 continue;
d7a17cad 925
683f17ec
KW
926 commit->object.flags |= cherry_flag;
927 id->commit->object.flags |= cherry_flag;
d7a17cad
JH
928 }
929
930 free_patch_ids(&ids);
931}
932
7d004199
LT
933/* How many extra uninteresting commits we want to see.. */
934#define SLOP 5
935
dddbad72 936static int still_interesting(struct commit_list *src, timestamp_t date, int slop,
b6e8a3b5 937 struct commit **interesting_cache)
3131b713 938{
7d004199
LT
939 /*
940 * No source list at all? We're definitely done..
941 */
942 if (!src)
943 return 0;
944
945 /*
946 * Does the destination list contain entries with a date
947 * before the source list? Definitely _not_ done.
948 */
c19d1b4e 949 if (date <= src->item->date)
7d004199
LT
950 return SLOP;
951
952 /*
953 * Does the source list still have interesting commits in
954 * it? Definitely not done..
955 */
b6e8a3b5 956 if (!everybody_uninteresting(src, interesting_cache))
7d004199
LT
957 return SLOP;
958
959 /* Ok, we're closing in.. */
960 return slop-1;
3131b713
LT
961}
962
ebdc94f3
JH
963/*
964 * "rev-list --ancestry-path A..B" computes commits that are ancestors
965 * of B but not ancestors of A but further limits the result to those
966 * that are descendants of A. This takes the list of bottom commits and
967 * the result of "A..B" without --ancestry-path, and limits the latter
968 * further to the ones that can reach one of the commits in "bottom".
969 */
970static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
971{
972 struct commit_list *p;
973 struct commit_list *rlist = NULL;
974 int made_progress;
975
976 /*
977 * Reverse the list so that it will be likely that we would
978 * process parents before children.
979 */
980 for (p = list; p; p = p->next)
981 commit_list_insert(p->item, &rlist);
982
983 for (p = bottom; p; p = p->next)
984 p->item->object.flags |= TMP_MARK;
985
986 /*
987 * Mark the ones that can reach bottom commits in "list",
988 * in a bottom-up fashion.
989 */
990 do {
991 made_progress = 0;
992 for (p = rlist; p; p = p->next) {
993 struct commit *c = p->item;
994 struct commit_list *parents;
995 if (c->object.flags & (TMP_MARK | UNINTERESTING))
996 continue;
997 for (parents = c->parents;
998 parents;
999 parents = parents->next) {
1000 if (!(parents->item->object.flags & TMP_MARK))
1001 continue;
1002 c->object.flags |= TMP_MARK;
1003 made_progress = 1;
1004 break;
1005 }
1006 }
1007 } while (made_progress);
1008
1009 /*
1010 * NEEDSWORK: decide if we want to remove parents that are
1011 * not marked with TMP_MARK from commit->parents for commits
1012 * in the resulting list. We may not want to do that, though.
1013 */
1014
1015 /*
1016 * The ones that are not marked with TMP_MARK are uninteresting
1017 */
1018 for (p = list; p; p = p->next) {
1019 struct commit *c = p->item;
1020 if (c->object.flags & TMP_MARK)
1021 continue;
1022 c->object.flags |= UNINTERESTING;
1023 }
1024
1025 /* We are done with the TMP_MARK */
1026 for (p = list; p; p = p->next)
1027 p->item->object.flags &= ~TMP_MARK;
1028 for (p = bottom; p; p = p->next)
1029 p->item->object.flags &= ~TMP_MARK;
1030 free_commit_list(rlist);
1031}
1032
1033/*
1034 * Before walking the history, keep the set of "negative" refs the
1035 * caller has asked to exclude.
1036 *
1037 * This is used to compute "rev-list --ancestry-path A..B", as we need
1038 * to filter the result of "A..B" further to the ones that can actually
1039 * reach A.
1040 */
7f34a46f 1041static struct commit_list *collect_bottom_commits(struct commit_list *list)
ebdc94f3 1042{
7f34a46f
KB
1043 struct commit_list *elem, *bottom = NULL;
1044 for (elem = list; elem; elem = elem->next)
1045 if (elem->item->object.flags & BOTTOM)
1046 commit_list_insert(elem->item, &bottom);
ebdc94f3
JH
1047 return bottom;
1048}
1049
60adf7d7
MG
1050/* Assumes either left_only or right_only is set */
1051static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1052{
1053 struct commit_list *p;
1054
1055 for (p = list; p; p = p->next) {
1056 struct commit *commit = p->item;
1057
1058 if (revs->right_only) {
1059 if (commit->object.flags & SYMMETRIC_LEFT)
1060 commit->object.flags |= SHOWN;
1061 } else /* revs->left_only is set */
1062 if (!(commit->object.flags & SYMMETRIC_LEFT))
1063 commit->object.flags |= SHOWN;
1064 }
1065}
1066
cc0e6c5a 1067static int limit_list(struct rev_info *revs)
a4a88b2b 1068{
7d004199 1069 int slop = SLOP;
dddbad72 1070 timestamp_t date = TIME_MAX;
a4a88b2b
LT
1071 struct commit_list *list = revs->commits;
1072 struct commit_list *newlist = NULL;
1073 struct commit_list **p = &newlist;
ebdc94f3 1074 struct commit_list *bottom = NULL;
b6e8a3b5 1075 struct commit *interesting_cache = NULL;
ebdc94f3
JH
1076
1077 if (revs->ancestry_path) {
7f34a46f 1078 bottom = collect_bottom_commits(list);
ebdc94f3 1079 if (!bottom)
97b03c35 1080 die("--ancestry-path given but there are no bottom commits");
ebdc94f3 1081 }
a4a88b2b
LT
1082
1083 while (list) {
e510ab89 1084 struct commit *commit = pop_commit(&list);
a4a88b2b 1085 struct object *obj = &commit->object;
cdcefbc9 1086 show_early_output_fn_t show;
a4a88b2b 1087
b6e8a3b5
JK
1088 if (commit == interesting_cache)
1089 interesting_cache = NULL;
1090
a4a88b2b
LT
1091 if (revs->max_age != -1 && (commit->date < revs->max_age))
1092 obj->flags |= UNINTERESTING;
fce87ae5 1093 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
cc0e6c5a 1094 return -1;
a4a88b2b
LT
1095 if (obj->flags & UNINTERESTING) {
1096 mark_parents_uninteresting(commit);
b6e8a3b5 1097 slop = still_interesting(list, date, slop, &interesting_cache);
7d004199 1098 if (slop)
3131b713 1099 continue;
7d004199 1100 break;
a4a88b2b
LT
1101 }
1102 if (revs->min_age != -1 && (commit->date > revs->min_age))
1103 continue;
7d004199 1104 date = commit->date;
a4a88b2b 1105 p = &commit_list_insert(commit, p)->next;
cdcefbc9
LT
1106
1107 show = show_early_output;
1108 if (!show)
1109 continue;
1110
1111 show(revs, newlist);
1112 show_early_output = NULL;
a4a88b2b 1113 }
adbbb31e 1114 if (revs->cherry_pick || revs->cherry_mark)
36d56de6 1115 cherry_pick_list(newlist, revs);
d7a17cad 1116
60adf7d7
MG
1117 if (revs->left_only || revs->right_only)
1118 limit_left_right(newlist, revs);
1119
ebdc94f3
JH
1120 if (bottom) {
1121 limit_to_ancestry(bottom, newlist);
1122 free_commit_list(bottom);
1123 }
1124
4d826608
KB
1125 /*
1126 * Check if any commits have become TREESAME by some of their parents
1127 * becoming UNINTERESTING.
1128 */
1129 if (limiting_can_increase_treesame(revs))
1130 for (list = newlist; list; list = list->next) {
1131 struct commit *c = list->item;
1132 if (c->object.flags & (UNINTERESTING | TREESAME))
1133 continue;
1134 update_treesame(revs, c);
1135 }
1136
a4a88b2b 1137 revs->commits = newlist;
cc0e6c5a 1138 return 0;
a4a88b2b
LT
1139}
1140
df835d3a
MH
1141/*
1142 * Add an entry to refs->cmdline with the specified information.
1143 * *name is copied.
1144 */
281eee47
JH
1145static void add_rev_cmdline(struct rev_info *revs,
1146 struct object *item,
1147 const char *name,
1148 int whence,
1149 unsigned flags)
1150{
1151 struct rev_cmdline_info *info = &revs->cmdline;
071bcaab 1152 unsigned int nr = info->nr;
281eee47
JH
1153
1154 ALLOC_GROW(info->rev, nr + 1, info->alloc);
1155 info->rev[nr].item = item;
df835d3a 1156 info->rev[nr].name = xstrdup(name);
281eee47
JH
1157 info->rev[nr].whence = whence;
1158 info->rev[nr].flags = flags;
1159 info->nr++;
1160}
1161
a765499a
KB
1162static void add_rev_cmdline_list(struct rev_info *revs,
1163 struct commit_list *commit_list,
1164 int whence,
1165 unsigned flags)
1166{
1167 while (commit_list) {
1168 struct object *object = &commit_list->item->object;
f2fd0760 1169 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
a765499a
KB
1170 whence, flags);
1171 commit_list = commit_list->next;
1172 }
1173}
1174
63049292
JH
1175struct all_refs_cb {
1176 int all_flags;
71b03b42 1177 int warned_bad_reflog;
63049292
JH
1178 struct rev_info *all_revs;
1179 const char *name_for_errormsg;
acd9544a 1180 struct ref_store *refs;
63049292 1181};
ae563542 1182
ff32d342 1183int ref_excluded(struct string_list *ref_excludes, const char *path)
e7b432c5
JH
1184{
1185 struct string_list_item *item;
1186
ff32d342 1187 if (!ref_excludes)
e7b432c5 1188 return 0;
ff32d342 1189 for_each_string_list_item(item, ref_excludes) {
55d34269 1190 if (!wildmatch(item->string, path, 0))
e7b432c5
JH
1191 return 1;
1192 }
1193 return 0;
1194}
1195
a217dcbd
MH
1196static int handle_one_ref(const char *path, const struct object_id *oid,
1197 int flag, void *cb_data)
ae563542 1198{
63049292 1199 struct all_refs_cb *cb = cb_data;
e7b432c5
JH
1200 struct object *object;
1201
ff32d342 1202 if (ref_excluded(cb->all_revs->ref_excludes, path))
e7b432c5
JH
1203 return 0;
1204
654b9a90 1205 object = get_reference(cb->all_revs, path, oid, cb->all_flags);
281eee47 1206 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
a58a1b01 1207 add_pending_oid(cb->all_revs, path, oid, cb->all_flags);
ae563542
LT
1208 return 0;
1209}
1210
d08bae7e
IL
1211static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1212 unsigned flags)
1213{
1214 cb->all_revs = revs;
1215 cb->all_flags = flags;
7ba82629 1216 revs->rev_input_given = 1;
acd9544a 1217 cb->refs = NULL;
d08bae7e
IL
1218}
1219
ff32d342 1220void clear_ref_exclusion(struct string_list **ref_excludes_p)
e7b432c5 1221{
ff32d342
JH
1222 if (*ref_excludes_p) {
1223 string_list_clear(*ref_excludes_p, 0);
1224 free(*ref_excludes_p);
e7b432c5 1225 }
ff32d342 1226 *ref_excludes_p = NULL;
e7b432c5
JH
1227}
1228
ff32d342 1229void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
e7b432c5 1230{
ff32d342
JH
1231 if (!*ref_excludes_p) {
1232 *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1233 (*ref_excludes_p)->strdup_strings = 1;
e7b432c5 1234 }
ff32d342 1235 string_list_append(*ref_excludes_p, exclude);
e7b432c5
JH
1236}
1237
073cf63c
NTND
1238static void handle_refs(struct ref_store *refs,
1239 struct rev_info *revs, unsigned flags,
1240 int (*for_each)(struct ref_store *, each_ref_fn, void *))
ae563542 1241{
63049292 1242 struct all_refs_cb cb;
073cf63c
NTND
1243
1244 if (!refs) {
1245 /* this could happen with uninitialized submodules */
1246 return;
1247 }
1248
d08bae7e 1249 init_all_refs_cb(&cb, revs, flags);
073cf63c 1250 for_each(refs, handle_one_ref, &cb);
63049292
JH
1251}
1252
9461d272 1253static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
63049292
JH
1254{
1255 struct all_refs_cb *cb = cb_data;
9461d272 1256 if (!is_null_oid(oid)) {
b3c7eef9 1257 struct object *o = parse_object(cb->all_revs->repo, oid);
71b03b42
SP
1258 if (o) {
1259 o->flags |= cb->all_flags;
281eee47 1260 /* ??? CMDLINEFLAGS ??? */
71b03b42
SP
1261 add_pending_object(cb->all_revs, o, "");
1262 }
1263 else if (!cb->warned_bad_reflog) {
46efd2d9 1264 warning("reflog of '%s' references pruned commits",
71b03b42
SP
1265 cb->name_for_errormsg);
1266 cb->warned_bad_reflog = 1;
1267 }
63049292 1268 }
71b03b42
SP
1269}
1270
9461d272 1271static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
dddbad72 1272 const char *email, timestamp_t timestamp, int tz,
883d60fa 1273 const char *message, void *cb_data)
71b03b42 1274{
9461d272 1275 handle_one_reflog_commit(ooid, cb_data);
1276 handle_one_reflog_commit(noid, cb_data);
63049292
JH
1277 return 0;
1278}
1279
a89caf4b
MH
1280static int handle_one_reflog(const char *path, const struct object_id *oid,
1281 int flag, void *cb_data)
63049292
JH
1282{
1283 struct all_refs_cb *cb = cb_data;
71b03b42 1284 cb->warned_bad_reflog = 0;
63049292 1285 cb->name_for_errormsg = path;
acd9544a
NTND
1286 refs_for_each_reflog_ent(cb->refs, path,
1287 handle_one_reflog_ent, cb_data);
63049292
JH
1288 return 0;
1289}
1290
acd9544a
NTND
1291static void add_other_reflogs_to_pending(struct all_refs_cb *cb)
1292{
1293 struct worktree **worktrees, **p;
1294
1295 worktrees = get_worktrees(0);
1296 for (p = worktrees; *p; p++) {
1297 struct worktree *wt = *p;
1298
1299 if (wt->is_current)
1300 continue;
1301
1302 cb->refs = get_worktree_ref_store(wt);
1303 refs_for_each_reflog(cb->refs,
1304 handle_one_reflog,
1305 cb);
1306 }
1307 free_worktrees(worktrees);
1308}
1309
718ccc97 1310void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
63049292
JH
1311{
1312 struct all_refs_cb cb;
2b2a5be3 1313
63049292
JH
1314 cb.all_revs = revs;
1315 cb.all_flags = flags;
b3c7eef9 1316 cb.refs = get_main_ref_store(revs->repo);
a89caf4b 1317 for_each_reflog(handle_one_reflog, &cb);
acd9544a
NTND
1318
1319 if (!revs->single_worktree)
1320 add_other_reflogs_to_pending(&cb);
ae563542
LT
1321}
1322
4fe10219
JK
1323static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1324 struct strbuf *path)
1325{
1326 size_t baselen = path->len;
1327 int i;
1328
1329 if (it->entry_count >= 0) {
b3c7eef9 1330 struct tree *tree = lookup_tree(revs->repo, &it->oid);
4fe10219
JK
1331 add_pending_object_with_path(revs, &tree->object, "",
1332 040000, path->buf);
1333 }
1334
1335 for (i = 0; i < it->subtree_nr; i++) {
1336 struct cache_tree_sub *sub = it->down[i];
1337 strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1338 add_cache_tree(sub->cache_tree, revs, path);
1339 strbuf_setlen(path, baselen);
1340 }
1341
1342}
1343
6c3d8181
NTND
1344static void do_add_index_objects_to_pending(struct rev_info *revs,
1345 struct index_state *istate)
4fe10219
JK
1346{
1347 int i;
1348
6c3d8181
NTND
1349 for (i = 0; i < istate->cache_nr; i++) {
1350 struct cache_entry *ce = istate->cache[i];
4fe10219
JK
1351 struct blob *blob;
1352
1353 if (S_ISGITLINK(ce->ce_mode))
1354 continue;
1355
b3c7eef9 1356 blob = lookup_blob(revs->repo, &ce->oid);
4fe10219
JK
1357 if (!blob)
1358 die("unable to add index blob to traversal");
1359 add_pending_object_with_path(revs, &blob->object, "",
1360 ce->ce_mode, ce->name);
1361 }
1362
6c3d8181 1363 if (istate->cache_tree) {
4fe10219 1364 struct strbuf path = STRBUF_INIT;
6c3d8181 1365 add_cache_tree(istate->cache_tree, revs, &path);
4fe10219
JK
1366 strbuf_release(&path);
1367 }
1368}
1369
6c3d8181
NTND
1370void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
1371{
be489d02
NTND
1372 struct worktree **worktrees, **p;
1373
2abf3503
NTND
1374 read_index(revs->repo->index);
1375 do_add_index_objects_to_pending(revs, revs->repo->index);
be489d02
NTND
1376
1377 if (revs->single_worktree)
1378 return;
1379
1380 worktrees = get_worktrees(0);
1381 for (p = worktrees; *p; p++) {
1382 struct worktree *wt = *p;
1383 struct index_state istate = { NULL };
1384
1385 if (wt->is_current)
1386 continue; /* current index already taken care of */
1387
1388 if (read_index_from(&istate,
a125a223
TG
1389 worktree_git_path(wt, "index"),
1390 get_worktree_git_dir(wt)) > 0)
be489d02
NTND
1391 do_add_index_objects_to_pending(revs, &istate);
1392 discard_index(&istate);
1393 }
1394 free_worktrees(worktrees);
6c3d8181
NTND
1395}
1396
8779351d
VN
1397static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1398 int exclude_parent)
ea4a19e1 1399{
654b9a90 1400 struct object_id oid;
ea4a19e1
JH
1401 struct object *it;
1402 struct commit *commit;
1403 struct commit_list *parents;
8779351d 1404 int parent_number;
281eee47 1405 const char *arg = arg_;
ea4a19e1
JH
1406
1407 if (*arg == '^') {
7f34a46f 1408 flags ^= UNINTERESTING | BOTTOM;
ea4a19e1
JH
1409 arg++;
1410 }
e82caf38 1411 if (get_oid_committish(arg, &oid))
ea4a19e1
JH
1412 return 0;
1413 while (1) {
654b9a90 1414 it = get_reference(revs, arg, &oid, 0);
cc243c3c
JH
1415 if (!it && revs->ignore_missing)
1416 return 0;
1974632c 1417 if (it->type != OBJ_TAG)
ea4a19e1 1418 break;
9684afd9
MK
1419 if (!((struct tag*)it)->tagged)
1420 return 0;
654b9a90 1421 oidcpy(&oid, &((struct tag*)it)->tagged->oid);
ea4a19e1 1422 }
1974632c 1423 if (it->type != OBJ_COMMIT)
ea4a19e1
JH
1424 return 0;
1425 commit = (struct commit *)it;
8779351d
VN
1426 if (exclude_parent &&
1427 exclude_parent > commit_list_count(commit->parents))
1428 return 0;
1429 for (parents = commit->parents, parent_number = 1;
1430 parents;
1431 parents = parents->next, parent_number++) {
1432 if (exclude_parent && parent_number != exclude_parent)
1433 continue;
1434
ea4a19e1
JH
1435 it = &parents->item->object;
1436 it->flags |= flags;
281eee47 1437 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
ea4a19e1
JH
1438 add_pending_object(revs, it, arg);
1439 }
1440 return 1;
1441}
1442
2abf3503
NTND
1443void repo_init_revisions(struct repository *r,
1444 struct rev_info *revs,
1445 const char *prefix)
8efdc326
FK
1446{
1447 memset(revs, 0, sizeof(*revs));
8e8f9987 1448
2abf3503 1449 revs->repo = r;
6b9c58f4 1450 revs->abbrev = DEFAULT_ABBREV;
8e8f9987 1451 revs->ignore_merges = 1;
9202434c 1452 revs->simplify_history = 1;
0d1e0e78
BW
1453 revs->pruning.flags.recursive = 1;
1454 revs->pruning.flags.quick = 1;
cd2bdc53
LT
1455 revs->pruning.add_remove = file_add_remove;
1456 revs->pruning.change = file_change;
a937b37e 1457 revs->pruning.change_fn_data = revs;
08f704f2 1458 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
8efdc326 1459 revs->dense = 1;
db6296a5 1460 revs->prefix = prefix;
8efdc326
FK
1461 revs->max_age = -1;
1462 revs->min_age = -1;
d5db6c9e 1463 revs->skip_count = -1;
8efdc326 1464 revs->max_count = -1;
ad5aeede 1465 revs->max_parents = -1;
0893eec8 1466 revs->expand_tabs_in_log = -1;
8efdc326 1467
cd2bdc53 1468 revs->commit_format = CMIT_FMT_DEFAULT;
fe37a9c5 1469 revs->expand_tabs_in_log_default = 8;
cd2bdc53 1470
2abf3503
NTND
1471 init_grep_defaults(revs->repo);
1472 grep_init(&revs->grep_filter, revs->repo, prefix);
0843acfd 1473 revs->grep_filter.status_only = 1;
0843acfd 1474
2abf3503 1475 repo_diff_setup(revs->repo, &revs->diffopt);
c0cb4a06 1476 if (prefix && !revs->diffopt.prefix) {
cd676a51
JH
1477 revs->diffopt.prefix = prefix;
1478 revs->diffopt.prefix_length = strlen(prefix);
1479 }
3a03cf6b
JK
1480
1481 revs->notes_opt.use_default_notes = -1;
8efdc326
FK
1482}
1483
0d2c9d67
RS
1484static void add_pending_commit_list(struct rev_info *revs,
1485 struct commit_list *commit_list,
1486 unsigned int flags)
1487{
1488 while (commit_list) {
1489 struct object *object = &commit_list->item->object;
1490 object->flags |= flags;
f2fd0760 1491 add_pending_object(revs, object, oid_to_hex(&object->oid));
0d2c9d67
RS
1492 commit_list = commit_list->next;
1493 }
1494}
1495
ae3e5e1e
JH
1496static void prepare_show_merge(struct rev_info *revs)
1497{
1498 struct commit_list *bases;
1499 struct commit *head, *other;
68ab61dd 1500 struct object_id oid;
ae3e5e1e
JH
1501 const char **prune = NULL;
1502 int i, prune_num = 1; /* counting terminating NULL */
2abf3503 1503 struct index_state *istate = revs->repo->index;
ae3e5e1e 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 1518
2abf3503
NTND
1519 if (!istate->cache_nr)
1520 read_index(istate);
1521 for (i = 0; i < istate->cache_nr; i++) {
1522 const struct cache_entry *ce = istate->cache[i];
ae3e5e1e
JH
1523 if (!ce_stage(ce))
1524 continue;
2abf3503 1525 if (ce_path_match(istate, 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 }
2abf3503
NTND
1531 while ((i+1 < istate->cache_nr) &&
1532 ce_same_name(ce, istate->cache[i+1]))
ae3e5e1e
JH
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
b3c7eef9
NTND
1589 a_obj = parse_object(revs->repo, &a_oid);
1590 b_obj = parse_object(revs->repo, &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
b3c7eef9
NTND
1603 a = lookup_commit_reference(revs->repo, &a_obj->oid);
1604 b = lookup_commit_reference(revs->repo, &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
b3c7eef9 2212 refs = get_main_ref_store(revs->repo);
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
9dad9d2e 2461 if (revs->topo_order)
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,
b3c7eef9 2892 void *cb)
df11e196 2893{
b3c7eef9
NTND
2894 struct rev_info *revs = cb;
2895 struct object *o = parse_object(revs->repo, oid);
df11e196
JT
2896 o->flags |= UNINTERESTING | SEEN;
2897 return 0;
2898}
2899
cc0e6c5a 2900int prepare_revision_walk(struct rev_info *revs)
a4a88b2b 2901{
1da1e07c
JK
2902 int i;
2903 struct object_array old_pending;
2e7da8e9 2904 struct commit_list **next = &revs->commits;
cd2bdc53 2905
1da1e07c 2906 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
1f1e895f
LT
2907 revs->pending.nr = 0;
2908 revs->pending.alloc = 0;
2909 revs->pending.objects = NULL;
1da1e07c
JK
2910 for (i = 0; i < old_pending.nr; i++) {
2911 struct object_array_entry *e = old_pending.objects + i;
20739490 2912 struct commit *commit = handle_commit(revs, e);
cd2bdc53
LT
2913 if (commit) {
2914 if (!(commit->object.flags & SEEN)) {
2915 commit->object.flags |= SEEN;
2e7da8e9 2916 next = commit_list_append(commit, next);
cd2bdc53
LT
2917 }
2918 }
cd2bdc53 2919 }
f1230fb5 2920 object_array_clear(&old_pending);
cd2bdc53 2921
d0af663e 2922 /* Signal whether we need per-parent treesame decoration */
4d826608
KB
2923 if (revs->simplify_merges ||
2924 (revs->limited && limiting_can_increase_treesame(revs)))
d0af663e
KB
2925 revs->treesame.name = "treesame";
2926
df11e196 2927 if (revs->exclude_promisor_objects) {
b3c7eef9 2928 for_each_packed_object(mark_uninteresting, revs,
df11e196
JT
2929 FOR_EACH_OBJECT_PROMISOR_ONLY);
2930 }
2931
ca92e59e
MZ
2932 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2933 commit_list_sort_by_date(&revs->commits);
ba1d4505 2934 if (revs->no_walk)
cc0e6c5a 2935 return 0;
a4a88b2b 2936 if (revs->limited)
cc0e6c5a
AR
2937 if (limit_list(revs) < 0)
2938 return -1;
a4a88b2b 2939 if (revs->topo_order)
08f704f2 2940 sort_in_topological_order(&revs->commits, revs->sort_order);
12da1d1f
TR
2941 if (revs->line_level_traverse)
2942 line_log_filter(revs);
6546b593
JH
2943 if (revs->simplify_merges)
2944 simplify_merges(revs);
f35f5603
JH
2945 if (revs->children.name)
2946 set_children(revs);
cc0e6c5a 2947 return 0;
a4a88b2b
LT
2948}
2949
cc0e6c5a 2950static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
765ac8ec 2951{
fce87ae5
AG
2952 struct commit_list *cache = NULL;
2953
765ac8ec
LT
2954 for (;;) {
2955 struct commit *p = *pp;
3381c790 2956 if (!revs->limited)
fce87ae5 2957 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
cc0e6c5a 2958 return rewrite_one_error;
7dc0fe3b
LT
2959 if (p->object.flags & UNINTERESTING)
2960 return rewrite_one_ok;
2961 if (!(p->object.flags & TREESAME))
cc0e6c5a 2962 return rewrite_one_ok;
765ac8ec 2963 if (!p->parents)
cc0e6c5a 2964 return rewrite_one_noparents;
4d826608
KB
2965 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2966 return rewrite_one_ok;
2967 *pp = p;
765ac8ec
LT
2968 }
2969}
2970
c7edcae0
BY
2971int rewrite_parents(struct rev_info *revs, struct commit *commit,
2972 rewrite_parent_fn_t rewrite_parent)
765ac8ec
LT
2973{
2974 struct commit_list **pp = &commit->parents;
2975 while (*pp) {
2976 struct commit_list *parent = *pp;
c7edcae0 2977 switch (rewrite_parent(revs, &parent->item)) {
cc0e6c5a
AR
2978 case rewrite_one_ok:
2979 break;
2980 case rewrite_one_noparents:
765ac8ec
LT
2981 *pp = parent->next;
2982 continue;
cc0e6c5a
AR
2983 case rewrite_one_error:
2984 return -1;
765ac8ec
LT
2985 }
2986 pp = &parent->next;
2987 }
d0af663e 2988 remove_duplicate_parents(revs, commit);
cc0e6c5a 2989 return 0;
765ac8ec
LT
2990}
2991
d72fbe81
AP
2992static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2993{
2994 char *person, *endp;
2995 size_t len, namelen, maillen;
2996 const char *name;
2997 const char *mail;
2998 struct ident_split ident;
2999
3000 person = strstr(buf->buf, what);
3001 if (!person)
3002 return 0;
3003
3004 person += strlen(what);
3005 endp = strchr(person, '\n');
3006 if (!endp)
3007 return 0;
3008
3009 len = endp - person;
3010
3011 if (split_ident_line(&ident, person, len))
3012 return 0;
3013
3014 mail = ident.mail_begin;
3015 maillen = ident.mail_end - ident.mail_begin;
3016 name = ident.name_begin;
3017 namelen = ident.name_end - ident.name_begin;
3018
3019 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
3020 struct strbuf namemail = STRBUF_INIT;
3021
3022 strbuf_addf(&namemail, "%.*s <%.*s>",
3023 (int)namelen, name, (int)maillen, mail);
3024
3025 strbuf_splice(buf, ident.name_begin - buf->buf,
3026 ident.mail_end - ident.name_begin + 1,
3027 namemail.buf, namemail.len);
3028
3029 strbuf_release(&namemail);
3030
3031 return 1;
3032 }
3033
3034 return 0;
3035}
3036
8ecae9b0
JH
3037static int commit_match(struct commit *commit, struct rev_info *opt)
3038{
72fd13f7 3039 int retval;
04deccda 3040 const char *encoding;
b000c59b 3041 const char *message;
72fd13f7 3042 struct strbuf buf = STRBUF_INIT;
04deccda 3043
80235ba7 3044 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
8ecae9b0 3045 return 1;
baa6378f
JH
3046
3047 /* Prepend "fake" headers as needed */
3048 if (opt->grep_filter.use_reflog_filter) {
72fd13f7
NTND
3049 strbuf_addstr(&buf, "reflog ");
3050 get_reflog_message(&buf, opt->reflog_info);
3051 strbuf_addch(&buf, '\n');
72fd13f7 3052 }
baa6378f 3053
04deccda
JK
3054 /*
3055 * We grep in the user's output encoding, under the assumption that it
3056 * is the encoding they are most likely to write their grep pattern
3057 * for. In addition, it means we will match the "notes" encoding below,
3058 * so we will not end up with a buffer that has two different encodings
3059 * in it.
3060 */
3061 encoding = get_log_output_encoding();
5a10d236 3062 message = logmsg_reencode(commit, NULL, encoding);
04deccda 3063
baa6378f
JH
3064 /* Copy the commit to temporary if we are using "fake" headers */
3065 if (buf.len)
04deccda 3066 strbuf_addstr(&buf, message);
baa6378f 3067
df874fa8 3068 if (opt->grep_filter.header_list && opt->mailmap) {
d72fbe81 3069 if (!buf.len)
04deccda 3070 strbuf_addstr(&buf, message);
d72fbe81
AP
3071
3072 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
3073 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
3074 }
3075
38cfe915
NTND
3076 /* Append "fake" message parts as needed */
3077 if (opt->show_notes) {
3078 if (!buf.len)
04deccda 3079 strbuf_addstr(&buf, message);
fb61e4d3 3080 format_display_notes(&commit->object.oid, &buf, encoding, 1);
38cfe915
NTND
3081 }
3082
b000c59b
JK
3083 /*
3084 * Find either in the original commit message, or in the temporary.
3085 * Note that we cast away the constness of "message" here. It is
3086 * const because it may come from the cached commit buffer. That's OK,
3087 * because we know that it is modifiable heap memory, and that while
3088 * grep_buffer may modify it for speed, it will restore any
3089 * changes before returning.
3090 */
72fd13f7
NTND
3091 if (buf.len)
3092 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
3093 else
3094 retval = grep_buffer(&opt->grep_filter,
b000c59b 3095 (char *)message, strlen(message));
72fd13f7 3096 strbuf_release(&buf);
b66103c3 3097 unuse_commit_buffer(commit, message);
22dfa8a2 3098 return opt->invert_grep ? !retval : retval;
8ecae9b0
JH
3099}
3100
53d00b39 3101static inline int want_ancestry(const struct rev_info *revs)
f35f5603 3102{
8bb65883 3103 return (revs->rewrite_parents || revs->children.name);
f35f5603
JH
3104}
3105
de239446
JK
3106/*
3107 * Return a timestamp to be used for --since/--until comparisons for this
3108 * commit, based on the revision options.
3109 */
3110static timestamp_t comparison_date(const struct rev_info *revs,
3111 struct commit *commit)
3112{
3113 return revs->reflog_info ?
3114 get_reflog_timestamp(revs->reflog_info) :
3115 commit->date;
3116}
3117
beb5af43 3118enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
252a7c02
LT
3119{
3120 if (commit->object.flags & SHOWN)
3121 return commit_ignore;
14c3c80c 3122 if (revs->unpacked && has_object_pack(&commit->object.oid))
252a7c02
LT
3123 return commit_ignore;
3124 if (commit->object.flags & UNINTERESTING)
3125 return commit_ignore;
de239446
JK
3126 if (revs->min_age != -1 &&
3127 comparison_date(revs, commit) > revs->min_age)
3128 return commit_ignore;
ad5aeede 3129 if (revs->min_parents || (revs->max_parents >= 0)) {
bf3418b0 3130 int n = commit_list_count(commit->parents);
ad5aeede
MG
3131 if ((n < revs->min_parents) ||
3132 ((revs->max_parents >= 0) && (n > revs->max_parents)))
3133 return commit_ignore;
3134 }
252a7c02
LT
3135 if (!commit_match(commit, revs))
3136 return commit_ignore;
53b2c823 3137 if (revs->prune && revs->dense) {
252a7c02 3138 /* Commit without changes? */
7dc0fe3b 3139 if (commit->object.flags & TREESAME) {
bf3418b0
KB
3140 int n;
3141 struct commit_list *p;
252a7c02 3142 /* drop merges unless we want parenthood */
f35f5603 3143 if (!want_ancestry(revs))
252a7c02 3144 return commit_ignore;
bf3418b0
KB
3145 /*
3146 * If we want ancestry, then need to keep any merges
3147 * between relevant commits to tie together topology.
3148 * For consistency with TREESAME and simplification
3149 * use "relevant" here rather than just INTERESTING,
3150 * to treat bottom commit(s) as part of the topology.
3151 */
3152 for (n = 0, p = commit->parents; p; p = p->next)
3153 if (relevant_commit(p->item))
3154 if (++n >= 2)
3155 return commit_show;
3156 return commit_ignore;
252a7c02 3157 }
252a7c02
LT
3158 }
3159 return commit_show;
3160}
3161
0131c490
JH
3162define_commit_slab(saved_parents, struct commit_list *);
3163
3164#define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3165
3166/*
3167 * You may only call save_parents() once per commit (this is checked
3168 * for non-root commits).
3169 */
3170static void save_parents(struct rev_info *revs, struct commit *commit)
3171{
3172 struct commit_list **pp;
3173
3174 if (!revs->saved_parents_slab) {
3175 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3176 init_saved_parents(revs->saved_parents_slab);
3177 }
3178
3179 pp = saved_parents_at(revs->saved_parents_slab, commit);
3180
3181 /*
3182 * When walking with reflogs, we may visit the same commit
3183 * several times: once for each appearance in the reflog.
3184 *
3185 * In this case, save_parents() will be called multiple times.
3186 * We want to keep only the first set of parents. We need to
3187 * store a sentinel value for an empty (i.e., NULL) parent
3188 * list to distinguish it from a not-yet-saved list, however.
3189 */
3190 if (*pp)
3191 return;
3192 if (commit->parents)
3193 *pp = copy_commit_list(commit->parents);
3194 else
3195 *pp = EMPTY_PARENT_LIST;
3196}
3197
3198static void free_saved_parents(struct rev_info *revs)
3199{
3200 if (revs->saved_parents_slab)
3201 clear_saved_parents(revs->saved_parents_slab);
3202}
3203
3204struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3205{
3206 struct commit_list *parents;
3207
3208 if (!revs->saved_parents_slab)
3209 return commit->parents;
3210
3211 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3212 if (parents == EMPTY_PARENT_LIST)
3213 return NULL;
3214 return parents;
3215}
3216
beb5af43
AS
3217enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3218{
3219 enum commit_action action = get_commit_action(revs, commit);
3220
3221 if (action == commit_show &&
beb5af43 3222 revs->prune && revs->dense && want_ancestry(revs)) {
53d00b39
TR
3223 /*
3224 * --full-diff on simplified parents is no good: it
3225 * will show spurious changes from the commits that
3226 * were elided. So we save the parents on the side
3227 * when --full-diff is in effect.
3228 */
3229 if (revs->full_diff)
3230 save_parents(revs, commit);
c7edcae0 3231 if (rewrite_parents(revs, commit, rewrite_one) < 0)
beb5af43
AS
3232 return commit_error;
3233 }
3234 return action;
3235}
3236
1b32dece
NTND
3237static void track_linear(struct rev_info *revs, struct commit *commit)
3238{
3239 if (revs->track_first_time) {
3240 revs->linear = 1;
3241 revs->track_first_time = 0;
3242 } else {
3243 struct commit_list *p;
3244 for (p = revs->previous_parents; p; p = p->next)
3245 if (p->item == NULL || /* first commit */
4a7e27e9 3246 oideq(&p->item->object.oid, &commit->object.oid))
1b32dece
NTND
3247 break;
3248 revs->linear = p != NULL;
3249 }
3250 if (revs->reverse) {
3251 if (revs->linear)
3252 commit->object.flags |= TRACK_LINEAR;
3253 }
3254 free_commit_list(revs->previous_parents);
3255 revs->previous_parents = copy_commit_list(commit->parents);
3256}
3257
d5db6c9e 3258static struct commit *get_revision_1(struct rev_info *revs)
a4a88b2b 3259{
7c2f08aa 3260 while (1) {
d08565bf 3261 struct commit *commit;
a4a88b2b 3262
d08565bf
JK
3263 if (revs->reflog_info)
3264 commit = next_reflog_entry(revs->reflog_info);
3265 else
3266 commit = pop_commit(&revs->commits);
2a0925be 3267
7c2f08aa
JK
3268 if (!commit)
3269 return NULL;
3270
d08565bf 3271 if (revs->reflog_info)
ffa1eeae 3272 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
8860fd42 3273
2a0925be
LT
3274 /*
3275 * If we haven't done the list limiting, we need to look at
be7db6e5
LT
3276 * the parents here. We also need to do the date-based limiting
3277 * that we'd otherwise have done in limit_list().
2a0925be 3278 */
be7db6e5 3279 if (!revs->limited) {
744f4985 3280 if (revs->max_age != -1 &&
de239446 3281 comparison_date(revs, commit) < revs->max_age)
86ab4906 3282 continue;
d08565bf
JK
3283
3284 if (revs->reflog_info)
3285 try_to_simplify_commit(revs, commit);
3286 else if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
2db1a43f
VM
3287 if (!revs->ignore_missing_links)
3288 die("Failed to traverse parents of commit %s",
f2fd0760 3289 oid_to_hex(&commit->object.oid));
2db1a43f 3290 }
be7db6e5 3291 }
744f4985 3292
252a7c02
LT
3293 switch (simplify_commit(revs, commit)) {
3294 case commit_ignore:
8ecae9b0 3295 continue;
252a7c02 3296 case commit_error:
ed62089c 3297 die("Failed to simplify parents of commit %s",
f2fd0760 3298 oid_to_hex(&commit->object.oid));
252a7c02 3299 default:
1b32dece
NTND
3300 if (revs->track_linear)
3301 track_linear(revs, commit);
252a7c02 3302 return commit;
384e99a4 3303 }
7c2f08aa 3304 }
765ac8ec 3305}
d5db6c9e 3306
be6754c6
MH
3307/*
3308 * Return true for entries that have not yet been shown. (This is an
3309 * object_array_each_func_t.)
3310 */
3311static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
86ab4906 3312{
be6754c6
MH
3313 return !(entry->item->flags & SHOWN);
3314}
86ab4906 3315
be6754c6
MH
3316/*
3317 * If array is on the verge of a realloc, garbage-collect any entries
3318 * that have already been shown to try to free up some space.
3319 */
3320static void gc_boundary(struct object_array *array)
3321{
3322 if (array->nr == array->alloc)
3323 object_array_filter(array, entry_unshown, NULL);
86ab4906
JH
3324}
3325
4603ec0f
AS
3326static void create_boundary_commit_list(struct rev_info *revs)
3327{
3328 unsigned i;
3329 struct commit *c;
3330 struct object_array *array = &revs->boundary_commits;
3331 struct object_array_entry *objects = array->objects;
3332
3333 /*
3334 * If revs->commits is non-NULL at this point, an error occurred in
3335 * get_revision_1(). Ignore the error and continue printing the
3336 * boundary commits anyway. (This is what the code has always
3337 * done.)
3338 */
3339 if (revs->commits) {
3340 free_commit_list(revs->commits);
3341 revs->commits = NULL;
3342 }
3343
3344 /*
3345 * Put all of the actual boundary commits from revs->boundary_commits
3346 * into revs->commits
3347 */
3348 for (i = 0; i < array->nr; i++) {
3349 c = (struct commit *)(objects[i].item);
3350 if (!c)
3351 continue;
3352 if (!(c->object.flags & CHILD_SHOWN))
3353 continue;
3354 if (c->object.flags & (SHOWN | BOUNDARY))
3355 continue;
3356 c->object.flags |= BOUNDARY;
3357 commit_list_insert(c, &revs->commits);
3358 }
3359
3360 /*
3361 * If revs->topo_order is set, sort the boundary commits
3362 * in topological order
3363 */
08f704f2 3364 sort_in_topological_order(&revs->commits, revs->sort_order);
4603ec0f
AS
3365}
3366
7fefda5c 3367static struct commit *get_revision_internal(struct rev_info *revs)
d5db6c9e
JH
3368{
3369 struct commit *c = NULL;
86ab4906
JH
3370 struct commit_list *l;
3371
3372 if (revs->boundary == 2) {
4603ec0f
AS
3373 /*
3374 * All of the normal commits have already been returned,
3375 * and we are now returning boundary commits.
3376 * create_boundary_commit_list() has populated
3377 * revs->commits with the remaining commits to return.
3378 */
3379 c = pop_commit(&revs->commits);
3380 if (c)
3381 c->object.flags |= SHOWN;
9c5e66e9
JS
3382 return c;
3383 }
3384
86ab4906 3385 /*
b72a1904
JK
3386 * If our max_count counter has reached zero, then we are done. We
3387 * don't simply return NULL because we still might need to show
3388 * boundary commits. But we want to avoid calling get_revision_1, which
3389 * might do a considerable amount of work finding the next commit only
3390 * for us to throw it away.
3391 *
3392 * If it is non-zero, then either we don't have a max_count at all
3393 * (-1), or it is still counting, in which case we decrement.
86ab4906 3394 */
b72a1904
JK
3395 if (revs->max_count) {
3396 c = get_revision_1(revs);
3397 if (c) {
9e57ac55 3398 while (revs->skip_count > 0) {
b72a1904
JK
3399 revs->skip_count--;
3400 c = get_revision_1(revs);
3401 if (!c)
3402 break;
3403 }
8839ac94 3404 }
86ab4906 3405
b72a1904
JK
3406 if (revs->max_count > 0)
3407 revs->max_count--;
d5db6c9e 3408 }
86ab4906 3409
c33d8593
JH
3410 if (c)
3411 c->object.flags |= SHOWN;
3412
9e57ac55 3413 if (!revs->boundary)
d5db6c9e 3414 return c;
86ab4906
JH
3415
3416 if (!c) {
3417 /*
3418 * get_revision_1() runs out the commits, and
3419 * we are done computing the boundaries.
3420 * switch to boundary commits output mode.
3421 */
3422 revs->boundary = 2;
4603ec0f
AS
3423
3424 /*
3425 * Update revs->commits to contain the list of
3426 * boundary commits.
3427 */
3428 create_boundary_commit_list(revs);
3429
3c68d67b 3430 return get_revision_internal(revs);
86ab4906
JH
3431 }
3432
3433 /*
3434 * boundary commits are the commits that are parents of the
3435 * ones we got from get_revision_1() but they themselves are
3436 * not returned from get_revision_1(). Before returning
3437 * 'c', we need to mark its parents that they could be boundaries.
3438 */
3439
3440 for (l = c->parents; l; l = l->next) {
3441 struct object *p;
3442 p = &(l->item->object);
c33d8593 3443 if (p->flags & (CHILD_SHOWN | SHOWN))
86ab4906
JH
3444 continue;
3445 p->flags |= CHILD_SHOWN;
3446 gc_boundary(&revs->boundary_commits);
3447 add_object_array(p, NULL, &revs->boundary_commits);
3448 }
3449
3450 return c;
d5db6c9e 3451}
7fefda5c
AS
3452
3453struct commit *get_revision(struct rev_info *revs)
3454{
498bcd31
TR
3455 struct commit *c;
3456 struct commit_list *reversed;
3457
3458 if (revs->reverse) {
3459 reversed = NULL;
9e57ac55 3460 while ((c = get_revision_internal(revs)))
498bcd31 3461 commit_list_insert(c, &reversed);
498bcd31
TR
3462 revs->commits = reversed;
3463 revs->reverse = 0;
3464 revs->reverse_output_stage = 1;
3465 }
3466
1b32dece
NTND
3467 if (revs->reverse_output_stage) {
3468 c = pop_commit(&revs->commits);
3469 if (revs->track_linear)
3470 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3471 return c;
3472 }
498bcd31
TR
3473
3474 c = get_revision_internal(revs);
7fefda5c
AS
3475 if (c && revs->graph)
3476 graph_update(revs->graph, c);
1b32dece 3477 if (!c) {
53d00b39 3478 free_saved_parents(revs);
1b32dece
NTND
3479 if (revs->previous_parents) {
3480 free_commit_list(revs->previous_parents);
3481 revs->previous_parents = NULL;
3482 }
3483 }
7fefda5c
AS
3484 return c;
3485}
1df2d656
MG
3486
3487char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3488{
3489 if (commit->object.flags & BOUNDARY)
3490 return "-";
3491 else if (commit->object.flags & UNINTERESTING)
3492 return "^";
adbbb31e
MG
3493 else if (commit->object.flags & PATCHSAME)
3494 return "=";
1df2d656
MG
3495