Merge branch 'cc/maint-bisect-paths' into maint-1.6.6
[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
16 volatile show_early_output_fn_t show_early_output;
17
18 char *path_name(const struct name_path *path, const char *name)
19 {
20 const struct name_path *p;
21 char *n, *m;
22 int nlen = strlen(name);
23 int len = nlen + 1;
24
25 for (p = path; p; p = p->up) {
26 if (p->elem_len)
27 len += p->elem_len + 1;
28 }
29 n = xmalloc(len);
30 m = n + len - (nlen + 1);
31 strcpy(m, name);
32 for (p = path; p; p = p->up) {
33 if (p->elem_len) {
34 m -= p->elem_len + 1;
35 memcpy(m, p->elem, p->elem_len);
36 m[p->elem_len] = '/';
37 }
38 }
39 return n;
40 }
41
42 void add_object(struct object *obj,
43 struct object_array *p,
44 struct name_path *path,
45 const char *name)
46 {
47 add_object_array(obj, path_name(path, name), p);
48 }
49
50 static void mark_blob_uninteresting(struct blob *blob)
51 {
52 if (!blob)
53 return;
54 if (blob->object.flags & UNINTERESTING)
55 return;
56 blob->object.flags |= UNINTERESTING;
57 }
58
59 void mark_tree_uninteresting(struct tree *tree)
60 {
61 struct tree_desc desc;
62 struct name_entry entry;
63 struct object *obj = &tree->object;
64
65 if (!tree)
66 return;
67 if (obj->flags & UNINTERESTING)
68 return;
69 obj->flags |= UNINTERESTING;
70 if (!has_sha1_file(obj->sha1))
71 return;
72 if (parse_tree(tree) < 0)
73 die("bad tree %s", sha1_to_hex(obj->sha1));
74
75 init_tree_desc(&desc, tree->buffer, tree->size);
76 while (tree_entry(&desc, &entry)) {
77 switch (object_type(entry.mode)) {
78 case OBJ_TREE:
79 mark_tree_uninteresting(lookup_tree(entry.sha1));
80 break;
81 case OBJ_BLOB:
82 mark_blob_uninteresting(lookup_blob(entry.sha1));
83 break;
84 default:
85 /* Subproject commit - not in this repository */
86 break;
87 }
88 }
89
90 /*
91 * We don't care about the tree any more
92 * after it has been marked uninteresting.
93 */
94 free(tree->buffer);
95 tree->buffer = NULL;
96 }
97
98 void mark_parents_uninteresting(struct commit *commit)
99 {
100 struct commit_list *parents = commit->parents;
101
102 while (parents) {
103 struct commit *commit = parents->item;
104 if (!(commit->object.flags & UNINTERESTING)) {
105 commit->object.flags |= UNINTERESTING;
106
107 /*
108 * Normally we haven't parsed the parent
109 * yet, so we won't have a parent of a parent
110 * here. However, it may turn out that we've
111 * reached this commit some other way (where it
112 * wasn't uninteresting), in which case we need
113 * to mark its parents recursively too..
114 */
115 if (commit->parents)
116 mark_parents_uninteresting(commit);
117 }
118
119 /*
120 * A missing commit is ok iff its parent is marked
121 * uninteresting.
122 *
123 * We just mark such a thing parsed, so that when
124 * it is popped next time around, we won't be trying
125 * to parse it and get an error.
126 */
127 if (!has_sha1_file(commit->object.sha1))
128 commit->object.parsed = 1;
129 parents = parents->next;
130 }
131 }
132
133 static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
134 {
135 if (revs->no_walk && (obj->flags & UNINTERESTING))
136 revs->no_walk = 0;
137 if (revs->reflog_info && obj->type == OBJ_COMMIT &&
138 add_reflog_for_walk(revs->reflog_info,
139 (struct commit *)obj, name))
140 return;
141 add_object_array_with_mode(obj, name, &revs->pending, mode);
142 }
143
144 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
145 {
146 add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
147 }
148
149 void add_head_to_pending(struct rev_info *revs)
150 {
151 unsigned char sha1[20];
152 struct object *obj;
153 if (get_sha1("HEAD", sha1))
154 return;
155 obj = parse_object(sha1);
156 if (!obj)
157 return;
158 add_pending_object(revs, obj, "HEAD");
159 }
160
161 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
162 {
163 struct object *object;
164
165 object = parse_object(sha1);
166 if (!object)
167 die("bad object %s", name);
168 object->flags |= flags;
169 return object;
170 }
171
172 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
173 {
174 unsigned long flags = object->flags;
175
176 /*
177 * Tag object? Look what it points to..
178 */
179 while (object->type == OBJ_TAG) {
180 struct tag *tag = (struct tag *) object;
181 if (revs->tag_objects && !(flags & UNINTERESTING))
182 add_pending_object(revs, object, tag->tag);
183 if (!tag->tagged)
184 die("bad tag");
185 object = parse_object(tag->tagged->sha1);
186 if (!object) {
187 if (flags & UNINTERESTING)
188 return NULL;
189 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
190 }
191 }
192
193 /*
194 * Commit object? Just return it, we'll do all the complex
195 * reachability crud.
196 */
197 if (object->type == OBJ_COMMIT) {
198 struct commit *commit = (struct commit *)object;
199 if (parse_commit(commit) < 0)
200 die("unable to parse commit %s", name);
201 if (flags & UNINTERESTING) {
202 commit->object.flags |= UNINTERESTING;
203 mark_parents_uninteresting(commit);
204 revs->limited = 1;
205 }
206 if (revs->show_source && !commit->util)
207 commit->util = (void *) name;
208 return commit;
209 }
210
211 /*
212 * Tree object? Either mark it uninteresting, or add it
213 * to the list of objects to look at later..
214 */
215 if (object->type == OBJ_TREE) {
216 struct tree *tree = (struct tree *)object;
217 if (!revs->tree_objects)
218 return NULL;
219 if (flags & UNINTERESTING) {
220 mark_tree_uninteresting(tree);
221 return NULL;
222 }
223 add_pending_object(revs, object, "");
224 return NULL;
225 }
226
227 /*
228 * Blob object? You know the drill by now..
229 */
230 if (object->type == OBJ_BLOB) {
231 struct blob *blob = (struct blob *)object;
232 if (!revs->blob_objects)
233 return NULL;
234 if (flags & UNINTERESTING) {
235 mark_blob_uninteresting(blob);
236 return NULL;
237 }
238 add_pending_object(revs, object, "");
239 return NULL;
240 }
241 die("%s is unknown object", name);
242 }
243
244 static int everybody_uninteresting(struct commit_list *orig)
245 {
246 struct commit_list *list = orig;
247 while (list) {
248 struct commit *commit = list->item;
249 list = list->next;
250 if (commit->object.flags & UNINTERESTING)
251 continue;
252 return 0;
253 }
254 return 1;
255 }
256
257 /*
258 * The goal is to get REV_TREE_NEW as the result only if the
259 * diff consists of all '+' (and no other changes), REV_TREE_OLD
260 * if the whole diff is removal of old data, and otherwise
261 * REV_TREE_DIFFERENT (of course if the trees are the same we
262 * want REV_TREE_SAME).
263 * That means that once we get to REV_TREE_DIFFERENT, we do not
264 * have to look any further.
265 */
266 static int tree_difference = REV_TREE_SAME;
267
268 static void file_add_remove(struct diff_options *options,
269 int addremove, unsigned mode,
270 const unsigned char *sha1,
271 const char *fullpath)
272 {
273 int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
274
275 tree_difference |= diff;
276 if (tree_difference == REV_TREE_DIFFERENT)
277 DIFF_OPT_SET(options, HAS_CHANGES);
278 }
279
280 static void file_change(struct diff_options *options,
281 unsigned old_mode, unsigned new_mode,
282 const unsigned char *old_sha1,
283 const unsigned char *new_sha1,
284 const char *fullpath)
285 {
286 tree_difference = REV_TREE_DIFFERENT;
287 DIFF_OPT_SET(options, HAS_CHANGES);
288 }
289
290 static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
291 {
292 struct tree *t1 = parent->tree;
293 struct tree *t2 = commit->tree;
294
295 if (!t1)
296 return REV_TREE_NEW;
297 if (!t2)
298 return REV_TREE_OLD;
299
300 if (revs->simplify_by_decoration) {
301 /*
302 * If we are simplifying by decoration, then the commit
303 * is worth showing if it has a tag pointing at it.
304 */
305 if (lookup_decoration(&name_decoration, &commit->object))
306 return REV_TREE_DIFFERENT;
307 /*
308 * A commit that is not pointed by a tag is uninteresting
309 * if we are not limited by path. This means that you will
310 * see the usual "commits that touch the paths" plus any
311 * tagged commit by specifying both --simplify-by-decoration
312 * and pathspec.
313 */
314 if (!revs->prune_data)
315 return REV_TREE_SAME;
316 }
317
318 tree_difference = REV_TREE_SAME;
319 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
320 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
321 &revs->pruning) < 0)
322 return REV_TREE_DIFFERENT;
323 return tree_difference;
324 }
325
326 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
327 {
328 int retval;
329 void *tree;
330 unsigned long size;
331 struct tree_desc empty, real;
332 struct tree *t1 = commit->tree;
333
334 if (!t1)
335 return 0;
336
337 tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
338 if (!tree)
339 return 0;
340 init_tree_desc(&real, tree, size);
341 init_tree_desc(&empty, "", 0);
342
343 tree_difference = REV_TREE_SAME;
344 DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
345 retval = diff_tree(&empty, &real, "", &revs->pruning);
346 free(tree);
347
348 return retval >= 0 && (tree_difference == REV_TREE_SAME);
349 }
350
351 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
352 {
353 struct commit_list **pp, *parent;
354 int tree_changed = 0, tree_same = 0;
355
356 /*
357 * If we don't do pruning, everything is interesting
358 */
359 if (!revs->prune)
360 return;
361
362 if (!commit->tree)
363 return;
364
365 if (!commit->parents) {
366 if (rev_same_tree_as_empty(revs, commit))
367 commit->object.flags |= TREESAME;
368 return;
369 }
370
371 /*
372 * Normal non-merge commit? If we don't want to make the
373 * history dense, we consider it always to be a change..
374 */
375 if (!revs->dense && !commit->parents->next)
376 return;
377
378 pp = &commit->parents;
379 while ((parent = *pp) != NULL) {
380 struct commit *p = parent->item;
381
382 if (parse_commit(p) < 0)
383 die("cannot simplify commit %s (because of %s)",
384 sha1_to_hex(commit->object.sha1),
385 sha1_to_hex(p->object.sha1));
386 switch (rev_compare_tree(revs, p, commit)) {
387 case REV_TREE_SAME:
388 tree_same = 1;
389 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
390 /* Even if a merge with an uninteresting
391 * side branch brought the entire change
392 * we are interested in, we do not want
393 * to lose the other branches of this
394 * merge, so we just keep going.
395 */
396 pp = &parent->next;
397 continue;
398 }
399 parent->next = NULL;
400 commit->parents = parent;
401 commit->object.flags |= TREESAME;
402 return;
403
404 case REV_TREE_NEW:
405 if (revs->remove_empty_trees &&
406 rev_same_tree_as_empty(revs, p)) {
407 /* We are adding all the specified
408 * paths from this parent, so the
409 * history beyond this parent is not
410 * interesting. Remove its parents
411 * (they are grandparents for us).
412 * IOW, we pretend this parent is a
413 * "root" commit.
414 */
415 if (parse_commit(p) < 0)
416 die("cannot simplify commit %s (invalid %s)",
417 sha1_to_hex(commit->object.sha1),
418 sha1_to_hex(p->object.sha1));
419 p->parents = NULL;
420 }
421 /* fallthrough */
422 case REV_TREE_OLD:
423 case REV_TREE_DIFFERENT:
424 tree_changed = 1;
425 pp = &parent->next;
426 continue;
427 }
428 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
429 }
430 if (tree_changed && !tree_same)
431 return;
432 commit->object.flags |= TREESAME;
433 }
434
435 static void insert_by_date_cached(struct commit *p, struct commit_list **head,
436 struct commit_list *cached_base, struct commit_list **cache)
437 {
438 struct commit_list *new_entry;
439
440 if (cached_base && p->date < cached_base->item->date)
441 new_entry = insert_by_date(p, &cached_base->next);
442 else
443 new_entry = insert_by_date(p, head);
444
445 if (cache && (!*cache || p->date < (*cache)->item->date))
446 *cache = new_entry;
447 }
448
449 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
450 struct commit_list **list, struct commit_list **cache_ptr)
451 {
452 struct commit_list *parent = commit->parents;
453 unsigned left_flag;
454 struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
455
456 if (commit->object.flags & ADDED)
457 return 0;
458 commit->object.flags |= ADDED;
459
460 /*
461 * If the commit is uninteresting, don't try to
462 * prune parents - we want the maximal uninteresting
463 * set.
464 *
465 * Normally we haven't parsed the parent
466 * yet, so we won't have a parent of a parent
467 * here. However, it may turn out that we've
468 * reached this commit some other way (where it
469 * wasn't uninteresting), in which case we need
470 * to mark its parents recursively too..
471 */
472 if (commit->object.flags & UNINTERESTING) {
473 while (parent) {
474 struct commit *p = parent->item;
475 parent = parent->next;
476 if (p)
477 p->object.flags |= UNINTERESTING;
478 if (parse_commit(p) < 0)
479 continue;
480 if (p->parents)
481 mark_parents_uninteresting(p);
482 if (p->object.flags & SEEN)
483 continue;
484 p->object.flags |= SEEN;
485 insert_by_date_cached(p, list, cached_base, cache_ptr);
486 }
487 return 0;
488 }
489
490 /*
491 * Ok, the commit wasn't uninteresting. Try to
492 * simplify the commit history and find the parent
493 * that has no differences in the path set if one exists.
494 */
495 try_to_simplify_commit(revs, commit);
496
497 if (revs->no_walk)
498 return 0;
499
500 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
501
502 for (parent = commit->parents; parent; parent = parent->next) {
503 struct commit *p = parent->item;
504
505 if (parse_commit(p) < 0)
506 return -1;
507 if (revs->show_source && !p->util)
508 p->util = commit->util;
509 p->object.flags |= left_flag;
510 if (!(p->object.flags & SEEN)) {
511 p->object.flags |= SEEN;
512 insert_by_date_cached(p, list, cached_base, cache_ptr);
513 }
514 if (revs->first_parent_only)
515 break;
516 }
517 return 0;
518 }
519
520 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
521 {
522 struct commit_list *p;
523 int left_count = 0, right_count = 0;
524 int left_first;
525 struct patch_ids ids;
526
527 /* First count the commits on the left and on the right */
528 for (p = list; p; p = p->next) {
529 struct commit *commit = p->item;
530 unsigned flags = commit->object.flags;
531 if (flags & BOUNDARY)
532 ;
533 else if (flags & SYMMETRIC_LEFT)
534 left_count++;
535 else
536 right_count++;
537 }
538
539 left_first = left_count < right_count;
540 init_patch_ids(&ids);
541 if (revs->diffopt.nr_paths) {
542 ids.diffopts.nr_paths = revs->diffopt.nr_paths;
543 ids.diffopts.paths = revs->diffopt.paths;
544 ids.diffopts.pathlens = revs->diffopt.pathlens;
545 }
546
547 /* Compute patch-ids for one side */
548 for (p = list; p; p = p->next) {
549 struct commit *commit = p->item;
550 unsigned flags = commit->object.flags;
551
552 if (flags & BOUNDARY)
553 continue;
554 /*
555 * If we have fewer left, left_first is set and we omit
556 * commits on the right branch in this loop. If we have
557 * fewer right, we skip the left ones.
558 */
559 if (left_first != !!(flags & SYMMETRIC_LEFT))
560 continue;
561 commit->util = add_commit_patch_id(commit, &ids);
562 }
563
564 /* Check the other side */
565 for (p = list; p; p = p->next) {
566 struct commit *commit = p->item;
567 struct patch_id *id;
568 unsigned flags = commit->object.flags;
569
570 if (flags & BOUNDARY)
571 continue;
572 /*
573 * If we have fewer left, left_first is set and we omit
574 * commits on the left branch in this loop.
575 */
576 if (left_first == !!(flags & SYMMETRIC_LEFT))
577 continue;
578
579 /*
580 * Have we seen the same patch id?
581 */
582 id = has_commit_patch_id(commit, &ids);
583 if (!id)
584 continue;
585 id->seen = 1;
586 commit->object.flags |= SHOWN;
587 }
588
589 /* Now check the original side for seen ones */
590 for (p = list; p; p = p->next) {
591 struct commit *commit = p->item;
592 struct patch_id *ent;
593
594 ent = commit->util;
595 if (!ent)
596 continue;
597 if (ent->seen)
598 commit->object.flags |= SHOWN;
599 commit->util = NULL;
600 }
601
602 free_patch_ids(&ids);
603 }
604
605 /* How many extra uninteresting commits we want to see.. */
606 #define SLOP 5
607
608 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
609 {
610 /*
611 * No source list at all? We're definitely done..
612 */
613 if (!src)
614 return 0;
615
616 /*
617 * Does the destination list contain entries with a date
618 * before the source list? Definitely _not_ done.
619 */
620 if (date < src->item->date)
621 return SLOP;
622
623 /*
624 * Does the source list still have interesting commits in
625 * it? Definitely not done..
626 */
627 if (!everybody_uninteresting(src))
628 return SLOP;
629
630 /* Ok, we're closing in.. */
631 return slop-1;
632 }
633
634 static int limit_list(struct rev_info *revs)
635 {
636 int slop = SLOP;
637 unsigned long date = ~0ul;
638 struct commit_list *list = revs->commits;
639 struct commit_list *newlist = NULL;
640 struct commit_list **p = &newlist;
641
642 while (list) {
643 struct commit_list *entry = list;
644 struct commit *commit = list->item;
645 struct object *obj = &commit->object;
646 show_early_output_fn_t show;
647
648 list = list->next;
649 free(entry);
650
651 if (revs->max_age != -1 && (commit->date < revs->max_age))
652 obj->flags |= UNINTERESTING;
653 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
654 return -1;
655 if (obj->flags & UNINTERESTING) {
656 mark_parents_uninteresting(commit);
657 if (revs->show_all)
658 p = &commit_list_insert(commit, p)->next;
659 slop = still_interesting(list, date, slop);
660 if (slop)
661 continue;
662 /* If showing all, add the whole pending list to the end */
663 if (revs->show_all)
664 *p = list;
665 break;
666 }
667 if (revs->min_age != -1 && (commit->date > revs->min_age))
668 continue;
669 date = commit->date;
670 p = &commit_list_insert(commit, p)->next;
671
672 show = show_early_output;
673 if (!show)
674 continue;
675
676 show(revs, newlist);
677 show_early_output = NULL;
678 }
679 if (revs->cherry_pick)
680 cherry_pick_list(newlist, revs);
681
682 revs->commits = newlist;
683 return 0;
684 }
685
686 struct all_refs_cb {
687 int all_flags;
688 int warned_bad_reflog;
689 struct rev_info *all_revs;
690 const char *name_for_errormsg;
691 };
692
693 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
694 {
695 struct all_refs_cb *cb = cb_data;
696 struct object *object = get_reference(cb->all_revs, path, sha1,
697 cb->all_flags);
698 add_pending_object(cb->all_revs, object, path);
699 return 0;
700 }
701
702 static void handle_refs(struct rev_info *revs, unsigned flags,
703 int (*for_each)(each_ref_fn, void *))
704 {
705 struct all_refs_cb cb;
706 cb.all_revs = revs;
707 cb.all_flags = flags;
708 for_each(handle_one_ref, &cb);
709 }
710
711 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
712 {
713 struct all_refs_cb *cb = cb_data;
714 if (!is_null_sha1(sha1)) {
715 struct object *o = parse_object(sha1);
716 if (o) {
717 o->flags |= cb->all_flags;
718 add_pending_object(cb->all_revs, o, "");
719 }
720 else if (!cb->warned_bad_reflog) {
721 warning("reflog of '%s' references pruned commits",
722 cb->name_for_errormsg);
723 cb->warned_bad_reflog = 1;
724 }
725 }
726 }
727
728 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
729 const char *email, unsigned long timestamp, int tz,
730 const char *message, void *cb_data)
731 {
732 handle_one_reflog_commit(osha1, cb_data);
733 handle_one_reflog_commit(nsha1, cb_data);
734 return 0;
735 }
736
737 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
738 {
739 struct all_refs_cb *cb = cb_data;
740 cb->warned_bad_reflog = 0;
741 cb->name_for_errormsg = path;
742 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
743 return 0;
744 }
745
746 static void handle_reflog(struct rev_info *revs, unsigned flags)
747 {
748 struct all_refs_cb cb;
749 cb.all_revs = revs;
750 cb.all_flags = flags;
751 for_each_reflog(handle_one_reflog, &cb);
752 }
753
754 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
755 {
756 unsigned char sha1[20];
757 struct object *it;
758 struct commit *commit;
759 struct commit_list *parents;
760
761 if (*arg == '^') {
762 flags ^= UNINTERESTING;
763 arg++;
764 }
765 if (get_sha1(arg, sha1))
766 return 0;
767 while (1) {
768 it = get_reference(revs, arg, sha1, 0);
769 if (it->type != OBJ_TAG)
770 break;
771 if (!((struct tag*)it)->tagged)
772 return 0;
773 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
774 }
775 if (it->type != OBJ_COMMIT)
776 return 0;
777 commit = (struct commit *)it;
778 for (parents = commit->parents; parents; parents = parents->next) {
779 it = &parents->item->object;
780 it->flags |= flags;
781 add_pending_object(revs, it, arg);
782 }
783 return 1;
784 }
785
786 void init_revisions(struct rev_info *revs, const char *prefix)
787 {
788 memset(revs, 0, sizeof(*revs));
789
790 revs->abbrev = DEFAULT_ABBREV;
791 revs->ignore_merges = 1;
792 revs->simplify_history = 1;
793 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
794 DIFF_OPT_SET(&revs->pruning, QUIET);
795 revs->pruning.add_remove = file_add_remove;
796 revs->pruning.change = file_change;
797 revs->lifo = 1;
798 revs->dense = 1;
799 revs->prefix = prefix;
800 revs->max_age = -1;
801 revs->min_age = -1;
802 revs->skip_count = -1;
803 revs->max_count = -1;
804
805 revs->commit_format = CMIT_FMT_DEFAULT;
806
807 revs->grep_filter.status_only = 1;
808 revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
809 revs->grep_filter.regflags = REG_NEWLINE;
810
811 diff_setup(&revs->diffopt);
812 if (prefix && !revs->diffopt.prefix) {
813 revs->diffopt.prefix = prefix;
814 revs->diffopt.prefix_length = strlen(prefix);
815 }
816 }
817
818 static void add_pending_commit_list(struct rev_info *revs,
819 struct commit_list *commit_list,
820 unsigned int flags)
821 {
822 while (commit_list) {
823 struct object *object = &commit_list->item->object;
824 object->flags |= flags;
825 add_pending_object(revs, object, sha1_to_hex(object->sha1));
826 commit_list = commit_list->next;
827 }
828 }
829
830 static void prepare_show_merge(struct rev_info *revs)
831 {
832 struct commit_list *bases;
833 struct commit *head, *other;
834 unsigned char sha1[20];
835 const char **prune = NULL;
836 int i, prune_num = 1; /* counting terminating NULL */
837
838 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
839 die("--merge without HEAD?");
840 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
841 die("--merge without MERGE_HEAD?");
842 add_pending_object(revs, &head->object, "HEAD");
843 add_pending_object(revs, &other->object, "MERGE_HEAD");
844 bases = get_merge_bases(head, other, 1);
845 add_pending_commit_list(revs, bases, UNINTERESTING);
846 free_commit_list(bases);
847 head->object.flags |= SYMMETRIC_LEFT;
848
849 if (!active_nr)
850 read_cache();
851 for (i = 0; i < active_nr; i++) {
852 struct cache_entry *ce = active_cache[i];
853 if (!ce_stage(ce))
854 continue;
855 if (ce_path_match(ce, revs->prune_data)) {
856 prune_num++;
857 prune = xrealloc(prune, sizeof(*prune) * prune_num);
858 prune[prune_num-2] = ce->name;
859 prune[prune_num-1] = NULL;
860 }
861 while ((i+1 < active_nr) &&
862 ce_same_name(ce, active_cache[i+1]))
863 i++;
864 }
865 revs->prune_data = prune;
866 revs->limited = 1;
867 }
868
869 int handle_revision_arg(const char *arg, struct rev_info *revs,
870 int flags,
871 int cant_be_filename)
872 {
873 unsigned mode;
874 char *dotdot;
875 struct object *object;
876 unsigned char sha1[20];
877 int local_flags;
878
879 dotdot = strstr(arg, "..");
880 if (dotdot) {
881 unsigned char from_sha1[20];
882 const char *next = dotdot + 2;
883 const char *this = arg;
884 int symmetric = *next == '.';
885 unsigned int flags_exclude = flags ^ UNINTERESTING;
886
887 *dotdot = 0;
888 next += symmetric;
889
890 if (!*next)
891 next = "HEAD";
892 if (dotdot == arg)
893 this = "HEAD";
894 if (!get_sha1(this, from_sha1) &&
895 !get_sha1(next, sha1)) {
896 struct commit *a, *b;
897 struct commit_list *exclude;
898
899 a = lookup_commit_reference(from_sha1);
900 b = lookup_commit_reference(sha1);
901 if (!a || !b) {
902 die(symmetric ?
903 "Invalid symmetric difference expression %s...%s" :
904 "Invalid revision range %s..%s",
905 arg, next);
906 }
907
908 if (!cant_be_filename) {
909 *dotdot = '.';
910 verify_non_filename(revs->prefix, arg);
911 }
912
913 if (symmetric) {
914 exclude = get_merge_bases(a, b, 1);
915 add_pending_commit_list(revs, exclude,
916 flags_exclude);
917 free_commit_list(exclude);
918 a->object.flags |= flags | SYMMETRIC_LEFT;
919 } else
920 a->object.flags |= flags_exclude;
921 b->object.flags |= flags;
922 add_pending_object(revs, &a->object, this);
923 add_pending_object(revs, &b->object, next);
924 return 0;
925 }
926 *dotdot = '.';
927 }
928 dotdot = strstr(arg, "^@");
929 if (dotdot && !dotdot[2]) {
930 *dotdot = 0;
931 if (add_parents_only(revs, arg, flags))
932 return 0;
933 *dotdot = '^';
934 }
935 dotdot = strstr(arg, "^!");
936 if (dotdot && !dotdot[2]) {
937 *dotdot = 0;
938 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
939 *dotdot = '^';
940 }
941
942 local_flags = 0;
943 if (*arg == '^') {
944 local_flags = UNINTERESTING;
945 arg++;
946 }
947 if (get_sha1_with_mode(arg, sha1, &mode))
948 return -1;
949 if (!cant_be_filename)
950 verify_non_filename(revs->prefix, arg);
951 object = get_reference(revs, arg, sha1, flags ^ local_flags);
952 add_pending_object_with_mode(revs, object, arg, mode);
953 return 0;
954 }
955
956 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb, const char ***prune_data)
957 {
958 const char **prune = *prune_data;
959 int prune_nr;
960 int prune_alloc;
961
962 /* count existing ones */
963 if (!prune)
964 prune_nr = 0;
965 else
966 for (prune_nr = 0; prune[prune_nr]; prune_nr++)
967 ;
968 prune_alloc = prune_nr; /* not really, but we do not know */
969
970 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
971 int len = sb->len;
972 if (len && sb->buf[len - 1] == '\n')
973 sb->buf[--len] = '\0';
974 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
975 prune[prune_nr++] = xstrdup(sb->buf);
976 }
977 if (prune) {
978 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
979 prune[prune_nr] = NULL;
980 }
981 *prune_data = prune;
982 }
983
984 static void read_revisions_from_stdin(struct rev_info *revs, const char ***prune)
985 {
986 struct strbuf sb;
987 int seen_dashdash = 0;
988
989 strbuf_init(&sb, 1000);
990 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
991 int len = sb.len;
992 if (len && sb.buf[len - 1] == '\n')
993 sb.buf[--len] = '\0';
994 if (!len)
995 break;
996 if (sb.buf[0] == '-') {
997 if (len == 2 && sb.buf[1] == '-') {
998 seen_dashdash = 1;
999 break;
1000 }
1001 die("options not supported in --stdin mode");
1002 }
1003 if (handle_revision_arg(sb.buf, revs, 0, 1))
1004 die("bad revision '%s'", sb.buf);
1005 }
1006 if (seen_dashdash)
1007 read_pathspec_from_stdin(revs, &sb, prune);
1008 strbuf_release(&sb);
1009 }
1010
1011 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1012 {
1013 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1014 }
1015
1016 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1017 {
1018 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1019 }
1020
1021 static void add_message_grep(struct rev_info *revs, const char *pattern)
1022 {
1023 add_grep(revs, pattern, GREP_PATTERN_BODY);
1024 }
1025
1026 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1027 int *unkc, const char **unkv)
1028 {
1029 const char *arg = argv[0];
1030
1031 /* pseudo revision arguments */
1032 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1033 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1034 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1035 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1036 !strcmp(arg, "--bisect"))
1037 {
1038 unkv[(*unkc)++] = arg;
1039 return 1;
1040 }
1041
1042 if (!prefixcmp(arg, "--max-count=")) {
1043 revs->max_count = atoi(arg + 12);
1044 } else if (!prefixcmp(arg, "--skip=")) {
1045 revs->skip_count = atoi(arg + 7);
1046 } else if ((*arg == '-') && isdigit(arg[1])) {
1047 /* accept -<digit>, like traditional "head" */
1048 revs->max_count = atoi(arg + 1);
1049 } else if (!strcmp(arg, "-n")) {
1050 if (argc <= 1)
1051 return error("-n requires an argument");
1052 revs->max_count = atoi(argv[1]);
1053 return 2;
1054 } else if (!prefixcmp(arg, "-n")) {
1055 revs->max_count = atoi(arg + 2);
1056 } else if (!prefixcmp(arg, "--max-age=")) {
1057 revs->max_age = atoi(arg + 10);
1058 } else if (!prefixcmp(arg, "--since=")) {
1059 revs->max_age = approxidate(arg + 8);
1060 } else if (!prefixcmp(arg, "--after=")) {
1061 revs->max_age = approxidate(arg + 8);
1062 } else if (!prefixcmp(arg, "--min-age=")) {
1063 revs->min_age = atoi(arg + 10);
1064 } else if (!prefixcmp(arg, "--before=")) {
1065 revs->min_age = approxidate(arg + 9);
1066 } else if (!prefixcmp(arg, "--until=")) {
1067 revs->min_age = approxidate(arg + 8);
1068 } else if (!strcmp(arg, "--first-parent")) {
1069 revs->first_parent_only = 1;
1070 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1071 init_reflog_walk(&revs->reflog_info);
1072 } else if (!strcmp(arg, "--default")) {
1073 if (argc <= 1)
1074 return error("bad --default argument");
1075 revs->def = argv[1];
1076 return 2;
1077 } else if (!strcmp(arg, "--merge")) {
1078 revs->show_merge = 1;
1079 } else if (!strcmp(arg, "--topo-order")) {
1080 revs->lifo = 1;
1081 revs->topo_order = 1;
1082 } else if (!strcmp(arg, "--simplify-merges")) {
1083 revs->simplify_merges = 1;
1084 revs->rewrite_parents = 1;
1085 revs->simplify_history = 0;
1086 revs->limited = 1;
1087 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1088 revs->simplify_merges = 1;
1089 revs->rewrite_parents = 1;
1090 revs->simplify_history = 0;
1091 revs->simplify_by_decoration = 1;
1092 revs->limited = 1;
1093 revs->prune = 1;
1094 load_ref_decorations(DECORATE_SHORT_REFS);
1095 } else if (!strcmp(arg, "--date-order")) {
1096 revs->lifo = 0;
1097 revs->topo_order = 1;
1098 } else if (!prefixcmp(arg, "--early-output")) {
1099 int count = 100;
1100 switch (arg[14]) {
1101 case '=':
1102 count = atoi(arg+15);
1103 /* Fallthrough */
1104 case 0:
1105 revs->topo_order = 1;
1106 revs->early_output = count;
1107 }
1108 } else if (!strcmp(arg, "--parents")) {
1109 revs->rewrite_parents = 1;
1110 revs->print_parents = 1;
1111 } else if (!strcmp(arg, "--dense")) {
1112 revs->dense = 1;
1113 } else if (!strcmp(arg, "--sparse")) {
1114 revs->dense = 0;
1115 } else if (!strcmp(arg, "--show-all")) {
1116 revs->show_all = 1;
1117 } else if (!strcmp(arg, "--remove-empty")) {
1118 revs->remove_empty_trees = 1;
1119 } else if (!strcmp(arg, "--merges")) {
1120 revs->merges_only = 1;
1121 } else if (!strcmp(arg, "--no-merges")) {
1122 revs->no_merges = 1;
1123 } else if (!strcmp(arg, "--boundary")) {
1124 revs->boundary = 1;
1125 } else if (!strcmp(arg, "--left-right")) {
1126 revs->left_right = 1;
1127 } else if (!strcmp(arg, "--cherry-pick")) {
1128 revs->cherry_pick = 1;
1129 revs->limited = 1;
1130 } else if (!strcmp(arg, "--objects")) {
1131 revs->tag_objects = 1;
1132 revs->tree_objects = 1;
1133 revs->blob_objects = 1;
1134 } else if (!strcmp(arg, "--objects-edge")) {
1135 revs->tag_objects = 1;
1136 revs->tree_objects = 1;
1137 revs->blob_objects = 1;
1138 revs->edge_hint = 1;
1139 } else if (!strcmp(arg, "--unpacked")) {
1140 revs->unpacked = 1;
1141 } else if (!prefixcmp(arg, "--unpacked=")) {
1142 die("--unpacked=<packfile> no longer supported.");
1143 } else if (!strcmp(arg, "-r")) {
1144 revs->diff = 1;
1145 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1146 } else if (!strcmp(arg, "-t")) {
1147 revs->diff = 1;
1148 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1149 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1150 } else if (!strcmp(arg, "-m")) {
1151 revs->ignore_merges = 0;
1152 } else if (!strcmp(arg, "-c")) {
1153 revs->diff = 1;
1154 revs->dense_combined_merges = 0;
1155 revs->combine_merges = 1;
1156 } else if (!strcmp(arg, "--cc")) {
1157 revs->diff = 1;
1158 revs->dense_combined_merges = 1;
1159 revs->combine_merges = 1;
1160 } else if (!strcmp(arg, "-v")) {
1161 revs->verbose_header = 1;
1162 } else if (!strcmp(arg, "--pretty")) {
1163 revs->verbose_header = 1;
1164 revs->pretty_given = 1;
1165 get_commit_format(arg+8, revs);
1166 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
1167 revs->verbose_header = 1;
1168 revs->pretty_given = 1;
1169 get_commit_format(arg+9, revs);
1170 } else if (!strcmp(arg, "--show-notes")) {
1171 revs->show_notes = 1;
1172 revs->show_notes_given = 1;
1173 } else if (!strcmp(arg, "--no-notes")) {
1174 revs->show_notes = 0;
1175 revs->show_notes_given = 1;
1176 } else if (!strcmp(arg, "--oneline")) {
1177 revs->verbose_header = 1;
1178 get_commit_format("oneline", revs);
1179 revs->pretty_given = 1;
1180 revs->abbrev_commit = 1;
1181 } else if (!strcmp(arg, "--graph")) {
1182 revs->topo_order = 1;
1183 revs->rewrite_parents = 1;
1184 revs->graph = graph_init(revs);
1185 } else if (!strcmp(arg, "--root")) {
1186 revs->show_root_diff = 1;
1187 } else if (!strcmp(arg, "--no-commit-id")) {
1188 revs->no_commit_id = 1;
1189 } else if (!strcmp(arg, "--always")) {
1190 revs->always_show_header = 1;
1191 } else if (!strcmp(arg, "--no-abbrev")) {
1192 revs->abbrev = 0;
1193 } else if (!strcmp(arg, "--abbrev")) {
1194 revs->abbrev = DEFAULT_ABBREV;
1195 } else if (!prefixcmp(arg, "--abbrev=")) {
1196 revs->abbrev = strtoul(arg + 9, NULL, 10);
1197 if (revs->abbrev < MINIMUM_ABBREV)
1198 revs->abbrev = MINIMUM_ABBREV;
1199 else if (revs->abbrev > 40)
1200 revs->abbrev = 40;
1201 } else if (!strcmp(arg, "--abbrev-commit")) {
1202 revs->abbrev_commit = 1;
1203 } else if (!strcmp(arg, "--full-diff")) {
1204 revs->diff = 1;
1205 revs->full_diff = 1;
1206 } else if (!strcmp(arg, "--full-history")) {
1207 revs->simplify_history = 0;
1208 } else if (!strcmp(arg, "--relative-date")) {
1209 revs->date_mode = DATE_RELATIVE;
1210 revs->date_mode_explicit = 1;
1211 } else if (!strncmp(arg, "--date=", 7)) {
1212 revs->date_mode = parse_date_format(arg + 7);
1213 revs->date_mode_explicit = 1;
1214 } else if (!strcmp(arg, "--log-size")) {
1215 revs->show_log_size = 1;
1216 }
1217 /*
1218 * Grepping the commit log
1219 */
1220 else if (!prefixcmp(arg, "--author=")) {
1221 add_header_grep(revs, GREP_HEADER_AUTHOR, arg+9);
1222 } else if (!prefixcmp(arg, "--committer=")) {
1223 add_header_grep(revs, GREP_HEADER_COMMITTER, arg+12);
1224 } else if (!prefixcmp(arg, "--grep=")) {
1225 add_message_grep(revs, arg+7);
1226 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1227 revs->grep_filter.regflags |= REG_EXTENDED;
1228 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1229 revs->grep_filter.regflags |= REG_ICASE;
1230 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1231 revs->grep_filter.fixed = 1;
1232 } else if (!strcmp(arg, "--all-match")) {
1233 revs->grep_filter.all_match = 1;
1234 } else if (!prefixcmp(arg, "--encoding=")) {
1235 arg += 11;
1236 if (strcmp(arg, "none"))
1237 git_log_output_encoding = xstrdup(arg);
1238 else
1239 git_log_output_encoding = "";
1240 } else if (!strcmp(arg, "--reverse")) {
1241 revs->reverse ^= 1;
1242 } else if (!strcmp(arg, "--children")) {
1243 revs->children.name = "children";
1244 revs->limited = 1;
1245 } else {
1246 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1247 if (!opts)
1248 unkv[(*unkc)++] = arg;
1249 return opts;
1250 }
1251
1252 return 1;
1253 }
1254
1255 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1256 const struct option *options,
1257 const char * const usagestr[])
1258 {
1259 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1260 &ctx->cpidx, ctx->out);
1261 if (n <= 0) {
1262 error("unknown option `%s'", ctx->argv[0]);
1263 usage_with_options(usagestr, options);
1264 }
1265 ctx->argv += n;
1266 ctx->argc -= n;
1267 }
1268
1269 static int for_each_bad_bisect_ref(each_ref_fn fn, void *cb_data)
1270 {
1271 return for_each_ref_in("refs/bisect/bad", fn, cb_data);
1272 }
1273
1274 static int for_each_good_bisect_ref(each_ref_fn fn, void *cb_data)
1275 {
1276 return for_each_ref_in("refs/bisect/good", fn, cb_data);
1277 }
1278
1279 static void append_prune_data(const char ***prune_data, const char **av)
1280 {
1281 const char **prune = *prune_data;
1282 int prune_nr;
1283 int prune_alloc;
1284
1285 if (!prune) {
1286 *prune_data = av;
1287 return;
1288 }
1289
1290 /* count existing ones */
1291 for (prune_nr = 0; prune[prune_nr]; prune_nr++)
1292 ;
1293 prune_alloc = prune_nr; /* not really, but we do not know */
1294
1295 while (*av) {
1296 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1297 prune[prune_nr++] = *av;
1298 av++;
1299 }
1300 if (prune) {
1301 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1302 prune[prune_nr] = NULL;
1303 }
1304 *prune_data = prune;
1305 }
1306
1307 /*
1308 * Parse revision information, filling in the "rev_info" structure,
1309 * and removing the used arguments from the argument list.
1310 *
1311 * Returns the number of arguments left that weren't recognized
1312 * (which are also moved to the head of the argument list)
1313 */
1314 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
1315 {
1316 int i, flags, left, seen_dashdash, read_from_stdin;
1317 const char **prune_data = NULL;
1318
1319 /* First, search for "--" */
1320 seen_dashdash = 0;
1321 for (i = 1; i < argc; i++) {
1322 const char *arg = argv[i];
1323 if (strcmp(arg, "--"))
1324 continue;
1325 argv[i] = NULL;
1326 argc = i;
1327 if (argv[i + 1])
1328 prune_data = argv + i + 1;
1329 seen_dashdash = 1;
1330 break;
1331 }
1332
1333 /* Second, deal with arguments and options */
1334 flags = 0;
1335 read_from_stdin = 0;
1336 for (left = i = 1; i < argc; i++) {
1337 const char *arg = argv[i];
1338 if (*arg == '-') {
1339 int opts;
1340
1341 if (!strcmp(arg, "--all")) {
1342 handle_refs(revs, flags, for_each_ref);
1343 handle_refs(revs, flags, head_ref);
1344 continue;
1345 }
1346 if (!strcmp(arg, "--branches")) {
1347 handle_refs(revs, flags, for_each_branch_ref);
1348 continue;
1349 }
1350 if (!strcmp(arg, "--bisect")) {
1351 handle_refs(revs, flags, for_each_bad_bisect_ref);
1352 handle_refs(revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);
1353 revs->bisect = 1;
1354 continue;
1355 }
1356 if (!strcmp(arg, "--tags")) {
1357 handle_refs(revs, flags, for_each_tag_ref);
1358 continue;
1359 }
1360 if (!strcmp(arg, "--remotes")) {
1361 handle_refs(revs, flags, for_each_remote_ref);
1362 continue;
1363 }
1364 if (!strcmp(arg, "--reflog")) {
1365 handle_reflog(revs, flags);
1366 continue;
1367 }
1368 if (!strcmp(arg, "--not")) {
1369 flags ^= UNINTERESTING;
1370 continue;
1371 }
1372 if (!strcmp(arg, "--no-walk")) {
1373 revs->no_walk = 1;
1374 continue;
1375 }
1376 if (!strcmp(arg, "--do-walk")) {
1377 revs->no_walk = 0;
1378 continue;
1379 }
1380 if (!strcmp(arg, "--stdin")) {
1381 if (revs->disable_stdin) {
1382 argv[left++] = arg;
1383 continue;
1384 }
1385 if (read_from_stdin++)
1386 die("--stdin given twice?");
1387 read_revisions_from_stdin(revs, &prune_data);
1388 continue;
1389 }
1390
1391 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1392 if (opts > 0) {
1393 i += opts - 1;
1394 continue;
1395 }
1396 if (opts < 0)
1397 exit(128);
1398 continue;
1399 }
1400
1401 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1402 int j;
1403 if (seen_dashdash || *arg == '^')
1404 die("bad revision '%s'", arg);
1405
1406 /* If we didn't have a "--":
1407 * (1) all filenames must exist;
1408 * (2) all rev-args must not be interpretable
1409 * as a valid filename.
1410 * but the latter we have checked in the main loop.
1411 */
1412 for (j = i; j < argc; j++)
1413 verify_filename(revs->prefix, argv[j]);
1414
1415 append_prune_data(&prune_data, argv + i);
1416 break;
1417 }
1418 }
1419
1420 if (prune_data)
1421 revs->prune_data = get_pathspec(revs->prefix, prune_data);
1422
1423 if (revs->def == NULL)
1424 revs->def = def;
1425 if (revs->show_merge)
1426 prepare_show_merge(revs);
1427 if (revs->def && !revs->pending.nr) {
1428 unsigned char sha1[20];
1429 struct object *object;
1430 unsigned mode;
1431 if (get_sha1_with_mode(revs->def, sha1, &mode))
1432 die("bad default revision '%s'", revs->def);
1433 object = get_reference(revs, revs->def, sha1, 0);
1434 add_pending_object_with_mode(revs, object, revs->def, mode);
1435 }
1436
1437 /* Did the user ask for any diff output? Run the diff! */
1438 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1439 revs->diff = 1;
1440
1441 /* Pickaxe, diff-filter and rename following need diffs */
1442 if (revs->diffopt.pickaxe ||
1443 revs->diffopt.filter ||
1444 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1445 revs->diff = 1;
1446
1447 if (revs->topo_order)
1448 revs->limited = 1;
1449
1450 if (revs->prune_data) {
1451 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1452 /* Can't prune commits with rename following: the paths change.. */
1453 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1454 revs->prune = 1;
1455 if (!revs->full_diff)
1456 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1457 }
1458 if (revs->combine_merges) {
1459 revs->ignore_merges = 0;
1460 if (revs->dense_combined_merges && !revs->diffopt.output_format)
1461 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1462 }
1463 revs->diffopt.abbrev = revs->abbrev;
1464 if (diff_setup_done(&revs->diffopt) < 0)
1465 die("diff_setup_done failed");
1466
1467 compile_grep_patterns(&revs->grep_filter);
1468
1469 if (revs->reverse && revs->reflog_info)
1470 die("cannot combine --reverse with --walk-reflogs");
1471 if (revs->rewrite_parents && revs->children.name)
1472 die("cannot combine --parents and --children");
1473
1474 /*
1475 * Limitations on the graph functionality
1476 */
1477 if (revs->reverse && revs->graph)
1478 die("cannot combine --reverse with --graph");
1479
1480 if (revs->reflog_info && revs->graph)
1481 die("cannot combine --walk-reflogs with --graph");
1482
1483 return left;
1484 }
1485
1486 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1487 {
1488 struct commit_list *l = xcalloc(1, sizeof(*l));
1489
1490 l->item = child;
1491 l->next = add_decoration(&revs->children, &parent->object, l);
1492 }
1493
1494 static int remove_duplicate_parents(struct commit *commit)
1495 {
1496 struct commit_list **pp, *p;
1497 int surviving_parents;
1498
1499 /* Examine existing parents while marking ones we have seen... */
1500 pp = &commit->parents;
1501 while ((p = *pp) != NULL) {
1502 struct commit *parent = p->item;
1503 if (parent->object.flags & TMP_MARK) {
1504 *pp = p->next;
1505 continue;
1506 }
1507 parent->object.flags |= TMP_MARK;
1508 pp = &p->next;
1509 }
1510 /* count them while clearing the temporary mark */
1511 surviving_parents = 0;
1512 for (p = commit->parents; p; p = p->next) {
1513 p->item->object.flags &= ~TMP_MARK;
1514 surviving_parents++;
1515 }
1516 return surviving_parents;
1517 }
1518
1519 struct merge_simplify_state {
1520 struct commit *simplified;
1521 };
1522
1523 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1524 {
1525 struct merge_simplify_state *st;
1526
1527 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1528 if (!st) {
1529 st = xcalloc(1, sizeof(*st));
1530 add_decoration(&revs->merge_simplification, &commit->object, st);
1531 }
1532 return st;
1533 }
1534
1535 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1536 {
1537 struct commit_list *p;
1538 struct merge_simplify_state *st, *pst;
1539 int cnt;
1540
1541 st = locate_simplify_state(revs, commit);
1542
1543 /*
1544 * Have we handled this one?
1545 */
1546 if (st->simplified)
1547 return tail;
1548
1549 /*
1550 * An UNINTERESTING commit simplifies to itself, so does a
1551 * root commit. We do not rewrite parents of such commit
1552 * anyway.
1553 */
1554 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
1555 st->simplified = commit;
1556 return tail;
1557 }
1558
1559 /*
1560 * Do we know what commit all of our parents should be rewritten to?
1561 * Otherwise we are not ready to rewrite this one yet.
1562 */
1563 for (cnt = 0, p = commit->parents; p; p = p->next) {
1564 pst = locate_simplify_state(revs, p->item);
1565 if (!pst->simplified) {
1566 tail = &commit_list_insert(p->item, tail)->next;
1567 cnt++;
1568 }
1569 }
1570 if (cnt) {
1571 tail = &commit_list_insert(commit, tail)->next;
1572 return tail;
1573 }
1574
1575 /*
1576 * Rewrite our list of parents.
1577 */
1578 for (p = commit->parents; p; p = p->next) {
1579 pst = locate_simplify_state(revs, p->item);
1580 p->item = pst->simplified;
1581 }
1582 cnt = remove_duplicate_parents(commit);
1583
1584 /*
1585 * It is possible that we are a merge and one side branch
1586 * does not have any commit that touches the given paths;
1587 * in such a case, the immediate parents will be rewritten
1588 * to different commits.
1589 *
1590 * o----X X: the commit we are looking at;
1591 * / / o: a commit that touches the paths;
1592 * ---o----'
1593 *
1594 * Further reduce the parents by removing redundant parents.
1595 */
1596 if (1 < cnt) {
1597 struct commit_list *h = reduce_heads(commit->parents);
1598 cnt = commit_list_count(h);
1599 free_commit_list(commit->parents);
1600 commit->parents = h;
1601 }
1602
1603 /*
1604 * A commit simplifies to itself if it is a root, if it is
1605 * UNINTERESTING, if it touches the given paths, or if it is a
1606 * merge and its parents simplifies to more than one commits
1607 * (the first two cases are already handled at the beginning of
1608 * this function).
1609 *
1610 * Otherwise, it simplifies to what its sole parent simplifies to.
1611 */
1612 if (!cnt ||
1613 (commit->object.flags & UNINTERESTING) ||
1614 !(commit->object.flags & TREESAME) ||
1615 (1 < cnt))
1616 st->simplified = commit;
1617 else {
1618 pst = locate_simplify_state(revs, commit->parents->item);
1619 st->simplified = pst->simplified;
1620 }
1621 return tail;
1622 }
1623
1624 static void simplify_merges(struct rev_info *revs)
1625 {
1626 struct commit_list *list;
1627 struct commit_list *yet_to_do, **tail;
1628
1629 if (!revs->topo_order)
1630 sort_in_topological_order(&revs->commits, revs->lifo);
1631 if (!revs->prune)
1632 return;
1633
1634 /* feed the list reversed */
1635 yet_to_do = NULL;
1636 for (list = revs->commits; list; list = list->next)
1637 commit_list_insert(list->item, &yet_to_do);
1638 while (yet_to_do) {
1639 list = yet_to_do;
1640 yet_to_do = NULL;
1641 tail = &yet_to_do;
1642 while (list) {
1643 struct commit *commit = list->item;
1644 struct commit_list *next = list->next;
1645 free(list);
1646 list = next;
1647 tail = simplify_one(revs, commit, tail);
1648 }
1649 }
1650
1651 /* clean up the result, removing the simplified ones */
1652 list = revs->commits;
1653 revs->commits = NULL;
1654 tail = &revs->commits;
1655 while (list) {
1656 struct commit *commit = list->item;
1657 struct commit_list *next = list->next;
1658 struct merge_simplify_state *st;
1659 free(list);
1660 list = next;
1661 st = locate_simplify_state(revs, commit);
1662 if (st->simplified == commit)
1663 tail = &commit_list_insert(commit, tail)->next;
1664 }
1665 }
1666
1667 static void set_children(struct rev_info *revs)
1668 {
1669 struct commit_list *l;
1670 for (l = revs->commits; l; l = l->next) {
1671 struct commit *commit = l->item;
1672 struct commit_list *p;
1673
1674 for (p = commit->parents; p; p = p->next)
1675 add_child(revs, p->item, commit);
1676 }
1677 }
1678
1679 int prepare_revision_walk(struct rev_info *revs)
1680 {
1681 int nr = revs->pending.nr;
1682 struct object_array_entry *e, *list;
1683
1684 e = list = revs->pending.objects;
1685 revs->pending.nr = 0;
1686 revs->pending.alloc = 0;
1687 revs->pending.objects = NULL;
1688 while (--nr >= 0) {
1689 struct commit *commit = handle_commit(revs, e->item, e->name);
1690 if (commit) {
1691 if (!(commit->object.flags & SEEN)) {
1692 commit->object.flags |= SEEN;
1693 insert_by_date(commit, &revs->commits);
1694 }
1695 }
1696 e++;
1697 }
1698 free(list);
1699
1700 if (revs->no_walk)
1701 return 0;
1702 if (revs->limited)
1703 if (limit_list(revs) < 0)
1704 return -1;
1705 if (revs->topo_order)
1706 sort_in_topological_order(&revs->commits, revs->lifo);
1707 if (revs->simplify_merges)
1708 simplify_merges(revs);
1709 if (revs->children.name)
1710 set_children(revs);
1711 return 0;
1712 }
1713
1714 enum rewrite_result {
1715 rewrite_one_ok,
1716 rewrite_one_noparents,
1717 rewrite_one_error,
1718 };
1719
1720 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
1721 {
1722 struct commit_list *cache = NULL;
1723
1724 for (;;) {
1725 struct commit *p = *pp;
1726 if (!revs->limited)
1727 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
1728 return rewrite_one_error;
1729 if (p->parents && p->parents->next)
1730 return rewrite_one_ok;
1731 if (p->object.flags & UNINTERESTING)
1732 return rewrite_one_ok;
1733 if (!(p->object.flags & TREESAME))
1734 return rewrite_one_ok;
1735 if (!p->parents)
1736 return rewrite_one_noparents;
1737 *pp = p->parents->item;
1738 }
1739 }
1740
1741 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
1742 {
1743 struct commit_list **pp = &commit->parents;
1744 while (*pp) {
1745 struct commit_list *parent = *pp;
1746 switch (rewrite_one(revs, &parent->item)) {
1747 case rewrite_one_ok:
1748 break;
1749 case rewrite_one_noparents:
1750 *pp = parent->next;
1751 continue;
1752 case rewrite_one_error:
1753 return -1;
1754 }
1755 pp = &parent->next;
1756 }
1757 remove_duplicate_parents(commit);
1758 return 0;
1759 }
1760
1761 static int commit_match(struct commit *commit, struct rev_info *opt)
1762 {
1763 if (!opt->grep_filter.pattern_list)
1764 return 1;
1765 return grep_buffer(&opt->grep_filter,
1766 NULL, /* we say nothing, not even filename */
1767 commit->buffer, strlen(commit->buffer));
1768 }
1769
1770 static inline int want_ancestry(struct rev_info *revs)
1771 {
1772 return (revs->rewrite_parents || revs->children.name);
1773 }
1774
1775 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
1776 {
1777 if (commit->object.flags & SHOWN)
1778 return commit_ignore;
1779 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
1780 return commit_ignore;
1781 if (revs->show_all)
1782 return commit_show;
1783 if (commit->object.flags & UNINTERESTING)
1784 return commit_ignore;
1785 if (revs->min_age != -1 && (commit->date > revs->min_age))
1786 return commit_ignore;
1787 if (revs->no_merges && commit->parents && commit->parents->next)
1788 return commit_ignore;
1789 if (revs->merges_only && !(commit->parents && commit->parents->next))
1790 return commit_ignore;
1791 if (!commit_match(commit, revs))
1792 return commit_ignore;
1793 if (revs->prune && revs->dense) {
1794 /* Commit without changes? */
1795 if (commit->object.flags & TREESAME) {
1796 /* drop merges unless we want parenthood */
1797 if (!want_ancestry(revs))
1798 return commit_ignore;
1799 /* non-merge - always ignore it */
1800 if (!commit->parents || !commit->parents->next)
1801 return commit_ignore;
1802 }
1803 }
1804 return commit_show;
1805 }
1806
1807 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1808 {
1809 enum commit_action action = get_commit_action(revs, commit);
1810
1811 if (action == commit_show &&
1812 !revs->show_all &&
1813 revs->prune && revs->dense && want_ancestry(revs)) {
1814 if (rewrite_parents(revs, commit) < 0)
1815 return commit_error;
1816 }
1817 return action;
1818 }
1819
1820 static struct commit *get_revision_1(struct rev_info *revs)
1821 {
1822 if (!revs->commits)
1823 return NULL;
1824
1825 do {
1826 struct commit_list *entry = revs->commits;
1827 struct commit *commit = entry->item;
1828
1829 revs->commits = entry->next;
1830 free(entry);
1831
1832 if (revs->reflog_info)
1833 fake_reflog_parent(revs->reflog_info, commit);
1834
1835 /*
1836 * If we haven't done the list limiting, we need to look at
1837 * the parents here. We also need to do the date-based limiting
1838 * that we'd otherwise have done in limit_list().
1839 */
1840 if (!revs->limited) {
1841 if (revs->max_age != -1 &&
1842 (commit->date < revs->max_age))
1843 continue;
1844 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
1845 die("Failed to traverse parents of commit %s",
1846 sha1_to_hex(commit->object.sha1));
1847 }
1848
1849 switch (simplify_commit(revs, commit)) {
1850 case commit_ignore:
1851 continue;
1852 case commit_error:
1853 die("Failed to simplify parents of commit %s",
1854 sha1_to_hex(commit->object.sha1));
1855 default:
1856 return commit;
1857 }
1858 } while (revs->commits);
1859 return NULL;
1860 }
1861
1862 static void gc_boundary(struct object_array *array)
1863 {
1864 unsigned nr = array->nr;
1865 unsigned alloc = array->alloc;
1866 struct object_array_entry *objects = array->objects;
1867
1868 if (alloc <= nr) {
1869 unsigned i, j;
1870 for (i = j = 0; i < nr; i++) {
1871 if (objects[i].item->flags & SHOWN)
1872 continue;
1873 if (i != j)
1874 objects[j] = objects[i];
1875 j++;
1876 }
1877 for (i = j; i < nr; i++)
1878 objects[i].item = NULL;
1879 array->nr = j;
1880 }
1881 }
1882
1883 static void create_boundary_commit_list(struct rev_info *revs)
1884 {
1885 unsigned i;
1886 struct commit *c;
1887 struct object_array *array = &revs->boundary_commits;
1888 struct object_array_entry *objects = array->objects;
1889
1890 /*
1891 * If revs->commits is non-NULL at this point, an error occurred in
1892 * get_revision_1(). Ignore the error and continue printing the
1893 * boundary commits anyway. (This is what the code has always
1894 * done.)
1895 */
1896 if (revs->commits) {
1897 free_commit_list(revs->commits);
1898 revs->commits = NULL;
1899 }
1900
1901 /*
1902 * Put all of the actual boundary commits from revs->boundary_commits
1903 * into revs->commits
1904 */
1905 for (i = 0; i < array->nr; i++) {
1906 c = (struct commit *)(objects[i].item);
1907 if (!c)
1908 continue;
1909 if (!(c->object.flags & CHILD_SHOWN))
1910 continue;
1911 if (c->object.flags & (SHOWN | BOUNDARY))
1912 continue;
1913 c->object.flags |= BOUNDARY;
1914 commit_list_insert(c, &revs->commits);
1915 }
1916
1917 /*
1918 * If revs->topo_order is set, sort the boundary commits
1919 * in topological order
1920 */
1921 sort_in_topological_order(&revs->commits, revs->lifo);
1922 }
1923
1924 static struct commit *get_revision_internal(struct rev_info *revs)
1925 {
1926 struct commit *c = NULL;
1927 struct commit_list *l;
1928
1929 if (revs->boundary == 2) {
1930 /*
1931 * All of the normal commits have already been returned,
1932 * and we are now returning boundary commits.
1933 * create_boundary_commit_list() has populated
1934 * revs->commits with the remaining commits to return.
1935 */
1936 c = pop_commit(&revs->commits);
1937 if (c)
1938 c->object.flags |= SHOWN;
1939 return c;
1940 }
1941
1942 /*
1943 * Now pick up what they want to give us
1944 */
1945 c = get_revision_1(revs);
1946 if (c) {
1947 while (0 < revs->skip_count) {
1948 revs->skip_count--;
1949 c = get_revision_1(revs);
1950 if (!c)
1951 break;
1952 }
1953 }
1954
1955 /*
1956 * Check the max_count.
1957 */
1958 switch (revs->max_count) {
1959 case -1:
1960 break;
1961 case 0:
1962 c = NULL;
1963 break;
1964 default:
1965 revs->max_count--;
1966 }
1967
1968 if (c)
1969 c->object.flags |= SHOWN;
1970
1971 if (!revs->boundary) {
1972 return c;
1973 }
1974
1975 if (!c) {
1976 /*
1977 * get_revision_1() runs out the commits, and
1978 * we are done computing the boundaries.
1979 * switch to boundary commits output mode.
1980 */
1981 revs->boundary = 2;
1982
1983 /*
1984 * Update revs->commits to contain the list of
1985 * boundary commits.
1986 */
1987 create_boundary_commit_list(revs);
1988
1989 return get_revision_internal(revs);
1990 }
1991
1992 /*
1993 * boundary commits are the commits that are parents of the
1994 * ones we got from get_revision_1() but they themselves are
1995 * not returned from get_revision_1(). Before returning
1996 * 'c', we need to mark its parents that they could be boundaries.
1997 */
1998
1999 for (l = c->parents; l; l = l->next) {
2000 struct object *p;
2001 p = &(l->item->object);
2002 if (p->flags & (CHILD_SHOWN | SHOWN))
2003 continue;
2004 p->flags |= CHILD_SHOWN;
2005 gc_boundary(&revs->boundary_commits);
2006 add_object_array(p, NULL, &revs->boundary_commits);
2007 }
2008
2009 return c;
2010 }
2011
2012 struct commit *get_revision(struct rev_info *revs)
2013 {
2014 struct commit *c;
2015 struct commit_list *reversed;
2016
2017 if (revs->reverse) {
2018 reversed = NULL;
2019 while ((c = get_revision_internal(revs))) {
2020 commit_list_insert(c, &reversed);
2021 }
2022 revs->commits = reversed;
2023 revs->reverse = 0;
2024 revs->reverse_output_stage = 1;
2025 }
2026
2027 if (revs->reverse_output_stage)
2028 return pop_commit(&revs->commits);
2029
2030 c = get_revision_internal(revs);
2031 if (c && revs->graph)
2032 graph_update(revs->graph, c);
2033 return c;
2034 }