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
29volatile show_early_output_fn_t show_early_output;
30
31static const char *term_bad;
32static const char *term_good;
33
34implement_shared_commit_slab(revision_sources, char *);
35
36void 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
46static 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
55static void mark_tree_contents_uninteresting(struct repository *r,
56 struct tree *tree)
57{
58 struct tree_desc desc;
59 struct name_entry entry;
60
61 if (parse_tree_gently(tree, 1) < 0)
62 return;
63
64 init_tree_desc(&desc, tree->buffer, tree->size);
65 while (tree_entry(&desc, &entry)) {
66 switch (object_type(entry.mode)) {
67 case OBJ_TREE:
68 mark_tree_uninteresting(r, lookup_tree(r, entry.oid));
69 break;
70 case OBJ_BLOB:
71 mark_blob_uninteresting(lookup_blob(r, entry.oid));
72 break;
73 default:
74 /* Subproject commit - not in this repository */
75 break;
76 }
77 }
78
79 /*
80 * We don't care about the tree any more
81 * after it has been marked uninteresting.
82 */
83 free_tree_buffer(tree);
84}
85
86void mark_tree_uninteresting(struct repository *r, struct tree *tree)
87{
88 struct object *obj;
89
90 if (!tree)
91 return;
92
93 obj = &tree->object;
94 if (obj->flags & UNINTERESTING)
95 return;
96 obj->flags |= UNINTERESTING;
97 mark_tree_contents_uninteresting(r, tree);
98}
99
100struct commit_stack {
101 struct commit **items;
102 size_t nr, alloc;
103};
104#define COMMIT_STACK_INIT { NULL, 0, 0 }
105
106static void commit_stack_push(struct commit_stack *stack, struct commit *commit)
107{
108 ALLOC_GROW(stack->items, stack->nr + 1, stack->alloc);
109 stack->items[stack->nr++] = commit;
110}
111
112static struct commit *commit_stack_pop(struct commit_stack *stack)
113{
114 return stack->nr ? stack->items[--stack->nr] : NULL;
115}
116
117static void commit_stack_clear(struct commit_stack *stack)
118{
119 FREE_AND_NULL(stack->items);
120 stack->nr = stack->alloc = 0;
121}
122
123static void mark_one_parent_uninteresting(struct commit *commit,
124 struct commit_stack *pending)
125{
126 struct commit_list *l;
127
128 if (commit->object.flags & UNINTERESTING)
129 return;
130 commit->object.flags |= UNINTERESTING;
131
132 /*
133 * Normally we haven't parsed the parent
134 * yet, so we won't have a parent of a parent
135 * here. However, it may turn out that we've
136 * reached this commit some other way (where it
137 * wasn't uninteresting), in which case we need
138 * to mark its parents recursively too..
139 */
140 for (l = commit->parents; l; l = l->next)
141 commit_stack_push(pending, l->item);
142}
143
144void mark_parents_uninteresting(struct commit *commit)
145{
146 struct commit_stack pending = COMMIT_STACK_INIT;
147 struct commit_list *l;
148
149 for (l = commit->parents; l; l = l->next)
150 mark_one_parent_uninteresting(l->item, &pending);
151
152 while (pending.nr > 0)
153 mark_one_parent_uninteresting(commit_stack_pop(&pending),
154 &pending);
155
156 commit_stack_clear(&pending);
157}
158
159static void add_pending_object_with_path(struct rev_info *revs,
160 struct object *obj,
161 const char *name, unsigned mode,
162 const char *path)
163{
164 if (!obj)
165 return;
166 if (revs->no_walk && (obj->flags & UNINTERESTING))
167 revs->no_walk = 0;
168 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
169 struct strbuf buf = STRBUF_INIT;
170 int len = interpret_branch_name(name, 0, &buf, 0);
171
172 if (0 < len && name[len] && buf.len)
173 strbuf_addstr(&buf, name + len);
174 add_reflog_for_walk(revs->reflog_info,
175 (struct commit *)obj,
176 buf.buf[0] ? buf.buf: name);
177 strbuf_release(&buf);
178 return; /* do not add the commit itself */
179 }
180 add_object_array_with_path(obj, name, &revs->pending, mode, path);
181}
182
183static void add_pending_object_with_mode(struct rev_info *revs,
184 struct object *obj,
185 const char *name, unsigned mode)
186{
187 add_pending_object_with_path(revs, obj, name, mode, NULL);
188}
189
190void 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
196void 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(revs->repo, &oid);
203 if (!obj)
204 return;
205 add_pending_object(revs, obj, "HEAD");
206}
207
208static 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(revs->repo, 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
226void 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
233static 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(revs->repo, &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(revs->repo, 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
322static 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 */
371static inline int relevant_commit(struct commit *commit)
372{
373 return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
374}
375
376/*
377 * Return a single relevant commit from a parent list. If we are a TREESAME
378 * commit, and this selects one of our parents, then we can safely simplify to
379 * that parent.
380 */
381static struct commit *one_relevant_parent(const struct rev_info *revs,
382 struct commit_list *orig)
383{
384 struct commit_list *list = orig;
385 struct commit *relevant = NULL;
386
387 if (!orig)
388 return NULL;
389
390 /*
391 * For 1-parent commits, or if first-parent-only, then return that
392 * first parent (even if not "relevant" by the above definition).
393 * TREESAME will have been set purely on that parent.
394 */
395 if (revs->first_parent_only || !orig->next)
396 return orig->item;
397
398 /*
399 * For multi-parent commits, identify a sole relevant parent, if any.
400 * If we have only one relevant parent, then TREESAME will be set purely
401 * with regard to that parent, and we can simplify accordingly.
402 *
403 * If we have more than one relevant parent, or no relevant parents
404 * (and multiple irrelevant ones), then we can't select a parent here
405 * and return NULL.
406 */
407 while (list) {
408 struct commit *commit = list->item;
409 list = list->next;
410 if (relevant_commit(commit)) {
411 if (relevant)
412 return NULL;
413 relevant = commit;
414 }
415 }
416 return relevant;
417}
418
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 */
436static int tree_difference = REV_TREE_SAME;
437
438static 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
452static 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
464static 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
501static 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
516struct treesame_state {
517 unsigned int nparents;
518 unsigned char treesame[FLEX_ARRAY];
519};
520
521static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
522{
523 unsigned n = commit_list_count(commit->parents);
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 */
537static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
538{
539 struct treesame_state *st;
540 int old_same;
541
542 if (!commit->parents) {
543 /*
544 * Have just removed the only parent from a non-merge.
545 * Different handling, as we lack decoration.
546 */
547 if (nth_parent != 0)
548 die("compact_treesame %u", nth_parent);
549 old_same = !!(commit->object.flags & TREESAME);
550 if (rev_same_tree_as_empty(revs, commit))
551 commit->object.flags |= TREESAME;
552 else
553 commit->object.flags &= ~TREESAME;
554 return old_same;
555 }
556
557 st = lookup_decoration(&revs->treesame, &commit->object);
558 if (!st || nth_parent >= st->nparents)
559 die("compact_treesame %u", nth_parent);
560
561 old_same = st->treesame[nth_parent];
562 memmove(st->treesame + nth_parent,
563 st->treesame + nth_parent + 1,
564 st->nparents - nth_parent - 1);
565
566 /*
567 * If we've just become a non-merge commit, update TREESAME
568 * immediately, and remove the no-longer-needed decoration.
569 * If still a merge, defer update until update_treesame().
570 */
571 if (--st->nparents == 1) {
572 if (commit->parents->next)
573 die("compact_treesame parents mismatch");
574 if (st->treesame[0] && revs->dense)
575 commit->object.flags |= TREESAME;
576 else
577 commit->object.flags &= ~TREESAME;
578 free(add_decoration(&revs->treesame, &commit->object, NULL));
579 }
580
581 return old_same;
582}
583
584static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
585{
586 if (commit->parents && commit->parents->next) {
587 unsigned n;
588 struct treesame_state *st;
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
614static inline int limiting_can_increase_treesame(const struct rev_info *revs)
615{
616 /*
617 * TREESAME is irrelevant unless prune && dense;
618 * if simplify_history is set, we can't have a mixture of TREESAME and
619 * !TREESAME INTERESTING parents (and we don't have treesame[]
620 * decoration anyway);
621 * if first_parent_only is set, then the TREESAME flag is locked
622 * against the first parent (and again we lack treesame[] decoration).
623 */
624 return revs->prune && revs->dense &&
625 !revs->simplify_history &&
626 !revs->first_parent_only;
627}
628
629static 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
756static 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
770static 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
857static 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(revs->repo, &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
936static 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 */
970static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
971{
972 struct commit_list *p;
973 struct commit_list *rlist = NULL;
974 int made_progress;
975
976 /*
977 * Reverse the list so that it will be likely that we would
978 * process parents before children.
979 */
980 for (p = list; p; p = p->next)
981 commit_list_insert(p->item, &rlist);
982
983 for (p = bottom; p; p = p->next)
984 p->item->object.flags |= TMP_MARK;
985
986 /*
987 * Mark the ones that can reach bottom commits in "list",
988 * in a bottom-up fashion.
989 */
990 do {
991 made_progress = 0;
992 for (p = rlist; p; p = p->next) {
993 struct commit *c = p->item;
994 struct commit_list *parents;
995 if (c->object.flags & (TMP_MARK | UNINTERESTING))
996 continue;
997 for (parents = c->parents;
998 parents;
999 parents = parents->next) {
1000 if (!(parents->item->object.flags & TMP_MARK))
1001 continue;
1002 c->object.flags |= TMP_MARK;
1003 made_progress = 1;
1004 break;
1005 }
1006 }
1007 } while (made_progress);
1008
1009 /*
1010 * NEEDSWORK: decide if we want to remove parents that are
1011 * not marked with TMP_MARK from commit->parents for commits
1012 * in the resulting list. We may not want to do that, though.
1013 */
1014
1015 /*
1016 * The ones that are not marked with TMP_MARK are uninteresting
1017 */
1018 for (p = list; p; p = p->next) {
1019 struct commit *c = p->item;
1020 if (c->object.flags & TMP_MARK)
1021 continue;
1022 c->object.flags |= UNINTERESTING;
1023 }
1024
1025 /* We are done with the TMP_MARK */
1026 for (p = list; p; p = p->next)
1027 p->item->object.flags &= ~TMP_MARK;
1028 for (p = bottom; p; p = p->next)
1029 p->item->object.flags &= ~TMP_MARK;
1030 free_commit_list(rlist);
1031}
1032
1033/*
1034 * Before walking the history, keep the set of "negative" refs the
1035 * caller has asked to exclude.
1036 *
1037 * This is used to compute "rev-list --ancestry-path A..B", as we need
1038 * to filter the result of "A..B" further to the ones that can actually
1039 * reach A.
1040 */
1041static 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 */
1051static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1052{
1053 struct commit_list *p;
1054
1055 for (p = list; p; p = p->next) {
1056 struct commit *commit = p->item;
1057
1058 if (revs->right_only) {
1059 if (commit->object.flags & SYMMETRIC_LEFT)
1060 commit->object.flags |= SHOWN;
1061 } else /* revs->left_only is set */
1062 if (!(commit->object.flags & SYMMETRIC_LEFT))
1063 commit->object.flags |= SHOWN;
1064 }
1065}
1066
1067static 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 */
1145static void add_rev_cmdline(struct rev_info *revs,
1146 struct object *item,
1147 const char *name,
1148 int whence,
1149 unsigned flags)
1150{
1151 struct rev_cmdline_info *info = &revs->cmdline;
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
1162static void add_rev_cmdline_list(struct rev_info *revs,
1163 struct commit_list *commit_list,
1164 int whence,
1165 unsigned flags)
1166{
1167 while (commit_list) {
1168 struct object *object = &commit_list->item->object;
1169 add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1170 whence, flags);
1171 commit_list = commit_list->next;
1172 }
1173}
1174
1175struct 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
1183int 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
1196static 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
1211static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1212 unsigned flags)
1213{
1214 cb->all_revs = revs;
1215 cb->all_flags = flags;
1216 revs->rev_input_given = 1;
1217 cb->refs = NULL;
1218}
1219
1220void 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
1229void 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
1238static void handle_refs(struct ref_store *refs,
1239 struct rev_info *revs, unsigned flags,
1240 int (*for_each)(struct ref_store *, each_ref_fn, void *))
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
1253static 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(cb->all_revs->repo, 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
1271static 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
1280static int handle_one_reflog(const char *path, const struct object_id *oid,
1281 int flag, void *cb_data)
1282{
1283 struct all_refs_cb *cb = cb_data;
1284 cb->warned_bad_reflog = 0;
1285 cb->name_for_errormsg = path;
1286 refs_for_each_reflog_ent(cb->refs, path,
1287 handle_one_reflog_ent, cb_data);
1288 return 0;
1289}
1290
1291static void add_other_reflogs_to_pending(struct all_refs_cb *cb)
1292{
1293 struct worktree **worktrees, **p;
1294
1295 worktrees = get_worktrees(0);
1296 for (p = worktrees; *p; p++) {
1297 struct worktree *wt = *p;
1298
1299 if (wt->is_current)
1300 continue;
1301
1302 cb->refs = get_worktree_ref_store(wt);
1303 refs_for_each_reflog(cb->refs,
1304 handle_one_reflog,
1305 cb);
1306 }
1307 free_worktrees(worktrees);
1308}
1309
1310void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1311{
1312 struct all_refs_cb cb;
1313
1314 cb.all_revs = revs;
1315 cb.all_flags = flags;
1316 cb.refs = get_main_ref_store(revs->repo);
1317 for_each_reflog(handle_one_reflog, &cb);
1318
1319 if (!revs->single_worktree)
1320 add_other_reflogs_to_pending(&cb);
1321}
1322
1323static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1324 struct strbuf *path, unsigned int flags)
1325{
1326 size_t baselen = path->len;
1327 int i;
1328
1329 if (it->entry_count >= 0) {
1330 struct tree *tree = lookup_tree(revs->repo, &it->oid);
1331 tree->object.flags |= flags;
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, flags);
1340 strbuf_setlen(path, baselen);
1341 }
1342
1343}
1344
1345static void do_add_index_objects_to_pending(struct rev_info *revs,
1346 struct index_state *istate,
1347 unsigned int flags)
1348{
1349 int i;
1350
1351 for (i = 0; i < istate->cache_nr; i++) {
1352 struct cache_entry *ce = istate->cache[i];
1353 struct blob *blob;
1354
1355 if (S_ISGITLINK(ce->ce_mode))
1356 continue;
1357
1358 blob = lookup_blob(revs->repo, &ce->oid);
1359 if (!blob)
1360 die("unable to add index blob to traversal");
1361 blob->object.flags |= flags;
1362 add_pending_object_with_path(revs, &blob->object, "",
1363 ce->ce_mode, ce->name);
1364 }
1365
1366 if (istate->cache_tree) {
1367 struct strbuf path = STRBUF_INIT;
1368 add_cache_tree(istate->cache_tree, revs, &path, flags);
1369 strbuf_release(&path);
1370 }
1371}
1372
1373void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
1374{
1375 struct worktree **worktrees, **p;
1376
1377 read_index(revs->repo->index);
1378 do_add_index_objects_to_pending(revs, revs->repo->index, flags);
1379
1380 if (revs->single_worktree)
1381 return;
1382
1383 worktrees = get_worktrees(0);
1384 for (p = worktrees; *p; p++) {
1385 struct worktree *wt = *p;
1386 struct index_state istate = { NULL };
1387
1388 if (wt->is_current)
1389 continue; /* current index already taken care of */
1390
1391 if (read_index_from(&istate,
1392 worktree_git_path(wt, "index"),
1393 get_worktree_git_dir(wt)) > 0)
1394 do_add_index_objects_to_pending(revs, &istate, flags);
1395 discard_index(&istate);
1396 }
1397 free_worktrees(worktrees);
1398}
1399
1400static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1401 int exclude_parent)
1402{
1403 struct object_id oid;
1404 struct object *it;
1405 struct commit *commit;
1406 struct commit_list *parents;
1407 int parent_number;
1408 const char *arg = arg_;
1409
1410 if (*arg == '^') {
1411 flags ^= UNINTERESTING | BOTTOM;
1412 arg++;
1413 }
1414 if (get_oid_committish(arg, &oid))
1415 return 0;
1416 while (1) {
1417 it = get_reference(revs, arg, &oid, 0);
1418 if (!it && revs->ignore_missing)
1419 return 0;
1420 if (it->type != OBJ_TAG)
1421 break;
1422 if (!((struct tag*)it)->tagged)
1423 return 0;
1424 oidcpy(&oid, &((struct tag*)it)->tagged->oid);
1425 }
1426 if (it->type != OBJ_COMMIT)
1427 return 0;
1428 commit = (struct commit *)it;
1429 if (exclude_parent &&
1430 exclude_parent > commit_list_count(commit->parents))
1431 return 0;
1432 for (parents = commit->parents, parent_number = 1;
1433 parents;
1434 parents = parents->next, parent_number++) {
1435 if (exclude_parent && parent_number != exclude_parent)
1436 continue;
1437
1438 it = &parents->item->object;
1439 it->flags |= flags;
1440 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1441 add_pending_object(revs, it, arg);
1442 }
1443 return 1;
1444}
1445
1446void repo_init_revisions(struct repository *r,
1447 struct rev_info *revs,
1448 const char *prefix)
1449{
1450 memset(revs, 0, sizeof(*revs));
1451
1452 revs->repo = r;
1453 revs->abbrev = DEFAULT_ABBREV;
1454 revs->ignore_merges = 1;
1455 revs->simplify_history = 1;
1456 revs->pruning.flags.recursive = 1;
1457 revs->pruning.flags.quick = 1;
1458 revs->pruning.add_remove = file_add_remove;
1459 revs->pruning.change = file_change;
1460 revs->pruning.change_fn_data = revs;
1461 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1462 revs->dense = 1;
1463 revs->prefix = prefix;
1464 revs->max_age = -1;
1465 revs->min_age = -1;
1466 revs->skip_count = -1;
1467 revs->max_count = -1;
1468 revs->max_parents = -1;
1469 revs->expand_tabs_in_log = -1;
1470
1471 revs->commit_format = CMIT_FMT_DEFAULT;
1472 revs->expand_tabs_in_log_default = 8;
1473
1474 init_grep_defaults(revs->repo);
1475 grep_init(&revs->grep_filter, revs->repo, prefix);
1476 revs->grep_filter.status_only = 1;
1477
1478 repo_diff_setup(revs->repo, &revs->diffopt);
1479 if (prefix && !revs->diffopt.prefix) {
1480 revs->diffopt.prefix = prefix;
1481 revs->diffopt.prefix_length = strlen(prefix);
1482 }
1483
1484 revs->notes_opt.use_default_notes = -1;
1485}
1486
1487static void add_pending_commit_list(struct rev_info *revs,
1488 struct commit_list *commit_list,
1489 unsigned int flags)
1490{
1491 while (commit_list) {
1492 struct object *object = &commit_list->item->object;
1493 object->flags |= flags;
1494 add_pending_object(revs, object, oid_to_hex(&object->oid));
1495 commit_list = commit_list->next;
1496 }
1497}
1498
1499static void prepare_show_merge(struct rev_info *revs)
1500{
1501 struct commit_list *bases;
1502 struct commit *head, *other;
1503 struct object_id oid;
1504 const char **prune = NULL;
1505 int i, prune_num = 1; /* counting terminating NULL */
1506 struct index_state *istate = revs->repo->index;
1507
1508 if (get_oid("HEAD", &oid))
1509 die("--merge without HEAD?");
1510 head = lookup_commit_or_die(&oid, "HEAD");
1511 if (get_oid("MERGE_HEAD", &oid))
1512 die("--merge without MERGE_HEAD?");
1513 other = lookup_commit_or_die(&oid, "MERGE_HEAD");
1514 add_pending_object(revs, &head->object, "HEAD");
1515 add_pending_object(revs, &other->object, "MERGE_HEAD");
1516 bases = get_merge_bases(head, other);
1517 add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1518 add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1519 free_commit_list(bases);
1520 head->object.flags |= SYMMETRIC_LEFT;
1521
1522 if (!istate->cache_nr)
1523 read_index(istate);
1524 for (i = 0; i < istate->cache_nr; i++) {
1525 const struct cache_entry *ce = istate->cache[i];
1526 if (!ce_stage(ce))
1527 continue;
1528 if (ce_path_match(istate, ce, &revs->prune_data, NULL)) {
1529 prune_num++;
1530 REALLOC_ARRAY(prune, prune_num);
1531 prune[prune_num-2] = ce->name;
1532 prune[prune_num-1] = NULL;
1533 }
1534 while ((i+1 < istate->cache_nr) &&
1535 ce_same_name(ce, istate->cache[i+1]))
1536 i++;
1537 }
1538 clear_pathspec(&revs->prune_data);
1539 parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1540 PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1541 revs->limited = 1;
1542}
1543
1544static int dotdot_missing(const char *arg, char *dotdot,
1545 struct rev_info *revs, int symmetric)
1546{
1547 if (revs->ignore_missing)
1548 return 0;
1549 /* de-munge so we report the full argument */
1550 *dotdot = '.';
1551 die(symmetric
1552 ? "Invalid symmetric difference expression %s"
1553 : "Invalid revision range %s", arg);
1554}
1555
1556static int handle_dotdot_1(const char *arg, char *dotdot,
1557 struct rev_info *revs, int flags,
1558 int cant_be_filename,
1559 struct object_context *a_oc,
1560 struct object_context *b_oc)
1561{
1562 const char *a_name, *b_name;
1563 struct object_id a_oid, b_oid;
1564 struct object *a_obj, *b_obj;
1565 unsigned int a_flags, b_flags;
1566 int symmetric = 0;
1567 unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1568 unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH;
1569
1570 a_name = arg;
1571 if (!*a_name)
1572 a_name = "HEAD";
1573
1574 b_name = dotdot + 2;
1575 if (*b_name == '.') {
1576 symmetric = 1;
1577 b_name++;
1578 }
1579 if (!*b_name)
1580 b_name = "HEAD";
1581
1582 if (get_oid_with_context(a_name, oc_flags, &a_oid, a_oc) ||
1583 get_oid_with_context(b_name, oc_flags, &b_oid, b_oc))
1584 return -1;
1585
1586 if (!cant_be_filename) {
1587 *dotdot = '.';
1588 verify_non_filename(revs->prefix, arg);
1589 *dotdot = '\0';
1590 }
1591
1592 a_obj = parse_object(revs->repo, &a_oid);
1593 b_obj = parse_object(revs->repo, &b_oid);
1594 if (!a_obj || !b_obj)
1595 return dotdot_missing(arg, dotdot, revs, symmetric);
1596
1597 if (!symmetric) {
1598 /* just A..B */
1599 b_flags = flags;
1600 a_flags = flags_exclude;
1601 } else {
1602 /* A...B -- find merge bases between the two */
1603 struct commit *a, *b;
1604 struct commit_list *exclude;
1605
1606 a = lookup_commit_reference(revs->repo, &a_obj->oid);
1607 b = lookup_commit_reference(revs->repo, &b_obj->oid);
1608 if (!a || !b)
1609 return dotdot_missing(arg, dotdot, revs, symmetric);
1610
1611 exclude = get_merge_bases(a, b);
1612 add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE,
1613 flags_exclude);
1614 add_pending_commit_list(revs, exclude, flags_exclude);
1615 free_commit_list(exclude);
1616
1617 b_flags = flags;
1618 a_flags = flags | SYMMETRIC_LEFT;
1619 }
1620
1621 a_obj->flags |= a_flags;
1622 b_obj->flags |= b_flags;
1623 add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
1624 add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
1625 add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path);
1626 add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path);
1627 return 0;
1628}
1629
1630static int handle_dotdot(const char *arg,
1631 struct rev_info *revs, int flags,
1632 int cant_be_filename)
1633{
1634 struct object_context a_oc, b_oc;
1635 char *dotdot = strstr(arg, "..");
1636 int ret;
1637
1638 if (!dotdot)
1639 return -1;
1640
1641 memset(&a_oc, 0, sizeof(a_oc));
1642 memset(&b_oc, 0, sizeof(b_oc));
1643
1644 *dotdot = '\0';
1645 ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename,
1646 &a_oc, &b_oc);
1647 *dotdot = '.';
1648
1649 free(a_oc.path);
1650 free(b_oc.path);
1651
1652 return ret;
1653}
1654
1655int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1656{
1657 struct object_context oc;
1658 char *mark;
1659 struct object *object;
1660 struct object_id oid;
1661 int local_flags;
1662 const char *arg = arg_;
1663 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1664 unsigned get_sha1_flags = GET_OID_RECORD_PATH;
1665
1666 flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1667
1668 if (!cant_be_filename && !strcmp(arg, "..")) {
1669 /*
1670 * Just ".."? That is not a range but the
1671 * pathspec for the parent directory.
1672 */
1673 return -1;
1674 }
1675
1676 if (!handle_dotdot(arg, revs, flags, revarg_opt))
1677 return 0;
1678
1679 mark = strstr(arg, "^@");
1680 if (mark && !mark[2]) {
1681 *mark = 0;
1682 if (add_parents_only(revs, arg, flags, 0))
1683 return 0;
1684 *mark = '^';
1685 }
1686 mark = strstr(arg, "^!");
1687 if (mark && !mark[2]) {
1688 *mark = 0;
1689 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0))
1690 *mark = '^';
1691 }
1692 mark = strstr(arg, "^-");
1693 if (mark) {
1694 int exclude_parent = 1;
1695
1696 if (mark[2]) {
1697 char *end;
1698 exclude_parent = strtoul(mark + 2, &end, 10);
1699 if (*end != '\0' || !exclude_parent)
1700 return -1;
1701 }
1702
1703 *mark = 0;
1704 if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent))
1705 *mark = '^';
1706 }
1707
1708 local_flags = 0;
1709 if (*arg == '^') {
1710 local_flags = UNINTERESTING | BOTTOM;
1711 arg++;
1712 }
1713
1714 if (revarg_opt & REVARG_COMMITTISH)
1715 get_sha1_flags |= GET_OID_COMMITTISH;
1716
1717 if (get_oid_with_context(arg, get_sha1_flags, &oid, &oc))
1718 return revs->ignore_missing ? 0 : -1;
1719 if (!cant_be_filename)
1720 verify_non_filename(revs->prefix, arg);
1721 object = get_reference(revs, arg, &oid, flags ^ local_flags);
1722 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1723 add_pending_object_with_path(revs, object, arg, oc.mode, oc.path);
1724 free(oc.path);
1725 return 0;
1726}
1727
1728static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1729 struct argv_array *prune)
1730{
1731 while (strbuf_getline(sb, stdin) != EOF)
1732 argv_array_push(prune, sb->buf);
1733}
1734
1735static void read_revisions_from_stdin(struct rev_info *revs,
1736 struct argv_array *prune)
1737{
1738 struct strbuf sb;
1739 int seen_dashdash = 0;
1740 int save_warning;
1741
1742 save_warning = warn_on_object_refname_ambiguity;
1743 warn_on_object_refname_ambiguity = 0;
1744
1745 strbuf_init(&sb, 1000);
1746 while (strbuf_getline(&sb, stdin) != EOF) {
1747 int len = sb.len;
1748 if (!len)
1749 break;
1750 if (sb.buf[0] == '-') {
1751 if (len == 2 && sb.buf[1] == '-') {
1752 seen_dashdash = 1;
1753 break;
1754 }
1755 die("options not supported in --stdin mode");
1756 }
1757 if (handle_revision_arg(sb.buf, revs, 0,
1758 REVARG_CANNOT_BE_FILENAME))
1759 die("bad revision '%s'", sb.buf);
1760 }
1761 if (seen_dashdash)
1762 read_pathspec_from_stdin(revs, &sb, prune);
1763
1764 strbuf_release(&sb);
1765 warn_on_object_refname_ambiguity = save_warning;
1766}
1767
1768static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1769{
1770 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1771}
1772
1773static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1774{
1775 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1776}
1777
1778static void add_message_grep(struct rev_info *revs, const char *pattern)
1779{
1780 add_grep(revs, pattern, GREP_PATTERN_BODY);
1781}
1782
1783static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1784 int *unkc, const char **unkv)
1785{
1786 const char *arg = argv[0];
1787 const char *optarg;
1788 int argcount;
1789 const unsigned hexsz = the_hash_algo->hexsz;
1790
1791 /* pseudo revision arguments */
1792 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1793 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1794 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1795 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1796 !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
1797 !strcmp(arg, "--indexed-objects") ||
1798 starts_with(arg, "--exclude=") ||
1799 starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1800 starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
1801 {
1802 unkv[(*unkc)++] = arg;
1803 return 1;
1804 }
1805
1806 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1807 revs->max_count = atoi(optarg);
1808 revs->no_walk = 0;
1809 return argcount;
1810 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1811 revs->skip_count = atoi(optarg);
1812 return argcount;
1813 } else if ((*arg == '-') && isdigit(arg[1])) {
1814 /* accept -<digit>, like traditional "head" */
1815 if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1816 revs->max_count < 0)
1817 die("'%s': not a non-negative integer", arg + 1);
1818 revs->no_walk = 0;
1819 } else if (!strcmp(arg, "-n")) {
1820 if (argc <= 1)
1821 return error("-n requires an argument");
1822 revs->max_count = atoi(argv[1]);
1823 revs->no_walk = 0;
1824 return 2;
1825 } else if (skip_prefix(arg, "-n", &optarg)) {
1826 revs->max_count = atoi(optarg);
1827 revs->no_walk = 0;
1828 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1829 revs->max_age = atoi(optarg);
1830 return argcount;
1831 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1832 revs->max_age = approxidate(optarg);
1833 return argcount;
1834 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1835 revs->max_age = approxidate(optarg);
1836 return argcount;
1837 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1838 revs->min_age = atoi(optarg);
1839 return argcount;
1840 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1841 revs->min_age = approxidate(optarg);
1842 return argcount;
1843 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1844 revs->min_age = approxidate(optarg);
1845 return argcount;
1846 } else if (!strcmp(arg, "--first-parent")) {
1847 revs->first_parent_only = 1;
1848 } else if (!strcmp(arg, "--ancestry-path")) {
1849 revs->ancestry_path = 1;
1850 revs->simplify_history = 0;
1851 revs->limited = 1;
1852 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1853 init_reflog_walk(&revs->reflog_info);
1854 } else if (!strcmp(arg, "--default")) {
1855 if (argc <= 1)
1856 return error("bad --default argument");
1857 revs->def = argv[1];
1858 return 2;
1859 } else if (!strcmp(arg, "--merge")) {
1860 revs->show_merge = 1;
1861 } else if (!strcmp(arg, "--topo-order")) {
1862 revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1863 revs->topo_order = 1;
1864 } else if (!strcmp(arg, "--simplify-merges")) {
1865 revs->simplify_merges = 1;
1866 revs->topo_order = 1;
1867 revs->rewrite_parents = 1;
1868 revs->simplify_history = 0;
1869 revs->limited = 1;
1870 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1871 revs->simplify_merges = 1;
1872 revs->topo_order = 1;
1873 revs->rewrite_parents = 1;
1874 revs->simplify_history = 0;
1875 revs->simplify_by_decoration = 1;
1876 revs->limited = 1;
1877 revs->prune = 1;
1878 load_ref_decorations(NULL, DECORATE_SHORT_REFS);
1879 } else if (!strcmp(arg, "--date-order")) {
1880 revs->sort_order = REV_SORT_BY_COMMIT_DATE;
1881 revs->topo_order = 1;
1882 } else if (!strcmp(arg, "--author-date-order")) {
1883 revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
1884 revs->topo_order = 1;
1885 } else if (!strcmp(arg, "--early-output")) {
1886 revs->early_output = 100;
1887 revs->topo_order = 1;
1888 } else if (skip_prefix(arg, "--early-output=", &optarg)) {
1889 if (strtoul_ui(optarg, 10, &revs->early_output) < 0)
1890 die("'%s': not a non-negative integer", optarg);
1891 revs->topo_order = 1;
1892 } else if (!strcmp(arg, "--parents")) {
1893 revs->rewrite_parents = 1;
1894 revs->print_parents = 1;
1895 } else if (!strcmp(arg, "--dense")) {
1896 revs->dense = 1;
1897 } else if (!strcmp(arg, "--sparse")) {
1898 revs->dense = 0;
1899 } else if (!strcmp(arg, "--in-commit-order")) {
1900 revs->tree_blobs_in_commit_order = 1;
1901 } else if (!strcmp(arg, "--remove-empty")) {
1902 revs->remove_empty_trees = 1;
1903 } else if (!strcmp(arg, "--merges")) {
1904 revs->min_parents = 2;
1905 } else if (!strcmp(arg, "--no-merges")) {
1906 revs->max_parents = 1;
1907 } else if (skip_prefix(arg, "--min-parents=", &optarg)) {
1908 revs->min_parents = atoi(optarg);
1909 } else if (!strcmp(arg, "--no-min-parents")) {
1910 revs->min_parents = 0;
1911 } else if (skip_prefix(arg, "--max-parents=", &optarg)) {
1912 revs->max_parents = atoi(optarg);
1913 } else if (!strcmp(arg, "--no-max-parents")) {
1914 revs->max_parents = -1;
1915 } else if (!strcmp(arg, "--boundary")) {
1916 revs->boundary = 1;
1917 } else if (!strcmp(arg, "--left-right")) {
1918 revs->left_right = 1;
1919 } else if (!strcmp(arg, "--left-only")) {
1920 if (revs->right_only)
1921 die("--left-only is incompatible with --right-only"
1922 " or --cherry");
1923 revs->left_only = 1;
1924 } else if (!strcmp(arg, "--right-only")) {
1925 if (revs->left_only)
1926 die("--right-only is incompatible with --left-only");
1927 revs->right_only = 1;
1928 } else if (!strcmp(arg, "--cherry")) {
1929 if (revs->left_only)
1930 die("--cherry is incompatible with --left-only");
1931 revs->cherry_mark = 1;
1932 revs->right_only = 1;
1933 revs->max_parents = 1;
1934 revs->limited = 1;
1935 } else if (!strcmp(arg, "--count")) {
1936 revs->count = 1;
1937 } else if (!strcmp(arg, "--cherry-mark")) {
1938 if (revs->cherry_pick)
1939 die("--cherry-mark is incompatible with --cherry-pick");
1940 revs->cherry_mark = 1;
1941 revs->limited = 1; /* needs limit_list() */
1942 } else if (!strcmp(arg, "--cherry-pick")) {
1943 if (revs->cherry_mark)
1944 die("--cherry-pick is incompatible with --cherry-mark");
1945 revs->cherry_pick = 1;
1946 revs->limited = 1;
1947 } else if (!strcmp(arg, "--objects")) {
1948 revs->tag_objects = 1;
1949 revs->tree_objects = 1;
1950 revs->blob_objects = 1;
1951 } else if (!strcmp(arg, "--objects-edge")) {
1952 revs->tag_objects = 1;
1953 revs->tree_objects = 1;
1954 revs->blob_objects = 1;
1955 revs->edge_hint = 1;
1956 } else if (!strcmp(arg, "--objects-edge-aggressive")) {
1957 revs->tag_objects = 1;
1958 revs->tree_objects = 1;
1959 revs->blob_objects = 1;
1960 revs->edge_hint = 1;
1961 revs->edge_hint_aggressive = 1;
1962 } else if (!strcmp(arg, "--verify-objects")) {
1963 revs->tag_objects = 1;
1964 revs->tree_objects = 1;
1965 revs->blob_objects = 1;
1966 revs->verify_objects = 1;
1967 } else if (!strcmp(arg, "--unpacked")) {
1968 revs->unpacked = 1;
1969 } else if (starts_with(arg, "--unpacked=")) {
1970 die("--unpacked=<packfile> no longer supported.");
1971 } else if (!strcmp(arg, "-r")) {
1972 revs->diff = 1;
1973 revs->diffopt.flags.recursive = 1;
1974 } else if (!strcmp(arg, "-t")) {
1975 revs->diff = 1;
1976 revs->diffopt.flags.recursive = 1;
1977 revs->diffopt.flags.tree_in_recursive = 1;
1978 } else if (!strcmp(arg, "-m")) {
1979 revs->ignore_merges = 0;
1980 } else if (!strcmp(arg, "-c")) {
1981 revs->diff = 1;
1982 revs->dense_combined_merges = 0;
1983 revs->combine_merges = 1;
1984 } else if (!strcmp(arg, "--cc")) {
1985 revs->diff = 1;
1986 revs->dense_combined_merges = 1;
1987 revs->combine_merges = 1;
1988 } else if (!strcmp(arg, "-v")) {
1989 revs->verbose_header = 1;
1990 } else if (!strcmp(arg, "--pretty")) {
1991 revs->verbose_header = 1;
1992 revs->pretty_given = 1;
1993 get_commit_format(NULL, revs);
1994 } else if (skip_prefix(arg, "--pretty=", &optarg) ||
1995 skip_prefix(arg, "--format=", &optarg)) {
1996 /*
1997 * Detached form ("--pretty X" as opposed to "--pretty=X")
1998 * not allowed, since the argument is optional.
1999 */
2000 revs->verbose_header = 1;
2001 revs->pretty_given = 1;
2002 get_commit_format(optarg, revs);
2003 } else if (!strcmp(arg, "--expand-tabs")) {
2004 revs->expand_tabs_in_log = 8;
2005 } else if (!strcmp(arg, "--no-expand-tabs")) {
2006 revs->expand_tabs_in_log = 0;
2007 } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
2008 int val;
2009 if (strtol_i(arg, 10, &val) < 0 || val < 0)
2010 die("'%s': not a non-negative integer", arg);
2011 revs->expand_tabs_in_log = val;
2012 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
2013 revs->show_notes = 1;
2014 revs->show_notes_given = 1;
2015 revs->notes_opt.use_default_notes = 1;
2016 } else if (!strcmp(arg, "--show-signature")) {
2017 revs->show_signature = 1;
2018 } else if (!strcmp(arg, "--no-show-signature")) {
2019 revs->show_signature = 0;
2020 } else if (!strcmp(arg, "--show-linear-break")) {
2021 revs->break_bar = " ..........";
2022 revs->track_linear = 1;
2023 revs->track_first_time = 1;
2024 } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) {
2025 revs->break_bar = xstrdup(optarg);
2026 revs->track_linear = 1;
2027 revs->track_first_time = 1;
2028 } else if (skip_prefix(arg, "--show-notes=", &optarg) ||
2029 skip_prefix(arg, "--notes=", &optarg)) {
2030 struct strbuf buf = STRBUF_INIT;
2031 revs->show_notes = 1;
2032 revs->show_notes_given = 1;
2033 if (starts_with(arg, "--show-notes=") &&
2034 revs->notes_opt.use_default_notes < 0)
2035 revs->notes_opt.use_default_notes = 1;
2036 strbuf_addstr(&buf, optarg);
2037 expand_notes_ref(&buf);
2038 string_list_append(&revs->notes_opt.extra_notes_refs,
2039 strbuf_detach(&buf, NULL));
2040 } else if (!strcmp(arg, "--no-notes")) {
2041 revs->show_notes = 0;
2042 revs->show_notes_given = 1;
2043 revs->notes_opt.use_default_notes = -1;
2044 /* we have been strdup'ing ourselves, so trick
2045 * string_list into free()ing strings */
2046 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
2047 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
2048 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
2049 } else if (!strcmp(arg, "--standard-notes")) {
2050 revs->show_notes_given = 1;
2051 revs->notes_opt.use_default_notes = 1;
2052 } else if (!strcmp(arg, "--no-standard-notes")) {
2053 revs->notes_opt.use_default_notes = 0;
2054 } else if (!strcmp(arg, "--oneline")) {
2055 revs->verbose_header = 1;
2056 get_commit_format("oneline", revs);
2057 revs->pretty_given = 1;
2058 revs->abbrev_commit = 1;
2059 } else if (!strcmp(arg, "--graph")) {
2060 revs->topo_order = 1;
2061 revs->rewrite_parents = 1;
2062 revs->graph = graph_init(revs);
2063 } else if (!strcmp(arg, "--root")) {
2064 revs->show_root_diff = 1;
2065 } else if (!strcmp(arg, "--no-commit-id")) {
2066 revs->no_commit_id = 1;
2067 } else if (!strcmp(arg, "--always")) {
2068 revs->always_show_header = 1;
2069 } else if (!strcmp(arg, "--no-abbrev")) {
2070 revs->abbrev = 0;
2071 } else if (!strcmp(arg, "--abbrev")) {
2072 revs->abbrev = DEFAULT_ABBREV;
2073 } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
2074 revs->abbrev = strtoul(optarg, NULL, 10);
2075 if (revs->abbrev < MINIMUM_ABBREV)
2076 revs->abbrev = MINIMUM_ABBREV;
2077 else if (revs->abbrev > hexsz)
2078 revs->abbrev = hexsz;
2079 } else if (!strcmp(arg, "--abbrev-commit")) {
2080 revs->abbrev_commit = 1;
2081 revs->abbrev_commit_given = 1;
2082 } else if (!strcmp(arg, "--no-abbrev-commit")) {
2083 revs->abbrev_commit = 0;
2084 } else if (!strcmp(arg, "--full-diff")) {
2085 revs->diff = 1;
2086 revs->full_diff = 1;
2087 } else if (!strcmp(arg, "--full-history")) {
2088 revs->simplify_history = 0;
2089 } else if (!strcmp(arg, "--relative-date")) {
2090 revs->date_mode.type = DATE_RELATIVE;
2091 revs->date_mode_explicit = 1;
2092 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
2093 parse_date_format(optarg, &revs->date_mode);
2094 revs->date_mode_explicit = 1;
2095 return argcount;
2096 } else if (!strcmp(arg, "--log-size")) {
2097 revs->show_log_size = 1;
2098 }
2099 /*
2100 * Grepping the commit log
2101 */
2102 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2103 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2104 return argcount;
2105 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2106 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2107 return argcount;
2108 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2109 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2110 return argcount;
2111 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2112 add_message_grep(revs, optarg);
2113 return argcount;
2114 } else if (!strcmp(arg, "--grep-debug")) {
2115 revs->grep_filter.debug = 1;
2116 } else if (!strcmp(arg, "--basic-regexp")) {
2117 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
2118 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2119 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
2120 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2121 revs->grep_filter.ignore_case = 1;
2122 revs->diffopt.pickaxe_opts |= DIFF_PICKAXE_IGNORE_CASE;
2123 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2124 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
2125 } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) {
2126 revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
2127 } else if (!strcmp(arg, "--all-match")) {
2128 revs->grep_filter.all_match = 1;
2129 } else if (!strcmp(arg, "--invert-grep")) {
2130 revs->invert_grep = 1;
2131 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2132 if (strcmp(optarg, "none"))
2133 git_log_output_encoding = xstrdup(optarg);
2134 else
2135 git_log_output_encoding = "";
2136 return argcount;
2137 } else if (!strcmp(arg, "--reverse")) {
2138 revs->reverse ^= 1;
2139 } else if (!strcmp(arg, "--children")) {
2140 revs->children.name = "children";
2141 revs->limited = 1;
2142 } else if (!strcmp(arg, "--ignore-missing")) {
2143 revs->ignore_missing = 1;
2144 } else if (!strcmp(arg, "--exclude-promisor-objects")) {
2145 if (fetch_if_missing)
2146 BUG("exclude_promisor_objects can only be used when fetch_if_missing is 0");
2147 revs->exclude_promisor_objects = 1;
2148 } else {
2149 int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
2150 if (!opts)
2151 unkv[(*unkc)++] = arg;
2152 return opts;
2153 }
2154 if (revs->graph && revs->track_linear)
2155 die("--show-linear-break and --graph are incompatible");
2156
2157 return 1;
2158}
2159
2160void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2161 const struct option *options,
2162 const char * const usagestr[])
2163{
2164 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2165 &ctx->cpidx, ctx->out);
2166 if (n <= 0) {
2167 error("unknown option `%s'", ctx->argv[0]);
2168 usage_with_options(usagestr, options);
2169 }
2170 ctx->argv += n;
2171 ctx->argc -= n;
2172}
2173
2174static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn,
2175 void *cb_data, const char *term)
2176{
2177 struct strbuf bisect_refs = STRBUF_INIT;
2178 int status;
2179 strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2180 status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data, 0);
2181 strbuf_release(&bisect_refs);
2182 return status;
2183}
2184
2185static int for_each_bad_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
2186{
2187 return for_each_bisect_ref(refs, fn, cb_data, term_bad);
2188}
2189
2190static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
2191{
2192 return for_each_bisect_ref(refs, fn, cb_data, term_good);
2193}
2194
2195static int handle_revision_pseudo_opt(const char *submodule,
2196 struct rev_info *revs,
2197 int argc, const char **argv, int *flags)
2198{
2199 const char *arg = argv[0];
2200 const char *optarg;
2201 struct ref_store *refs;
2202 int argcount;
2203
2204 if (submodule) {
2205 /*
2206 * We need some something like get_submodule_worktrees()
2207 * before we can go through all worktrees of a submodule,
2208 * .e.g with adding all HEADs from --all, which is not
2209 * supported right now, so stick to single worktree.
2210 */
2211 if (!revs->single_worktree)
2212 BUG("--single-worktree cannot be used together with submodule");
2213 refs = get_submodule_ref_store(submodule);
2214 } else
2215 refs = get_main_ref_store(revs->repo);
2216
2217 /*
2218 * NOTE!
2219 *
2220 * Commands like "git shortlog" will not accept the options below
2221 * unless parse_revision_opt queues them (as opposed to erroring
2222 * out).
2223 *
2224 * When implementing your new pseudo-option, remember to
2225 * register it in the list at the top of handle_revision_opt.
2226 */
2227 if (!strcmp(arg, "--all")) {
2228 handle_refs(refs, revs, *flags, refs_for_each_ref);
2229 handle_refs(refs, revs, *flags, refs_head_ref);
2230 if (!revs->single_worktree) {
2231 struct all_refs_cb cb;
2232
2233 init_all_refs_cb(&cb, revs, *flags);
2234 other_head_refs(handle_one_ref, &cb);
2235 }
2236 clear_ref_exclusion(&revs->ref_excludes);
2237 } else if (!strcmp(arg, "--branches")) {
2238 handle_refs(refs, revs, *flags, refs_for_each_branch_ref);
2239 clear_ref_exclusion(&revs->ref_excludes);
2240 } else if (!strcmp(arg, "--bisect")) {
2241 read_bisect_terms(&term_bad, &term_good);
2242 handle_refs(refs, revs, *flags, for_each_bad_bisect_ref);
2243 handle_refs(refs, revs, *flags ^ (UNINTERESTING | BOTTOM),
2244 for_each_good_bisect_ref);
2245 revs->bisect = 1;
2246 } else if (!strcmp(arg, "--tags")) {
2247 handle_refs(refs, revs, *flags, refs_for_each_tag_ref);
2248 clear_ref_exclusion(&revs->ref_excludes);
2249 } else if (!strcmp(arg, "--remotes")) {
2250 handle_refs(refs, revs, *flags, refs_for_each_remote_ref);
2251 clear_ref_exclusion(&revs->ref_excludes);
2252 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2253 struct all_refs_cb cb;
2254 init_all_refs_cb(&cb, revs, *flags);
2255 for_each_glob_ref(handle_one_ref, optarg, &cb);
2256 clear_ref_exclusion(&revs->ref_excludes);
2257 return argcount;
2258 } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2259 add_ref_exclusion(&revs->ref_excludes, optarg);
2260 return argcount;
2261 } else if (skip_prefix(arg, "--branches=", &optarg)) {
2262 struct all_refs_cb cb;
2263 init_all_refs_cb(&cb, revs, *flags);
2264 for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb);
2265 clear_ref_exclusion(&revs->ref_excludes);
2266 } else if (skip_prefix(arg, "--tags=", &optarg)) {
2267 struct all_refs_cb cb;
2268 init_all_refs_cb(&cb, revs, *flags);
2269 for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb);
2270 clear_ref_exclusion(&revs->ref_excludes);
2271 } else if (skip_prefix(arg, "--remotes=", &optarg)) {
2272 struct all_refs_cb cb;
2273 init_all_refs_cb(&cb, revs, *flags);
2274 for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb);
2275 clear_ref_exclusion(&revs->ref_excludes);
2276 } else if (!strcmp(arg, "--reflog")) {
2277 add_reflogs_to_pending(revs, *flags);
2278 } else if (!strcmp(arg, "--indexed-objects")) {
2279 add_index_objects_to_pending(revs, *flags);
2280 } else if (!strcmp(arg, "--not")) {
2281 *flags ^= UNINTERESTING | BOTTOM;
2282 } else if (!strcmp(arg, "--no-walk")) {
2283 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2284 } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
2285 /*
2286 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2287 * not allowed, since the argument is optional.
2288 */
2289 if (!strcmp(optarg, "sorted"))
2290 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2291 else if (!strcmp(optarg, "unsorted"))
2292 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2293 else
2294 return error("invalid argument to --no-walk");
2295 } else if (!strcmp(arg, "--do-walk")) {
2296 revs->no_walk = 0;
2297 } else if (!strcmp(arg, "--single-worktree")) {
2298 revs->single_worktree = 1;
2299 } else {
2300 return 0;
2301 }
2302
2303 return 1;
2304}
2305
2306static void NORETURN diagnose_missing_default(const char *def)
2307{
2308 int flags;
2309 const char *refname;
2310
2311 refname = resolve_ref_unsafe(def, 0, NULL, &flags);
2312 if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2313 die(_("your current branch appears to be broken"));
2314
2315 skip_prefix(refname, "refs/heads/", &refname);
2316 die(_("your current branch '%s' does not have any commits yet"),
2317 refname);
2318}
2319
2320/*
2321 * Parse revision information, filling in the "rev_info" structure,
2322 * and removing the used arguments from the argument list.
2323 *
2324 * Returns the number of arguments left that weren't recognized
2325 * (which are also moved to the head of the argument list)
2326 */
2327int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2328{
2329 int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt;
2330 struct argv_array prune_data = ARGV_ARRAY_INIT;
2331 const char *submodule = NULL;
2332
2333 if (opt)
2334 submodule = opt->submodule;
2335
2336 /* First, search for "--" */
2337 if (opt && opt->assume_dashdash) {
2338 seen_dashdash = 1;
2339 } else {
2340 seen_dashdash = 0;
2341 for (i = 1; i < argc; i++) {
2342 const char *arg = argv[i];
2343 if (strcmp(arg, "--"))
2344 continue;
2345 argv[i] = NULL;
2346 argc = i;
2347 if (argv[i + 1])
2348 argv_array_pushv(&prune_data, argv + i + 1);
2349 seen_dashdash = 1;
2350 break;
2351 }
2352 }
2353
2354 /* Second, deal with arguments and options */
2355 flags = 0;
2356 revarg_opt = opt ? opt->revarg_opt : 0;
2357 if (seen_dashdash)
2358 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2359 for (left = i = 1; i < argc; i++) {
2360 const char *arg = argv[i];
2361 if (*arg == '-') {
2362 int opts;
2363
2364 opts = handle_revision_pseudo_opt(submodule,
2365 revs, argc - i, argv + i,
2366 &flags);
2367 if (opts > 0) {
2368 i += opts - 1;
2369 continue;
2370 }
2371
2372 if (!strcmp(arg, "--stdin")) {
2373 if (revs->disable_stdin) {
2374 argv[left++] = arg;
2375 continue;
2376 }
2377 if (revs->read_from_stdin++)
2378 die("--stdin given twice?");
2379 read_revisions_from_stdin(revs, &prune_data);
2380 continue;
2381 }
2382
2383 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
2384 if (opts > 0) {
2385 i += opts - 1;
2386 continue;
2387 }
2388 if (opts < 0)
2389 exit(128);
2390 continue;
2391 }
2392
2393
2394 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2395 int j;
2396 if (seen_dashdash || *arg == '^')
2397 die("bad revision '%s'", arg);
2398
2399 /* If we didn't have a "--":
2400 * (1) all filenames must exist;
2401 * (2) all rev-args must not be interpretable
2402 * as a valid filename.
2403 * but the latter we have checked in the main loop.
2404 */
2405 for (j = i; j < argc; j++)
2406 verify_filename(revs->prefix, argv[j], j == i);
2407
2408 argv_array_pushv(&prune_data, argv + i);
2409 break;
2410 }
2411 else
2412 got_rev_arg = 1;
2413 }
2414
2415 if (prune_data.argc) {
2416 /*
2417 * If we need to introduce the magic "a lone ':' means no
2418 * pathspec whatsoever", here is the place to do so.
2419 *
2420 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2421 * prune_data.nr = 0;
2422 * prune_data.alloc = 0;
2423 * free(prune_data.path);
2424 * prune_data.path = NULL;
2425 * } else {
2426 * terminate prune_data.alloc with NULL and
2427 * call init_pathspec() to set revs->prune_data here.
2428 * }
2429 */
2430 parse_pathspec(&revs->prune_data, 0, 0,
2431 revs->prefix, prune_data.argv);
2432 }
2433 argv_array_clear(&prune_data);
2434
2435 if (revs->def == NULL)
2436 revs->def = opt ? opt->def : NULL;
2437 if (opt && opt->tweak)
2438 opt->tweak(revs, opt);
2439 if (revs->show_merge)
2440 prepare_show_merge(revs);
2441 if (revs->def && !revs->pending.nr && !revs->rev_input_given && !got_rev_arg) {
2442 struct object_id oid;
2443 struct object *object;
2444 struct object_context oc;
2445 if (get_oid_with_context(revs->def, 0, &oid, &oc))
2446 diagnose_missing_default(revs->def);
2447 object = get_reference(revs, revs->def, &oid, 0);
2448 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2449 }
2450
2451 /* Did the user ask for any diff output? Run the diff! */
2452 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2453 revs->diff = 1;
2454
2455 /* Pickaxe, diff-filter and rename following need diffs */
2456 if ((revs->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
2457 revs->diffopt.filter ||
2458 revs->diffopt.flags.follow_renames)
2459 revs->diff = 1;
2460
2461 if (revs->diffopt.objfind)
2462 revs->simplify_history = 0;
2463
2464 if (revs->topo_order)
2465 revs->limited = 1;
2466
2467 if (revs->prune_data.nr) {
2468 copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2469 /* Can't prune commits with rename following: the paths change.. */
2470 if (!revs->diffopt.flags.follow_renames)
2471 revs->prune = 1;
2472 if (!revs->full_diff)
2473 copy_pathspec(&revs->diffopt.pathspec,
2474 &revs->prune_data);
2475 }
2476 if (revs->combine_merges)
2477 revs->ignore_merges = 0;
2478 revs->diffopt.abbrev = revs->abbrev;
2479
2480 if (revs->line_level_traverse) {
2481 revs->limited = 1;
2482 revs->topo_order = 1;
2483 }
2484
2485 diff_setup_done(&revs->diffopt);
2486
2487 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2488 &revs->grep_filter);
2489 compile_grep_patterns(&revs->grep_filter);
2490
2491 if (revs->reverse && revs->reflog_info)
2492 die("cannot combine --reverse with --walk-reflogs");
2493 if (revs->reflog_info && revs->limited)
2494 die("cannot combine --walk-reflogs with history-limiting options");
2495 if (revs->rewrite_parents && revs->children.name)
2496 die("cannot combine --parents and --children");
2497
2498 /*
2499 * Limitations on the graph functionality
2500 */
2501 if (revs->reverse && revs->graph)
2502 die("cannot combine --reverse with --graph");
2503
2504 if (revs->reflog_info && revs->graph)
2505 die("cannot combine --walk-reflogs with --graph");
2506 if (revs->no_walk && revs->graph)
2507 die("cannot combine --no-walk with --graph");
2508 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2509 die("cannot use --grep-reflog without --walk-reflogs");
2510
2511 if (revs->first_parent_only && revs->bisect)
2512 die(_("--first-parent is incompatible with --bisect"));
2513
2514 if (revs->expand_tabs_in_log < 0)
2515 revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2516
2517 return left;
2518}
2519
2520static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2521{
2522 struct commit_list *l = xcalloc(1, sizeof(*l));
2523
2524 l->item = child;
2525 l->next = add_decoration(&revs->children, &parent->object, l);
2526}
2527
2528static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2529{
2530 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2531 struct commit_list **pp, *p;
2532 int surviving_parents;
2533
2534 /* Examine existing parents while marking ones we have seen... */
2535 pp = &commit->parents;
2536 surviving_parents = 0;
2537 while ((p = *pp) != NULL) {
2538 struct commit *parent = p->item;
2539 if (parent->object.flags & TMP_MARK) {
2540 *pp = p->next;
2541 if (ts)
2542 compact_treesame(revs, commit, surviving_parents);
2543 continue;
2544 }
2545 parent->object.flags |= TMP_MARK;
2546 surviving_parents++;
2547 pp = &p->next;
2548 }
2549 /* clear the temporary mark */
2550 for (p = commit->parents; p; p = p->next) {
2551 p->item->object.flags &= ~TMP_MARK;
2552 }
2553 /* no update_treesame() - removing duplicates can't affect TREESAME */
2554 return surviving_parents;
2555}
2556
2557struct merge_simplify_state {
2558 struct commit *simplified;
2559};
2560
2561static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2562{
2563 struct merge_simplify_state *st;
2564
2565 st = lookup_decoration(&revs->merge_simplification, &commit->object);
2566 if (!st) {
2567 st = xcalloc(1, sizeof(*st));
2568 add_decoration(&revs->merge_simplification, &commit->object, st);
2569 }
2570 return st;
2571}
2572
2573static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2574{
2575 struct commit_list *h = reduce_heads(commit->parents);
2576 int i = 0, marked = 0;
2577 struct commit_list *po, *pn;
2578
2579 /* Want these for sanity-checking only */
2580 int orig_cnt = commit_list_count(commit->parents);
2581 int cnt = commit_list_count(h);
2582
2583 /*
2584 * Not ready to remove items yet, just mark them for now, based
2585 * on the output of reduce_heads(). reduce_heads outputs the reduced
2586 * set in its original order, so this isn't too hard.
2587 */
2588 po = commit->parents;
2589 pn = h;
2590 while (po) {
2591 if (pn && po->item == pn->item) {
2592 pn = pn->next;
2593 i++;
2594 } else {
2595 po->item->object.flags |= TMP_MARK;
2596 marked++;
2597 }
2598 po=po->next;
2599 }
2600
2601 if (i != cnt || cnt+marked != orig_cnt)
2602 die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2603
2604 free_commit_list(h);
2605
2606 return marked;
2607}
2608
2609static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2610{
2611 struct commit_list *p;
2612 int marked = 0;
2613
2614 for (p = commit->parents; p; p = p->next) {
2615 struct commit *parent = p->item;
2616 if (!parent->parents && (parent->object.flags & TREESAME)) {
2617 parent->object.flags |= TMP_MARK;
2618 marked++;
2619 }
2620 }
2621
2622 return marked;
2623}
2624
2625/*
2626 * Awkward naming - this means one parent we are TREESAME to.
2627 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2628 * empty tree). Better name suggestions?
2629 */
2630static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2631{
2632 struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2633 struct commit *unmarked = NULL, *marked = NULL;
2634 struct commit_list *p;
2635 unsigned n;
2636
2637 for (p = commit->parents, n = 0; p; p = p->next, n++) {
2638 if (ts->treesame[n]) {
2639 if (p->item->object.flags & TMP_MARK) {
2640 if (!marked)
2641 marked = p->item;
2642 } else {
2643 if (!unmarked) {
2644 unmarked = p->item;
2645 break;
2646 }
2647 }
2648 }
2649 }
2650
2651 /*
2652 * If we are TREESAME to a marked-for-deletion parent, but not to any
2653 * unmarked parents, unmark the first TREESAME parent. This is the
2654 * parent that the default simplify_history==1 scan would have followed,
2655 * and it doesn't make sense to omit that path when asking for a
2656 * simplified full history. Retaining it improves the chances of
2657 * understanding odd missed merges that took an old version of a file.
2658 *
2659 * Example:
2660 *
2661 * I--------*X A modified the file, but mainline merge X used
2662 * \ / "-s ours", so took the version from I. X is
2663 * `-*A--' TREESAME to I and !TREESAME to A.
2664 *
2665 * Default log from X would produce "I". Without this check,
2666 * --full-history --simplify-merges would produce "I-A-X", showing
2667 * the merge commit X and that it changed A, but not making clear that
2668 * it had just taken the I version. With this check, the topology above
2669 * is retained.
2670 *
2671 * Note that it is possible that the simplification chooses a different
2672 * TREESAME parent from the default, in which case this test doesn't
2673 * activate, and we _do_ drop the default parent. Example:
2674 *
2675 * I------X A modified the file, but it was reverted in B,
2676 * \ / meaning mainline merge X is TREESAME to both
2677 * *A-*B parents.
2678 *
2679 * Default log would produce "I" by following the first parent;
2680 * --full-history --simplify-merges will produce "I-A-B". But this is a
2681 * reasonable result - it presents a logical full history leading from
2682 * I to X, and X is not an important merge.
2683 */
2684 if (!unmarked && marked) {
2685 marked->object.flags &= ~TMP_MARK;
2686 return 1;
2687 }
2688
2689 return 0;
2690}
2691
2692static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2693{
2694 struct commit_list **pp, *p;
2695 int nth_parent, removed = 0;
2696
2697 pp = &commit->parents;
2698 nth_parent = 0;
2699 while ((p = *pp) != NULL) {
2700 struct commit *parent = p->item;
2701 if (parent->object.flags & TMP_MARK) {
2702 parent->object.flags &= ~TMP_MARK;
2703 *pp = p->next;
2704 free(p);
2705 removed++;
2706 compact_treesame(revs, commit, nth_parent);
2707 continue;
2708 }
2709 pp = &p->next;
2710 nth_parent++;
2711 }
2712
2713 /* Removing parents can only increase TREESAMEness */
2714 if (removed && !(commit->object.flags & TREESAME))
2715 update_treesame(revs, commit);
2716
2717 return nth_parent;
2718}
2719
2720static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
2721{
2722 struct commit_list *p;
2723 struct commit *parent;
2724 struct merge_simplify_state *st, *pst;
2725 int cnt;
2726
2727 st = locate_simplify_state(revs, commit);
2728
2729 /*
2730 * Have we handled this one?
2731 */
2732 if (st->simplified)
2733 return tail;
2734
2735 /*
2736 * An UNINTERESTING commit simplifies to itself, so does a
2737 * root commit. We do not rewrite parents of such commit
2738 * anyway.
2739 */
2740 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
2741 st->simplified = commit;
2742 return tail;
2743 }
2744
2745 /*
2746 * Do we know what commit all of our parents that matter
2747 * should be rewritten to? Otherwise we are not ready to
2748 * rewrite this one yet.
2749 */
2750 for (cnt = 0, p = commit->parents; p; p = p->next) {
2751 pst = locate_simplify_state(revs, p->item);
2752 if (!pst->simplified) {
2753 tail = &commit_list_insert(p->item, tail)->next;
2754 cnt++;
2755 }
2756 if (revs->first_parent_only)
2757 break;
2758 }
2759 if (cnt) {
2760 tail = &commit_list_insert(commit, tail)->next;
2761 return tail;
2762 }
2763
2764 /*
2765 * Rewrite our list of parents. Note that this cannot
2766 * affect our TREESAME flags in any way - a commit is
2767 * always TREESAME to its simplification.
2768 */
2769 for (p = commit->parents; p; p = p->next) {
2770 pst = locate_simplify_state(revs, p->item);
2771 p->item = pst->simplified;
2772 if (revs->first_parent_only)
2773 break;
2774 }
2775
2776 if (revs->first_parent_only)
2777 cnt = 1;
2778 else
2779 cnt = remove_duplicate_parents(revs, commit);
2780
2781 /*
2782 * It is possible that we are a merge and one side branch
2783 * does not have any commit that touches the given paths;
2784 * in such a case, the immediate parent from that branch
2785 * will be rewritten to be the merge base.
2786 *
2787 * o----X X: the commit we are looking at;
2788 * / / o: a commit that touches the paths;
2789 * ---o----'
2790 *
2791 * Further, a merge of an independent branch that doesn't
2792 * touch the path will reduce to a treesame root parent:
2793 *
2794 * ----o----X X: the commit we are looking at;
2795 * / o: a commit that touches the paths;
2796 * r r: a root commit not touching the paths
2797 *
2798 * Detect and simplify both cases.
2799 */
2800 if (1 < cnt) {
2801 int marked = mark_redundant_parents(revs, commit);
2802 marked += mark_treesame_root_parents(revs, commit);
2803 if (marked)
2804 marked -= leave_one_treesame_to_parent(revs, commit);
2805 if (marked)
2806 cnt = remove_marked_parents(revs, commit);
2807 }
2808
2809 /*
2810 * A commit simplifies to itself if it is a root, if it is
2811 * UNINTERESTING, if it touches the given paths, or if it is a
2812 * merge and its parents don't simplify to one relevant commit
2813 * (the first two cases are already handled at the beginning of
2814 * this function).
2815 *
2816 * Otherwise, it simplifies to what its sole relevant parent
2817 * simplifies to.
2818 */
2819 if (!cnt ||
2820 (commit->object.flags & UNINTERESTING) ||
2821 !(commit->object.flags & TREESAME) ||
2822 (parent = one_relevant_parent(revs, commit->parents)) == NULL)
2823 st->simplified = commit;
2824 else {
2825 pst = locate_simplify_state(revs, parent);
2826 st->simplified = pst->simplified;
2827 }
2828 return tail;
2829}
2830
2831static void simplify_merges(struct rev_info *revs)
2832{
2833 struct commit_list *list, *next;
2834 struct commit_list *yet_to_do, **tail;
2835 struct commit *commit;
2836
2837 if (!revs->prune)
2838 return;
2839
2840 /* feed the list reversed */
2841 yet_to_do = NULL;
2842 for (list = revs->commits; list; list = next) {
2843 commit = list->item;
2844 next = list->next;
2845 /*
2846 * Do not free(list) here yet; the original list
2847 * is used later in this function.
2848 */
2849 commit_list_insert(commit, &yet_to_do);
2850 }
2851 while (yet_to_do) {
2852 list = yet_to_do;
2853 yet_to_do = NULL;
2854 tail = &yet_to_do;
2855 while (list) {
2856 commit = pop_commit(&list);
2857 tail = simplify_one(revs, commit, tail);
2858 }
2859 }
2860
2861 /* clean up the result, removing the simplified ones */
2862 list = revs->commits;
2863 revs->commits = NULL;
2864 tail = &revs->commits;
2865 while (list) {
2866 struct merge_simplify_state *st;
2867
2868 commit = pop_commit(&list);
2869 st = locate_simplify_state(revs, commit);
2870 if (st->simplified == commit)
2871 tail = &commit_list_insert(commit, tail)->next;
2872 }
2873}
2874
2875static void set_children(struct rev_info *revs)
2876{
2877 struct commit_list *l;
2878 for (l = revs->commits; l; l = l->next) {
2879 struct commit *commit = l->item;
2880 struct commit_list *p;
2881
2882 for (p = commit->parents; p; p = p->next)
2883 add_child(revs, p->item, commit);
2884 }
2885}
2886
2887void reset_revision_walk(void)
2888{
2889 clear_object_flags(SEEN | ADDED | SHOWN);
2890}
2891
2892static int mark_uninteresting(const struct object_id *oid,
2893 struct packed_git *pack,
2894 uint32_t pos,
2895 void *cb)
2896{
2897 struct rev_info *revs = cb;
2898 struct object *o = parse_object(revs->repo, oid);
2899 o->flags |= UNINTERESTING | SEEN;
2900 return 0;
2901}
2902
2903int prepare_revision_walk(struct rev_info *revs)
2904{
2905 int i;
2906 struct object_array old_pending;
2907 struct commit_list **next = &revs->commits;
2908
2909 memcpy(&old_pending, &revs->pending, sizeof(old_pending));
2910 revs->pending.nr = 0;
2911 revs->pending.alloc = 0;
2912 revs->pending.objects = NULL;
2913 for (i = 0; i < old_pending.nr; i++) {
2914 struct object_array_entry *e = old_pending.objects + i;
2915 struct commit *commit = handle_commit(revs, e);
2916 if (commit) {
2917 if (!(commit->object.flags & SEEN)) {
2918 commit->object.flags |= SEEN;
2919 next = commit_list_append(commit, next);
2920 }
2921 }
2922 }
2923 object_array_clear(&old_pending);
2924
2925 /* Signal whether we need per-parent treesame decoration */
2926 if (revs->simplify_merges ||
2927 (revs->limited && limiting_can_increase_treesame(revs)))
2928 revs->treesame.name = "treesame";
2929
2930 if (revs->exclude_promisor_objects) {
2931 for_each_packed_object(mark_uninteresting, revs,
2932 FOR_EACH_OBJECT_PROMISOR_ONLY);
2933 }
2934
2935 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2936 commit_list_sort_by_date(&revs->commits);
2937 if (revs->no_walk)
2938 return 0;
2939 if (revs->limited)
2940 if (limit_list(revs) < 0)
2941 return -1;
2942 if (revs->topo_order)
2943 sort_in_topological_order(&revs->commits, revs->sort_order);
2944 if (revs->line_level_traverse)
2945 line_log_filter(revs);
2946 if (revs->simplify_merges)
2947 simplify_merges(revs);
2948 if (revs->children.name)
2949 set_children(revs);
2950 return 0;
2951}
2952
2953static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2954{
2955 struct commit_list *cache = NULL;
2956
2957 for (;;) {
2958 struct commit *p = *pp;
2959 if (!revs->limited)
2960 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2961 return rewrite_one_error;
2962 if (p->object.flags & UNINTERESTING)
2963 return rewrite_one_ok;
2964 if (!(p->object.flags & TREESAME))
2965 return rewrite_one_ok;
2966 if (!p->parents)
2967 return rewrite_one_noparents;
2968 if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2969 return rewrite_one_ok;
2970 *pp = p;
2971 }
2972}
2973
2974int rewrite_parents(struct rev_info *revs, struct commit *commit,
2975 rewrite_parent_fn_t rewrite_parent)
2976{
2977 struct commit_list **pp = &commit->parents;
2978 while (*pp) {
2979 struct commit_list *parent = *pp;
2980 switch (rewrite_parent(revs, &parent->item)) {
2981 case rewrite_one_ok:
2982 break;
2983 case rewrite_one_noparents:
2984 *pp = parent->next;
2985 continue;
2986 case rewrite_one_error:
2987 return -1;
2988 }
2989 pp = &parent->next;
2990 }
2991 remove_duplicate_parents(revs, commit);
2992 return 0;
2993}
2994
2995static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2996{
2997 char *person, *endp;
2998 size_t len, namelen, maillen;
2999 const char *name;
3000 const char *mail;
3001 struct ident_split ident;
3002
3003 person = strstr(buf->buf, what);
3004 if (!person)
3005 return 0;
3006
3007 person += strlen(what);
3008 endp = strchr(person, '\n');
3009 if (!endp)
3010 return 0;
3011
3012 len = endp - person;
3013
3014 if (split_ident_line(&ident, person, len))
3015 return 0;
3016
3017 mail = ident.mail_begin;
3018 maillen = ident.mail_end - ident.mail_begin;
3019 name = ident.name_begin;
3020 namelen = ident.name_end - ident.name_begin;
3021
3022 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
3023 struct strbuf namemail = STRBUF_INIT;
3024
3025 strbuf_addf(&namemail, "%.*s <%.*s>",
3026 (int)namelen, name, (int)maillen, mail);
3027
3028 strbuf_splice(buf, ident.name_begin - buf->buf,
3029 ident.mail_end - ident.name_begin + 1,
3030 namemail.buf, namemail.len);
3031
3032 strbuf_release(&namemail);
3033
3034 return 1;
3035 }
3036
3037 return 0;
3038}
3039
3040static int commit_match(struct commit *commit, struct rev_info *opt)
3041{
3042 int retval;
3043 const char *encoding;
3044 const char *message;
3045 struct strbuf buf = STRBUF_INIT;
3046
3047 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
3048 return 1;
3049
3050 /* Prepend "fake" headers as needed */
3051 if (opt->grep_filter.use_reflog_filter) {
3052 strbuf_addstr(&buf, "reflog ");
3053 get_reflog_message(&buf, opt->reflog_info);
3054 strbuf_addch(&buf, '\n');
3055 }
3056
3057 /*
3058 * We grep in the user's output encoding, under the assumption that it
3059 * is the encoding they are most likely to write their grep pattern
3060 * for. In addition, it means we will match the "notes" encoding below,
3061 * so we will not end up with a buffer that has two different encodings
3062 * in it.
3063 */
3064 encoding = get_log_output_encoding();
3065 message = logmsg_reencode(commit, NULL, encoding);
3066
3067 /* Copy the commit to temporary if we are using "fake" headers */
3068 if (buf.len)
3069 strbuf_addstr(&buf, message);
3070
3071 if (opt->grep_filter.header_list && opt->mailmap) {
3072 if (!buf.len)
3073 strbuf_addstr(&buf, message);
3074
3075 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
3076 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
3077 }
3078
3079 /* Append "fake" message parts as needed */
3080 if (opt->show_notes) {
3081 if (!buf.len)
3082 strbuf_addstr(&buf, message);
3083 format_display_notes(&commit->object.oid, &buf, encoding, 1);
3084 }
3085
3086 /*
3087 * Find either in the original commit message, or in the temporary.
3088 * Note that we cast away the constness of "message" here. It is
3089 * const because it may come from the cached commit buffer. That's OK,
3090 * because we know that it is modifiable heap memory, and that while
3091 * grep_buffer may modify it for speed, it will restore any
3092 * changes before returning.
3093 */
3094 if (buf.len)
3095 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
3096 else
3097 retval = grep_buffer(&opt->grep_filter,
3098 (char *)message, strlen(message));
3099 strbuf_release(&buf);
3100 unuse_commit_buffer(commit, message);
3101 return opt->invert_grep ? !retval : retval;
3102}
3103
3104static inline int want_ancestry(const struct rev_info *revs)
3105{
3106 return (revs->rewrite_parents || revs->children.name);
3107}
3108
3109/*
3110 * Return a timestamp to be used for --since/--until comparisons for this
3111 * commit, based on the revision options.
3112 */
3113static timestamp_t comparison_date(const struct rev_info *revs,
3114 struct commit *commit)
3115{
3116 return revs->reflog_info ?
3117 get_reflog_timestamp(revs->reflog_info) :
3118 commit->date;
3119}
3120
3121enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
3122{
3123 if (commit->object.flags & SHOWN)
3124 return commit_ignore;
3125 if (revs->unpacked && has_object_pack(&commit->object.oid))
3126 return commit_ignore;
3127 if (commit->object.flags & UNINTERESTING)
3128 return commit_ignore;
3129 if (revs->min_age != -1 &&
3130 comparison_date(revs, commit) > revs->min_age)
3131 return commit_ignore;
3132 if (revs->min_parents || (revs->max_parents >= 0)) {
3133 int n = commit_list_count(commit->parents);
3134 if ((n < revs->min_parents) ||
3135 ((revs->max_parents >= 0) && (n > revs->max_parents)))
3136 return commit_ignore;
3137 }
3138 if (!commit_match(commit, revs))
3139 return commit_ignore;
3140 if (revs->prune && revs->dense) {
3141 /* Commit without changes? */
3142 if (commit->object.flags & TREESAME) {
3143 int n;
3144 struct commit_list *p;
3145 /* drop merges unless we want parenthood */
3146 if (!want_ancestry(revs))
3147 return commit_ignore;
3148 /*
3149 * If we want ancestry, then need to keep any merges
3150 * between relevant commits to tie together topology.
3151 * For consistency with TREESAME and simplification
3152 * use "relevant" here rather than just INTERESTING,
3153 * to treat bottom commit(s) as part of the topology.
3154 */
3155 for (n = 0, p = commit->parents; p; p = p->next)
3156 if (relevant_commit(p->item))
3157 if (++n >= 2)
3158 return commit_show;
3159 return commit_ignore;
3160 }
3161 }
3162 return commit_show;
3163}
3164
3165define_commit_slab(saved_parents, struct commit_list *);
3166
3167#define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3168
3169/*
3170 * You may only call save_parents() once per commit (this is checked
3171 * for non-root commits).
3172 */
3173static void save_parents(struct rev_info *revs, struct commit *commit)
3174{
3175 struct commit_list **pp;
3176
3177 if (!revs->saved_parents_slab) {
3178 revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3179 init_saved_parents(revs->saved_parents_slab);
3180 }
3181
3182 pp = saved_parents_at(revs->saved_parents_slab, commit);
3183
3184 /*
3185 * When walking with reflogs, we may visit the same commit
3186 * several times: once for each appearance in the reflog.
3187 *
3188 * In this case, save_parents() will be called multiple times.
3189 * We want to keep only the first set of parents. We need to
3190 * store a sentinel value for an empty (i.e., NULL) parent
3191 * list to distinguish it from a not-yet-saved list, however.
3192 */
3193 if (*pp)
3194 return;
3195 if (commit->parents)
3196 *pp = copy_commit_list(commit->parents);
3197 else
3198 *pp = EMPTY_PARENT_LIST;
3199}
3200
3201static void free_saved_parents(struct rev_info *revs)
3202{
3203 if (revs->saved_parents_slab)
3204 clear_saved_parents(revs->saved_parents_slab);
3205}
3206
3207struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3208{
3209 struct commit_list *parents;
3210
3211 if (!revs->saved_parents_slab)
3212 return commit->parents;
3213
3214 parents = *saved_parents_at(revs->saved_parents_slab, commit);
3215 if (parents == EMPTY_PARENT_LIST)
3216 return NULL;
3217 return parents;
3218}
3219
3220enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3221{
3222 enum commit_action action = get_commit_action(revs, commit);
3223
3224 if (action == commit_show &&
3225 revs->prune && revs->dense && want_ancestry(revs)) {
3226 /*
3227 * --full-diff on simplified parents is no good: it
3228 * will show spurious changes from the commits that
3229 * were elided. So we save the parents on the side
3230 * when --full-diff is in effect.
3231 */
3232 if (revs->full_diff)
3233 save_parents(revs, commit);
3234 if (rewrite_parents(revs, commit, rewrite_one) < 0)
3235 return commit_error;
3236 }
3237 return action;
3238}
3239
3240static void track_linear(struct rev_info *revs, struct commit *commit)
3241{
3242 if (revs->track_first_time) {
3243 revs->linear = 1;
3244 revs->track_first_time = 0;
3245 } else {
3246 struct commit_list *p;
3247 for (p = revs->previous_parents; p; p = p->next)
3248 if (p->item == NULL || /* first commit */
3249 oideq(&p->item->object.oid, &commit->object.oid))
3250 break;
3251 revs->linear = p != NULL;
3252 }
3253 if (revs->reverse) {
3254 if (revs->linear)
3255 commit->object.flags |= TRACK_LINEAR;
3256 }
3257 free_commit_list(revs->previous_parents);
3258 revs->previous_parents = copy_commit_list(commit->parents);
3259}
3260
3261static struct commit *get_revision_1(struct rev_info *revs)
3262{
3263 while (1) {
3264 struct commit *commit;
3265
3266 if (revs->reflog_info)
3267 commit = next_reflog_entry(revs->reflog_info);
3268 else
3269 commit = pop_commit(&revs->commits);
3270
3271 if (!commit)
3272 return NULL;
3273
3274 if (revs->reflog_info)
3275 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3276
3277 /*
3278 * If we haven't done the list limiting, we need to look at
3279 * the parents here. We also need to do the date-based limiting
3280 * that we'd otherwise have done in limit_list().
3281 */
3282 if (!revs->limited) {
3283 if (revs->max_age != -1 &&
3284 comparison_date(revs, commit) < revs->max_age)
3285 continue;
3286
3287 if (revs->reflog_info)
3288 try_to_simplify_commit(revs, commit);
3289 else if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3290 if (!revs->ignore_missing_links)
3291 die("Failed to traverse parents of commit %s",
3292 oid_to_hex(&commit->object.oid));
3293 }
3294 }
3295
3296 switch (simplify_commit(revs, commit)) {
3297 case commit_ignore:
3298 continue;
3299 case commit_error:
3300 die("Failed to simplify parents of commit %s",
3301 oid_to_hex(&commit->object.oid));
3302 default:
3303 if (revs->track_linear)
3304 track_linear(revs, commit);
3305 return commit;
3306 }
3307 }
3308}
3309
3310/*
3311 * Return true for entries that have not yet been shown. (This is an
3312 * object_array_each_func_t.)
3313 */
3314static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3315{
3316 return !(entry->item->flags & SHOWN);
3317}
3318
3319/*
3320 * If array is on the verge of a realloc, garbage-collect any entries
3321 * that have already been shown to try to free up some space.
3322 */
3323static void gc_boundary(struct object_array *array)
3324{
3325 if (array->nr == array->alloc)
3326 object_array_filter(array, entry_unshown, NULL);
3327}
3328
3329static void create_boundary_commit_list(struct rev_info *revs)
3330{
3331 unsigned i;
3332 struct commit *c;
3333 struct object_array *array = &revs->boundary_commits;
3334 struct object_array_entry *objects = array->objects;
3335
3336 /*
3337 * If revs->commits is non-NULL at this point, an error occurred in
3338 * get_revision_1(). Ignore the error and continue printing the
3339 * boundary commits anyway. (This is what the code has always
3340 * done.)
3341 */
3342 if (revs->commits) {
3343 free_commit_list(revs->commits);
3344 revs->commits = NULL;
3345 }
3346
3347 /*
3348 * Put all of the actual boundary commits from revs->boundary_commits
3349 * into revs->commits
3350 */
3351 for (i = 0; i < array->nr; i++) {
3352 c = (struct commit *)(objects[i].item);
3353 if (!c)
3354 continue;
3355 if (!(c->object.flags & CHILD_SHOWN))
3356 continue;
3357 if (c->object.flags & (SHOWN | BOUNDARY))
3358 continue;
3359 c->object.flags |= BOUNDARY;
3360 commit_list_insert(c, &revs->commits);
3361 }
3362
3363 /*
3364 * If revs->topo_order is set, sort the boundary commits
3365 * in topological order
3366 */
3367 sort_in_topological_order(&revs->commits, revs->sort_order);
3368}
3369
3370static struct commit *get_revision_internal(struct rev_info *revs)
3371{
3372 struct commit *c = NULL;
3373 struct commit_list *l;
3374
3375 if (revs->boundary == 2) {
3376 /*
3377 * All of the normal commits have already been returned,
3378 * and we are now returning boundary commits.
3379 * create_boundary_commit_list() has populated
3380 * revs->commits with the remaining commits to return.
3381 */
3382 c = pop_commit(&revs->commits);
3383 if (c)
3384 c->object.flags |= SHOWN;
3385 return c;
3386 }
3387
3388 /*
3389 * If our max_count counter has reached zero, then we are done. We
3390 * don't simply return NULL because we still might need to show
3391 * boundary commits. But we want to avoid calling get_revision_1, which
3392 * might do a considerable amount of work finding the next commit only
3393 * for us to throw it away.
3394 *
3395 * If it is non-zero, then either we don't have a max_count at all
3396 * (-1), or it is still counting, in which case we decrement.
3397 */
3398 if (revs->max_count) {
3399 c = get_revision_1(revs);
3400 if (c) {
3401 while (revs->skip_count > 0) {
3402 revs->skip_count--;
3403 c = get_revision_1(revs);
3404 if (!c)
3405 break;
3406 }
3407 }
3408
3409 if (revs->max_count > 0)
3410 revs->max_count--;
3411 }
3412
3413 if (c)
3414 c->object.flags |= SHOWN;
3415
3416 if (!revs->boundary)
3417 return c;
3418
3419 if (!c) {
3420 /*
3421 * get_revision_1() runs out the commits, and
3422 * we are done computing the boundaries.
3423 * switch to boundary commits output mode.
3424 */
3425 revs->boundary = 2;
3426
3427 /*
3428 * Update revs->commits to contain the list of
3429 * boundary commits.
3430 */
3431 create_boundary_commit_list(revs);
3432
3433 return get_revision_internal(revs);
3434 }
3435
3436 /*
3437 * boundary commits are the commits that are parents of the
3438 * ones we got from get_revision_1() but they themselves are
3439 * not returned from get_revision_1(). Before returning
3440 * 'c', we need to mark its parents that they could be boundaries.
3441 */
3442
3443 for (l = c->parents; l; l = l->next) {
3444 struct object *p;
3445 p = &(l->item->object);
3446 if (p->flags & (CHILD_SHOWN | SHOWN))
3447 continue;
3448 p->flags |= CHILD_SHOWN;
3449 gc_boundary(&revs->boundary_commits);
3450 add_object_array(p, NULL, &revs->boundary_commits);
3451 }
3452
3453 return c;
3454}
3455
3456struct commit *get_revision(struct rev_info *revs)
3457{
3458 struct commit *c;
3459 struct commit_list *reversed;
3460
3461 if (revs->reverse) {
3462 reversed = NULL;
3463 while ((c = get_revision_internal(revs)))
3464 commit_list_insert(c, &reversed);
3465 revs->commits = reversed;
3466 revs->reverse = 0;
3467 revs->reverse_output_stage = 1;
3468 }
3469
3470 if (revs->reverse_output_stage) {
3471 c = pop_commit(&revs->commits);
3472 if (revs->track_linear)
3473 revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3474 return c;
3475 }
3476
3477 c = get_revision_internal(revs);
3478 if (c && revs->graph)
3479 graph_update(revs->graph, c);
3480 if (!c) {
3481 free_saved_parents(revs);
3482 if (revs->previous_parents) {
3483 free_commit_list(revs->previous_parents);
3484 revs->previous_parents = NULL;
3485 }
3486 }
3487 return c;
3488}
3489
3490char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3491{
3492 if (commit->object.flags & BOUNDARY)
3493 return "-";
3494 else if (commit->object.flags & UNINTERESTING)
3495 return "^";
3496 else if (commit->object.flags & PATCHSAME)
3497 return "=";
3498 else if (!revs || revs->left_right) {
3499 if (commit->object.flags & SYMMETRIC_LEFT)
3500 return "<";
3501 else
3502 return ">";
3503 } else if (revs->graph)
3504 return "*";
3505 else if (revs->cherry_mark)
3506 return "+";
3507 return "";
3508}
3509
3510void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3511{
3512 char *mark = get_revision_mark(revs, commit);
3513 if (!strlen(mark))
3514 return;
3515 fputs(mark, stdout);
3516 putchar(' ');
3517}