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"
16 volatile show_early_output_fn_t show_early_output;
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;
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 }
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 }
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 }
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;
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));
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 }
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 }
98 void mark_parents_uninteresting(struct commit *commit)
99 {
100 struct commit_list *parents = commit->parents;
102 while (parents) {
103 struct commit *commit = parents->item;
104 if (!(commit->object.flags & UNINTERESTING)) {
105 commit->object.flags |= UNINTERESTING;
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 }
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 }
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 }
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 }
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 }
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;
165 object = parse_object(sha1);
166 if (!object)
167 die("bad object %s", name);
168 object->flags |= flags;
169 return object;
170 }
172 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
173 {
174 unsigned long flags = object->flags;
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 }
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 }
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 }
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 }
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 }
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;
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;
275 tree_difference |= diff;
276 if (tree_difference == REV_TREE_DIFFERENT)
277 DIFF_OPT_SET(options, HAS_CHANGES);
278 }
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 }
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;
295 if (!t1)
296 return REV_TREE_NEW;
297 if (!t2)
298 return REV_TREE_OLD;
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 }
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 }
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;
334 if (!t1)
335 return 0;
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);
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);
348 return retval >= 0 && (tree_difference == REV_TREE_SAME);
349 }
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;
356 /*
357 * If we don't do pruning, everything is interesting
358 */
359 if (!revs->prune)
360 return;
362 if (!commit->tree)
363 return;
365 if (!commit->parents) {
366 if (rev_same_tree_as_empty(revs, commit))
367 commit->object.flags |= TREESAME;
368 return;
369 }
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;
378 pp = &commit->parents;
379 while ((parent = *pp) != NULL) {
380 struct commit *p = parent->item;
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;
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 }
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;
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);
445 if (cache && (!*cache || p->date < (*cache)->item->date))
446 *cache = new_entry;
447 }
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;
456 if (commit->object.flags & ADDED)
457 return 0;
458 commit->object.flags |= ADDED;
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 }
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);
497 if (revs->no_walk)
498 return 0;
500 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
502 for (parent = commit->parents; parent; parent = parent->next) {
503 struct commit *p = parent->item;
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 }
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;
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 }
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 }
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;
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 }
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;
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;
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 }
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;
594 ent = commit->util;
595 if (!ent)
596 continue;
597 if (ent->seen)
598 commit->object.flags |= SHOWN;
599 commit->util = NULL;
600 }
602 free_patch_ids(&ids);
603 }
605 /* How many extra uninteresting commits we want to see.. */
606 #define SLOP 5
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;
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;
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;
630 /* Ok, we're closing in.. */
631 return slop-1;
632 }
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;
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;
648 list = list->next;
649 free(entry);
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;
672 show = show_early_output;
673 if (!show)
674 continue;
676 show(revs, newlist);
677 show_early_output = NULL;
678 }
679 if (revs->cherry_pick)
680 cherry_pick_list(newlist, revs);
682 revs->commits = newlist;
683 return 0;
684 }
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 };
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 }
702 static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
703 unsigned flags)
704 {
705 cb->all_revs = revs;
706 cb->all_flags = flags;
707 }
709 static void handle_refs(struct rev_info *revs, unsigned flags,
710 int (*for_each)(each_ref_fn, void *))
711 {
712 struct all_refs_cb cb;
713 init_all_refs_cb(&cb, revs, flags);
714 for_each(handle_one_ref, &cb);
715 }
717 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
718 {
719 struct all_refs_cb *cb = cb_data;
720 if (!is_null_sha1(sha1)) {
721 struct object *o = parse_object(sha1);
722 if (o) {
723 o->flags |= cb->all_flags;
724 add_pending_object(cb->all_revs, o, "");
725 }
726 else if (!cb->warned_bad_reflog) {
727 warning("reflog of '%s' references pruned commits",
728 cb->name_for_errormsg);
729 cb->warned_bad_reflog = 1;
730 }
731 }
732 }
734 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
735 const char *email, unsigned long timestamp, int tz,
736 const char *message, void *cb_data)
737 {
738 handle_one_reflog_commit(osha1, cb_data);
739 handle_one_reflog_commit(nsha1, cb_data);
740 return 0;
741 }
743 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
744 {
745 struct all_refs_cb *cb = cb_data;
746 cb->warned_bad_reflog = 0;
747 cb->name_for_errormsg = path;
748 for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
749 return 0;
750 }
752 static void handle_reflog(struct rev_info *revs, unsigned flags)
753 {
754 struct all_refs_cb cb;
755 cb.all_revs = revs;
756 cb.all_flags = flags;
757 for_each_reflog(handle_one_reflog, &cb);
758 }
760 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
761 {
762 unsigned char sha1[20];
763 struct object *it;
764 struct commit *commit;
765 struct commit_list *parents;
767 if (*arg == '^') {
768 flags ^= UNINTERESTING;
769 arg++;
770 }
771 if (get_sha1(arg, sha1))
772 return 0;
773 while (1) {
774 it = get_reference(revs, arg, sha1, 0);
775 if (it->type != OBJ_TAG)
776 break;
777 if (!((struct tag*)it)->tagged)
778 return 0;
779 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
780 }
781 if (it->type != OBJ_COMMIT)
782 return 0;
783 commit = (struct commit *)it;
784 for (parents = commit->parents; parents; parents = parents->next) {
785 it = &parents->item->object;
786 it->flags |= flags;
787 add_pending_object(revs, it, arg);
788 }
789 return 1;
790 }
792 void init_revisions(struct rev_info *revs, const char *prefix)
793 {
794 memset(revs, 0, sizeof(*revs));
796 revs->abbrev = DEFAULT_ABBREV;
797 revs->ignore_merges = 1;
798 revs->simplify_history = 1;
799 DIFF_OPT_SET(&revs->pruning, RECURSIVE);
800 DIFF_OPT_SET(&revs->pruning, QUICK);
801 revs->pruning.add_remove = file_add_remove;
802 revs->pruning.change = file_change;
803 revs->lifo = 1;
804 revs->dense = 1;
805 revs->prefix = prefix;
806 revs->max_age = -1;
807 revs->min_age = -1;
808 revs->skip_count = -1;
809 revs->max_count = -1;
811 revs->commit_format = CMIT_FMT_DEFAULT;
813 revs->grep_filter.status_only = 1;
814 revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
815 revs->grep_filter.regflags = REG_NEWLINE;
817 diff_setup(&revs->diffopt);
818 if (prefix && !revs->diffopt.prefix) {
819 revs->diffopt.prefix = prefix;
820 revs->diffopt.prefix_length = strlen(prefix);
821 }
822 }
824 static void add_pending_commit_list(struct rev_info *revs,
825 struct commit_list *commit_list,
826 unsigned int flags)
827 {
828 while (commit_list) {
829 struct object *object = &commit_list->item->object;
830 object->flags |= flags;
831 add_pending_object(revs, object, sha1_to_hex(object->sha1));
832 commit_list = commit_list->next;
833 }
834 }
836 static void prepare_show_merge(struct rev_info *revs)
837 {
838 struct commit_list *bases;
839 struct commit *head, *other;
840 unsigned char sha1[20];
841 const char **prune = NULL;
842 int i, prune_num = 1; /* counting terminating NULL */
844 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
845 die("--merge without HEAD?");
846 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
847 die("--merge without MERGE_HEAD?");
848 add_pending_object(revs, &head->object, "HEAD");
849 add_pending_object(revs, &other->object, "MERGE_HEAD");
850 bases = get_merge_bases(head, other, 1);
851 add_pending_commit_list(revs, bases, UNINTERESTING);
852 free_commit_list(bases);
853 head->object.flags |= SYMMETRIC_LEFT;
855 if (!active_nr)
856 read_cache();
857 for (i = 0; i < active_nr; i++) {
858 struct cache_entry *ce = active_cache[i];
859 if (!ce_stage(ce))
860 continue;
861 if (ce_path_match(ce, revs->prune_data)) {
862 prune_num++;
863 prune = xrealloc(prune, sizeof(*prune) * prune_num);
864 prune[prune_num-2] = ce->name;
865 prune[prune_num-1] = NULL;
866 }
867 while ((i+1 < active_nr) &&
868 ce_same_name(ce, active_cache[i+1]))
869 i++;
870 }
871 revs->prune_data = prune;
872 revs->limited = 1;
873 }
875 int handle_revision_arg(const char *arg, struct rev_info *revs,
876 int flags,
877 int cant_be_filename)
878 {
879 unsigned mode;
880 char *dotdot;
881 struct object *object;
882 unsigned char sha1[20];
883 int local_flags;
885 dotdot = strstr(arg, "..");
886 if (dotdot) {
887 unsigned char from_sha1[20];
888 const char *next = dotdot + 2;
889 const char *this = arg;
890 int symmetric = *next == '.';
891 unsigned int flags_exclude = flags ^ UNINTERESTING;
893 *dotdot = 0;
894 next += symmetric;
896 if (!*next)
897 next = "HEAD";
898 if (dotdot == arg)
899 this = "HEAD";
900 if (!get_sha1(this, from_sha1) &&
901 !get_sha1(next, sha1)) {
902 struct commit *a, *b;
903 struct commit_list *exclude;
905 a = lookup_commit_reference(from_sha1);
906 b = lookup_commit_reference(sha1);
907 if (!a || !b) {
908 die(symmetric ?
909 "Invalid symmetric difference expression %s...%s" :
910 "Invalid revision range %s..%s",
911 arg, next);
912 }
914 if (!cant_be_filename) {
915 *dotdot = '.';
916 verify_non_filename(revs->prefix, arg);
917 }
919 if (symmetric) {
920 exclude = get_merge_bases(a, b, 1);
921 add_pending_commit_list(revs, exclude,
922 flags_exclude);
923 free_commit_list(exclude);
924 a->object.flags |= flags | SYMMETRIC_LEFT;
925 } else
926 a->object.flags |= flags_exclude;
927 b->object.flags |= flags;
928 add_pending_object(revs, &a->object, this);
929 add_pending_object(revs, &b->object, next);
930 return 0;
931 }
932 *dotdot = '.';
933 }
934 dotdot = strstr(arg, "^@");
935 if (dotdot && !dotdot[2]) {
936 *dotdot = 0;
937 if (add_parents_only(revs, arg, flags))
938 return 0;
939 *dotdot = '^';
940 }
941 dotdot = strstr(arg, "^!");
942 if (dotdot && !dotdot[2]) {
943 *dotdot = 0;
944 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
945 *dotdot = '^';
946 }
948 local_flags = 0;
949 if (*arg == '^') {
950 local_flags = UNINTERESTING;
951 arg++;
952 }
953 if (get_sha1_with_mode(arg, sha1, &mode))
954 return -1;
955 if (!cant_be_filename)
956 verify_non_filename(revs->prefix, arg);
957 object = get_reference(revs, arg, sha1, flags ^ local_flags);
958 add_pending_object_with_mode(revs, object, arg, mode);
959 return 0;
960 }
962 static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb, const char ***prune_data)
963 {
964 const char **prune = *prune_data;
965 int prune_nr;
966 int prune_alloc;
968 /* count existing ones */
969 if (!prune)
970 prune_nr = 0;
971 else
972 for (prune_nr = 0; prune[prune_nr]; prune_nr++)
973 ;
974 prune_alloc = prune_nr; /* not really, but we do not know */
976 while (strbuf_getwholeline(sb, stdin, '\n') != EOF) {
977 int len = sb->len;
978 if (len && sb->buf[len - 1] == '\n')
979 sb->buf[--len] = '\0';
980 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
981 prune[prune_nr++] = xstrdup(sb->buf);
982 }
983 if (prune) {
984 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
985 prune[prune_nr] = NULL;
986 }
987 *prune_data = prune;
988 }
990 static void read_revisions_from_stdin(struct rev_info *revs, const char ***prune)
991 {
992 struct strbuf sb;
993 int seen_dashdash = 0;
995 strbuf_init(&sb, 1000);
996 while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
997 int len = sb.len;
998 if (len && sb.buf[len - 1] == '\n')
999 sb.buf[--len] = '\0';
1000 if (!len)
1001 break;
1002 if (sb.buf[0] == '-') {
1003 if (len == 2 && sb.buf[1] == '-') {
1004 seen_dashdash = 1;
1005 break;
1006 }
1007 die("options not supported in --stdin mode");
1008 }
1009 if (handle_revision_arg(sb.buf, revs, 0, 1))
1010 die("bad revision '%s'", sb.buf);
1011 }
1012 if (seen_dashdash)
1013 read_pathspec_from_stdin(revs, &sb, prune);
1014 strbuf_release(&sb);
1015 }
1017 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1018 {
1019 append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1020 }
1022 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1023 {
1024 append_header_grep_pattern(&revs->grep_filter, field, pattern);
1025 }
1027 static void add_message_grep(struct rev_info *revs, const char *pattern)
1028 {
1029 add_grep(revs, pattern, GREP_PATTERN_BODY);
1030 }
1032 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1033 int *unkc, const char **unkv)
1034 {
1035 const char *arg = argv[0];
1037 /* pseudo revision arguments */
1038 if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1039 !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1040 !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1041 !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1042 !strcmp(arg, "--bisect"))
1043 {
1044 unkv[(*unkc)++] = arg;
1045 return 1;
1046 }
1048 if (!prefixcmp(arg, "--max-count=")) {
1049 revs->max_count = atoi(arg + 12);
1050 } else if (!prefixcmp(arg, "--skip=")) {
1051 revs->skip_count = atoi(arg + 7);
1052 } else if ((*arg == '-') && isdigit(arg[1])) {
1053 /* accept -<digit>, like traditional "head" */
1054 revs->max_count = atoi(arg + 1);
1055 } else if (!strcmp(arg, "-n")) {
1056 if (argc <= 1)
1057 return error("-n requires an argument");
1058 revs->max_count = atoi(argv[1]);
1059 return 2;
1060 } else if (!prefixcmp(arg, "-n")) {
1061 revs->max_count = atoi(arg + 2);
1062 } else if (!prefixcmp(arg, "--max-age=")) {
1063 revs->max_age = atoi(arg + 10);
1064 } else if (!prefixcmp(arg, "--since=")) {
1065 revs->max_age = approxidate(arg + 8);
1066 } else if (!prefixcmp(arg, "--after=")) {
1067 revs->max_age = approxidate(arg + 8);
1068 } else if (!prefixcmp(arg, "--min-age=")) {
1069 revs->min_age = atoi(arg + 10);
1070 } else if (!prefixcmp(arg, "--before=")) {
1071 revs->min_age = approxidate(arg + 9);
1072 } else if (!prefixcmp(arg, "--until=")) {
1073 revs->min_age = approxidate(arg + 8);
1074 } else if (!strcmp(arg, "--first-parent")) {
1075 revs->first_parent_only = 1;
1076 } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1077 init_reflog_walk(&revs->reflog_info);
1078 } else if (!strcmp(arg, "--default")) {
1079 if (argc <= 1)
1080 return error("bad --default argument");
1081 revs->def = argv[1];
1082 return 2;
1083 } else if (!strcmp(arg, "--merge")) {
1084 revs->show_merge = 1;
1085 } else if (!strcmp(arg, "--topo-order")) {
1086 revs->lifo = 1;
1087 revs->topo_order = 1;
1088 } else if (!strcmp(arg, "--simplify-merges")) {
1089 revs->simplify_merges = 1;
1090 revs->rewrite_parents = 1;
1091 revs->simplify_history = 0;
1092 revs->limited = 1;
1093 } else if (!strcmp(arg, "--simplify-by-decoration")) {
1094 revs->simplify_merges = 1;
1095 revs->rewrite_parents = 1;
1096 revs->simplify_history = 0;
1097 revs->simplify_by_decoration = 1;
1098 revs->limited = 1;
1099 revs->prune = 1;
1100 load_ref_decorations(DECORATE_SHORT_REFS);
1101 } else if (!strcmp(arg, "--date-order")) {
1102 revs->lifo = 0;
1103 revs->topo_order = 1;
1104 } else if (!prefixcmp(arg, "--early-output")) {
1105 int count = 100;
1106 switch (arg[14]) {
1107 case '=':
1108 count = atoi(arg+15);
1109 /* Fallthrough */
1110 case 0:
1111 revs->topo_order = 1;
1112 revs->early_output = count;
1113 }
1114 } else if (!strcmp(arg, "--parents")) {
1115 revs->rewrite_parents = 1;
1116 revs->print_parents = 1;
1117 } else if (!strcmp(arg, "--dense")) {
1118 revs->dense = 1;
1119 } else if (!strcmp(arg, "--sparse")) {
1120 revs->dense = 0;
1121 } else if (!strcmp(arg, "--show-all")) {
1122 revs->show_all = 1;
1123 } else if (!strcmp(arg, "--remove-empty")) {
1124 revs->remove_empty_trees = 1;
1125 } else if (!strcmp(arg, "--merges")) {
1126 revs->merges_only = 1;
1127 } else if (!strcmp(arg, "--no-merges")) {
1128 revs->no_merges = 1;
1129 } else if (!strcmp(arg, "--boundary")) {
1130 revs->boundary = 1;
1131 } else if (!strcmp(arg, "--left-right")) {
1132 revs->left_right = 1;
1133 } else if (!strcmp(arg, "--cherry-pick")) {
1134 revs->cherry_pick = 1;
1135 revs->limited = 1;
1136 } else if (!strcmp(arg, "--objects")) {
1137 revs->tag_objects = 1;
1138 revs->tree_objects = 1;
1139 revs->blob_objects = 1;
1140 } else if (!strcmp(arg, "--objects-edge")) {
1141 revs->tag_objects = 1;
1142 revs->tree_objects = 1;
1143 revs->blob_objects = 1;
1144 revs->edge_hint = 1;
1145 } else if (!strcmp(arg, "--unpacked")) {
1146 revs->unpacked = 1;
1147 } else if (!prefixcmp(arg, "--unpacked=")) {
1148 die("--unpacked=<packfile> no longer supported.");
1149 } else if (!strcmp(arg, "-r")) {
1150 revs->diff = 1;
1151 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1152 } else if (!strcmp(arg, "-t")) {
1153 revs->diff = 1;
1154 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1155 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1156 } else if (!strcmp(arg, "-m")) {
1157 revs->ignore_merges = 0;
1158 } else if (!strcmp(arg, "-c")) {
1159 revs->diff = 1;
1160 revs->dense_combined_merges = 0;
1161 revs->combine_merges = 1;
1162 } else if (!strcmp(arg, "--cc")) {
1163 revs->diff = 1;
1164 revs->dense_combined_merges = 1;
1165 revs->combine_merges = 1;
1166 } else if (!strcmp(arg, "-v")) {
1167 revs->verbose_header = 1;
1168 } else if (!strcmp(arg, "--pretty")) {
1169 revs->verbose_header = 1;
1170 revs->pretty_given = 1;
1171 get_commit_format(arg+8, revs);
1172 } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
1173 revs->verbose_header = 1;
1174 revs->pretty_given = 1;
1175 get_commit_format(arg+9, revs);
1176 } else if (!strcmp(arg, "--show-notes")) {
1177 revs->show_notes = 1;
1178 revs->show_notes_given = 1;
1179 } else if (!strcmp(arg, "--no-notes")) {
1180 revs->show_notes = 0;
1181 revs->show_notes_given = 1;
1182 } else if (!strcmp(arg, "--oneline")) {
1183 revs->verbose_header = 1;
1184 get_commit_format("oneline", revs);
1185 revs->pretty_given = 1;
1186 revs->abbrev_commit = 1;
1187 } else if (!strcmp(arg, "--graph")) {
1188 revs->topo_order = 1;
1189 revs->rewrite_parents = 1;
1190 revs->graph = graph_init(revs);
1191 } else if (!strcmp(arg, "--root")) {
1192 revs->show_root_diff = 1;
1193 } else if (!strcmp(arg, "--no-commit-id")) {
1194 revs->no_commit_id = 1;
1195 } else if (!strcmp(arg, "--always")) {
1196 revs->always_show_header = 1;
1197 } else if (!strcmp(arg, "--no-abbrev")) {
1198 revs->abbrev = 0;
1199 } else if (!strcmp(arg, "--abbrev")) {
1200 revs->abbrev = DEFAULT_ABBREV;
1201 } else if (!prefixcmp(arg, "--abbrev=")) {
1202 revs->abbrev = strtoul(arg + 9, NULL, 10);
1203 if (revs->abbrev < MINIMUM_ABBREV)
1204 revs->abbrev = MINIMUM_ABBREV;
1205 else if (revs->abbrev > 40)
1206 revs->abbrev = 40;
1207 } else if (!strcmp(arg, "--abbrev-commit")) {
1208 revs->abbrev_commit = 1;
1209 } else if (!strcmp(arg, "--full-diff")) {
1210 revs->diff = 1;
1211 revs->full_diff = 1;
1212 } else if (!strcmp(arg, "--full-history")) {
1213 revs->simplify_history = 0;
1214 } else if (!strcmp(arg, "--relative-date")) {
1215 revs->date_mode = DATE_RELATIVE;
1216 revs->date_mode_explicit = 1;
1217 } else if (!strncmp(arg, "--date=", 7)) {
1218 revs->date_mode = parse_date_format(arg + 7);
1219 revs->date_mode_explicit = 1;
1220 } else if (!strcmp(arg, "--log-size")) {
1221 revs->show_log_size = 1;
1222 }
1223 /*
1224 * Grepping the commit log
1225 */
1226 else if (!prefixcmp(arg, "--author=")) {
1227 add_header_grep(revs, GREP_HEADER_AUTHOR, arg+9);
1228 } else if (!prefixcmp(arg, "--committer=")) {
1229 add_header_grep(revs, GREP_HEADER_COMMITTER, arg+12);
1230 } else if (!prefixcmp(arg, "--grep=")) {
1231 add_message_grep(revs, arg+7);
1232 } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1233 revs->grep_filter.regflags |= REG_EXTENDED;
1234 } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1235 revs->grep_filter.regflags |= REG_ICASE;
1236 } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1237 revs->grep_filter.fixed = 1;
1238 } else if (!strcmp(arg, "--all-match")) {
1239 revs->grep_filter.all_match = 1;
1240 } else if (!prefixcmp(arg, "--encoding=")) {
1241 arg += 11;
1242 if (strcmp(arg, "none"))
1243 git_log_output_encoding = xstrdup(arg);
1244 else
1245 git_log_output_encoding = "";
1246 } else if (!strcmp(arg, "--reverse")) {
1247 revs->reverse ^= 1;
1248 } else if (!strcmp(arg, "--children")) {
1249 revs->children.name = "children";
1250 revs->limited = 1;
1251 } else {
1252 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1253 if (!opts)
1254 unkv[(*unkc)++] = arg;
1255 return opts;
1256 }
1258 return 1;
1259 }
1261 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1262 const struct option *options,
1263 const char * const usagestr[])
1264 {
1265 int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1266 &ctx->cpidx, ctx->out);
1267 if (n <= 0) {
1268 error("unknown option `%s'", ctx->argv[0]);
1269 usage_with_options(usagestr, options);
1270 }
1271 ctx->argv += n;
1272 ctx->argc -= n;
1273 }
1275 static int for_each_bad_bisect_ref(each_ref_fn fn, void *cb_data)
1276 {
1277 return for_each_ref_in("refs/bisect/bad", fn, cb_data);
1278 }
1280 static int for_each_good_bisect_ref(each_ref_fn fn, void *cb_data)
1281 {
1282 return for_each_ref_in("refs/bisect/good", fn, cb_data);
1283 }
1285 static void append_prune_data(const char ***prune_data, const char **av)
1286 {
1287 const char **prune = *prune_data;
1288 int prune_nr;
1289 int prune_alloc;
1291 if (!prune) {
1292 *prune_data = av;
1293 return;
1294 }
1296 /* count existing ones */
1297 for (prune_nr = 0; prune[prune_nr]; prune_nr++)
1298 ;
1299 prune_alloc = prune_nr; /* not really, but we do not know */
1301 while (*av) {
1302 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1303 prune[prune_nr++] = *av;
1304 av++;
1305 }
1306 if (prune) {
1307 ALLOC_GROW(prune, prune_nr+1, prune_alloc);
1308 prune[prune_nr] = NULL;
1309 }
1310 *prune_data = prune;
1311 }
1313 /*
1314 * Parse revision information, filling in the "rev_info" structure,
1315 * and removing the used arguments from the argument list.
1316 *
1317 * Returns the number of arguments left that weren't recognized
1318 * (which are also moved to the head of the argument list)
1319 */
1320 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
1321 {
1322 int i, flags, left, seen_dashdash, read_from_stdin;
1323 const char **prune_data = NULL;
1325 /* First, search for "--" */
1326 seen_dashdash = 0;
1327 for (i = 1; i < argc; i++) {
1328 const char *arg = argv[i];
1329 if (strcmp(arg, "--"))
1330 continue;
1331 argv[i] = NULL;
1332 argc = i;
1333 if (argv[i + 1])
1334 prune_data = argv + i + 1;
1335 seen_dashdash = 1;
1336 break;
1337 }
1339 /* Second, deal with arguments and options */
1340 flags = 0;
1341 read_from_stdin = 0;
1342 for (left = i = 1; i < argc; i++) {
1343 const char *arg = argv[i];
1344 if (*arg == '-') {
1345 int opts;
1347 if (!strcmp(arg, "--all")) {
1348 handle_refs(revs, flags, for_each_ref);
1349 handle_refs(revs, flags, head_ref);
1350 continue;
1351 }
1352 if (!strcmp(arg, "--branches")) {
1353 handle_refs(revs, flags, for_each_branch_ref);
1354 continue;
1355 }
1356 if (!strcmp(arg, "--bisect")) {
1357 handle_refs(revs, flags, for_each_bad_bisect_ref);
1358 handle_refs(revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);
1359 revs->bisect = 1;
1360 continue;
1361 }
1362 if (!strcmp(arg, "--tags")) {
1363 handle_refs(revs, flags, for_each_tag_ref);
1364 continue;
1365 }
1366 if (!strcmp(arg, "--remotes")) {
1367 handle_refs(revs, flags, for_each_remote_ref);
1368 continue;
1369 }
1370 if (!prefixcmp(arg, "--glob=")) {
1371 struct all_refs_cb cb;
1372 init_all_refs_cb(&cb, revs, flags);
1373 for_each_glob_ref(handle_one_ref, arg + 7, &cb);
1374 continue;
1375 }
1376 if (!prefixcmp(arg, "--branches=")) {
1377 struct all_refs_cb cb;
1378 init_all_refs_cb(&cb, revs, flags);
1379 for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
1380 continue;
1381 }
1382 if (!prefixcmp(arg, "--tags=")) {
1383 struct all_refs_cb cb;
1384 init_all_refs_cb(&cb, revs, flags);
1385 for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
1386 continue;
1387 }
1388 if (!prefixcmp(arg, "--remotes=")) {
1389 struct all_refs_cb cb;
1390 init_all_refs_cb(&cb, revs, flags);
1391 for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
1392 continue;
1393 }
1394 if (!strcmp(arg, "--reflog")) {
1395 handle_reflog(revs, flags);
1396 continue;
1397 }
1398 if (!strcmp(arg, "--not")) {
1399 flags ^= UNINTERESTING;
1400 continue;
1401 }
1402 if (!strcmp(arg, "--no-walk")) {
1403 revs->no_walk = 1;
1404 continue;
1405 }
1406 if (!strcmp(arg, "--do-walk")) {
1407 revs->no_walk = 0;
1408 continue;
1409 }
1410 if (!strcmp(arg, "--stdin")) {
1411 if (revs->disable_stdin) {
1412 argv[left++] = arg;
1413 continue;
1414 }
1415 if (read_from_stdin++)
1416 die("--stdin given twice?");
1417 read_revisions_from_stdin(revs, &prune_data);
1418 continue;
1419 }
1421 opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1422 if (opts > 0) {
1423 i += opts - 1;
1424 continue;
1425 }
1426 if (opts < 0)
1427 exit(128);
1428 continue;
1429 }
1431 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1432 int j;
1433 if (seen_dashdash || *arg == '^')
1434 die("bad revision '%s'", arg);
1436 /* If we didn't have a "--":
1437 * (1) all filenames must exist;
1438 * (2) all rev-args must not be interpretable
1439 * as a valid filename.
1440 * but the latter we have checked in the main loop.
1441 */
1442 for (j = i; j < argc; j++)
1443 verify_filename(revs->prefix, argv[j]);
1445 append_prune_data(&prune_data, argv + i);
1446 break;
1447 }
1448 }
1450 if (prune_data)
1451 revs->prune_data = get_pathspec(revs->prefix, prune_data);
1453 if (revs->def == NULL)
1454 revs->def = def;
1455 if (revs->show_merge)
1456 prepare_show_merge(revs);
1457 if (revs->def && !revs->pending.nr) {
1458 unsigned char sha1[20];
1459 struct object *object;
1460 unsigned mode;
1461 if (get_sha1_with_mode(revs->def, sha1, &mode))
1462 die("bad default revision '%s'", revs->def);
1463 object = get_reference(revs, revs->def, sha1, 0);
1464 add_pending_object_with_mode(revs, object, revs->def, mode);
1465 }
1467 /* Did the user ask for any diff output? Run the diff! */
1468 if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1469 revs->diff = 1;
1471 /* Pickaxe, diff-filter and rename following need diffs */
1472 if (revs->diffopt.pickaxe ||
1473 revs->diffopt.filter ||
1474 DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1475 revs->diff = 1;
1477 if (revs->topo_order)
1478 revs->limited = 1;
1480 if (revs->prune_data) {
1481 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1482 /* Can't prune commits with rename following: the paths change.. */
1483 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1484 revs->prune = 1;
1485 if (!revs->full_diff)
1486 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1487 }
1488 if (revs->combine_merges) {
1489 revs->ignore_merges = 0;
1490 if (revs->dense_combined_merges && !revs->diffopt.output_format)
1491 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1492 }
1493 revs->diffopt.abbrev = revs->abbrev;
1494 if (diff_setup_done(&revs->diffopt) < 0)
1495 die("diff_setup_done failed");
1497 compile_grep_patterns(&revs->grep_filter);
1499 if (revs->reverse && revs->reflog_info)
1500 die("cannot combine --reverse with --walk-reflogs");
1501 if (revs->rewrite_parents && revs->children.name)
1502 die("cannot combine --parents and --children");
1504 /*
1505 * Limitations on the graph functionality
1506 */
1507 if (revs->reverse && revs->graph)
1508 die("cannot combine --reverse with --graph");
1510 if (revs->reflog_info && revs->graph)
1511 die("cannot combine --walk-reflogs with --graph");
1513 return left;
1514 }
1516 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1517 {
1518 struct commit_list *l = xcalloc(1, sizeof(*l));
1520 l->item = child;
1521 l->next = add_decoration(&revs->children, &parent->object, l);
1522 }
1524 static int remove_duplicate_parents(struct commit *commit)
1525 {
1526 struct commit_list **pp, *p;
1527 int surviving_parents;
1529 /* Examine existing parents while marking ones we have seen... */
1530 pp = &commit->parents;
1531 while ((p = *pp) != NULL) {
1532 struct commit *parent = p->item;
1533 if (parent->object.flags & TMP_MARK) {
1534 *pp = p->next;
1535 continue;
1536 }
1537 parent->object.flags |= TMP_MARK;
1538 pp = &p->next;
1539 }
1540 /* count them while clearing the temporary mark */
1541 surviving_parents = 0;
1542 for (p = commit->parents; p; p = p->next) {
1543 p->item->object.flags &= ~TMP_MARK;
1544 surviving_parents++;
1545 }
1546 return surviving_parents;
1547 }
1549 struct merge_simplify_state {
1550 struct commit *simplified;
1551 };
1553 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1554 {
1555 struct merge_simplify_state *st;
1557 st = lookup_decoration(&revs->merge_simplification, &commit->object);
1558 if (!st) {
1559 st = xcalloc(1, sizeof(*st));
1560 add_decoration(&revs->merge_simplification, &commit->object, st);
1561 }
1562 return st;
1563 }
1565 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1566 {
1567 struct commit_list *p;
1568 struct merge_simplify_state *st, *pst;
1569 int cnt;
1571 st = locate_simplify_state(revs, commit);
1573 /*
1574 * Have we handled this one?
1575 */
1576 if (st->simplified)
1577 return tail;
1579 /*
1580 * An UNINTERESTING commit simplifies to itself, so does a
1581 * root commit. We do not rewrite parents of such commit
1582 * anyway.
1583 */
1584 if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
1585 st->simplified = commit;
1586 return tail;
1587 }
1589 /*
1590 * Do we know what commit all of our parents should be rewritten to?
1591 * Otherwise we are not ready to rewrite this one yet.
1592 */
1593 for (cnt = 0, p = commit->parents; p; p = p->next) {
1594 pst = locate_simplify_state(revs, p->item);
1595 if (!pst->simplified) {
1596 tail = &commit_list_insert(p->item, tail)->next;
1597 cnt++;
1598 }
1599 }
1600 if (cnt) {
1601 tail = &commit_list_insert(commit, tail)->next;
1602 return tail;
1603 }
1605 /*
1606 * Rewrite our list of parents.
1607 */
1608 for (p = commit->parents; p; p = p->next) {
1609 pst = locate_simplify_state(revs, p->item);
1610 p->item = pst->simplified;
1611 }
1612 cnt = remove_duplicate_parents(commit);
1614 /*
1615 * It is possible that we are a merge and one side branch
1616 * does not have any commit that touches the given paths;
1617 * in such a case, the immediate parents will be rewritten
1618 * to different commits.
1619 *
1620 * o----X X: the commit we are looking at;
1621 * / / o: a commit that touches the paths;
1622 * ---o----'
1623 *
1624 * Further reduce the parents by removing redundant parents.
1625 */
1626 if (1 < cnt) {
1627 struct commit_list *h = reduce_heads(commit->parents);
1628 cnt = commit_list_count(h);
1629 free_commit_list(commit->parents);
1630 commit->parents = h;
1631 }
1633 /*
1634 * A commit simplifies to itself if it is a root, if it is
1635 * UNINTERESTING, if it touches the given paths, or if it is a
1636 * merge and its parents simplifies to more than one commits
1637 * (the first two cases are already handled at the beginning of
1638 * this function).
1639 *
1640 * Otherwise, it simplifies to what its sole parent simplifies to.
1641 */
1642 if (!cnt ||
1643 (commit->object.flags & UNINTERESTING) ||
1644 !(commit->object.flags & TREESAME) ||
1645 (1 < cnt))
1646 st->simplified = commit;
1647 else {
1648 pst = locate_simplify_state(revs, commit->parents->item);
1649 st->simplified = pst->simplified;
1650 }
1651 return tail;
1652 }
1654 static void simplify_merges(struct rev_info *revs)
1655 {
1656 struct commit_list *list;
1657 struct commit_list *yet_to_do, **tail;
1659 if (!revs->topo_order)
1660 sort_in_topological_order(&revs->commits, revs->lifo);
1661 if (!revs->prune)
1662 return;
1664 /* feed the list reversed */
1665 yet_to_do = NULL;
1666 for (list = revs->commits; list; list = list->next)
1667 commit_list_insert(list->item, &yet_to_do);
1668 while (yet_to_do) {
1669 list = yet_to_do;
1670 yet_to_do = NULL;
1671 tail = &yet_to_do;
1672 while (list) {
1673 struct commit *commit = list->item;
1674 struct commit_list *next = list->next;
1675 free(list);
1676 list = next;
1677 tail = simplify_one(revs, commit, tail);
1678 }
1679 }
1681 /* clean up the result, removing the simplified ones */
1682 list = revs->commits;
1683 revs->commits = NULL;
1684 tail = &revs->commits;
1685 while (list) {
1686 struct commit *commit = list->item;
1687 struct commit_list *next = list->next;
1688 struct merge_simplify_state *st;
1689 free(list);
1690 list = next;
1691 st = locate_simplify_state(revs, commit);
1692 if (st->simplified == commit)
1693 tail = &commit_list_insert(commit, tail)->next;
1694 }
1695 }
1697 static void set_children(struct rev_info *revs)
1698 {
1699 struct commit_list *l;
1700 for (l = revs->commits; l; l = l->next) {
1701 struct commit *commit = l->item;
1702 struct commit_list *p;
1704 for (p = commit->parents; p; p = p->next)
1705 add_child(revs, p->item, commit);
1706 }
1707 }
1709 int prepare_revision_walk(struct rev_info *revs)
1710 {
1711 int nr = revs->pending.nr;
1712 struct object_array_entry *e, *list;
1714 e = list = revs->pending.objects;
1715 revs->pending.nr = 0;
1716 revs->pending.alloc = 0;
1717 revs->pending.objects = NULL;
1718 while (--nr >= 0) {
1719 struct commit *commit = handle_commit(revs, e->item, e->name);
1720 if (commit) {
1721 if (!(commit->object.flags & SEEN)) {
1722 commit->object.flags |= SEEN;
1723 insert_by_date(commit, &revs->commits);
1724 }
1725 }
1726 e++;
1727 }
1728 free(list);
1730 if (revs->no_walk)
1731 return 0;
1732 if (revs->limited)
1733 if (limit_list(revs) < 0)
1734 return -1;
1735 if (revs->topo_order)
1736 sort_in_topological_order(&revs->commits, revs->lifo);
1737 if (revs->simplify_merges)
1738 simplify_merges(revs);
1739 if (revs->children.name)
1740 set_children(revs);
1741 return 0;
1742 }
1744 enum rewrite_result {
1745 rewrite_one_ok,
1746 rewrite_one_noparents,
1747 rewrite_one_error,
1748 };
1750 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
1751 {
1752 struct commit_list *cache = NULL;
1754 for (;;) {
1755 struct commit *p = *pp;
1756 if (!revs->limited)
1757 if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
1758 return rewrite_one_error;
1759 if (p->parents && p->parents->next)
1760 return rewrite_one_ok;
1761 if (p->object.flags & UNINTERESTING)
1762 return rewrite_one_ok;
1763 if (!(p->object.flags & TREESAME))
1764 return rewrite_one_ok;
1765 if (!p->parents)
1766 return rewrite_one_noparents;
1767 *pp = p->parents->item;
1768 }
1769 }
1771 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
1772 {
1773 struct commit_list **pp = &commit->parents;
1774 while (*pp) {
1775 struct commit_list *parent = *pp;
1776 switch (rewrite_one(revs, &parent->item)) {
1777 case rewrite_one_ok:
1778 break;
1779 case rewrite_one_noparents:
1780 *pp = parent->next;
1781 continue;
1782 case rewrite_one_error:
1783 return -1;
1784 }
1785 pp = &parent->next;
1786 }
1787 remove_duplicate_parents(commit);
1788 return 0;
1789 }
1791 static int commit_match(struct commit *commit, struct rev_info *opt)
1792 {
1793 if (!opt->grep_filter.pattern_list)
1794 return 1;
1795 return grep_buffer(&opt->grep_filter,
1796 NULL, /* we say nothing, not even filename */
1797 commit->buffer, strlen(commit->buffer));
1798 }
1800 static inline int want_ancestry(struct rev_info *revs)
1801 {
1802 return (revs->rewrite_parents || revs->children.name);
1803 }
1805 enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
1806 {
1807 if (commit->object.flags & SHOWN)
1808 return commit_ignore;
1809 if (revs->unpacked && has_sha1_pack(commit->object.sha1))
1810 return commit_ignore;
1811 if (revs->show_all)
1812 return commit_show;
1813 if (commit->object.flags & UNINTERESTING)
1814 return commit_ignore;
1815 if (revs->min_age != -1 && (commit->date > revs->min_age))
1816 return commit_ignore;
1817 if (revs->no_merges && commit->parents && commit->parents->next)
1818 return commit_ignore;
1819 if (revs->merges_only && !(commit->parents && commit->parents->next))
1820 return commit_ignore;
1821 if (!commit_match(commit, revs))
1822 return commit_ignore;
1823 if (revs->prune && revs->dense) {
1824 /* Commit without changes? */
1825 if (commit->object.flags & TREESAME) {
1826 /* drop merges unless we want parenthood */
1827 if (!want_ancestry(revs))
1828 return commit_ignore;
1829 /* non-merge - always ignore it */
1830 if (!commit->parents || !commit->parents->next)
1831 return commit_ignore;
1832 }
1833 }
1834 return commit_show;
1835 }
1837 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1838 {
1839 enum commit_action action = get_commit_action(revs, commit);
1841 if (action == commit_show &&
1842 !revs->show_all &&
1843 revs->prune && revs->dense && want_ancestry(revs)) {
1844 if (rewrite_parents(revs, commit) < 0)
1845 return commit_error;
1846 }
1847 return action;
1848 }
1850 static struct commit *get_revision_1(struct rev_info *revs)
1851 {
1852 if (!revs->commits)
1853 return NULL;
1855 do {
1856 struct commit_list *entry = revs->commits;
1857 struct commit *commit = entry->item;
1859 revs->commits = entry->next;
1860 free(entry);
1862 if (revs->reflog_info)
1863 fake_reflog_parent(revs->reflog_info, commit);
1865 /*
1866 * If we haven't done the list limiting, we need to look at
1867 * the parents here. We also need to do the date-based limiting
1868 * that we'd otherwise have done in limit_list().
1869 */
1870 if (!revs->limited) {
1871 if (revs->max_age != -1 &&
1872 (commit->date < revs->max_age))
1873 continue;
1874 if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
1875 die("Failed to traverse parents of commit %s",
1876 sha1_to_hex(commit->object.sha1));
1877 }
1879 switch (simplify_commit(revs, commit)) {
1880 case commit_ignore:
1881 continue;
1882 case commit_error:
1883 die("Failed to simplify parents of commit %s",
1884 sha1_to_hex(commit->object.sha1));
1885 default:
1886 return commit;
1887 }
1888 } while (revs->commits);
1889 return NULL;
1890 }
1892 static void gc_boundary(struct object_array *array)
1893 {
1894 unsigned nr = array->nr;
1895 unsigned alloc = array->alloc;
1896 struct object_array_entry *objects = array->objects;
1898 if (alloc <= nr) {
1899 unsigned i, j;
1900 for (i = j = 0; i < nr; i++) {
1901 if (objects[i].item->flags & SHOWN)
1902 continue;
1903 if (i != j)
1904 objects[j] = objects[i];
1905 j++;
1906 }
1907 for (i = j; i < nr; i++)
1908 objects[i].item = NULL;
1909 array->nr = j;
1910 }
1911 }
1913 static void create_boundary_commit_list(struct rev_info *revs)
1914 {
1915 unsigned i;
1916 struct commit *c;
1917 struct object_array *array = &revs->boundary_commits;
1918 struct object_array_entry *objects = array->objects;
1920 /*
1921 * If revs->commits is non-NULL at this point, an error occurred in
1922 * get_revision_1(). Ignore the error and continue printing the
1923 * boundary commits anyway. (This is what the code has always
1924 * done.)
1925 */
1926 if (revs->commits) {
1927 free_commit_list(revs->commits);
1928 revs->commits = NULL;
1929 }
1931 /*
1932 * Put all of the actual boundary commits from revs->boundary_commits
1933 * into revs->commits
1934 */
1935 for (i = 0; i < array->nr; i++) {
1936 c = (struct commit *)(objects[i].item);
1937 if (!c)
1938 continue;
1939 if (!(c->object.flags & CHILD_SHOWN))
1940 continue;
1941 if (c->object.flags & (SHOWN | BOUNDARY))
1942 continue;
1943 c->object.flags |= BOUNDARY;
1944 commit_list_insert(c, &revs->commits);
1945 }
1947 /*
1948 * If revs->topo_order is set, sort the boundary commits
1949 * in topological order
1950 */
1951 sort_in_topological_order(&revs->commits, revs->lifo);
1952 }
1954 static struct commit *get_revision_internal(struct rev_info *revs)
1955 {
1956 struct commit *c = NULL;
1957 struct commit_list *l;
1959 if (revs->boundary == 2) {
1960 /*
1961 * All of the normal commits have already been returned,
1962 * and we are now returning boundary commits.
1963 * create_boundary_commit_list() has populated
1964 * revs->commits with the remaining commits to return.
1965 */
1966 c = pop_commit(&revs->commits);
1967 if (c)
1968 c->object.flags |= SHOWN;
1969 return c;
1970 }
1972 /*
1973 * Now pick up what they want to give us
1974 */
1975 c = get_revision_1(revs);
1976 if (c) {
1977 while (0 < revs->skip_count) {
1978 revs->skip_count--;
1979 c = get_revision_1(revs);
1980 if (!c)
1981 break;
1982 }
1983 }
1985 /*
1986 * Check the max_count.
1987 */
1988 switch (revs->max_count) {
1989 case -1:
1990 break;
1991 case 0:
1992 c = NULL;
1993 break;
1994 default:
1995 revs->max_count--;
1996 }
1998 if (c)
1999 c->object.flags |= SHOWN;
2001 if (!revs->boundary) {
2002 return c;
2003 }
2005 if (!c) {
2006 /*
2007 * get_revision_1() runs out the commits, and
2008 * we are done computing the boundaries.
2009 * switch to boundary commits output mode.
2010 */
2011 revs->boundary = 2;
2013 /*
2014 * Update revs->commits to contain the list of
2015 * boundary commits.
2016 */
2017 create_boundary_commit_list(revs);
2019 return get_revision_internal(revs);
2020 }
2022 /*
2023 * boundary commits are the commits that are parents of the
2024 * ones we got from get_revision_1() but they themselves are
2025 * not returned from get_revision_1(). Before returning
2026 * 'c', we need to mark its parents that they could be boundaries.
2027 */
2029 for (l = c->parents; l; l = l->next) {
2030 struct object *p;
2031 p = &(l->item->object);
2032 if (p->flags & (CHILD_SHOWN | SHOWN))
2033 continue;
2034 p->flags |= CHILD_SHOWN;
2035 gc_boundary(&revs->boundary_commits);
2036 add_object_array(p, NULL, &revs->boundary_commits);
2037 }
2039 return c;
2040 }
2042 struct commit *get_revision(struct rev_info *revs)
2043 {
2044 struct commit *c;
2045 struct commit_list *reversed;
2047 if (revs->reverse) {
2048 reversed = NULL;
2049 while ((c = get_revision_internal(revs))) {
2050 commit_list_insert(c, &reversed);
2051 }
2052 revs->commits = reversed;
2053 revs->reverse = 0;
2054 revs->reverse_output_stage = 1;
2055 }
2057 if (revs->reverse_output_stage)
2058 return pop_commit(&revs->commits);
2060 c = get_revision_internal(revs);
2061 if (c && revs->graph)
2062 graph_update(revs->graph, c);
2063 return c;
2064 }