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