Implement line-history search (git log -L)
[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
19 volatile show_early_output_fn_t show_early_output;
20
21 char *path_name(const struct name_path *path, const char *name)
22 {
23 const struct name_path *p;
24 char *n, *m;
25 int nlen = strlen(name);
26 int len = nlen + 1;
27
28 for (p = path; p; p = p->up) {
29 if (p->elem_len)
30 len += p->elem_len + 1;
31 }
32 n = xmalloc(len);
33 m = n + len - (nlen + 1);
34 strcpy(m, name);
35 for (p = path; p; p = p->up) {
36 if (p->elem_len) {
37 m -= p->elem_len + 1;
38 memcpy(m, p->elem, p->elem_len);
39 m[p->elem_len] = '/';
40 }
41 }
42 return n;
43 }
44
45 static int show_path_component_truncated(FILE *out, const char *name, int len)
46 {
47 int cnt;
48 for (cnt = 0; cnt < len; cnt++) {
49 int ch = name[cnt];
50 if (!ch || ch == '\n')
51 return -1;
52 fputc(ch, out);
53 }
54 return len;
55 }
56
57 static int show_path_truncated(FILE *out, const struct name_path *path)
58 {
59 int emitted, ours;
60
61 if (!path)
62 return 0;
63 emitted = show_path_truncated(out, path->up);
64 if (emitted < 0)
65 return emitted;
66 if (emitted)
67 fputc('/', out);
68 ours = show_path_component_truncated(out, path->elem, path->elem_len);
69 if (ours < 0)
70 return ours;
71 return ours || emitted;
72 }
73
74 void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component)
75 {
76 struct name_path leaf;
77 leaf.up = (struct name_path *)path;
78 leaf.elem = component;
79 leaf.elem_len = strlen(component);
80
81 fprintf(out, "%s ", sha1_to_hex(obj->sha1));
82 show_path_truncated(out, &leaf);
83 fputc('\n', out);
84 }
85
86 void add_object(struct object *obj,
87 struct object_array *p,
88 struct name_path *path,
89 const char *name)
90 {
91 add_object_array(obj, path_name(path, name), p);
92 }
93
94 static void mark_blob_uninteresting(struct blob *blob)
95 {
96 if (!blob)
97 return;
98 if (blob->object.flags & UNINTERESTING)
99 return;
100 blob->object.flags |= UNINTERESTING;
101 }
102
103 void mark_tree_uninteresting(struct tree *tree)
104 {
105 struct tree_desc desc;
106 struct name_entry entry;
107 struct object *obj = &tree->object;
108
109 if (!tree)
110 return;
111 if (obj->flags & UNINTERESTING)
112 return;
113 obj->flags |= UNINTERESTING;
114 if (!has_sha1_file(obj->sha1))
115 return;
116 if (parse_tree(tree) < 0)
117 die("bad tree %s", sha1_to_hex(obj->sha1));
118
119 init_tree_desc(&desc, tree->buffer, tree->size);
120 while (tree_entry(&desc, &entry)) {
121 switch (object_type(entry.mode)) {
122 case OBJ_TREE:
123 mark_tree_uninteresting(lookup_tree(entry.sha1));
124 break;
125 case OBJ_BLOB:
126 mark_blob_uninteresting(lookup_blob(entry.sha1));
127 break;
128 default:
129 /* Subproject commit - not in this repository */
130 break;
131 }
132 }
133
134 /*
135 * We don't care about the tree any more
136 * after it has been marked uninteresting.
137 */
138 free(tree->buffer);
139 tree->buffer = NULL;
140 }
141
142 void mark_parents_uninteresting(struct commit *commit)
143 {
144 struct commit_list *parents = NULL, *l;
145
146 for (l = commit->parents; l; l = l->next)
147 commit_list_insert(l->item, &parents);
148
149 while (parents) {
150 struct commit *commit = parents->item;
151 l = parents;
152 parents = parents->next;
153 free(l);
154
155 while (commit) {
156 /*
157 * A missing commit is ok iff its parent is marked
158 * uninteresting.
159 *
160 * We just mark such a thing parsed, so that when
161 * it is popped next time around, we won't be trying
162 * to parse it and get an error.
163 */
164 if (!has_sha1_file(commit->object.sha1))
165 commit->object.parsed = 1;
166
167 if (commit->object.flags & UNINTERESTING)
168 break;
169
170 commit->object.flags |= UNINTERESTING;
171
172 /*
173 * Normally we haven't parsed the parent
174 * yet, so we won't have a parent of a parent
175 * here. However, it may turn out that we've
176 * reached this commit some other way (where it
177 * wasn't uninteresting), in which case we need
178 * to mark its parents recursively too..
179 */
180 if (!commit->parents)
181 break;
182
183 for (l = commit->parents->next; l; l = l->next)
184 commit_list_insert(l->item, &parents);
185 commit = commit->parents->item;
186 }
187 }
188 }
189
190 static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
191 {
192 if (!obj)
193 return;
194 if (revs->no_walk && (obj->flags & UNINTERESTING))
195 revs->no_walk = 0;
196 if (revs->reflog_info && obj->type == OBJ_COMMIT) {
197 struct strbuf buf = STRBUF_INIT;
198 int len = interpret_branch_name(name, &buf);
199 int st;
200
201 if (0 < len && name[len] && buf.len)
202 strbuf_addstr(&buf, name + len);
203 st = add_reflog_for_walk(revs->reflog_info,
204 (struct commit *)obj,
205 buf.buf[0] ? buf.buf: name);
206 strbuf_release(&buf);
207 if (st)
208 return;
209 }
210 add_object_array_with_mode(obj, name, &revs->pending, mode);
211 }
212
213 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
214 {
215 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
216 }
217
218 void add_head_to_pending(struct rev_info *revs)
219 {
220 unsigned char sha1[20];
221 struct object *obj;
222 if (get_sha1("HEAD", sha1))
223 return;
224 obj = parse_object(sha1);
225 if (!obj)
226 return;
227 add_pending_object(revs, obj, "HEAD");
228 }
229
230 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
231 {
232 struct object *object;
233
234 object = parse_object(sha1);
235 if (!object) {
236 if (revs->ignore_missing)
237 return object;
238 die("bad object %s", name);
239 }
240 object->flags |= flags;
241 return object;
242 }
243
244 void add_pending_sha1(struct rev_info *revs, const char *name,
245 const unsigned char *sha1, unsigned int flags)
246 {
247 struct object *object = get_reference(revs, name, sha1, flags);
248 add_pending_object(revs, object, name);
249 }
250
251 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
252 {
253 unsigned long flags = object->flags;
254
255 /*
256 * Tag object? Look what it points to..
257 */
258 while (object->type == OBJ_TAG) {
259 struct tag *tag = (struct tag *) object;
260 if (revs->tag_objects && !(flags & UNINTERESTING))
261 add_pending_object(revs, object, tag->tag);
262 if (!tag->tagged)
263 die("bad tag");
264 object = parse_object(tag->tagged->sha1);
265 if (!object) {
266 if (flags & UNINTERESTING)
267 return NULL;
268 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
269 }
270 }
271
272 /*
273 * Commit object? Just return it, we'll do all the complex
274 * reachability crud.
275 */
276 if (object->type == OBJ_COMMIT) {
277 struct commit *commit = (struct commit *)object;
278 if (parse_commit(commit) < 0)
279 die("unable to parse commit %s", name);
280 if (flags & UNINTERESTING) {
281 commit->object.flags |= UNINTERESTING;
282 mark_parents_uninteresting(commit);
283 revs->limited = 1;
284 }
285 if (revs->show_source && !commit->util)
286 commit->util = (void *) name;
287 return commit;
288 }
289
290 /*
291 * Tree object? Either mark it uninteresting, or add it
292 * to the list of objects to look at later..
293 */
294 if (object->type == OBJ_TREE) {
295 struct tree *tree = (struct tree *)object;
296 if (!revs->tree_objects)
297 return NULL;
298 if (flags & UNINTERESTING) {
299 mark_tree_uninteresting(tree);
300 return NULL;
301 }
302 add_pending_object(revs, object, "");
303 return NULL;
304 }
305
306 /*
307 * Blob object? You know the drill by now..
308 */
309 if (object->type == OBJ_BLOB) {
310 struct blob *blob = (struct blob *)object;
311 if (!revs->blob_objects)
312 return NULL;
313 if (flags & UNINTERESTING) {
314 mark_blob_uninteresting(blob);
315 return NULL;
316 }
317 add_pending_object(revs, object, "");
318 return NULL;
319 }
320 die("%s is unknown object", name);
321 }
322
323 static int everybody_uninteresting(struct commit_list *orig)
324 {
325 struct commit_list *list = orig;
326 while (list) {
327 struct commit *commit = list->item;
328 list = list->next;
329 if (commit->object.flags & UNINTERESTING)
330 continue;
331 return 0;
332 }
333 return 1;
334 }
335
336 /*
337 * The goal is to get REV_TREE_NEW as the result only if the
338 * diff consists of all '+' (and no other changes), REV_TREE_OLD
339 * if the whole diff is removal of old data, and otherwise
340 * REV_TREE_DIFFERENT (of course if the trees are the same we
341 * want REV_TREE_SAME).
342 * That means that once we get to REV_TREE_DIFFERENT, we do not
343 * have to look any further.
344 */
345 static int tree_difference = REV_TREE_SAME;
346
347 static void file_add_remove(struct diff_options *options,
348 int addremove, unsigned mode,
349 const unsigned char *sha1,
350 int sha1_valid,
351 const char *fullpath, unsigned dirty_submodule)
352 {
353 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
354
355 tree_difference |= diff;
356 if (tree_difference == REV_TREE_DIFFERENT)
357 DIFF_OPT_SET(options, HAS_CHANGES);
358 }
359
360 static void file_change(struct diff_options *options,
361 unsigned old_mode, unsigned new_mode,
362 const unsigned char *old_sha1,
363 const unsigned char *new_sha1,
364 int old_sha1_valid, int new_sha1_valid,
365 const char *fullpath,
366 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
367 {
368 tree_difference = REV_TREE_DIFFERENT;
369 DIFF_OPT_SET(options, HAS_CHANGES);
370 }
371
372 static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
373 {
374 struct tree *t1 = parent->tree;
375 struct tree *t2 = commit->tree;
376
377 if (!t1)
378 return REV_TREE_NEW;
379 if (!t2)
380 return REV_TREE_OLD;
381
382 if (revs->simplify_by_decoration) {
383 /*
384 * If we are simplifying by decoration, then the commit
385 * is worth showing if it has a tag pointing at it.
386 */
387 if (lookup_decoration(&name_decoration, &commit->object))
388 return REV_TREE_DIFFERENT;
389 /*
390 * A commit that is not pointed by a tag is uninteresting
391 * if we are not limited by path. This means that you will
392 * see the usual "commits that touch the paths" plus any
393 * tagged commit by specifying both --simplify-by-decoration
394 * and pathspec.
395 */
396 if (!revs->prune_data.nr)
397 return REV_TREE_SAME;
398 }
399
400 tree_difference = REV_TREE_SAME;
401 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
402 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
403 &revs->pruning) < 0)
404 return REV_TREE_DIFFERENT;
405 return tree_difference;
406 }
407
408 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
409 {
410 int retval;
411 void *tree;
412 unsigned long size;
413 struct tree_desc empty, real;
414 struct tree *t1 = commit->tree;
415
416 if (!t1)
417 return 0;
418
419 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
420 if (!tree)
421 return 0;
422 init_tree_desc(&real, tree, size);
423 init_tree_desc(&empty, "", 0);
424
425 tree_difference = REV_TREE_SAME;
426 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
427 retval = diff_tree(&empty, &real, "", &revs->pruning);
428 free(tree);
429
430 return retval >= 0 && (tree_difference == REV_TREE_SAME);
431 }
432
433 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
434 {
435 struct commit_list **pp, *parent;
436 int tree_changed = 0, tree_same = 0, nth_parent = 0;
437
438 /*
439 * If we don't do pruning, everything is interesting
440 */
441 if (!revs->prune)
442 return;
443
444 if (!commit->tree)
445 return;
446
447 if (!commit->parents) {
448 if (rev_same_tree_as_empty(revs, commit))
449 commit->object.flags |= TREESAME;
450 return;
451 }
452
453 /*
454 * Normal non-merge commit? If we don't want to make the
455 * history dense, we consider it always to be a change..
456 */
457 if (!revs->dense && !commit->parents->next)
458 return;
459
460 pp = &commit->parents;
461 while ((parent = *pp) != NULL) {
462 struct commit *p = parent->item;
463
464 /*
465 * Do not compare with later parents when we care only about
466 * the first parent chain, in order to avoid derailing the
467 * traversal to follow a side branch that brought everything
468 * in the path we are limited to by the pathspec.
469 */
470 if (revs->first_parent_only && nth_parent++)
471 break;
472 if (parse_commit(p) < 0)
473 die("cannot simplify commit %s (because of %s)",
474 sha1_to_hex(commit->object.sha1),
475 sha1_to_hex(p->object.sha1));
476 switch (rev_compare_tree(revs, p, commit)) {
477 case REV_TREE_SAME:
478 tree_same = 1;
479 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
480 /* Even if a merge with an uninteresting
481 * side branch brought the entire change
482 * we are interested in, we do not want
483 * to lose the other branches of this
484 * merge, so we just keep going.
485 */
486 pp = &parent->next;
487 continue;
488 }
489 parent->next = NULL;
490 commit->parents = parent;
491 commit->object.flags |= TREESAME;
492 return;
493
494 case REV_TREE_NEW:
495 if (revs->remove_empty_trees &&
496 rev_same_tree_as_empty(revs, p)) {
497 /* We are adding all the specified
498 * paths from this parent, so the
499 * history beyond this parent is not
500 * interesting. Remove its parents
501 * (they are grandparents for us).
502 * IOW, we pretend this parent is a
503 * "root" commit.
504 */
505 if (parse_commit(p) < 0)
506 die("cannot simplify commit %s (invalid %s)",
507 sha1_to_hex(commit->object.sha1),
508 sha1_to_hex(p->object.sha1));
509 p->parents = NULL;
510 }
511 /* fallthrough */
512 case REV_TREE_OLD:
513 case REV_TREE_DIFFERENT:
514 tree_changed = 1;
515 pp = &parent->next;
516 continue;
517 }
518 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
519 }
520 if (tree_changed && !tree_same)
521 return;
522 commit->object.flags |= TREESAME;
523 }
524
525 static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
526 struct commit_list *cached_base, struct commit_list **cache)
527 {
528 struct commit_list *new_entry;
529
530 if (cached_base && p->date < cached_base->item->date)
531 new_entry = commit_list_insert_by_date(p, &cached_base->next);
532 else
533 new_entry = commit_list_insert_by_date(p, head);
534
535 if (cache && (!*cache || p->date < (*cache)->item->date))
536 *cache = new_entry;
537 }
538
539 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
540 struct commit_list **list, struct commit_list **cache_ptr)
541 {
542 struct commit_list *parent = commit->parents;
543 unsigned left_flag;
544 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
545
546 if (commit->object.flags & ADDED)
547 return 0;
548 commit->object.flags |= ADDED;
549
550 /*
551 * If the commit is uninteresting, don't try to
552 * prune parents - we want the maximal uninteresting
553 * set.
554 *
555 * Normally we haven't parsed the parent
556 * yet, so we won't have a parent of a parent
557 * here. However, it may turn out that we've
558 * reached this commit some other way (where it
559 * wasn't uninteresting), in which case we need
560 * to mark its parents recursively too..
561 */
562 if (commit->object.flags & UNINTERESTING) {
563 while (parent) {
564 struct commit *p = parent->item;
565 parent = parent->next;
566 if (p)
567 p->object.flags |= UNINTERESTING;
568 if (parse_commit(p) < 0)
569 continue;
570 if (p->parents)
571 mark_parents_uninteresting(p);
572 if (p->object.flags & SEEN)
573 continue;
574 p->object.flags |= SEEN;
575 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
576 }
577 return 0;
578 }
579
580 /*
581 * Ok, the commit wasn't uninteresting. Try to
582 * simplify the commit history and find the parent
583 * that has no differences in the path set if one exists.
584 */
585 try_to_simplify_commit(revs, commit);
586
587 if (revs->no_walk)
588 return 0;
589
590 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
591
592 for (parent = commit->parents; parent; parent = parent->next) {
593 struct commit *p = parent->item;
594
595 if (parse_commit(p) < 0)
596 return -1;
597 if (revs->show_source && !p->util)
598 p->util = commit->util;
599 p->object.flags |= left_flag;
600 if (!(p->object.flags & SEEN)) {
601 p->object.flags |= SEEN;
602 commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
603 }
604 if (revs->first_parent_only)
605 break;
606 }
607 return 0;
608 }
609
610 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
611 {
612 struct commit_list *p;
613 int left_count = 0, right_count = 0;
614 int left_first;
615 struct patch_ids ids;
616 unsigned cherry_flag;
617
618 /* First count the commits on the left and on the right */
619 for (p = list; p; p = p->next) {
620 struct commit *commit = p->item;
621 unsigned flags = commit->object.flags;
622 if (flags & BOUNDARY)
623 ;
624 else if (flags & SYMMETRIC_LEFT)
625 left_count++;
626 else
627 right_count++;
628 }
629
630 if (!left_count || !right_count)
631 return;
632
633 left_first = left_count < right_count;
634 init_patch_ids(&ids);
635 ids.diffopts.pathspec = revs->diffopt.pathspec;
636
637 /* Compute patch-ids for one side */
638 for (p = list; p; p = p->next) {
639 struct commit *commit = p->item;
640 unsigned flags = commit->object.flags;
641
642 if (flags & BOUNDARY)
643 continue;
644 /*
645 * If we have fewer left, left_first is set and we omit
646 * commits on the right branch in this loop. If we have
647 * fewer right, we skip the left ones.
648 */
649 if (left_first != !!(flags & SYMMETRIC_LEFT))
650 continue;
651 commit->util = add_commit_patch_id(commit, &ids);
652 }
653
654 /* either cherry_mark or cherry_pick are true */
655 cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
656
657 /* Check the other side */
658 for (p = list; p; p = p->next) {
659 struct commit *commit = p->item;
660 struct patch_id *id;
661 unsigned flags = commit->object.flags;
662
663 if (flags & BOUNDARY)
664 continue;
665 /*
666 * If we have fewer left, left_first is set and we omit
667 * commits on the left branch in this loop.
668 */
669 if (left_first == !!(flags & SYMMETRIC_LEFT))
670 continue;
671
672 /*
673 * Have we seen the same patch id?
674 */
675 id = has_commit_patch_id(commit, &ids);
676 if (!id)
677 continue;
678 id->seen = 1;
679 commit->object.flags |= cherry_flag;
680 }
681
682 /* Now check the original side for seen ones */
683 for (p = list; p; p = p->next) {
684 struct commit *commit = p->item;
685 struct patch_id *ent;
686
687 ent = commit->util;
688 if (!ent)
689 continue;
690 if (ent->seen)
691 commit->object.flags |= cherry_flag;
692 commit->util = NULL;
693 }
694
695 free_patch_ids(&ids);
696 }
697
698 /* How many extra uninteresting commits we want to see.. */
699 #define SLOP 5
700
701 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
702 {
703 /*
704 * No source list at all? We're definitely done..
705 */
706 if (!src)
707 return 0;
708
709 /*
710 * Does the destination list contain entries with a date
711 * before the source list? Definitely _not_ done.
712 */
713 if (date < src->item->date)
714 return SLOP;
715
716 /*
717 * Does the source list still have interesting commits in
718 * it? Definitely not done..
719 */
720 if (!everybody_uninteresting(src))
721 return SLOP;
722
723 /* Ok, we're closing in.. */
724 return slop-1;
725 }
726
727 /*
728 * "rev-list --ancestry-path A..B" computes commits that are ancestors
729 * of B but not ancestors of A but further limits the result to those
730 * that are descendants of A. This takes the list of bottom commits and
731 * the result of "A..B" without --ancestry-path, and limits the latter
732 * further to the ones that can reach one of the commits in "bottom".
733 */
734 static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
735 {
736 struct commit_list *p;
737 struct commit_list *rlist = NULL;
738 int made_progress;
739
740 /*
741 * Reverse the list so that it will be likely that we would
742 * process parents before children.
743 */
744 for (p = list; p; p = p->next)
745 commit_list_insert(p->item, &rlist);
746
747 for (p = bottom; p; p = p->next)
748 p->item->object.flags |= TMP_MARK;
749
750 /*
751 * Mark the ones that can reach bottom commits in "list",
752 * in a bottom-up fashion.
753 */
754 do {
755 made_progress = 0;
756 for (p = rlist; p; p = p->next) {
757 struct commit *c = p->item;
758 struct commit_list *parents;
759 if (c->object.flags & (TMP_MARK | UNINTERESTING))
760 continue;
761 for (parents = c->parents;
762 parents;
763 parents = parents->next) {
764 if (!(parents->item->object.flags & TMP_MARK))
765 continue;
766 c->object.flags |= TMP_MARK;
767 made_progress = 1;
768 break;
769 }
770 }
771 } while (made_progress);
772
773 /*
774 * NEEDSWORK: decide if we want to remove parents that are
775 * not marked with TMP_MARK from commit->parents for commits
776 * in the resulting list. We may not want to do that, though.
777 */
778
779 /*
780 * The ones that are not marked with TMP_MARK are uninteresting
781 */
782 for (p = list; p; p = p->next) {
783 struct commit *c = p->item;
784 if (c->object.flags & TMP_MARK)
785 continue;
786 c->object.flags |= UNINTERESTING;
787 }
788
789 /* We are done with the TMP_MARK */
790 for (p = list; p; p = p->next)
791 p->item->object.flags &= ~TMP_MARK;
792 for (p = bottom; p; p = p->next)
793 p->item->object.flags &= ~TMP_MARK;
794 free_commit_list(rlist);
795 }
796
797 /*
798 * Before walking the history, keep the set of "negative" refs the
799 * caller has asked to exclude.
800 *
801 * This is used to compute "rev-list --ancestry-path A..B", as we need
802 * to filter the result of "A..B" further to the ones that can actually
803 * reach A.
804 */
805 static struct commit_list *collect_bottom_commits(struct rev_info *revs)
806 {
807 struct commit_list *bottom = NULL;
808 int i;
809 for (i = 0; i < revs->cmdline.nr; i++) {
810 struct rev_cmdline_entry *elem = &revs->cmdline.rev[i];
811 if ((elem->flags & UNINTERESTING) &&
812 elem->item->type == OBJ_COMMIT)
813 commit_list_insert((struct commit *)elem->item, &bottom);
814 }
815 return bottom;
816 }
817
818 /* Assumes either left_only or right_only is set */
819 static void limit_left_right(struct commit_list *list, struct rev_info *revs)
820 {
821 struct commit_list *p;
822
823 for (p = list; p; p = p->next) {
824 struct commit *commit = p->item;
825
826 if (revs->right_only) {
827 if (commit->object.flags & SYMMETRIC_LEFT)
828 commit->object.flags |= SHOWN;
829 } else /* revs->left_only is set */
830 if (!(commit->object.flags & SYMMETRIC_LEFT))
831 commit->object.flags |= SHOWN;
832 }
833 }
834
835 static int limit_list(struct rev_info *revs)
836 {
837 int slop = SLOP;
838 unsigned long date = ~0ul;
839 struct commit_list *list = revs->commits;
840 struct commit_list *newlist = NULL;
841 struct commit_list **p = &newlist;
842 struct commit_list *bottom = NULL;
843
844 if (revs->ancestry_path) {
845 bottom = collect_bottom_commits(revs);
846 if (!bottom)
847 die("--ancestry-path given but there are no bottom commits");
848 }
849
850 while (list) {
851 struct commit_list *entry = list;
852 struct commit *commit = list->item;
853 struct object *obj = &commit->object;
854 show_early_output_fn_t show;
855
856 list = list->next;
857 free(entry);
858
859 if (revs->max_age != -1 && (commit->date < revs->max_age))
860 obj->flags |= UNINTERESTING;
861 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
862 return -1;
863 if (obj->flags & UNINTERESTING) {
864 mark_parents_uninteresting(commit);
865 if (revs->show_all)
866 p = &commit_list_insert(commit, p)->next;
867 slop = still_interesting(list, date, slop);
868 if (slop)
869 continue;
870 /* If showing all, add the whole pending list to the end */
871 if (revs->show_all)
872 *p = list;
873 break;
874 }
875 if (revs->min_age != -1 && (commit->date > revs->min_age))
876 continue;
877 date = commit->date;
878 p = &commit_list_insert(commit, p)->next;
879
880 show = show_early_output;
881 if (!show)
882 continue;
883
884 show(revs, newlist);
885 show_early_output = NULL;
886 }
887 if (revs->cherry_pick || revs->cherry_mark)
888 cherry_pick_list(newlist, revs);
889
890 if (revs->left_only || revs->right_only)
891 limit_left_right(newlist, revs);
892
893 if (bottom) {
894 limit_to_ancestry(bottom, newlist);
895 free_commit_list(bottom);
896 }
897
898 revs->commits = newlist;
899 return 0;
900 }
901
902 static void add_rev_cmdline(struct rev_info *revs,
903 struct object *item,
904 const char *name,
905 int whence,
906 unsigned flags)
907 {
908 struct rev_cmdline_info *info = &revs->cmdline;
909 int nr = info->nr;
910
911 ALLOC_GROW(info->rev, nr + 1, info->alloc);
912 info->rev[nr].item = item;
913 info->rev[nr].name = name;
914 info->rev[nr].whence = whence;
915 info->rev[nr].flags = flags;
916 info->nr++;
917 }
918
919 struct all_refs_cb {
920 int all_flags;
921 int warned_bad_reflog;
922 struct rev_info *all_revs;
923 const char *name_for_errormsg;
924 };
925
926 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
927 {
928 struct all_refs_cb *cb = cb_data;
929 struct object *object = get_reference(cb->all_revs, path, sha1,
930 cb->all_flags);
931 add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
932 add_pending_sha1(cb->all_revs, path, sha1, cb->all_flags);
933 return 0;
934 }
935
936 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
937 unsigned flags)
938 {
939 cb->all_revs = revs;
940 cb->all_flags = flags;
941 }
942
943 static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
944 int (*for_each)(const char *, each_ref_fn, void *))
945 {
946 struct all_refs_cb cb;
947 init_all_refs_cb(&cb, revs, flags);
948 for_each(submodule, handle_one_ref, &cb);
949 }
950
951 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
952 {
953 struct all_refs_cb *cb = cb_data;
954 if (!is_null_sha1(sha1)) {
955 struct object *o = parse_object(sha1);
956 if (o) {
957 o->flags |= cb->all_flags;
958 /* ??? CMDLINEFLAGS ??? */
959 add_pending_object(cb->all_revs, o, "");
960 }
961 else if (!cb->warned_bad_reflog) {
962 warning("reflog of '%s' references pruned commits",
963 cb->name_for_errormsg);
964 cb->warned_bad_reflog = 1;
965 }
966 }
967 }
968
969 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
970 const char *email, unsigned long timestamp, int tz,
971 const char *message, void *cb_data)
972 {
973 handle_one_reflog_commit(osha1, cb_data);
974 handle_one_reflog_commit(nsha1, cb_data);
975 return 0;
976 }
977
978 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
979 {
980 struct all_refs_cb *cb = cb_data;
981 cb->warned_bad_reflog = 0;
982 cb->name_for_errormsg = path;
983 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
984 return 0;
985 }
986
987 static void handle_reflog(struct rev_info *revs, unsigned flags)
988 {
989 struct all_refs_cb cb;
990 cb.all_revs = revs;
991 cb.all_flags = flags;
992 for_each_reflog(handle_one_reflog, &cb);
993 }
994
995 static int add_parents_only(struct rev_info *revs, const char *arg_, int flags)
996 {
997 unsigned char sha1[20];
998 struct object *it;
999 struct commit *commit;
1000 struct commit_list *parents;
1001 const char *arg = arg_;
1002
1003 if (*arg == '^') {
1004 flags ^= UNINTERESTING;
1005 arg++;
1006 }
1007 if (get_sha1_committish(arg, sha1))
1008 return 0;
1009 while (1) {
1010 it = get_reference(revs, arg, sha1, 0);
1011 if (!it && revs->ignore_missing)
1012 return 0;
1013 if (it->type != OBJ_TAG)
1014 break;
1015 if (!((struct tag*)it)->tagged)
1016 return 0;
1017 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
1018 }
1019 if (it->type != OBJ_COMMIT)
1020 return 0;
1021 commit = (struct commit *)it;
1022 for (parents = commit->parents; parents; parents = parents->next) {
1023 it = &parents->item->object;
1024 it->flags |= flags;
1025 add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1026 add_pending_object(revs, it, arg);
1027 }
1028 return 1;
1029 }
1030
1031 void init_revisions(struct rev_info *revs, const char *prefix)
1032 {
1033 memset(revs, 0, sizeof(*revs));
1034
1035 revs->abbrev = DEFAULT_ABBREV;
1036 revs->ignore_merges = 1;
1037 revs->simplify_history = 1;
1038 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1039 DIFF_OPT_SET(&revs->pruning, QUICK);
1040 revs->pruning.add_remove = file_add_remove;
1041 revs->pruning.change = file_change;
1042 revs->lifo = 1;
1043 revs->dense = 1;
1044 revs->prefix = prefix;
1045 revs->max_age = -1;
1046 revs->min_age = -1;
1047 revs->skip_count = -1;
1048 revs->max_count = -1;
1049 revs->max_parents = -1;
1050
1051 revs->commit_format = CMIT_FMT_DEFAULT;
1052
1053 init_grep_defaults();
1054 grep_init(&revs->grep_filter, prefix);
1055 revs->grep_filter.status_only = 1;
1056 revs->grep_filter.regflags = REG_NEWLINE;
1057
1058 diff_setup(&revs->diffopt);
1059 if (prefix && !revs->diffopt.prefix) {
1060 revs->diffopt.prefix = prefix;
1061 revs->diffopt.prefix_length = strlen(prefix);
1062 }
1063
1064 revs->notes_opt.use_default_notes = -1;
1065 }
1066
1067 static void add_pending_commit_list(struct rev_info *revs,
1068 struct commit_list *commit_list,
1069 unsigned int flags)
1070 {
1071 while (commit_list) {
1072 struct object *object = &commit_list->item->object;
1073 object->flags |= flags;
1074 add_pending_object(revs, object, sha1_to_hex(object->sha1));
1075 commit_list = commit_list->next;
1076 }
1077 }
1078
1079 static void prepare_show_merge(struct rev_info *revs)
1080 {
1081 struct commit_list *bases;
1082 struct commit *head, *other;
1083 unsigned char sha1[20];
1084 const char **prune = NULL;
1085 int i, prune_num = 1; /* counting terminating NULL */
1086
1087 if (get_sha1("HEAD", sha1))
1088 die("--merge without HEAD?");
1089 head = lookup_commit_or_die(sha1, "HEAD");
1090 if (get_sha1("MERGE_HEAD", sha1))
1091 die("--merge without MERGE_HEAD?");
1092 other = lookup_commit_or_die(sha1, "MERGE_HEAD");
1093 add_pending_object(revs, &head->object, "HEAD");
1094 add_pending_object(revs, &other->object, "MERGE_HEAD");
1095 bases = get_merge_bases(head, other, 1);
1096 add_pending_commit_list(revs, bases, UNINTERESTING);
1097 free_commit_list(bases);
1098 head->object.flags |= SYMMETRIC_LEFT;
1099
1100 if (!active_nr)
1101 read_cache();
1102 for (i = 0; i < active_nr; i++) {
1103 struct cache_entry *ce = active_cache[i];
1104 if (!ce_stage(ce))
1105 continue;
1106 if (ce_path_match(ce, &revs->prune_data)) {
1107 prune_num++;
1108 prune = xrealloc(prune, sizeof(*prune) * prune_num);
1109 prune[prune_num-2] = ce->name;
1110 prune[prune_num-1] = NULL;
1111 }
1112 while ((i+1 < active_nr) &&
1113 ce_same_name(ce, active_cache[i+1]))
1114 i++;
1115 }
1116 free_pathspec(&revs->prune_data);
1117 init_pathspec(&revs->prune_data, prune);
1118 revs->limited = 1;
1119 }
1120
1121 int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1122 {
1123 struct object_context oc;
1124 char *dotdot;
1125 struct object *object;
1126 unsigned char sha1[20];
1127 int local_flags;
1128 const char *arg = arg_;
1129 int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1130 unsigned get_sha1_flags = 0;
1131
1132 dotdot = strstr(arg, "..");
1133 if (dotdot) {
1134 unsigned char from_sha1[20];
1135 const char *next = dotdot + 2;
1136 const char *this = arg;
1137 int symmetric = *next == '.';
1138 unsigned int flags_exclude = flags ^ UNINTERESTING;
1139 static const char head_by_default[] = "HEAD";
1140 unsigned int a_flags;
1141
1142 *dotdot = 0;
1143 next += symmetric;
1144
1145 if (!*next)
1146 next = head_by_default;
1147 if (dotdot == arg)
1148 this = head_by_default;
1149 if (this == head_by_default && next == head_by_default &&
1150 !symmetric) {
1151 /*
1152 * Just ".."? That is not a range but the
1153 * pathspec for the parent directory.
1154 */
1155 if (!cant_be_filename) {
1156 *dotdot = '.';
1157 return -1;
1158 }
1159 }
1160 if (!get_sha1_committish(this, from_sha1) &&
1161 !get_sha1_committish(next, sha1)) {
1162 struct commit *a, *b;
1163 struct commit_list *exclude;
1164
1165 a = lookup_commit_reference(from_sha1);
1166 b = lookup_commit_reference(sha1);
1167 if (!a || !b) {
1168 if (revs->ignore_missing)
1169 return 0;
1170 die(symmetric ?
1171 "Invalid symmetric difference expression %s...%s" :
1172 "Invalid revision range %s..%s",
1173 arg, next);
1174 }
1175
1176 if (!cant_be_filename) {
1177 *dotdot = '.';
1178 verify_non_filename(revs->prefix, arg);
1179 }
1180
1181 if (symmetric) {
1182 exclude = get_merge_bases(a, b, 1);
1183 add_pending_commit_list(revs, exclude,
1184 flags_exclude);
1185 free_commit_list(exclude);
1186 a_flags = flags | SYMMETRIC_LEFT;
1187 } else
1188 a_flags = flags_exclude;
1189 a->object.flags |= a_flags;
1190 b->object.flags |= flags;
1191 add_rev_cmdline(revs, &a->object, this,
1192 REV_CMD_LEFT, a_flags);
1193 add_rev_cmdline(revs, &b->object, next,
1194 REV_CMD_RIGHT, flags);
1195 add_pending_object(revs, &a->object, this);
1196 add_pending_object(revs, &b->object, next);
1197 return 0;
1198 }
1199 *dotdot = '.';
1200 }
1201 dotdot = strstr(arg, "^@");
1202 if (dotdot && !dotdot[2]) {
1203 *dotdot = 0;
1204 if (add_parents_only(revs, arg, flags))
1205 return 0;
1206 *dotdot = '^';
1207 }
1208 dotdot = strstr(arg, "^!");
1209 if (dotdot && !dotdot[2]) {
1210 *dotdot = 0;
1211 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
1212 *dotdot = '^';
1213 }
1214
1215 local_flags = 0;
1216 if (*arg == '^') {
1217 local_flags = UNINTERESTING;
1218 arg++;
1219 }
1220
1221 if (revarg_opt & REVARG_COMMITTISH)
1222 get_sha1_flags = GET_SHA1_COMMITTISH;
1223
1224 if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
1225 return revs->ignore_missing ? 0 : -1;
1226 if (!cant_be_filename)
1227 verify_non_filename(revs->prefix, arg);
1228 object = get_reference(revs, arg, sha1, flags ^ local_flags);
1229 add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1230 add_pending_object_with_mode(revs, object, arg, oc.mode);
1231 return 0;
1232 }
1233
1234 struct cmdline_pathspec {
1235 int alloc;
1236 int nr;
1237 const char **path;
1238 };
1239
1240 static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1241 {
1242 while (*av) {
1243 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1244 prune->path[prune->nr++] = *(av++);
1245 }
1246 }
1247
1248 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1249 struct cmdline_pathspec *prune)
1250 {
1251 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
1252 int len = sb->len;
1253 if (len && sb->buf[len - 1] == '\n')
1254 sb->buf[--len] = '\0';
1255 ALLOC_GROW(prune->path, prune->nr+1, prune->alloc);
1256 prune->path[prune->nr++] = xstrdup(sb->buf);
1257 }
1258 }
1259
1260 static void read_revisions_from_stdin(struct rev_info *revs,
1261 struct cmdline_pathspec *prune)
1262 {
1263 struct strbuf sb;
1264 int seen_dashdash = 0;
1265
1266 strbuf_init(&sb, 1000);
1267 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
1268 int len = sb.len;
1269 if (len && sb.buf[len - 1] == '\n')
1270 sb.buf[--len] = '\0';
1271 if (!len)
1272 break;
1273 if (sb.buf[0] == '-') {
1274 if (len == 2 && sb.buf[1] == '-') {
1275 seen_dashdash = 1;
1276 break;
1277 }
1278 die("options not supported in --stdin mode");
1279 }
1280 if (handle_revision_arg(sb.buf, revs, 0, REVARG_CANNOT_BE_FILENAME))
1281 die("bad revision '%s'", sb.buf);
1282 }
1283 if (seen_dashdash)
1284 read_pathspec_from_stdin(revs, &sb, prune);
1285 strbuf_release(&sb);
1286 }
1287
1288 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1289 {
1290 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1291 }
1292
1293 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1294 {
1295 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1296 }
1297
1298 static void add_message_grep(struct rev_info *revs, const char *pattern)
1299 {
1300 add_grep(revs, pattern, GREP_PATTERN_BODY);
1301 }
1302
1303 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1304 int *unkc, const char **unkv)
1305 {
1306 const char *arg = argv[0];
1307 const char *optarg;
1308 int argcount;
1309
1310 /* pseudo revision arguments */
1311 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1312 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1313 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1314 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1315 !strcmp(arg, "--bisect") || !prefixcmp(arg, "--glob=") ||
1316 !prefixcmp(arg, "--branches=") || !prefixcmp(arg, "--tags=") ||
1317 !prefixcmp(arg, "--remotes=") || !prefixcmp(arg, "--no-walk="))
1318 {
1319 unkv[(*unkc)++] = arg;
1320 return 1;
1321 }
1322
1323 if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1324 revs->max_count = atoi(optarg);
1325 revs->no_walk = 0;
1326 return argcount;
1327 } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1328 revs->skip_count = atoi(optarg);
1329 return argcount;
1330 } else if ((*arg == '-') && isdigit(arg[1])) {
1331 /* accept -<digit>, like traditional "head" */
1332 revs->max_count = atoi(arg + 1);
1333 revs->no_walk = 0;
1334 } else if (!strcmp(arg, "-n")) {
1335 if (argc <= 1)
1336 return error("-n requires an argument");
1337 revs->max_count = atoi(argv[1]);
1338 revs->no_walk = 0;
1339 return 2;
1340 } else if (!prefixcmp(arg, "-n")) {
1341 revs->max_count = atoi(arg + 2);
1342 revs->no_walk = 0;
1343 } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1344 revs->max_age = atoi(optarg);
1345 return argcount;
1346 } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1347 revs->max_age = approxidate(optarg);
1348 return argcount;
1349 } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1350 revs->max_age = approxidate(optarg);
1351 return argcount;
1352 } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1353 revs->min_age = atoi(optarg);
1354 return argcount;
1355 } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1356 revs->min_age = approxidate(optarg);
1357 return argcount;
1358 } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1359 revs->min_age = approxidate(optarg);
1360 return argcount;
1361 } else if (!strcmp(arg, "--first-parent")) {
1362 revs->first_parent_only = 1;
1363 } else if (!strcmp(arg, "--ancestry-path")) {
1364 revs->ancestry_path = 1;
1365 revs->simplify_history = 0;
1366 revs->limited = 1;
1367 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1368 init_reflog_walk(&revs->reflog_info);
1369 } else if (!strcmp(arg, "--default")) {
1370 if (argc <= 1)
1371 return error("bad --default argument");
1372 revs->def = argv[1];
1373 return 2;
1374 } else if (!strcmp(arg, "--merge")) {
1375 revs->show_merge = 1;
1376 } else if (!strcmp(arg, "--topo-order")) {
1377 revs->lifo = 1;
1378 revs->topo_order = 1;
1379 } else if (!strcmp(arg, "--simplify-merges")) {
1380 revs->simplify_merges = 1;
1381 revs->topo_order = 1;
1382 revs->rewrite_parents = 1;
1383 revs->simplify_history = 0;
1384 revs->limited = 1;
1385 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1386 revs->simplify_merges = 1;
1387 revs->topo_order = 1;
1388 revs->rewrite_parents = 1;
1389 revs->simplify_history = 0;
1390 revs->simplify_by_decoration = 1;
1391 revs->limited = 1;
1392 revs->prune = 1;
1393 load_ref_decorations(DECORATE_SHORT_REFS);
1394 } else if (!strcmp(arg, "--date-order")) {
1395 revs->lifo = 0;
1396 revs->topo_order = 1;
1397 } else if (!prefixcmp(arg, "--early-output")) {
1398 int count = 100;
1399 switch (arg[14]) {
1400 case '=':
1401 count = atoi(arg+15);
1402 /* Fallthrough */
1403 case 0:
1404 revs->topo_order = 1;
1405 revs->early_output = count;
1406 }
1407 } else if (!strcmp(arg, "--parents")) {
1408 revs->rewrite_parents = 1;
1409 revs->print_parents = 1;
1410 } else if (!strcmp(arg, "--dense")) {
1411 revs->dense = 1;
1412 } else if (!strcmp(arg, "--sparse")) {
1413 revs->dense = 0;
1414 } else if (!strcmp(arg, "--show-all")) {
1415 revs->show_all = 1;
1416 } else if (!strcmp(arg, "--remove-empty")) {
1417 revs->remove_empty_trees = 1;
1418 } else if (!strcmp(arg, "--merges")) {
1419 revs->min_parents = 2;
1420 } else if (!strcmp(arg, "--no-merges")) {
1421 revs->max_parents = 1;
1422 } else if (!prefixcmp(arg, "--min-parents=")) {
1423 revs->min_parents = atoi(arg+14);
1424 } else if (!prefixcmp(arg, "--no-min-parents")) {
1425 revs->min_parents = 0;
1426 } else if (!prefixcmp(arg, "--max-parents=")) {
1427 revs->max_parents = atoi(arg+14);
1428 } else if (!prefixcmp(arg, "--no-max-parents")) {
1429 revs->max_parents = -1;
1430 } else if (!strcmp(arg, "--boundary")) {
1431 revs->boundary = 1;
1432 } else if (!strcmp(arg, "--left-right")) {
1433 revs->left_right = 1;
1434 } else if (!strcmp(arg, "--left-only")) {
1435 if (revs->right_only)
1436 die("--left-only is incompatible with --right-only"
1437 " or --cherry");
1438 revs->left_only = 1;
1439 } else if (!strcmp(arg, "--right-only")) {
1440 if (revs->left_only)
1441 die("--right-only is incompatible with --left-only");
1442 revs->right_only = 1;
1443 } else if (!strcmp(arg, "--cherry")) {
1444 if (revs->left_only)
1445 die("--cherry is incompatible with --left-only");
1446 revs->cherry_mark = 1;
1447 revs->right_only = 1;
1448 revs->max_parents = 1;
1449 revs->limited = 1;
1450 } else if (!strcmp(arg, "--count")) {
1451 revs->count = 1;
1452 } else if (!strcmp(arg, "--cherry-mark")) {
1453 if (revs->cherry_pick)
1454 die("--cherry-mark is incompatible with --cherry-pick");
1455 revs->cherry_mark = 1;
1456 revs->limited = 1; /* needs limit_list() */
1457 } else if (!strcmp(arg, "--cherry-pick")) {
1458 if (revs->cherry_mark)
1459 die("--cherry-pick is incompatible with --cherry-mark");
1460 revs->cherry_pick = 1;
1461 revs->limited = 1;
1462 } else if (!strcmp(arg, "--objects")) {
1463 revs->tag_objects = 1;
1464 revs->tree_objects = 1;
1465 revs->blob_objects = 1;
1466 } else if (!strcmp(arg, "--objects-edge")) {
1467 revs->tag_objects = 1;
1468 revs->tree_objects = 1;
1469 revs->blob_objects = 1;
1470 revs->edge_hint = 1;
1471 } else if (!strcmp(arg, "--verify-objects")) {
1472 revs->tag_objects = 1;
1473 revs->tree_objects = 1;
1474 revs->blob_objects = 1;
1475 revs->verify_objects = 1;
1476 } else if (!strcmp(arg, "--unpacked")) {
1477 revs->unpacked = 1;
1478 } else if (!prefixcmp(arg, "--unpacked=")) {
1479 die("--unpacked=<packfile> no longer supported.");
1480 } else if (!strcmp(arg, "-r")) {
1481 revs->diff = 1;
1482 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1483 } else if (!strcmp(arg, "-t")) {
1484 revs->diff = 1;
1485 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1486 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1487 } else if (!strcmp(arg, "-m")) {
1488 revs->ignore_merges = 0;
1489 } else if (!strcmp(arg, "-c")) {
1490 revs->diff = 1;
1491 revs->dense_combined_merges = 0;
1492 revs->combine_merges = 1;
1493 } else if (!strcmp(arg, "--cc")) {
1494 revs->diff = 1;
1495 revs->dense_combined_merges = 1;
1496 revs->combine_merges = 1;
1497 } else if (!strcmp(arg, "-v")) {
1498 revs->verbose_header = 1;
1499 } else if (!strcmp(arg, "--pretty")) {
1500 revs->verbose_header = 1;
1501 revs->pretty_given = 1;
1502 get_commit_format(arg+8, revs);
1503 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
1504 /*
1505 * Detached form ("--pretty X" as opposed to "--pretty=X")
1506 * not allowed, since the argument is optional.
1507 */
1508 revs->verbose_header = 1;
1509 revs->pretty_given = 1;
1510 get_commit_format(arg+9, revs);
1511 } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1512 revs->show_notes = 1;
1513 revs->show_notes_given = 1;
1514 revs->notes_opt.use_default_notes = 1;
1515 } else if (!strcmp(arg, "--show-signature")) {
1516 revs->show_signature = 1;
1517 } else if (!prefixcmp(arg, "--show-notes=") ||
1518 !prefixcmp(arg, "--notes=")) {
1519 struct strbuf buf = STRBUF_INIT;
1520 revs->show_notes = 1;
1521 revs->show_notes_given = 1;
1522 if (!prefixcmp(arg, "--show-notes")) {
1523 if (revs->notes_opt.use_default_notes < 0)
1524 revs->notes_opt.use_default_notes = 1;
1525 strbuf_addstr(&buf, arg+13);
1526 }
1527 else
1528 strbuf_addstr(&buf, arg+8);
1529 expand_notes_ref(&buf);
1530 string_list_append(&revs->notes_opt.extra_notes_refs,
1531 strbuf_detach(&buf, NULL));
1532 } else if (!strcmp(arg, "--no-notes")) {
1533 revs->show_notes = 0;
1534 revs->show_notes_given = 1;
1535 revs->notes_opt.use_default_notes = -1;
1536 /* we have been strdup'ing ourselves, so trick
1537 * string_list into free()ing strings */
1538 revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1539 string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1540 revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1541 } else if (!strcmp(arg, "--standard-notes")) {
1542 revs->show_notes_given = 1;
1543 revs->notes_opt.use_default_notes = 1;
1544 } else if (!strcmp(arg, "--no-standard-notes")) {
1545 revs->notes_opt.use_default_notes = 0;
1546 } else if (!strcmp(arg, "--oneline")) {
1547 revs->verbose_header = 1;
1548 get_commit_format("oneline", revs);
1549 revs->pretty_given = 1;
1550 revs->abbrev_commit = 1;
1551 } else if (!strcmp(arg, "--graph")) {
1552 revs->topo_order = 1;
1553 revs->rewrite_parents = 1;
1554 revs->graph = graph_init(revs);
1555 } else if (!strcmp(arg, "--root")) {
1556 revs->show_root_diff = 1;
1557 } else if (!strcmp(arg, "--no-commit-id")) {
1558 revs->no_commit_id = 1;
1559 } else if (!strcmp(arg, "--always")) {
1560 revs->always_show_header = 1;
1561 } else if (!strcmp(arg, "--no-abbrev")) {
1562 revs->abbrev = 0;
1563 } else if (!strcmp(arg, "--abbrev")) {
1564 revs->abbrev = DEFAULT_ABBREV;
1565 } else if (!prefixcmp(arg, "--abbrev=")) {
1566 revs->abbrev = strtoul(arg + 9, NULL, 10);
1567 if (revs->abbrev < MINIMUM_ABBREV)
1568 revs->abbrev = MINIMUM_ABBREV;
1569 else if (revs->abbrev > 40)
1570 revs->abbrev = 40;
1571 } else if (!strcmp(arg, "--abbrev-commit")) {
1572 revs->abbrev_commit = 1;
1573 revs->abbrev_commit_given = 1;
1574 } else if (!strcmp(arg, "--no-abbrev-commit")) {
1575 revs->abbrev_commit = 0;
1576 } else if (!strcmp(arg, "--full-diff")) {
1577 revs->diff = 1;
1578 revs->full_diff = 1;
1579 } else if (!strcmp(arg, "--full-history")) {
1580 revs->simplify_history = 0;
1581 } else if (!strcmp(arg, "--relative-date")) {
1582 revs->date_mode = DATE_RELATIVE;
1583 revs->date_mode_explicit = 1;
1584 } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1585 revs->date_mode = parse_date_format(optarg);
1586 revs->date_mode_explicit = 1;
1587 return argcount;
1588 } else if (!strcmp(arg, "--log-size")) {
1589 revs->show_log_size = 1;
1590 }
1591 /*
1592 * Grepping the commit log
1593 */
1594 else if ((argcount = parse_long_opt("author", argv, &optarg))) {
1595 add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
1596 return argcount;
1597 } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
1598 add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
1599 return argcount;
1600 } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
1601 add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
1602 return argcount;
1603 } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
1604 add_message_grep(revs, optarg);
1605 return argcount;
1606 } else if (!strcmp(arg, "--grep-debug")) {
1607 revs->grep_filter.debug = 1;
1608 } else if (!strcmp(arg, "--basic-regexp")) {
1609 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE, &revs->grep_filter);
1610 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1611 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter);
1612 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1613 revs->grep_filter.regflags |= REG_ICASE;
1614 DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
1615 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1616 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter);
1617 } else if (!strcmp(arg, "--perl-regexp")) {
1618 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE, &revs->grep_filter);
1619 } else if (!strcmp(arg, "--all-match")) {
1620 revs->grep_filter.all_match = 1;
1621 } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
1622 if (strcmp(optarg, "none"))
1623 git_log_output_encoding = xstrdup(optarg);
1624 else
1625 git_log_output_encoding = "";
1626 return argcount;
1627 } else if (!strcmp(arg, "--reverse")) {
1628 revs->reverse ^= 1;
1629 } else if (!strcmp(arg, "--children")) {
1630 revs->children.name = "children";
1631 revs->limited = 1;
1632 } else if (!strcmp(arg, "--ignore-missing")) {
1633 revs->ignore_missing = 1;
1634 } else {
1635 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1636 if (!opts)
1637 unkv[(*unkc)++] = arg;
1638 return opts;
1639 }
1640
1641 return 1;
1642 }
1643
1644 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1645 const struct option *options,
1646 const char * const usagestr[])
1647 {
1648 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1649 &ctx->cpidx, ctx->out);
1650 if (n <= 0) {
1651 error("unknown option `%s'", ctx->argv[0]);
1652 usage_with_options(usagestr, options);
1653 }
1654 ctx->argv += n;
1655 ctx->argc -= n;
1656 }
1657
1658 static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1659 {
1660 return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
1661 }
1662
1663 static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
1664 {
1665 return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
1666 }
1667
1668 static int handle_revision_pseudo_opt(const char *submodule,
1669 struct rev_info *revs,
1670 int argc, const char **argv, int *flags)
1671 {
1672 const char *arg = argv[0];
1673 const char *optarg;
1674 int argcount;
1675
1676 /*
1677 * NOTE!
1678 *
1679 * Commands like "git shortlog" will not accept the options below
1680 * unless parse_revision_opt queues them (as opposed to erroring
1681 * out).
1682 *
1683 * When implementing your new pseudo-option, remember to
1684 * register it in the list at the top of handle_revision_opt.
1685 */
1686 if (!strcmp(arg, "--all")) {
1687 handle_refs(submodule, revs, *flags, for_each_ref_submodule);
1688 handle_refs(submodule, revs, *flags, head_ref_submodule);
1689 } else if (!strcmp(arg, "--branches")) {
1690 handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
1691 } else if (!strcmp(arg, "--bisect")) {
1692 handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
1693 handle_refs(submodule, revs, *flags ^ UNINTERESTING, for_each_good_bisect_ref);
1694 revs->bisect = 1;
1695 } else if (!strcmp(arg, "--tags")) {
1696 handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
1697 } else if (!strcmp(arg, "--remotes")) {
1698 handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
1699 } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
1700 struct all_refs_cb cb;
1701 init_all_refs_cb(&cb, revs, *flags);
1702 for_each_glob_ref(handle_one_ref, optarg, &cb);
1703 return argcount;
1704 } else if (!prefixcmp(arg, "--branches=")) {
1705 struct all_refs_cb cb;
1706 init_all_refs_cb(&cb, revs, *flags);
1707 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
1708 } else if (!prefixcmp(arg, "--tags=")) {
1709 struct all_refs_cb cb;
1710 init_all_refs_cb(&cb, revs, *flags);
1711 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
1712 } else if (!prefixcmp(arg, "--remotes=")) {
1713 struct all_refs_cb cb;
1714 init_all_refs_cb(&cb, revs, *flags);
1715 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
1716 } else if (!strcmp(arg, "--reflog")) {
1717 handle_reflog(revs, *flags);
1718 } else if (!strcmp(arg, "--not")) {
1719 *flags ^= UNINTERESTING;
1720 } else if (!strcmp(arg, "--no-walk")) {
1721 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
1722 } else if (!prefixcmp(arg, "--no-walk=")) {
1723 /*
1724 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
1725 * not allowed, since the argument is optional.
1726 */
1727 if (!strcmp(arg + 10, "sorted"))
1728 revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
1729 else if (!strcmp(arg + 10, "unsorted"))
1730 revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
1731 else
1732 return error("invalid argument to --no-walk");
1733 } else if (!strcmp(arg, "--do-walk")) {
1734 revs->no_walk = 0;
1735 } else {
1736 return 0;
1737 }
1738
1739 return 1;
1740 }
1741
1742 /*
1743 * Parse revision information, filling in the "rev_info" structure,
1744 * and removing the used arguments from the argument list.
1745 *
1746 * Returns the number of arguments left that weren't recognized
1747 * (which are also moved to the head of the argument list)
1748 */
1749 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
1750 {
1751 int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
1752 struct cmdline_pathspec prune_data;
1753 const char *submodule = NULL;
1754
1755 memset(&prune_data, 0, sizeof(prune_data));
1756 if (opt)
1757 submodule = opt->submodule;
1758
1759 /* First, search for "--" */
1760 if (opt && opt->assume_dashdash) {
1761 seen_dashdash = 1;
1762 } else {
1763 seen_dashdash = 0;
1764 for (i = 1; i < argc; i++) {
1765 const char *arg = argv[i];
1766 if (strcmp(arg, "--"))
1767 continue;
1768 argv[i] = NULL;
1769 argc = i;
1770 if (argv[i + 1])
1771 append_prune_data(&prune_data, argv + i + 1);
1772 seen_dashdash = 1;
1773 break;
1774 }
1775 }
1776
1777 /* Second, deal with arguments and options */
1778 flags = 0;
1779 revarg_opt = opt ? opt->revarg_opt : 0;
1780 if (seen_dashdash)
1781 revarg_opt |= REVARG_CANNOT_BE_FILENAME;
1782 read_from_stdin = 0;
1783 for (left = i = 1; i < argc; i++) {
1784 const char *arg = argv[i];
1785 if (*arg == '-') {
1786 int opts;
1787
1788 opts = handle_revision_pseudo_opt(submodule,
1789 revs, argc - i, argv + i,
1790 &flags);
1791 if (opts > 0) {
1792 i += opts - 1;
1793 continue;
1794 }
1795
1796 if (!strcmp(arg, "--stdin")) {
1797 if (revs->disable_stdin) {
1798 argv[left++] = arg;
1799 continue;
1800 }
1801 if (read_from_stdin++)
1802 die("--stdin given twice?");
1803 read_revisions_from_stdin(revs, &prune_data);
1804 continue;
1805 }
1806
1807 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1808 if (opts > 0) {
1809 i += opts - 1;
1810 continue;
1811 }
1812 if (opts < 0)
1813 exit(128);
1814 continue;
1815 }
1816
1817
1818 if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
1819 int j;
1820 if (seen_dashdash || *arg == '^')
1821 die("bad revision '%s'", arg);
1822
1823 /* If we didn't have a "--":
1824 * (1) all filenames must exist;
1825 * (2) all rev-args must not be interpretable
1826 * as a valid filename.
1827 * but the latter we have checked in the main loop.
1828 */
1829 for (j = i; j < argc; j++)
1830 verify_filename(revs->prefix, argv[j], j == i);
1831
1832 append_prune_data(&prune_data, argv + i);
1833 break;
1834 }
1835 else
1836 got_rev_arg = 1;
1837 }
1838
1839 if (prune_data.nr) {
1840 /*
1841 * If we need to introduce the magic "a lone ':' means no
1842 * pathspec whatsoever", here is the place to do so.
1843 *
1844 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
1845 * prune_data.nr = 0;
1846 * prune_data.alloc = 0;
1847 * free(prune_data.path);
1848 * prune_data.path = NULL;
1849 * } else {
1850 * terminate prune_data.alloc with NULL and
1851 * call init_pathspec() to set revs->prune_data here.
1852 * }
1853 */
1854 ALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc);
1855 prune_data.path[prune_data.nr++] = NULL;
1856 init_pathspec(&revs->prune_data,
1857 get_pathspec(revs->prefix, prune_data.path));
1858 }
1859
1860 if (revs->def == NULL)
1861 revs->def = opt ? opt->def : NULL;
1862 if (opt && opt->tweak)
1863 opt->tweak(revs, opt);
1864 if (revs->show_merge)
1865 prepare_show_merge(revs);
1866 if (revs->def && !revs->pending.nr && !got_rev_arg) {
1867 unsigned char sha1[20];
1868 struct object *object;
1869 struct object_context oc;
1870 if (get_sha1_with_context(revs->def, 0, sha1, &oc))
1871 die("bad default revision '%s'", revs->def);
1872 object = get_reference(revs, revs->def, sha1, 0);
1873 add_pending_object_with_mode(revs, object, revs->def, oc.mode);
1874 }
1875
1876 /* Did the user ask for any diff output? Run the diff! */
1877 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1878 revs->diff = 1;
1879
1880 /* Pickaxe, diff-filter and rename following need diffs */
1881 if (revs->diffopt.pickaxe ||
1882 revs->diffopt.filter ||
1883 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1884 revs->diff = 1;
1885
1886 if (revs->topo_order)
1887 revs->limited = 1;
1888
1889 if (revs->prune_data.nr) {
1890 diff_tree_setup_paths(revs->prune_data.raw, &revs->pruning);
1891 /* Can't prune commits with rename following: the paths change.. */
1892 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1893 revs->prune = 1;
1894 if (!revs->full_diff)
1895 diff_tree_setup_paths(revs->prune_data.raw, &revs->diffopt);
1896 }
1897 if (revs->combine_merges)
1898 revs->ignore_merges = 0;
1899 revs->diffopt.abbrev = revs->abbrev;
1900
1901 if (revs->line_level_traverse) {
1902 revs->limited = 1;
1903 revs->topo_order = 1;
1904 }
1905
1906 diff_setup_done(&revs->diffopt);
1907
1908 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
1909 &revs->grep_filter);
1910 compile_grep_patterns(&revs->grep_filter);
1911
1912 if (revs->reverse && revs->reflog_info)
1913 die("cannot combine --reverse with --walk-reflogs");
1914 if (revs->rewrite_parents && revs->children.name)
1915 die("cannot combine --parents and --children");
1916
1917 /*
1918 * Limitations on the graph functionality
1919 */
1920 if (revs->reverse && revs->graph)
1921 die("cannot combine --reverse with --graph");
1922
1923 if (revs->reflog_info && revs->graph)
1924 die("cannot combine --walk-reflogs with --graph");
1925 if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
1926 die("cannot use --grep-reflog without --walk-reflogs");
1927
1928 return left;
1929 }
1930
1931 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1932 {
1933 struct commit_list *l = xcalloc(1, sizeof(*l));
1934
1935 l->item = child;
1936 l->next = add_decoration(&revs->children, &parent->object, l);
1937 }
1938
1939 static int remove_duplicate_parents(struct commit *commit)
1940 {
1941 struct commit_list **pp, *p;
1942 int surviving_parents;
1943
1944 /* Examine existing parents while marking ones we have seen... */
1945 pp = &commit->parents;
1946 while ((p = *pp) != NULL) {
1947 struct commit *parent = p->item;
1948 if (parent->object.flags & TMP_MARK) {
1949 *pp = p->next;
1950 continue;
1951 }
1952 parent->object.flags |= TMP_MARK;
1953 pp = &p->next;
1954 }
1955 /* count them while clearing the temporary mark */
1956 surviving_parents = 0;
1957 for (p = commit->parents; p; p = p->next) {
1958 p->item->object.flags &= ~TMP_MARK;
1959 surviving_parents++;
1960 }
1961 return surviving_parents;
1962 }
1963
1964 struct merge_simplify_state {
1965 struct commit *simplified;
1966 };
1967
1968 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1969 {
1970 struct merge_simplify_state *st;
1971
1972 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1973 if (!st) {
1974 st = xcalloc(1, sizeof(*st));
1975 add_decoration(&revs->merge_simplification, &commit->object, st);
1976 }
1977 return st;
1978 }
1979
1980 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1981 {
1982 struct commit_list *p;
1983 struct merge_simplify_state *st, *pst;
1984 int cnt;
1985
1986 st = locate_simplify_state(revs, commit);
1987
1988 /*
1989 * Have we handled this one?
1990 */
1991 if (st->simplified)
1992 return tail;
1993
1994 /*
1995 * An UNINTERESTING commit simplifies to itself, so does a
1996 * root commit. We do not rewrite parents of such commit
1997 * anyway.
1998 */
1999 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
2000 st->simplified = commit;
2001 return tail;
2002 }
2003
2004 /*
2005 * Do we know what commit all of our parents that matter
2006 * should be rewritten to? Otherwise we are not ready to
2007 * rewrite this one yet.
2008 */
2009 for (cnt = 0, p = commit->parents; p; p = p->next) {
2010 pst = locate_simplify_state(revs, p->item);
2011 if (!pst->simplified) {
2012 tail = &commit_list_insert(p->item, tail)->next;
2013 cnt++;
2014 }
2015 if (revs->first_parent_only)
2016 break;
2017 }
2018 if (cnt) {
2019 tail = &commit_list_insert(commit, tail)->next;
2020 return tail;
2021 }
2022
2023 /*
2024 * Rewrite our list of parents.
2025 */
2026 for (p = commit->parents; p; p = p->next) {
2027 pst = locate_simplify_state(revs, p->item);
2028 p->item = pst->simplified;
2029 if (revs->first_parent_only)
2030 break;
2031 }
2032 if (!revs->first_parent_only)
2033 cnt = remove_duplicate_parents(commit);
2034 else
2035 cnt = 1;
2036
2037 /*
2038 * It is possible that we are a merge and one side branch
2039 * does not have any commit that touches the given paths;
2040 * in such a case, the immediate parents will be rewritten
2041 * to different commits.
2042 *
2043 * o----X X: the commit we are looking at;
2044 * / / o: a commit that touches the paths;
2045 * ---o----'
2046 *
2047 * Further reduce the parents by removing redundant parents.
2048 */
2049 if (1 < cnt) {
2050 struct commit_list *h = reduce_heads(commit->parents);
2051 cnt = commit_list_count(h);
2052 free_commit_list(commit->parents);
2053 commit->parents = h;
2054 }
2055
2056 /*
2057 * A commit simplifies to itself if it is a root, if it is
2058 * UNINTERESTING, if it touches the given paths, or if it is a
2059 * merge and its parents simplifies to more than one commits
2060 * (the first two cases are already handled at the beginning of
2061 * this function).
2062 *
2063 * Otherwise, it simplifies to what its sole parent simplifies to.
2064 */
2065 if (!cnt ||
2066 (commit->object.flags & UNINTERESTING) ||
2067 !(commit->object.flags & TREESAME) ||
2068 (1 < cnt))
2069 st->simplified = commit;
2070 else {
2071 pst = locate_simplify_state(revs, commit->parents->item);
2072 st->simplified = pst->simplified;
2073 }
2074 return tail;
2075 }
2076
2077 static void simplify_merges(struct rev_info *revs)
2078 {
2079 struct commit_list *list, *next;
2080 struct commit_list *yet_to_do, **tail;
2081 struct commit *commit;
2082
2083 if (!revs->prune)
2084 return;
2085
2086 /* feed the list reversed */
2087 yet_to_do = NULL;
2088 for (list = revs->commits; list; list = next) {
2089 commit = list->item;
2090 next = list->next;
2091 /*
2092 * Do not free(list) here yet; the original list
2093 * is used later in this function.
2094 */
2095 commit_list_insert(commit, &yet_to_do);
2096 }
2097 while (yet_to_do) {
2098 list = yet_to_do;
2099 yet_to_do = NULL;
2100 tail = &yet_to_do;
2101 while (list) {
2102 commit = list->item;
2103 next = list->next;
2104 free(list);
2105 list = next;
2106 tail = simplify_one(revs, commit, tail);
2107 }
2108 }
2109
2110 /* clean up the result, removing the simplified ones */
2111 list = revs->commits;
2112 revs->commits = NULL;
2113 tail = &revs->commits;
2114 while (list) {
2115 struct merge_simplify_state *st;
2116
2117 commit = list->item;
2118 next = list->next;
2119 free(list);
2120 list = next;
2121 st = locate_simplify_state(revs, commit);
2122 if (st->simplified == commit)
2123 tail = &commit_list_insert(commit, tail)->next;
2124 }
2125 }
2126
2127 static void set_children(struct rev_info *revs)
2128 {
2129 struct commit_list *l;
2130 for (l = revs->commits; l; l = l->next) {
2131 struct commit *commit = l->item;
2132 struct commit_list *p;
2133
2134 for (p = commit->parents; p; p = p->next)
2135 add_child(revs, p->item, commit);
2136 }
2137 }
2138
2139 void reset_revision_walk(void)
2140 {
2141 clear_object_flags(SEEN | ADDED | SHOWN);
2142 }
2143
2144 int prepare_revision_walk(struct rev_info *revs)
2145 {
2146 int nr = revs->pending.nr;
2147 struct object_array_entry *e, *list;
2148 struct commit_list **next = &revs->commits;
2149
2150 e = list = revs->pending.objects;
2151 revs->pending.nr = 0;
2152 revs->pending.alloc = 0;
2153 revs->pending.objects = NULL;
2154 while (--nr >= 0) {
2155 struct commit *commit = handle_commit(revs, e->item, e->name);
2156 if (commit) {
2157 if (!(commit->object.flags & SEEN)) {
2158 commit->object.flags |= SEEN;
2159 next = commit_list_append(commit, next);
2160 }
2161 }
2162 e++;
2163 }
2164 if (!revs->leak_pending)
2165 free(list);
2166
2167 if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2168 commit_list_sort_by_date(&revs->commits);
2169 if (revs->no_walk)
2170 return 0;
2171 if (revs->limited)
2172 if (limit_list(revs) < 0)
2173 return -1;
2174 if (revs->topo_order)
2175 sort_in_topological_order(&revs->commits, revs->lifo);
2176 if (revs->line_level_traverse)
2177 line_log_filter(revs);
2178 if (revs->simplify_merges)
2179 simplify_merges(revs);
2180 if (revs->children.name)
2181 set_children(revs);
2182 return 0;
2183 }
2184
2185 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2186 {
2187 struct commit_list *cache = NULL;
2188
2189 for (;;) {
2190 struct commit *p = *pp;
2191 if (!revs->limited)
2192 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2193 return rewrite_one_error;
2194 if (p->parents && p->parents->next)
2195 return rewrite_one_ok;
2196 if (p->object.flags & UNINTERESTING)
2197 return rewrite_one_ok;
2198 if (!(p->object.flags & TREESAME))
2199 return rewrite_one_ok;
2200 if (!p->parents)
2201 return rewrite_one_noparents;
2202 *pp = p->parents->item;
2203 }
2204 }
2205
2206 int rewrite_parents(struct rev_info *revs, struct commit *commit,
2207 rewrite_parent_fn_t rewrite_parent)
2208 {
2209 struct commit_list **pp = &commit->parents;
2210 while (*pp) {
2211 struct commit_list *parent = *pp;
2212 switch (rewrite_parent(revs, &parent->item)) {
2213 case rewrite_one_ok:
2214 break;
2215 case rewrite_one_noparents:
2216 *pp = parent->next;
2217 continue;
2218 case rewrite_one_error:
2219 return -1;
2220 }
2221 pp = &parent->next;
2222 }
2223 remove_duplicate_parents(commit);
2224 return 0;
2225 }
2226
2227 static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2228 {
2229 char *person, *endp;
2230 size_t len, namelen, maillen;
2231 const char *name;
2232 const char *mail;
2233 struct ident_split ident;
2234
2235 person = strstr(buf->buf, what);
2236 if (!person)
2237 return 0;
2238
2239 person += strlen(what);
2240 endp = strchr(person, '\n');
2241 if (!endp)
2242 return 0;
2243
2244 len = endp - person;
2245
2246 if (split_ident_line(&ident, person, len))
2247 return 0;
2248
2249 mail = ident.mail_begin;
2250 maillen = ident.mail_end - ident.mail_begin;
2251 name = ident.name_begin;
2252 namelen = ident.name_end - ident.name_begin;
2253
2254 if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2255 struct strbuf namemail = STRBUF_INIT;
2256
2257 strbuf_addf(&namemail, "%.*s <%.*s>",
2258 (int)namelen, name, (int)maillen, mail);
2259
2260 strbuf_splice(buf, ident.name_begin - buf->buf,
2261 ident.mail_end - ident.name_begin + 1,
2262 namemail.buf, namemail.len);
2263
2264 strbuf_release(&namemail);
2265
2266 return 1;
2267 }
2268
2269 return 0;
2270 }
2271
2272 static int commit_match(struct commit *commit, struct rev_info *opt)
2273 {
2274 int retval;
2275 const char *encoding;
2276 char *message;
2277 struct strbuf buf = STRBUF_INIT;
2278
2279 if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2280 return 1;
2281
2282 /* Prepend "fake" headers as needed */
2283 if (opt->grep_filter.use_reflog_filter) {
2284 strbuf_addstr(&buf, "reflog ");
2285 get_reflog_message(&buf, opt->reflog_info);
2286 strbuf_addch(&buf, '\n');
2287 }
2288
2289 /*
2290 * We grep in the user's output encoding, under the assumption that it
2291 * is the encoding they are most likely to write their grep pattern
2292 * for. In addition, it means we will match the "notes" encoding below,
2293 * so we will not end up with a buffer that has two different encodings
2294 * in it.
2295 */
2296 encoding = get_log_output_encoding();
2297 message = logmsg_reencode(commit, encoding);
2298
2299 /* Copy the commit to temporary if we are using "fake" headers */
2300 if (buf.len)
2301 strbuf_addstr(&buf, message);
2302
2303 if (opt->grep_filter.header_list && opt->mailmap) {
2304 if (!buf.len)
2305 strbuf_addstr(&buf, message);
2306
2307 commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2308 commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2309 }
2310
2311 /* Append "fake" message parts as needed */
2312 if (opt->show_notes) {
2313 if (!buf.len)
2314 strbuf_addstr(&buf, message);
2315 format_display_notes(commit->object.sha1, &buf, encoding, 1);
2316 }
2317
2318 /* Find either in the original commit message, or in the temporary */
2319 if (buf.len)
2320 retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2321 else
2322 retval = grep_buffer(&opt->grep_filter,
2323 message, strlen(message));
2324 strbuf_release(&buf);
2325 logmsg_free(message, commit);
2326 return retval;
2327 }
2328
2329 static inline int want_ancestry(struct rev_info *revs)
2330 {
2331 return (revs->rewrite_parents || revs->children.name);
2332 }
2333
2334 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2335 {
2336 if (commit->object.flags & SHOWN)
2337 return commit_ignore;
2338 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
2339 return commit_ignore;
2340 if (revs->show_all)
2341 return commit_show;
2342 if (commit->object.flags & UNINTERESTING)
2343 return commit_ignore;
2344 if (revs->min_age != -1 && (commit->date > revs->min_age))
2345 return commit_ignore;
2346 if (revs->min_parents || (revs->max_parents >= 0)) {
2347 int n = 0;
2348 struct commit_list *p;
2349 for (p = commit->parents; p; p = p->next)
2350 n++;
2351 if ((n < revs->min_parents) ||
2352 ((revs->max_parents >= 0) && (n > revs->max_parents)))
2353 return commit_ignore;
2354 }
2355 if (!commit_match(commit, revs))
2356 return commit_ignore;
2357 if (revs->prune && revs->dense) {
2358 /* Commit without changes? */
2359 if (commit->object.flags & TREESAME) {
2360 /* drop merges unless we want parenthood */
2361 if (!want_ancestry(revs))
2362 return commit_ignore;
2363 /* non-merge - always ignore it */
2364 if (!commit->parents || !commit->parents->next)
2365 return commit_ignore;
2366 }
2367 }
2368 return commit_show;
2369 }
2370
2371 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
2372 {
2373 enum commit_action action = get_commit_action(revs, commit);
2374
2375 if (action == commit_show &&
2376 !revs->show_all &&
2377 revs->prune && revs->dense && want_ancestry(revs)) {
2378 if (rewrite_parents(revs, commit, rewrite_one) < 0)
2379 return commit_error;
2380 }
2381 return action;
2382 }
2383
2384 static struct commit *get_revision_1(struct rev_info *revs)
2385 {
2386 if (!revs->commits)
2387 return NULL;
2388
2389 do {
2390 struct commit_list *entry = revs->commits;
2391 struct commit *commit = entry->item;
2392
2393 revs->commits = entry->next;
2394 free(entry);
2395
2396 if (revs->reflog_info) {
2397 fake_reflog_parent(revs->reflog_info, commit);
2398 commit->object.flags &= ~(ADDED | SEEN | SHOWN);
2399 }
2400
2401 /*
2402 * If we haven't done the list limiting, we need to look at
2403 * the parents here. We also need to do the date-based limiting
2404 * that we'd otherwise have done in limit_list().
2405 */
2406 if (!revs->limited) {
2407 if (revs->max_age != -1 &&
2408 (commit->date < revs->max_age))
2409 continue;
2410 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
2411 die("Failed to traverse parents of commit %s",
2412 sha1_to_hex(commit->object.sha1));
2413 }
2414
2415 switch (simplify_commit(revs, commit)) {
2416 case commit_ignore:
2417 continue;
2418 case commit_error:
2419 die("Failed to simplify parents of commit %s",
2420 sha1_to_hex(commit->object.sha1));
2421 default:
2422 return commit;
2423 }
2424 } while (revs->commits);
2425 return NULL;
2426 }
2427
2428 static void gc_boundary(struct object_array *array)
2429 {
2430 unsigned nr = array->nr;
2431 unsigned alloc = array->alloc;
2432 struct object_array_entry *objects = array->objects;
2433
2434 if (alloc <= nr) {
2435 unsigned i, j;
2436 for (i = j = 0; i < nr; i++) {
2437 if (objects[i].item->flags & SHOWN)
2438 continue;
2439 if (i != j)
2440 objects[j] = objects[i];
2441 j++;
2442 }
2443 for (i = j; i < nr; i++)
2444 objects[i].item = NULL;
2445 array->nr = j;
2446 }
2447 }
2448
2449 static void create_boundary_commit_list(struct rev_info *revs)
2450 {
2451 unsigned i;
2452 struct commit *c;
2453 struct object_array *array = &revs->boundary_commits;
2454 struct object_array_entry *objects = array->objects;
2455
2456 /*
2457 * If revs->commits is non-NULL at this point, an error occurred in
2458 * get_revision_1(). Ignore the error and continue printing the
2459 * boundary commits anyway. (This is what the code has always
2460 * done.)
2461 */
2462 if (revs->commits) {
2463 free_commit_list(revs->commits);
2464 revs->commits = NULL;
2465 }
2466
2467 /*
2468 * Put all of the actual boundary commits from revs->boundary_commits
2469 * into revs->commits
2470 */
2471 for (i = 0; i < array->nr; i++) {
2472 c = (struct commit *)(objects[i].item);
2473 if (!c)
2474 continue;
2475 if (!(c->object.flags & CHILD_SHOWN))
2476 continue;
2477 if (c->object.flags & (SHOWN | BOUNDARY))
2478 continue;
2479 c->object.flags |= BOUNDARY;
2480 commit_list_insert(c, &revs->commits);
2481 }
2482
2483 /*
2484 * If revs->topo_order is set, sort the boundary commits
2485 * in topological order
2486 */
2487 sort_in_topological_order(&revs->commits, revs->lifo);
2488 }
2489
2490 static struct commit *get_revision_internal(struct rev_info *revs)
2491 {
2492 struct commit *c = NULL;
2493 struct commit_list *l;
2494
2495 if (revs->boundary == 2) {
2496 /*
2497 * All of the normal commits have already been returned,
2498 * and we are now returning boundary commits.
2499 * create_boundary_commit_list() has populated
2500 * revs->commits with the remaining commits to return.
2501 */
2502 c = pop_commit(&revs->commits);
2503 if (c)
2504 c->object.flags |= SHOWN;
2505 return c;
2506 }
2507
2508 /*
2509 * If our max_count counter has reached zero, then we are done. We
2510 * don't simply return NULL because we still might need to show
2511 * boundary commits. But we want to avoid calling get_revision_1, which
2512 * might do a considerable amount of work finding the next commit only
2513 * for us to throw it away.
2514 *
2515 * If it is non-zero, then either we don't have a max_count at all
2516 * (-1), or it is still counting, in which case we decrement.
2517 */
2518 if (revs->max_count) {
2519 c = get_revision_1(revs);
2520 if (c) {
2521 while (0 < revs->skip_count) {
2522 revs->skip_count--;
2523 c = get_revision_1(revs);
2524 if (!c)
2525 break;
2526 }
2527 }
2528
2529 if (revs->max_count > 0)
2530 revs->max_count--;
2531 }
2532
2533 if (c)
2534 c->object.flags |= SHOWN;
2535
2536 if (!revs->boundary) {
2537 return c;
2538 }
2539
2540 if (!c) {
2541 /*
2542 * get_revision_1() runs out the commits, and
2543 * we are done computing the boundaries.
2544 * switch to boundary commits output mode.
2545 */
2546 revs->boundary = 2;
2547
2548 /*
2549 * Update revs->commits to contain the list of
2550 * boundary commits.
2551 */
2552 create_boundary_commit_list(revs);
2553
2554 return get_revision_internal(revs);
2555 }
2556
2557 /*
2558 * boundary commits are the commits that are parents of the
2559 * ones we got from get_revision_1() but they themselves are
2560 * not returned from get_revision_1(). Before returning
2561 * 'c', we need to mark its parents that they could be boundaries.
2562 */
2563
2564 for (l = c->parents; l; l = l->next) {
2565 struct object *p;
2566 p = &(l->item->object);
2567 if (p->flags & (CHILD_SHOWN | SHOWN))
2568 continue;
2569 p->flags |= CHILD_SHOWN;
2570 gc_boundary(&revs->boundary_commits);
2571 add_object_array(p, NULL, &revs->boundary_commits);
2572 }
2573
2574 return c;
2575 }
2576
2577 struct commit *get_revision(struct rev_info *revs)
2578 {
2579 struct commit *c;
2580 struct commit_list *reversed;
2581
2582 if (revs->reverse) {
2583 reversed = NULL;
2584 while ((c = get_revision_internal(revs))) {
2585 commit_list_insert(c, &reversed);
2586 }
2587 revs->commits = reversed;
2588 revs->reverse = 0;
2589 revs->reverse_output_stage = 1;
2590 }
2591
2592 if (revs->reverse_output_stage)
2593 return pop_commit(&revs->commits);
2594
2595 c = get_revision_internal(revs);
2596 if (c && revs->graph)
2597 graph_update(revs->graph, c);
2598 return c;
2599 }
2600
2601 char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
2602 {
2603 if (commit->object.flags & BOUNDARY)
2604 return "-";
2605 else if (commit->object.flags & UNINTERESTING)
2606 return "^";
2607 else if (commit->object.flags & PATCHSAME)
2608 return "=";
2609 else if (!revs || revs->left_right) {
2610 if (commit->object.flags & SYMMETRIC_LEFT)
2611 return "<";
2612 else
2613 return ">";
2614 } else if (revs->graph)
2615 return "*";
2616 else if (revs->cherry_mark)
2617 return "+";
2618 return "";
2619 }
2620
2621 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
2622 {
2623 char *mark = get_revision_mark(revs, commit);
2624 if (!strlen(mark))
2625 return;
2626 fputs(mark, stdout);
2627 putchar(' ');
2628 }