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