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