Merge branch 'maint'
[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"
ae563542 18
cdcefbc9
LT
19volatile show_early_output_fn_t show_early_output;
20
cf2ab916 21char *path_name(const struct name_path *path, const char *name)
ae563542 22{
cf2ab916 23 const struct name_path *p;
ae563542
LT
24 char *n, *m;
25 int nlen = strlen(name);
26 int len = nlen + 1;
27
28 for (p = path; p; p = p->up) {
29 if (p->elem_len)
30 len += p->elem_len + 1;
31 }
32 n = xmalloc(len);
33 m = n + len - (nlen + 1);
34 strcpy(m, name);
35 for (p = path; p; p = p->up) {
36 if (p->elem_len) {
37 m -= p->elem_len + 1;
38 memcpy(m, p->elem, p->elem_len);
39 m[p->elem_len] = '/';
40 }
41 }
42 return n;
43}
44
beba25ab
JH
45static int show_path_component_truncated(FILE *out, const char *name, int len)
46{
47 int cnt;
48 for (cnt = 0; cnt < len; cnt++) {
49 int ch = name[cnt];
50 if (!ch || ch == '\n')
51 return -1;
52 fputc(ch, out);
53 }
54 return len;
55}
56
57static int show_path_truncated(FILE *out, const struct name_path *path)
58{
59 int emitted, ours;
60
61 if (!path)
62 return 0;
63 emitted = show_path_truncated(out, path->up);
64 if (emitted < 0)
65 return emitted;
66 if (emitted)
67 fputc('/', out);
68 ours = show_path_component_truncated(out, path->elem, path->elem_len);
69 if (ours < 0)
70 return ours;
71 return ours || emitted;
72}
73
ff5f5f26
MH
74void show_object_with_name(FILE *out, struct object *obj,
75 const struct name_path *path, const char *component)
91f17516 76{
beba25ab
JH
77 struct name_path leaf;
78 leaf.up = (struct name_path *)path;
79 leaf.elem = component;
80 leaf.elem_len = strlen(component);
91f17516 81
beba25ab
JH
82 fprintf(out, "%s ", sha1_to_hex(obj->sha1));
83 show_path_truncated(out, &leaf);
84 fputc('\n', out);
91f17516
JH
85}
86
1f1e895f
LT
87void add_object(struct object *obj,
88 struct object_array *p,
89 struct name_path *path,
90 const char *name)
ae563542 91{
31faeb20
MH
92 char *pn = path_name(path, name);
93 add_object_array(obj, pn, p);
94 free(pn);
ae563542
LT
95}
96
97static void mark_blob_uninteresting(struct blob *blob)
98{
c1ee9013
MK
99 if (!blob)
100 return;
ae563542
LT
101 if (blob->object.flags & UNINTERESTING)
102 return;
103 blob->object.flags |= UNINTERESTING;
104}
105
106void mark_tree_uninteresting(struct tree *tree)
107{
f75e53ed 108 struct tree_desc desc;
4c068a98 109 struct name_entry entry;
ae563542 110 struct object *obj = &tree->object;
ae563542 111
c1ee9013
MK
112 if (!tree)
113 return;
ae563542
LT
114 if (obj->flags & UNINTERESTING)
115 return;
116 obj->flags |= UNINTERESTING;
117 if (!has_sha1_file(obj->sha1))
118 return;
119 if (parse_tree(tree) < 0)
120 die("bad tree %s", sha1_to_hex(obj->sha1));
f75e53ed 121
6fda5e51 122 init_tree_desc(&desc, tree->buffer, tree->size);
4c068a98 123 while (tree_entry(&desc, &entry)) {
4d1012c3
LT
124 switch (object_type(entry.mode)) {
125 case OBJ_TREE:
4c068a98 126 mark_tree_uninteresting(lookup_tree(entry.sha1));
4d1012c3
LT
127 break;
128 case OBJ_BLOB:
4c068a98 129 mark_blob_uninteresting(lookup_blob(entry.sha1));
4d1012c3
LT
130 break;
131 default:
132 /* Subproject commit - not in this repository */
133 break;
134 }
ae563542 135 }
f75e53ed
LT
136
137 /*
138 * We don't care about the tree any more
139 * after it has been marked uninteresting.
140 */
141 free(tree->buffer);
142 tree->buffer = NULL;
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;
203 int len = interpret_branch_name(name, &buf);
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++) {
1361 struct cache_entry *ce = active_cache[i];
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
NTND
1374 free_pathspec(&revs->prune_data);
1375 init_pathspec(&revs->prune_data, prune);
e82447b1 1376 revs->limited = 1;
ae3e5e1e
JH
1377}
1378
8e676e8b 1379int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
5d6f0935 1380{
249c8f4a 1381 struct object_context oc;
5d6f0935
JH
1382 char *dotdot;
1383 struct object *object;
1384 unsigned char sha1[20];
1385 int local_flags;
281eee47 1386 const char *arg = arg_;
8e676e8b 1387 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
d5f6b1d7 1388 unsigned get_sha1_flags = 0;
5d6f0935 1389
7f34a46f
KB
1390 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1391
5d6f0935
JH
1392 dotdot = strstr(arg, "..");
1393 if (dotdot) {
1394 unsigned char from_sha1[20];
1395 const char *next = dotdot + 2;
1396 const char *this = arg;
1397 int symmetric = *next == '.';
7f34a46f 1398 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
003c84f6 1399 static const char head_by_default[] = "HEAD";
281eee47 1400 unsigned int a_flags;
5d6f0935
JH
1401
1402 *dotdot = 0;
1403 next += symmetric;
1404
1405 if (!*next)
003c84f6 1406 next = head_by_default;
5d6f0935 1407 if (dotdot == arg)
003c84f6
JH
1408 this = head_by_default;
1409 if (this == head_by_default && next == head_by_default &&
1410 !symmetric) {
1411 /*
1412 * Just ".."? That is not a range but the
1413 * pathspec for the parent directory.
1414 */
1415 if (!cant_be_filename) {
1416 *dotdot = '.';
1417 return -1;
1418 }
1419 }
cd74e473
JH
1420 if (!get_sha1_committish(this, from_sha1) &&
1421 !get_sha1_committish(next, sha1)) {
5d6f0935
JH
1422 struct commit *a, *b;
1423 struct commit_list *exclude;
1424
1425 a = lookup_commit_reference(from_sha1);
1426 b = lookup_commit_reference(sha1);
1427 if (!a || !b) {
cc243c3c
JH
1428 if (revs->ignore_missing)
1429 return 0;
5d6f0935
JH
1430 die(symmetric ?
1431 "Invalid symmetric difference expression %s...%s" :
1432 "Invalid revision range %s..%s",
1433 arg, next);
1434 }
1435
1436 if (!cant_be_filename) {
1437 *dotdot = '.';
1438 verify_non_filename(revs->prefix, arg);
1439 }
1440
1441 if (symmetric) {
1442 exclude = get_merge_bases(a, b, 1);
a765499a
KB
1443 add_rev_cmdline_list(revs, exclude,
1444 REV_CMD_MERGE_BASE,
1445 flags_exclude);
5d6f0935
JH
1446 add_pending_commit_list(revs, exclude,
1447 flags_exclude);
1448 free_commit_list(exclude);
281eee47 1449 a_flags = flags | SYMMETRIC_LEFT;
5d6f0935 1450 } else
281eee47
JH
1451 a_flags = flags_exclude;
1452 a->object.flags |= a_flags;
5d6f0935 1453 b->object.flags |= flags;
281eee47
JH
1454 add_rev_cmdline(revs, &a->object, this,
1455 REV_CMD_LEFT, a_flags);
1456 add_rev_cmdline(revs, &b->object, next,
1457 REV_CMD_RIGHT, flags);
5d6f0935
JH
1458 add_pending_object(revs, &a->object, this);
1459 add_pending_object(revs, &b->object, next);
1460 return 0;
1461 }
1462 *dotdot = '.';
1463 }
1464 dotdot = strstr(arg, "^@");
1465 if (dotdot && !dotdot[2]) {
1466 *dotdot = 0;
1467 if (add_parents_only(revs, arg, flags))
1468 return 0;
1469 *dotdot = '^';
1470 }
62476c8e
JH
1471 dotdot = strstr(arg, "^!");
1472 if (dotdot && !dotdot[2]) {
1473 *dotdot = 0;
7f34a46f 1474 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM)))
62476c8e
JH
1475 *dotdot = '^';
1476 }
1477
5d6f0935
JH
1478 local_flags = 0;
1479 if (*arg == '^') {
7f34a46f 1480 local_flags = UNINTERESTING | BOTTOM;
5d6f0935
JH
1481 arg++;
1482 }
d5f6b1d7
JH
1483
1484 if (revarg_opt & REVARG_COMMITTISH)
1485 get_sha1_flags = GET_SHA1_COMMITTISH;
1486
1487 if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
cc243c3c 1488 return revs->ignore_missing ? 0 : -1;
5d6f0935
JH
1489 if (!cant_be_filename)
1490 verify_non_filename(revs->prefix, arg);
1491 object = get_reference(revs, arg, sha1, flags ^ local_flags);
281eee47 1492 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
249c8f4a 1493 add_pending_object_with_mode(revs, object, arg, oc.mode);
5d6f0935
JH
1494 return 0;
1495}
1496
4da5af31
JH
1497struct cmdline_pathspec {
1498 int alloc;
1499 int nr;
1500 const char **path;
1501};
1fc561d1 1502
4da5af31
JH
1503static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1504{
1505 while (*av) {
1506 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1507 prune->path[prune->nr++] = *(av++);
1508 }
1509}
60da8b15 1510
4da5af31
JH
1511static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1512 struct cmdline_pathspec *prune)
1513{
60da8b15
JH
1514 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1515 int len = sb->len;
1516 if (len && sb->buf[len - 1] == '\n')
1517 sb->buf[--len] = '\0';
4da5af31
JH
1518 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1519 prune->path[prune->nr++] = xstrdup(sb->buf);
60da8b15 1520 }
60da8b15
JH
1521}
1522
4da5af31
JH
1523static void read_revisions_from_stdin(struct rev_info *revs,
1524 struct cmdline_pathspec *prune)
1fc561d1 1525{
63d564b3 1526 struct strbuf sb;
60da8b15 1527 int seen_dashdash = 0;
1fc561d1 1528
63d564b3
JH
1529 strbuf_init(&sb, 1000);
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';
1fc561d1
AB
1534 if (!len)
1535 break;
60da8b15
JH
1536 if (sb.buf[0] == '-') {
1537 if (len == 2 && sb.buf[1] == '-') {
1538 seen_dashdash = 1;
1539 break;
1540 }
1fc561d1 1541 die("options not supported in --stdin mode");
60da8b15 1542 }
31faeb20 1543 if (handle_revision_arg(sb.buf, revs, 0,
70d26c6e 1544 REVARG_CANNOT_BE_FILENAME))
63d564b3 1545 die("bad revision '%s'", sb.buf);
1fc561d1 1546 }
60da8b15
JH
1547 if (seen_dashdash)
1548 read_pathspec_from_stdin(revs, &sb, prune);
63d564b3 1549 strbuf_release(&sb);
1fc561d1
AB
1550}
1551
2d10c555 1552static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
bd95fcd3 1553{
0843acfd 1554 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
2d10c555
JH
1555}
1556
a4d7d2c6 1557static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
2d10c555 1558{
a4d7d2c6 1559 append_header_grep_pattern(&revs->grep_filter, field, pattern);
bd95fcd3
JH
1560}
1561
1562static void add_message_grep(struct rev_info *revs, const char *pattern)
1563{
2d10c555 1564 add_grep(revs, pattern, GREP_PATTERN_BODY);
bd95fcd3
JH
1565}
1566
6b61ec05
PH
1567static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1568 int *unkc, const char **unkv)
02e54220
PH
1569{
1570 const char *arg = argv[0];
7d7b86f7
MM
1571 const char *optarg;
1572 int argcount;
02e54220
PH
1573
1574 /* pseudo revision arguments */
1575 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1576 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1577 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
ad3f9a71 1578 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
0fc63ec4
JN
1579 !strcmp(arg, "--bisect") || !prefixcmp(arg, "--glob=") ||
1580 !prefixcmp(arg, "--branches=") || !prefixcmp(arg, "--tags=") ||
ca92e59e 1581 !prefixcmp(arg, "--remotes=") || !prefixcmp(arg, "--no-walk="))
02e54220
PH
1582 {
1583 unkv[(*unkc)++] = arg;
0fe8c138 1584 return 1;
02e54220
PH
1585 }
1586
7d7b86f7
MM
1587 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1588 revs->max_count = atoi(optarg);
5853caec 1589 revs->no_walk = 0;
7d7b86f7
MM
1590 return argcount;
1591 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1592 revs->skip_count = atoi(optarg);
1593 return argcount;
02e54220
PH
1594 } else if ((*arg == '-') && isdigit(arg[1])) {
1595 /* accept -<digit>, like traditional "head" */
1596 revs->max_count = atoi(arg + 1);
5853caec 1597 revs->no_walk = 0;
02e54220
PH
1598 } else if (!strcmp(arg, "-n")) {
1599 if (argc <= 1)
1600 return error("-n requires an argument");
1601 revs->max_count = atoi(argv[1]);
5853caec 1602 revs->no_walk = 0;
02e54220
PH
1603 return 2;
1604 } else if (!prefixcmp(arg, "-n")) {
1605 revs->max_count = atoi(arg + 2);
5853caec 1606 revs->no_walk = 0;
7d7b86f7
MM
1607 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1608 revs->max_age = atoi(optarg);
1609 return argcount;
1610 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1611 revs->max_age = approxidate(optarg);
1612 return argcount;
1613 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1614 revs->max_age = approxidate(optarg);
1615 return argcount;
1616 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1617 revs->min_age = atoi(optarg);
1618 return argcount;
1619 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1620 revs->min_age = approxidate(optarg);
1621 return argcount;
1622 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1623 revs->min_age = approxidate(optarg);
1624 return argcount;
02e54220
PH
1625 } else if (!strcmp(arg, "--first-parent")) {
1626 revs->first_parent_only = 1;
ebdc94f3
JH
1627 } else if (!strcmp(arg, "--ancestry-path")) {
1628 revs->ancestry_path = 1;
cb7529e1 1629 revs->simplify_history = 0;
ebdc94f3 1630 revs->limited = 1;
02e54220
PH
1631 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1632 init_reflog_walk(&revs->reflog_info);
1633 } else if (!strcmp(arg, "--default")) {
1634 if (argc <= 1)
1635 return error("bad --default argument");
1636 revs->def = argv[1];
1637 return 2;
1638 } else if (!strcmp(arg, "--merge")) {
1639 revs->show_merge = 1;
1640 } else if (!strcmp(arg, "--topo-order")) {
08f704f2 1641 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
02e54220 1642 revs->topo_order = 1;
6546b593
JH
1643 } else if (!strcmp(arg, "--simplify-merges")) {
1644 revs->simplify_merges = 1;
a52f0071 1645 revs->topo_order = 1;
6546b593
JH
1646 revs->rewrite_parents = 1;
1647 revs->simplify_history = 0;
1648 revs->limited = 1;
78892e32
LT
1649 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1650 revs->simplify_merges = 1;
a52f0071 1651 revs->topo_order = 1;
78892e32
LT
1652 revs->rewrite_parents = 1;
1653 revs->simplify_history = 0;
1654 revs->simplify_by_decoration = 1;
1655 revs->limited = 1;
1656 revs->prune = 1;
33e7018c 1657 load_ref_decorations(DECORATE_SHORT_REFS);
02e54220 1658 } else if (!strcmp(arg, "--date-order")) {
08f704f2 1659 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
02e54220 1660 revs->topo_order = 1;
81c6b38b
JH
1661 } else if (!strcmp(arg, "--author-date-order")) {
1662 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
02e54220
PH
1663 revs->topo_order = 1;
1664 } else if (!prefixcmp(arg, "--early-output")) {
1665 int count = 100;
1666 switch (arg[14]) {
1667 case '=':
1668 count = atoi(arg+15);
1669 /* Fallthrough */
1670 case 0:
1671 revs->topo_order = 1;
1672 revs->early_output = count;
1673 }
1674 } else if (!strcmp(arg, "--parents")) {
1675 revs->rewrite_parents = 1;
1676 revs->print_parents = 1;
1677 } else if (!strcmp(arg, "--dense")) {
1678 revs->dense = 1;
1679 } else if (!strcmp(arg, "--sparse")) {
1680 revs->dense = 0;
1681 } else if (!strcmp(arg, "--show-all")) {
1682 revs->show_all = 1;
1683 } else if (!strcmp(arg, "--remove-empty")) {
1684 revs->remove_empty_trees = 1;
b8e8db28 1685 } else if (!strcmp(arg, "--merges")) {
ad5aeede 1686 revs->min_parents = 2;
02e54220 1687 } else if (!strcmp(arg, "--no-merges")) {
ad5aeede
MG
1688 revs->max_parents = 1;
1689 } else if (!prefixcmp(arg, "--min-parents=")) {
1690 revs->min_parents = atoi(arg+14);
1691 } else if (!prefixcmp(arg, "--no-min-parents")) {
1692 revs->min_parents = 0;
1693 } else if (!prefixcmp(arg, "--max-parents=")) {
1694 revs->max_parents = atoi(arg+14);
1695 } else if (!prefixcmp(arg, "--no-max-parents")) {
1696 revs->max_parents = -1;
02e54220
PH
1697 } else if (!strcmp(arg, "--boundary")) {
1698 revs->boundary = 1;
1699 } else if (!strcmp(arg, "--left-right")) {
1700 revs->left_right = 1;
60adf7d7 1701 } else if (!strcmp(arg, "--left-only")) {
24852d91 1702 if (revs->right_only)
94f605ec
MG
1703 die("--left-only is incompatible with --right-only"
1704 " or --cherry");
60adf7d7
MG
1705 revs->left_only = 1;
1706 } else if (!strcmp(arg, "--right-only")) {
24852d91
JH
1707 if (revs->left_only)
1708 die("--right-only is incompatible with --left-only");
60adf7d7 1709 revs->right_only = 1;
94f605ec
MG
1710 } else if (!strcmp(arg, "--cherry")) {
1711 if (revs->left_only)
1712 die("--cherry is incompatible with --left-only");
1713 revs->cherry_mark = 1;
1714 revs->right_only = 1;
ad5aeede 1715 revs->max_parents = 1;
94f605ec 1716 revs->limited = 1;
f69c5018
TR
1717 } else if (!strcmp(arg, "--count")) {
1718 revs->count = 1;
adbbb31e
MG
1719 } else if (!strcmp(arg, "--cherry-mark")) {
1720 if (revs->cherry_pick)
1721 die("--cherry-mark is incompatible with --cherry-pick");
1722 revs->cherry_mark = 1;
1723 revs->limited = 1; /* needs limit_list() */
02e54220 1724 } else if (!strcmp(arg, "--cherry-pick")) {
adbbb31e
MG
1725 if (revs->cherry_mark)
1726 die("--cherry-pick is incompatible with --cherry-mark");
02e54220
PH
1727 revs->cherry_pick = 1;
1728 revs->limited = 1;
1729 } else if (!strcmp(arg, "--objects")) {
1730 revs->tag_objects = 1;
1731 revs->tree_objects = 1;
1732 revs->blob_objects = 1;
1733 } else if (!strcmp(arg, "--objects-edge")) {
1734 revs->tag_objects = 1;
1735 revs->tree_objects = 1;
1736 revs->blob_objects = 1;
1737 revs->edge_hint = 1;
5a48d240
JH
1738 } else if (!strcmp(arg, "--verify-objects")) {
1739 revs->tag_objects = 1;
1740 revs->tree_objects = 1;
1741 revs->blob_objects = 1;
1742 revs->verify_objects = 1;
02e54220
PH
1743 } else if (!strcmp(arg, "--unpacked")) {
1744 revs->unpacked = 1;
03a9683d
JH
1745 } else if (!prefixcmp(arg, "--unpacked=")) {
1746 die("--unpacked=<packfile> no longer supported.");
02e54220
PH
1747 } else if (!strcmp(arg, "-r")) {
1748 revs->diff = 1;
1749 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1750 } else if (!strcmp(arg, "-t")) {
1751 revs->diff = 1;
1752 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1753 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1754 } else if (!strcmp(arg, "-m")) {
1755 revs->ignore_merges = 0;
1756 } else if (!strcmp(arg, "-c")) {
1757 revs->diff = 1;
1758 revs->dense_combined_merges = 0;
1759 revs->combine_merges = 1;
1760 } else if (!strcmp(arg, "--cc")) {
1761 revs->diff = 1;
1762 revs->dense_combined_merges = 1;
1763 revs->combine_merges = 1;
1764 } else if (!strcmp(arg, "-v")) {
1765 revs->verbose_header = 1;
1766 } else if (!strcmp(arg, "--pretty")) {
1767 revs->verbose_header = 1;
66b2ed09 1768 revs->pretty_given = 1;
02e54220 1769 get_commit_format(arg+8, revs);
3a4c1a5e 1770 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
7d7b86f7
MM
1771 /*
1772 * Detached form ("--pretty X" as opposed to "--pretty=X")
1773 * not allowed, since the argument is optional.
1774 */
02e54220 1775 revs->verbose_header = 1;
66b2ed09 1776 revs->pretty_given = 1;
02e54220 1777 get_commit_format(arg+9, revs);
7249e912 1778 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
66b2ed09
JH
1779 revs->show_notes = 1;
1780 revs->show_notes_given = 1;
3a03cf6b 1781 revs->notes_opt.use_default_notes = 1;
0c37f1fc
JH
1782 } else if (!strcmp(arg, "--show-signature")) {
1783 revs->show_signature = 1;
7249e912
JK
1784 } else if (!prefixcmp(arg, "--show-notes=") ||
1785 !prefixcmp(arg, "--notes=")) {
894a9d33
TR
1786 struct strbuf buf = STRBUF_INIT;
1787 revs->show_notes = 1;
1788 revs->show_notes_given = 1;
7249e912
JK
1789 if (!prefixcmp(arg, "--show-notes")) {
1790 if (revs->notes_opt.use_default_notes < 0)
1791 revs->notes_opt.use_default_notes = 1;
1792 strbuf_addstr(&buf, arg+13);
1793 }
1794 else
1795 strbuf_addstr(&buf, arg+8);
c063f0a9 1796 expand_notes_ref(&buf);
304cc11c 1797 string_list_append(&revs->notes_opt.extra_notes_refs,
1d2f80fa 1798 strbuf_detach(&buf, NULL));
66b2ed09
JH
1799 } else if (!strcmp(arg, "--no-notes")) {
1800 revs->show_notes = 0;
1801 revs->show_notes_given = 1;
92e0d425
JK
1802 revs->notes_opt.use_default_notes = -1;
1803 /* we have been strdup'ing ourselves, so trick
1804 * string_list into free()ing strings */
1805 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1806 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1807 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
894a9d33
TR
1808 } else if (!strcmp(arg, "--standard-notes")) {
1809 revs->show_notes_given = 1;
3a03cf6b 1810 revs->notes_opt.use_default_notes = 1;
894a9d33 1811 } else if (!strcmp(arg, "--no-standard-notes")) {
3a03cf6b 1812 revs->notes_opt.use_default_notes = 0;
de84accc
NS
1813 } else if (!strcmp(arg, "--oneline")) {
1814 revs->verbose_header = 1;
1815 get_commit_format("oneline", revs);
7dccadf3 1816 revs->pretty_given = 1;
de84accc 1817 revs->abbrev_commit = 1;
02e54220
PH
1818 } else if (!strcmp(arg, "--graph")) {
1819 revs->topo_order = 1;
1820 revs->rewrite_parents = 1;
1821 revs->graph = graph_init(revs);
1822 } else if (!strcmp(arg, "--root")) {
1823 revs->show_root_diff = 1;
1824 } else if (!strcmp(arg, "--no-commit-id")) {
1825 revs->no_commit_id = 1;
1826 } else if (!strcmp(arg, "--always")) {
1827 revs->always_show_header = 1;
1828 } else if (!strcmp(arg, "--no-abbrev")) {
1829 revs->abbrev = 0;
1830 } else if (!strcmp(arg, "--abbrev")) {
1831 revs->abbrev = DEFAULT_ABBREV;
1832 } else if (!prefixcmp(arg, "--abbrev=")) {
1833 revs->abbrev = strtoul(arg + 9, NULL, 10);
1834 if (revs->abbrev < MINIMUM_ABBREV)
1835 revs->abbrev = MINIMUM_ABBREV;
1836 else if (revs->abbrev > 40)
1837 revs->abbrev = 40;
1838 } else if (!strcmp(arg, "--abbrev-commit")) {
1839 revs->abbrev_commit = 1;
0c47695a
JS
1840 revs->abbrev_commit_given = 1;
1841 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1842 revs->abbrev_commit = 0;
02e54220
PH
1843 } else if (!strcmp(arg, "--full-diff")) {
1844 revs->diff = 1;
1845 revs->full_diff = 1;
1846 } else if (!strcmp(arg, "--full-history")) {
1847 revs->simplify_history = 0;
1848 } else if (!strcmp(arg, "--relative-date")) {
1849 revs->date_mode = DATE_RELATIVE;
f4ea32f0 1850 revs->date_mode_explicit = 1;
7d7b86f7
MM
1851 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1852 revs->date_mode = parse_date_format(optarg);
f4ea32f0 1853 revs->date_mode_explicit = 1;
7d7b86f7 1854 return argcount;
02e54220
PH
1855 } else if (!strcmp(arg, "--log-size")) {
1856 revs->show_log_size = 1;
1857 }
1858 /*
1859 * Grepping the commit log
1860 */
7d7b86f7
MM
1861 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1862 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1863 return argcount;
1864 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1865 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1866 return argcount;
72fd13f7
NTND
1867 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
1868 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
1869 return argcount;
7d7b86f7
MM
1870 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1871 add_message_grep(revs, optarg);
1872 return argcount;
17bf35a3
JH
1873 } else if (!strcmp(arg, "--grep-debug")) {
1874 revs->grep_filter.debug = 1;
727b6fc3
JH
1875 } else if (!strcmp(arg, "--basic-regexp")) {
1876 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE, &revs->grep_filter);
02e54220 1877 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
34a4ae55 1878 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter);
02e54220 1879 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
0843acfd 1880 revs->grep_filter.regflags |= REG_ICASE;
accccde4 1881 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
02e54220 1882 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
34a4ae55 1883 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter);
727b6fc3
JH
1884 } else if (!strcmp(arg, "--perl-regexp")) {
1885 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE, &revs->grep_filter);
02e54220 1886 } else if (!strcmp(arg, "--all-match")) {
0843acfd 1887 revs->grep_filter.all_match = 1;
7d7b86f7
MM
1888 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
1889 if (strcmp(optarg, "none"))
1890 git_log_output_encoding = xstrdup(optarg);
02e54220
PH
1891 else
1892 git_log_output_encoding = "";
7d7b86f7 1893 return argcount;
02e54220
PH
1894 } else if (!strcmp(arg, "--reverse")) {
1895 revs->reverse ^= 1;
1896 } else if (!strcmp(arg, "--children")) {
1897 revs->children.name = "children";
1898 revs->limited = 1;
cc243c3c
JH
1899 } else if (!strcmp(arg, "--ignore-missing")) {
1900 revs->ignore_missing = 1;
02e54220
PH
1901 } else {
1902 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1903 if (!opts)
1904 unkv[(*unkc)++] = arg;
1905 return opts;
1906 }
1907
1908 return 1;
1909}
1910
6b61ec05
PH
1911void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1912 const struct option *options,
1913 const char * const usagestr[])
1914{
1915 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1916 &ctx->cpidx, ctx->out);
1917 if (n <= 0) {
1918 error("unknown option `%s'", ctx->argv[0]);
1919 usage_with_options(usagestr, options);
1920 }
1921 ctx->argv += n;
1922 ctx->argc -= n;
1923}
1924
9ef6aeb0 1925static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
ad3f9a71 1926{
9ef6aeb0 1927 return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
ad3f9a71
LT
1928}
1929
9ef6aeb0 1930static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
ad3f9a71 1931{
9ef6aeb0 1932 return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
ad3f9a71
LT
1933}
1934
f6aca0dc
JN
1935static int handle_revision_pseudo_opt(const char *submodule,
1936 struct rev_info *revs,
1937 int argc, const char **argv, int *flags)
1938{
1939 const char *arg = argv[0];
1940 const char *optarg;
1941 int argcount;
1942
0fc63ec4
JN
1943 /*
1944 * NOTE!
1945 *
1946 * Commands like "git shortlog" will not accept the options below
1947 * unless parse_revision_opt queues them (as opposed to erroring
1948 * out).
1949 *
1950 * When implementing your new pseudo-option, remember to
1951 * register it in the list at the top of handle_revision_opt.
1952 */
f6aca0dc
JN
1953 if (!strcmp(arg, "--all")) {
1954 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
1955 handle_refs(submodule, revs, *flags, head_ref_submodule);
1956 } else if (!strcmp(arg, "--branches")) {
1957 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
1958 } else if (!strcmp(arg, "--bisect")) {
1959 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
7f34a46f 1960 handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
f6aca0dc
JN
1961 revs->bisect = 1;
1962 } else if (!strcmp(arg, "--tags")) {
1963 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
1964 } else if (!strcmp(arg, "--remotes")) {
1965 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
1966 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
1967 struct all_refs_cb cb;
1968 init_all_refs_cb(&cb, revs, *flags);
1969 for_each_glob_ref(handle_one_ref, optarg, &cb);
1970 return argcount;
1971 } else if (!prefixcmp(arg, "--branches=")) {
1972 struct all_refs_cb cb;
1973 init_all_refs_cb(&cb, revs, *flags);
1974 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
1975 } else if (!prefixcmp(arg, "--tags=")) {
1976 struct all_refs_cb cb;
1977 init_all_refs_cb(&cb, revs, *flags);
1978 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
1979 } else if (!prefixcmp(arg, "--remotes=")) {
1980 struct all_refs_cb cb;
1981 init_all_refs_cb(&cb, revs, *flags);
1982 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
1983 } else if (!strcmp(arg, "--reflog")) {
1984 handle_reflog(revs, *flags);
1985 } else if (!strcmp(arg, "--not")) {
7f34a46f 1986 *flags ^= UNINTERESTING | BOTTOM;
f6aca0dc 1987 } else if (!strcmp(arg, "--no-walk")) {
ca92e59e
MZ
1988 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
1989 } else if (!prefixcmp(arg, "--no-walk=")) {
1990 /*
1991 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
1992 * not allowed, since the argument is optional.
1993 */
1994 if (!strcmp(arg + 10, "sorted"))
1995 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
1996 else if (!strcmp(arg + 10, "unsorted"))
1997 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
1998 else
1999 return error("invalid argument to --no-walk");
f6aca0dc
JN
2000 } else if (!strcmp(arg, "--do-walk")) {
2001 revs->no_walk = 0;
2002 } else {
2003 return 0;
2004 }
2005
2006 return 1;
2007}
2008
ae563542
LT
2009/*
2010 * Parse revision information, filling in the "rev_info" structure,
2011 * and removing the used arguments from the argument list.
2012 *
765ac8ec
LT
2013 * Returns the number of arguments left that weren't recognized
2014 * (which are also moved to the head of the argument list)
ae563542 2015 */
32962c9b 2016int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
ae563542 2017{
8e676e8b 2018 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
4da5af31 2019 struct cmdline_pathspec prune_data;
9ef6aeb0
HV
2020 const char *submodule = NULL;
2021
4da5af31 2022 memset(&prune_data, 0, sizeof(prune_data));
9ef6aeb0
HV
2023 if (opt)
2024 submodule = opt->submodule;
ae563542 2025
ae563542 2026 /* First, search for "--" */
6d5b93f2 2027 if (opt && opt->assume_dashdash) {
ae563542 2028 seen_dashdash = 1;
6d5b93f2
CB
2029 } else {
2030 seen_dashdash = 0;
2031 for (i = 1; i < argc; i++) {
2032 const char *arg = argv[i];
2033 if (strcmp(arg, "--"))
2034 continue;
2035 argv[i] = NULL;
2036 argc = i;
2037 if (argv[i + 1])
2038 append_prune_data(&prune_data, argv + i + 1);
2039 seen_dashdash = 1;
2040 break;
2041 }
ae563542
LT
2042 }
2043
02e54220
PH
2044 /* Second, deal with arguments and options */
2045 flags = 0;
d5f6b1d7
JH
2046 revarg_opt = opt ? opt->revarg_opt : 0;
2047 if (seen_dashdash)
2048 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
8b3dce56 2049 read_from_stdin = 0;
02e54220 2050 for (left = i = 1; i < argc; i++) {
ae563542 2051 const char *arg = argv[i];
ae563542 2052 if (*arg == '-') {
cd2bdc53 2053 int opts;
02e54220 2054
f6aca0dc
JN
2055 opts = handle_revision_pseudo_opt(submodule,
2056 revs, argc - i, argv + i,
2057 &flags);
2058 if (opts > 0) {
2059 i += opts - 1;
8e64006e
JS
2060 continue;
2061 }
f6aca0dc 2062
8b3dce56
JH
2063 if (!strcmp(arg, "--stdin")) {
2064 if (revs->disable_stdin) {
2065 argv[left++] = arg;
2066 continue;
2067 }
2068 if (read_from_stdin++)
2069 die("--stdin given twice?");
60da8b15 2070 read_revisions_from_stdin(revs, &prune_data);
8b3dce56
JH
2071 continue;
2072 }
2d10c555 2073
02e54220 2074 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
cd2bdc53 2075 if (opts > 0) {
cd2bdc53
LT
2076 i += opts - 1;
2077 continue;
2078 }
02e54220
PH
2079 if (opts < 0)
2080 exit(128);
ae563542
LT
2081 continue;
2082 }
ae563542 2083
8e676e8b
JH
2084
2085 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
5d6f0935
JH
2086 int j;
2087 if (seen_dashdash || *arg == '^')
ae563542
LT
2088 die("bad revision '%s'", arg);
2089
ea92f41f
JH
2090 /* If we didn't have a "--":
2091 * (1) all filenames must exist;
2092 * (2) all rev-args must not be interpretable
2093 * as a valid filename.
2094 * but the latter we have checked in the main loop.
2095 */
e23d0b4a 2096 for (j = i; j < argc; j++)
023e37c3 2097 verify_filename(revs->prefix, argv[j], j == i);
e23d0b4a 2098
60da8b15 2099 append_prune_data(&prune_data, argv + i);
ae563542
LT
2100 break;
2101 }
8fcaca3f
DO
2102 else
2103 got_rev_arg = 1;
ae563542 2104 }
5d6f0935 2105
4da5af31 2106 if (prune_data.nr) {
93e7d672
JH
2107 /*
2108 * If we need to introduce the magic "a lone ':' means no
2109 * pathspec whatsoever", here is the place to do so.
2110 *
2111 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2112 * prune_data.nr = 0;
2113 * prune_data.alloc = 0;
2114 * free(prune_data.path);
2115 * prune_data.path = NULL;
2116 * } else {
2117 * terminate prune_data.alloc with NULL and
2118 * call init_pathspec() to set revs->prune_data here.
2119 * }
2120 */
4da5af31
JH
2121 ALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc);
2122 prune_data.path[prune_data.nr++] = NULL;
8f2d4b19
JH
2123 init_pathspec(&revs->prune_data,
2124 get_pathspec(revs->prefix, prune_data.path));
4da5af31 2125 }
5486ef0e 2126
02e54220 2127 if (revs->def == NULL)
32962c9b 2128 revs->def = opt ? opt->def : NULL;
b4490059
JH
2129 if (opt && opt->tweak)
2130 opt->tweak(revs, opt);
02e54220 2131 if (revs->show_merge)
ae3e5e1e 2132 prepare_show_merge(revs);
8fcaca3f 2133 if (revs->def && !revs->pending.nr && !got_rev_arg) {
ae563542 2134 unsigned char sha1[20];
cd2bdc53 2135 struct object *object;
249c8f4a 2136 struct object_context oc;
33bd598c 2137 if (get_sha1_with_context(revs->def, 0, sha1, &oc))
02e54220
PH
2138 die("bad default revision '%s'", revs->def);
2139 object = get_reference(revs, revs->def, sha1, 0);
249c8f4a 2140 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
ae563542 2141 }
8efdc326 2142
b7bb760d
LT
2143 /* Did the user ask for any diff output? Run the diff! */
2144 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2145 revs->diff = 1;
2146
0faf2da7
AL
2147 /* Pickaxe, diff-filter and rename following need diffs */
2148 if (revs->diffopt.pickaxe ||
2149 revs->diffopt.filter ||
2150 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
b7bb760d
LT
2151 revs->diff = 1;
2152
9dad9d2e 2153 if (revs->topo_order)
53069686
JH
2154 revs->limited = 1;
2155
afe069d1
NTND
2156 if (revs->prune_data.nr) {
2157 diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning);
750f7b66 2158 /* Can't prune commits with rename following: the paths change.. */
8f67f8ae 2159 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
53b2c823 2160 revs->prune = 1;
cd2bdc53 2161 if (!revs->full_diff)
afe069d1 2162 diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt);
8efdc326 2163 }
b4490059 2164 if (revs->combine_merges)
cd2bdc53 2165 revs->ignore_merges = 0;
cd2bdc53 2166 revs->diffopt.abbrev = revs->abbrev;
12da1d1f
TR
2167
2168 if (revs->line_level_traverse) {
2169 revs->limited = 1;
2170 revs->topo_order = 1;
2171 }
2172
28452655 2173 diff_setup_done(&revs->diffopt);
8efdc326 2174
918d4e1c
JH
2175 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2176 &revs->grep_filter);
0843acfd 2177 compile_grep_patterns(&revs->grep_filter);
bd95fcd3 2178
d56651c0
SP
2179 if (revs->reverse && revs->reflog_info)
2180 die("cannot combine --reverse with --walk-reflogs");
8bb65883 2181 if (revs->rewrite_parents && revs->children.name)
f35f5603 2182 die("cannot combine --parents and --children");
d56651c0 2183
7fefda5c
AS
2184 /*
2185 * Limitations on the graph functionality
2186 */
2187 if (revs->reverse && revs->graph)
2188 die("cannot combine --reverse with --graph");
2189
2190 if (revs->reflog_info && revs->graph)
2191 die("cannot combine --walk-reflogs with --graph");
baa6378f
JH
2192 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2193 die("cannot use --grep-reflog without --walk-reflogs");
7fefda5c 2194
ae563542
LT
2195 return left;
2196}
a4a88b2b 2197
f35f5603
JH
2198static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2199{
2200 struct commit_list *l = xcalloc(1, sizeof(*l));
2201
2202 l->item = child;
2203 l->next = add_decoration(&revs->children, &parent->object, l);
2204}
2205
d0af663e 2206static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
6546b593 2207{
d0af663e 2208 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
6546b593
JH
2209 struct commit_list **pp, *p;
2210 int surviving_parents;
2211
2212 /* Examine existing parents while marking ones we have seen... */
2213 pp = &commit->parents;
d0af663e 2214 surviving_parents = 0;
6546b593
JH
2215 while ((p = *pp) != NULL) {
2216 struct commit *parent = p->item;
2217 if (parent->object.flags & TMP_MARK) {
2218 *pp = p->next;
d0af663e
KB
2219 if (ts)
2220 compact_treesame(revs, commit, surviving_parents);
6546b593
JH
2221 continue;
2222 }
2223 parent->object.flags |= TMP_MARK;
d0af663e 2224 surviving_parents++;
6546b593
JH
2225 pp = &p->next;
2226 }
d0af663e 2227 /* clear the temporary mark */
6546b593
JH
2228 for (p = commit->parents; p; p = p->next) {
2229 p->item->object.flags &= ~TMP_MARK;
6546b593 2230 }
d0af663e 2231 /* no update_treesame() - removing duplicates can't affect TREESAME */
6546b593
JH
2232 return surviving_parents;
2233}
2234
faf0156b
JH
2235struct merge_simplify_state {
2236 struct commit *simplified;
2237};
2238
2239static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2240{
2241 struct merge_simplify_state *st;
2242
2243 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2244 if (!st) {
2245 st = xcalloc(1, sizeof(*st));
2246 add_decoration(&revs->merge_simplification, &commit->object, st);
2247 }
2248 return st;
2249}
2250
d0af663e
KB
2251static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2252{
2253 struct commit_list *h = reduce_heads(commit->parents);
2254 int i = 0, marked = 0;
2255 struct commit_list *po, *pn;
2256
2257 /* Want these for sanity-checking only */
2258 int orig_cnt = commit_list_count(commit->parents);
2259 int cnt = commit_list_count(h);
2260
2261 /*
2262 * Not ready to remove items yet, just mark them for now, based
2263 * on the output of reduce_heads(). reduce_heads outputs the reduced
2264 * set in its original order, so this isn't too hard.
2265 */
2266 po = commit->parents;
2267 pn = h;
2268 while (po) {
2269 if (pn && po->item == pn->item) {
2270 pn = pn->next;
2271 i++;
2272 } else {
2273 po->item->object.flags |= TMP_MARK;
2274 marked++;
2275 }
2276 po=po->next;
2277 }
2278
2279 if (i != cnt || cnt+marked != orig_cnt)
2280 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2281
2282 free_commit_list(h);
2283
2284 return marked;
2285}
2286
143f1eaf
KB
2287static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2288{
2289 struct commit_list *p;
2290 int marked = 0;
2291
2292 for (p = commit->parents; p; p = p->next) {
2293 struct commit *parent = p->item;
2294 if (!parent->parents && (parent->object.flags & TREESAME)) {
2295 parent->object.flags |= TMP_MARK;
2296 marked++;
2297 }
2298 }
2299
2300 return marked;
2301}
2302
9c129eab
KB
2303/*
2304 * Awkward naming - this means one parent we are TREESAME to.
2305 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2306 * empty tree). Better name suggestions?
2307 */
2308static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2309{
2310 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2311 struct commit *unmarked = NULL, *marked = NULL;
2312 struct commit_list *p;
2313 unsigned n;
2314
2315 for (p = commit->parents, n = 0; p; p = p->next, n++) {
2316 if (ts->treesame[n]) {
2317 if (p->item->object.flags & TMP_MARK) {
2318 if (!marked)
2319 marked = p->item;
2320 } else {
2321 if (!unmarked) {
2322 unmarked = p->item;
2323 break;
2324 }
2325 }
2326 }
2327 }
2328
2329 /*
2330 * If we are TREESAME to a marked-for-deletion parent, but not to any
2331 * unmarked parents, unmark the first TREESAME parent. This is the
2332 * parent that the default simplify_history==1 scan would have followed,
2333 * and it doesn't make sense to omit that path when asking for a
2334 * simplified full history. Retaining it improves the chances of
2335 * understanding odd missed merges that took an old version of a file.
2336 *
2337 * Example:
2338 *
2339 * I--------*X A modified the file, but mainline merge X used
2340 * \ / "-s ours", so took the version from I. X is
2341 * `-*A--' TREESAME to I and !TREESAME to A.
2342 *
2343 * Default log from X would produce "I". Without this check,
2344 * --full-history --simplify-merges would produce "I-A-X", showing
2345 * the merge commit X and that it changed A, but not making clear that
2346 * it had just taken the I version. With this check, the topology above
2347 * is retained.
2348 *
2349 * Note that it is possible that the simplification chooses a different
2350 * TREESAME parent from the default, in which case this test doesn't
2351 * activate, and we _do_ drop the default parent. Example:
2352 *
2353 * I------X A modified the file, but it was reverted in B,
2354 * \ / meaning mainline merge X is TREESAME to both
2355 * *A-*B parents.
2356 *
2357 * Default log would produce "I" by following the first parent;
2358 * --full-history --simplify-merges will produce "I-A-B". But this is a
2359 * reasonable result - it presents a logical full history leading from
2360 * I to X, and X is not an important merge.
2361 */
2362 if (!unmarked && marked) {
2363 marked->object.flags &= ~TMP_MARK;
2364 return 1;
2365 }
2366
2367 return 0;
2368}
2369
d0af663e
KB
2370static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2371{
2372 struct commit_list **pp, *p;
2373 int nth_parent, removed = 0;
2374
2375 pp = &commit->parents;
2376 nth_parent = 0;
2377 while ((p = *pp) != NULL) {
2378 struct commit *parent = p->item;
2379 if (parent->object.flags & TMP_MARK) {
2380 parent->object.flags &= ~TMP_MARK;
2381 *pp = p->next;
2382 free(p);
2383 removed++;
2384 compact_treesame(revs, commit, nth_parent);
2385 continue;
2386 }
2387 pp = &p->next;
2388 nth_parent++;
2389 }
2390
2391 /* Removing parents can only increase TREESAMEness */
2392 if (removed && !(commit->object.flags & TREESAME))
2393 update_treesame(revs, commit);
2394
2395 return nth_parent;
2396}
2397
faf0156b 2398static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
6546b593
JH
2399{
2400 struct commit_list *p;
4d826608 2401 struct commit *parent;
faf0156b 2402 struct merge_simplify_state *st, *pst;
6546b593
JH
2403 int cnt;
2404
faf0156b
JH
2405 st = locate_simplify_state(revs, commit);
2406
6546b593 2407 /*
6546b593
JH
2408 * Have we handled this one?
2409 */
faf0156b 2410 if (st->simplified)
6546b593
JH
2411 return tail;
2412
2413 /*
2414 * An UNINTERESTING commit simplifies to itself, so does a
2415 * root commit. We do not rewrite parents of such commit
2416 * anyway.
2417 */
2418 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
faf0156b 2419 st->simplified = commit;
6546b593
JH
2420 return tail;
2421 }
2422
2423 /*
6e513ba3
JH
2424 * Do we know what commit all of our parents that matter
2425 * should be rewritten to? Otherwise we are not ready to
2426 * rewrite this one yet.
6546b593
JH
2427 */
2428 for (cnt = 0, p = commit->parents; p; p = p->next) {
faf0156b
JH
2429 pst = locate_simplify_state(revs, p->item);
2430 if (!pst->simplified) {
6546b593
JH
2431 tail = &commit_list_insert(p->item, tail)->next;
2432 cnt++;
2433 }
6e513ba3
JH
2434 if (revs->first_parent_only)
2435 break;
6546b593 2436 }
53030f8d
JH
2437 if (cnt) {
2438 tail = &commit_list_insert(commit, tail)->next;
6546b593 2439 return tail;
53030f8d 2440 }
6546b593
JH
2441
2442 /*
d0af663e
KB
2443 * Rewrite our list of parents. Note that this cannot
2444 * affect our TREESAME flags in any way - a commit is
2445 * always TREESAME to its simplification.
6546b593 2446 */
faf0156b
JH
2447 for (p = commit->parents; p; p = p->next) {
2448 pst = locate_simplify_state(revs, p->item);
2449 p->item = pst->simplified;
6e513ba3
JH
2450 if (revs->first_parent_only)
2451 break;
faf0156b 2452 }
4b7f53da 2453
0290bf12 2454 if (revs->first_parent_only)
6e513ba3 2455 cnt = 1;
0290bf12 2456 else
d0af663e 2457 cnt = remove_duplicate_parents(revs, commit);
6546b593
JH
2458
2459 /*
2460 * It is possible that we are a merge and one side branch
2461 * does not have any commit that touches the given paths;
d0af663e
KB
2462 * in such a case, the immediate parent from that branch
2463 * will be rewritten to be the merge base.
6546b593
JH
2464 *
2465 * o----X X: the commit we are looking at;
2466 * / / o: a commit that touches the paths;
2467 * ---o----'
2468 *
143f1eaf
KB
2469 * Further, a merge of an independent branch that doesn't
2470 * touch the path will reduce to a treesame root parent:
2471 *
2472 * ----o----X X: the commit we are looking at;
2473 * / o: a commit that touches the paths;
2474 * r r: a root commit not touching the paths
2475 *
2476 * Detect and simplify both cases.
6546b593
JH
2477 */
2478 if (1 < cnt) {
d0af663e 2479 int marked = mark_redundant_parents(revs, commit);
143f1eaf 2480 marked += mark_treesame_root_parents(revs, commit);
9c129eab
KB
2481 if (marked)
2482 marked -= leave_one_treesame_to_parent(revs, commit);
d0af663e
KB
2483 if (marked)
2484 cnt = remove_marked_parents(revs, commit);
6546b593
JH
2485 }
2486
2487 /*
2488 * A commit simplifies to itself if it is a root, if it is
2489 * UNINTERESTING, if it touches the given paths, or if it is a
4d826608 2490 * merge and its parents don't simplify to one relevant commit
6546b593
JH
2491 * (the first two cases are already handled at the beginning of
2492 * this function).
2493 *
4d826608
KB
2494 * Otherwise, it simplifies to what its sole relevant parent
2495 * simplifies to.
6546b593
JH
2496 */
2497 if (!cnt ||
2498 (commit->object.flags & UNINTERESTING) ||
2499 !(commit->object.flags & TREESAME) ||
4d826608 2500 (parent = one_relevant_parent(revs, commit->parents)) == NULL)
faf0156b
JH
2501 st->simplified = commit;
2502 else {
4d826608 2503 pst = locate_simplify_state(revs, parent);
faf0156b
JH
2504 st->simplified = pst->simplified;
2505 }
6546b593
JH
2506 return tail;
2507}
2508
2509static void simplify_merges(struct rev_info *revs)
2510{
ab9d75a8 2511 struct commit_list *list, *next;
6546b593 2512 struct commit_list *yet_to_do, **tail;
ab9d75a8 2513 struct commit *commit;
6546b593 2514
5eac739e
JH
2515 if (!revs->prune)
2516 return;
65347030 2517
6546b593
JH
2518 /* feed the list reversed */
2519 yet_to_do = NULL;
ab9d75a8
JH
2520 for (list = revs->commits; list; list = next) {
2521 commit = list->item;
2522 next = list->next;
2523 /*
2524 * Do not free(list) here yet; the original list
2525 * is used later in this function.
2526 */
2527 commit_list_insert(commit, &yet_to_do);
2528 }
6546b593
JH
2529 while (yet_to_do) {
2530 list = yet_to_do;
2531 yet_to_do = NULL;
2532 tail = &yet_to_do;
2533 while (list) {
ab9d75a8
JH
2534 commit = list->item;
2535 next = list->next;
6546b593
JH
2536 free(list);
2537 list = next;
faf0156b 2538 tail = simplify_one(revs, commit, tail);
6546b593
JH
2539 }
2540 }
2541
2542 /* clean up the result, removing the simplified ones */
2543 list = revs->commits;
2544 revs->commits = NULL;
2545 tail = &revs->commits;
2546 while (list) {
faf0156b 2547 struct merge_simplify_state *st;
ab9d75a8
JH
2548
2549 commit = list->item;
2550 next = list->next;
6546b593
JH
2551 free(list);
2552 list = next;
faf0156b
JH
2553 st = locate_simplify_state(revs, commit);
2554 if (st->simplified == commit)
6546b593
JH
2555 tail = &commit_list_insert(commit, tail)->next;
2556 }
6546b593
JH
2557}
2558
f35f5603
JH
2559static void set_children(struct rev_info *revs)
2560{
2561 struct commit_list *l;
2562 for (l = revs->commits; l; l = l->next) {
2563 struct commit *commit = l->item;
2564 struct commit_list *p;
2565
2566 for (p = commit->parents; p; p = p->next)
2567 add_child(revs, p->item, commit);
2568 }
2569}
2570
bcc0a3ea
HV
2571void reset_revision_walk(void)
2572{
2573 clear_object_flags(SEEN | ADDED | SHOWN);
2574}
2575
cc0e6c5a 2576int prepare_revision_walk(struct rev_info *revs)
a4a88b2b 2577{
1f1e895f 2578 int nr = revs->pending.nr;
94d23673 2579 struct object_array_entry *e, *list;
2e7da8e9 2580 struct commit_list **next = &revs->commits;
cd2bdc53 2581
94d23673 2582 e = list = revs->pending.objects;
1f1e895f
LT
2583 revs->pending.nr = 0;
2584 revs->pending.alloc = 0;
2585 revs->pending.objects = NULL;
2586 while (--nr >= 0) {
94d23673 2587 struct commit *commit = handle_commit(revs, e->item, e->name);
cd2bdc53
LT
2588 if (commit) {
2589 if (!(commit->object.flags & SEEN)) {
2590 commit->object.flags |= SEEN;
2e7da8e9 2591 next = commit_list_append(commit, next);
cd2bdc53
LT
2592 }
2593 }
94d23673 2594 e++;
cd2bdc53 2595 }
4a43d374
RS
2596 if (!revs->leak_pending)
2597 free(list);
cd2bdc53 2598
d0af663e 2599 /* Signal whether we need per-parent treesame decoration */
4d826608
KB
2600 if (revs->simplify_merges ||
2601 (revs->limited && limiting_can_increase_treesame(revs)))
d0af663e
KB
2602 revs->treesame.name = "treesame";
2603
ca92e59e
MZ
2604 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2605 commit_list_sort_by_date(&revs->commits);
ba1d4505 2606 if (revs->no_walk)
cc0e6c5a 2607 return 0;
a4a88b2b 2608 if (revs->limited)
cc0e6c5a
AR
2609 if (limit_list(revs) < 0)
2610 return -1;
a4a88b2b 2611 if (revs->topo_order)
08f704f2 2612 sort_in_topological_order(&revs->commits, revs->sort_order);
12da1d1f
TR
2613 if (revs->line_level_traverse)
2614 line_log_filter(revs);
6546b593
JH
2615 if (revs->simplify_merges)
2616 simplify_merges(revs);
f35f5603
JH
2617 if (revs->children.name)
2618 set_children(revs);
cc0e6c5a 2619 return 0;
a4a88b2b
LT
2620}
2621
cc0e6c5a 2622static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
765ac8ec 2623{
fce87ae5
AG
2624 struct commit_list *cache = NULL;
2625
765ac8ec
LT
2626 for (;;) {
2627 struct commit *p = *pp;
3381c790 2628 if (!revs->limited)
fce87ae5 2629 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
cc0e6c5a 2630 return rewrite_one_error;
7dc0fe3b
LT
2631 if (p->object.flags & UNINTERESTING)
2632 return rewrite_one_ok;
2633 if (!(p->object.flags & TREESAME))
cc0e6c5a 2634 return rewrite_one_ok;
765ac8ec 2635 if (!p->parents)
cc0e6c5a 2636 return rewrite_one_noparents;
4d826608
KB
2637 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2638 return rewrite_one_ok;
2639 *pp = p;
765ac8ec
LT
2640 }
2641}
2642
c7edcae0
BY
2643int rewrite_parents(struct rev_info *revs, struct commit *commit,
2644 rewrite_parent_fn_t rewrite_parent)
765ac8ec
LT
2645{
2646 struct commit_list **pp = &commit->parents;
2647 while (*pp) {
2648 struct commit_list *parent = *pp;
c7edcae0 2649 switch (rewrite_parent(revs, &parent->item)) {
cc0e6c5a
AR
2650 case rewrite_one_ok:
2651 break;
2652 case rewrite_one_noparents:
765ac8ec
LT
2653 *pp = parent->next;
2654 continue;
cc0e6c5a
AR
2655 case rewrite_one_error:
2656 return -1;
765ac8ec
LT
2657 }
2658 pp = &parent->next;
2659 }
d0af663e 2660 remove_duplicate_parents(revs, commit);
cc0e6c5a 2661 return 0;
765ac8ec
LT
2662}
2663
d72fbe81
AP
2664static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2665{
2666 char *person, *endp;
2667 size_t len, namelen, maillen;
2668 const char *name;
2669 const char *mail;
2670 struct ident_split ident;
2671
2672 person = strstr(buf->buf, what);
2673 if (!person)
2674 return 0;
2675
2676 person += strlen(what);
2677 endp = strchr(person, '\n');
2678 if (!endp)
2679 return 0;
2680
2681 len = endp - person;
2682
2683 if (split_ident_line(&ident, person, len))
2684 return 0;
2685
2686 mail = ident.mail_begin;
2687 maillen = ident.mail_end - ident.mail_begin;
2688 name = ident.name_begin;
2689 namelen = ident.name_end - ident.name_begin;
2690
2691 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2692 struct strbuf namemail = STRBUF_INIT;
2693
2694 strbuf_addf(&namemail, "%.*s <%.*s>",
2695 (int)namelen, name, (int)maillen, mail);
2696
2697 strbuf_splice(buf, ident.name_begin - buf->buf,
2698 ident.mail_end - ident.name_begin + 1,
2699 namemail.buf, namemail.len);
2700
2701 strbuf_release(&namemail);
2702
2703 return 1;
2704 }
2705
2706 return 0;
2707}
2708
8ecae9b0
JH
2709static int commit_match(struct commit *commit, struct rev_info *opt)
2710{
72fd13f7 2711 int retval;
04deccda
JK
2712 const char *encoding;
2713 char *message;
72fd13f7 2714 struct strbuf buf = STRBUF_INIT;
04deccda 2715
80235ba7 2716 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
8ecae9b0 2717 return 1;
baa6378f
JH
2718
2719 /* Prepend "fake" headers as needed */
2720 if (opt->grep_filter.use_reflog_filter) {
72fd13f7
NTND
2721 strbuf_addstr(&buf, "reflog ");
2722 get_reflog_message(&buf, opt->reflog_info);
2723 strbuf_addch(&buf, '\n');
72fd13f7 2724 }
baa6378f 2725
04deccda
JK
2726 /*
2727 * We grep in the user's output encoding, under the assumption that it
2728 * is the encoding they are most likely to write their grep pattern
2729 * for. In addition, it means we will match the "notes" encoding below,
2730 * so we will not end up with a buffer that has two different encodings
2731 * in it.
2732 */
2733 encoding = get_log_output_encoding();
5a10d236 2734 message = logmsg_reencode(commit, NULL, encoding);
04deccda 2735
baa6378f
JH
2736 /* Copy the commit to temporary if we are using "fake" headers */
2737 if (buf.len)
04deccda 2738 strbuf_addstr(&buf, message);
baa6378f 2739
df874fa8 2740 if (opt->grep_filter.header_list && opt->mailmap) {
d72fbe81 2741 if (!buf.len)
04deccda 2742 strbuf_addstr(&buf, message);
d72fbe81
AP
2743
2744 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2745 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2746 }
2747
38cfe915
NTND
2748 /* Append "fake" message parts as needed */
2749 if (opt->show_notes) {
2750 if (!buf.len)
04deccda
JK
2751 strbuf_addstr(&buf, message);
2752 format_display_notes(commit->object.sha1, &buf, encoding, 1);
38cfe915
NTND
2753 }
2754
04deccda 2755 /* Find either in the original commit message, or in the temporary */
72fd13f7
NTND
2756 if (buf.len)
2757 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2758 else
2759 retval = grep_buffer(&opt->grep_filter,
04deccda 2760 message, strlen(message));
72fd13f7 2761 strbuf_release(&buf);
04deccda 2762 logmsg_free(message, commit);
72fd13f7 2763 return retval;
8ecae9b0
JH
2764}
2765
f35f5603
JH
2766static inline int want_ancestry(struct rev_info *revs)
2767{
8bb65883 2768 return (revs->rewrite_parents || revs->children.name);
f35f5603
JH
2769}
2770
beb5af43 2771enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
252a7c02
LT
2772{
2773 if (commit->object.flags & SHOWN)
2774 return commit_ignore;
4d6acb70 2775 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
252a7c02 2776 return commit_ignore;
3131b713
LT
2777 if (revs->show_all)
2778 return commit_show;
252a7c02
LT
2779 if (commit->object.flags & UNINTERESTING)
2780 return commit_ignore;
2781 if (revs->min_age != -1 && (commit->date > revs->min_age))
2782 return commit_ignore;
ad5aeede 2783 if (revs->min_parents || (revs->max_parents >= 0)) {
bf3418b0 2784 int n = commit_list_count(commit->parents);
ad5aeede
MG
2785 if ((n < revs->min_parents) ||
2786 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2787 return commit_ignore;
2788 }
252a7c02
LT
2789 if (!commit_match(commit, revs))
2790 return commit_ignore;
53b2c823 2791 if (revs->prune && revs->dense) {
252a7c02 2792 /* Commit without changes? */
7dc0fe3b 2793 if (commit->object.flags & TREESAME) {
bf3418b0
KB
2794 int n;
2795 struct commit_list *p;
252a7c02 2796 /* drop merges unless we want parenthood */
f35f5603 2797 if (!want_ancestry(revs))
252a7c02 2798 return commit_ignore;
bf3418b0
KB
2799 /*
2800 * If we want ancestry, then need to keep any merges
2801 * between relevant commits to tie together topology.
2802 * For consistency with TREESAME and simplification
2803 * use "relevant" here rather than just INTERESTING,
2804 * to treat bottom commit(s) as part of the topology.
2805 */
2806 for (n = 0, p = commit->parents; p; p = p->next)
2807 if (relevant_commit(p->item))
2808 if (++n >= 2)
2809 return commit_show;
2810 return commit_ignore;
252a7c02 2811 }
252a7c02
LT
2812 }
2813 return commit_show;
2814}
2815
beb5af43
AS
2816enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
2817{
2818 enum commit_action action = get_commit_action(revs, commit);
2819
2820 if (action == commit_show &&
2821 !revs->show_all &&
2822 revs->prune && revs->dense && want_ancestry(revs)) {
c7edcae0 2823 if (rewrite_parents(revs, commit, rewrite_one) < 0)
beb5af43
AS
2824 return commit_error;
2825 }
2826 return action;
2827}
2828
d5db6c9e 2829static struct commit *get_revision_1(struct rev_info *revs)
a4a88b2b 2830{
d5db6c9e 2831 if (!revs->commits)
a4a88b2b 2832 return NULL;
a4a88b2b 2833
765ac8ec 2834 do {
cb115748
LT
2835 struct commit_list *entry = revs->commits;
2836 struct commit *commit = entry->item;
ea5ed3ab 2837
cb115748
LT
2838 revs->commits = entry->next;
2839 free(entry);
2a0925be 2840
ffa1eeae 2841 if (revs->reflog_info) {
8860fd42 2842 fake_reflog_parent(revs->reflog_info, commit);
ffa1eeae
JK
2843 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
2844 }
8860fd42 2845
2a0925be
LT
2846 /*
2847 * If we haven't done the list limiting, we need to look at
be7db6e5
LT
2848 * the parents here. We also need to do the date-based limiting
2849 * that we'd otherwise have done in limit_list().
2a0925be 2850 */
be7db6e5 2851 if (!revs->limited) {
744f4985 2852 if (revs->max_age != -1 &&
86ab4906
JH
2853 (commit->date < revs->max_age))
2854 continue;
fce87ae5 2855 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
ed62089c
JH
2856 die("Failed to traverse parents of commit %s",
2857 sha1_to_hex(commit->object.sha1));
be7db6e5 2858 }
744f4985 2859
252a7c02
LT
2860 switch (simplify_commit(revs, commit)) {
2861 case commit_ignore:
8ecae9b0 2862 continue;
252a7c02 2863 case commit_error:
ed62089c
JH
2864 die("Failed to simplify parents of commit %s",
2865 sha1_to_hex(commit->object.sha1));
252a7c02
LT
2866 default:
2867 return commit;
384e99a4 2868 }
765ac8ec
LT
2869 } while (revs->commits);
2870 return NULL;
2871}
d5db6c9e 2872
be6754c6
MH
2873/*
2874 * Return true for entries that have not yet been shown. (This is an
2875 * object_array_each_func_t.)
2876 */
2877static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
86ab4906 2878{
be6754c6
MH
2879 return !(entry->item->flags & SHOWN);
2880}
86ab4906 2881
be6754c6
MH
2882/*
2883 * If array is on the verge of a realloc, garbage-collect any entries
2884 * that have already been shown to try to free up some space.
2885 */
2886static void gc_boundary(struct object_array *array)
2887{
2888 if (array->nr == array->alloc)
2889 object_array_filter(array, entry_unshown, NULL);
86ab4906
JH
2890}
2891
4603ec0f
AS
2892static void create_boundary_commit_list(struct rev_info *revs)
2893{
2894 unsigned i;
2895 struct commit *c;
2896 struct object_array *array = &revs->boundary_commits;
2897 struct object_array_entry *objects = array->objects;
2898
2899 /*
2900 * If revs->commits is non-NULL at this point, an error occurred in
2901 * get_revision_1(). Ignore the error and continue printing the
2902 * boundary commits anyway. (This is what the code has always
2903 * done.)
2904 */
2905 if (revs->commits) {
2906 free_commit_list(revs->commits);
2907 revs->commits = NULL;
2908 }
2909
2910 /*
2911 * Put all of the actual boundary commits from revs->boundary_commits
2912 * into revs->commits
2913 */
2914 for (i = 0; i < array->nr; i++) {
2915 c = (struct commit *)(objects[i].item);
2916 if (!c)
2917 continue;
2918 if (!(c->object.flags & CHILD_SHOWN))
2919 continue;
2920 if (c->object.flags & (SHOWN | BOUNDARY))
2921 continue;
2922 c->object.flags |= BOUNDARY;
2923 commit_list_insert(c, &revs->commits);
2924 }
2925
2926 /*
2927 * If revs->topo_order is set, sort the boundary commits
2928 * in topological order
2929 */
08f704f2 2930 sort_in_topological_order(&revs->commits, revs->sort_order);
4603ec0f
AS
2931}
2932
7fefda5c 2933static struct commit *get_revision_internal(struct rev_info *revs)
d5db6c9e
JH
2934{
2935 struct commit *c = NULL;
86ab4906
JH
2936 struct commit_list *l;
2937
2938 if (revs->boundary == 2) {
4603ec0f
AS
2939 /*
2940 * All of the normal commits have already been returned,
2941 * and we are now returning boundary commits.
2942 * create_boundary_commit_list() has populated
2943 * revs->commits with the remaining commits to return.
2944 */
2945 c = pop_commit(&revs->commits);
2946 if (c)
2947 c->object.flags |= SHOWN;
9c5e66e9
JS
2948 return c;
2949 }
2950
86ab4906 2951 /*
b72a1904
JK
2952 * If our max_count counter has reached zero, then we are done. We
2953 * don't simply return NULL because we still might need to show
2954 * boundary commits. But we want to avoid calling get_revision_1, which
2955 * might do a considerable amount of work finding the next commit only
2956 * for us to throw it away.
2957 *
2958 * If it is non-zero, then either we don't have a max_count at all
2959 * (-1), or it is still counting, in which case we decrement.
86ab4906 2960 */
b72a1904
JK
2961 if (revs->max_count) {
2962 c = get_revision_1(revs);
2963 if (c) {
2964 while (0 < revs->skip_count) {
2965 revs->skip_count--;
2966 c = get_revision_1(revs);
2967 if (!c)
2968 break;
2969 }
8839ac94 2970 }
86ab4906 2971
b72a1904
JK
2972 if (revs->max_count > 0)
2973 revs->max_count--;
d5db6c9e 2974 }
86ab4906 2975
c33d8593
JH
2976 if (c)
2977 c->object.flags |= SHOWN;
2978
2979 if (!revs->boundary) {
d5db6c9e 2980 return c;
c33d8593 2981 }
86ab4906
JH
2982
2983 if (!c) {
2984 /*
2985 * get_revision_1() runs out the commits, and
2986 * we are done computing the boundaries.
2987 * switch to boundary commits output mode.
2988 */
2989 revs->boundary = 2;
4603ec0f
AS
2990
2991 /*
2992 * Update revs->commits to contain the list of
2993 * boundary commits.
2994 */
2995 create_boundary_commit_list(revs);
2996
3c68d67b 2997 return get_revision_internal(revs);
86ab4906
JH
2998 }
2999
3000 /*
3001 * boundary commits are the commits that are parents of the
3002 * ones we got from get_revision_1() but they themselves are
3003 * not returned from get_revision_1(). Before returning
3004 * 'c', we need to mark its parents that they could be boundaries.
3005 */
3006
3007 for (l = c->parents; l; l = l->next) {
3008 struct object *p;
3009 p = &(l->item->object);
c33d8593 3010 if (p->flags & (CHILD_SHOWN | SHOWN))
86ab4906
JH
3011 continue;
3012 p->flags |= CHILD_SHOWN;
3013 gc_boundary(&revs->boundary_commits);
3014 add_object_array(p, NULL, &revs->boundary_commits);
3015 }
3016
3017 return c;
d5db6c9e 3018}
7fefda5c
AS
3019
3020struct commit *get_revision(struct rev_info *revs)
3021{
498bcd31
TR
3022 struct commit *c;
3023 struct commit_list *reversed;
3024
3025 if (revs->reverse) {
3026 reversed = NULL;
3027 while ((c = get_revision_internal(revs))) {
3028 commit_list_insert(c, &reversed);
3029 }
3030 revs->commits = reversed;
3031 revs->reverse = 0;
3032 revs->reverse_output_stage = 1;
3033 }
3034
3035 if (revs->reverse_output_stage)
3036 return pop_commit(&revs->commits);
3037
3038 c = get_revision_internal(revs);
7fefda5c
AS
3039 if (c && revs->graph)
3040 graph_update(revs->graph, c);
3041 return c;
3042}
1df2d656
MG
3043
3044char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3045{
3046 if (commit->object.flags & BOUNDARY)
3047 return "-";
3048 else if (commit->object.flags & UNINTERESTING)
3049 return "^";
adbbb31e
MG
3050 else if (commit->object.flags & PATCHSAME)
3051 return "=";
1df2d656
MG
3052 else if (!revs || revs->left_right) {
3053 if (commit->object.flags & SYMMETRIC_LEFT)
3054 return "<";
3055 else
3056 return ">";
3057 } else if (revs->graph)
3058 return "*";
adbbb31e
MG
3059 else if (revs->cherry_mark)
3060 return "+";
1df2d656
MG
3061 return "";
3062}
b1b47554
MG
3063
3064void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3065{
3066 char *mark = get_revision_mark(revs, commit);
3067 if (!strlen(mark))
3068 return;
3069 fputs(mark, stdout);
3070 putchar(' ');
3071}