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