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