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