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