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 "grep.h"
10static char *path_name(struct name_path *path, const char *name)
12{
13 struct name_path *p;
14 char *n, *m;
15 int nlen = strlen(name);
16 int len = nlen + 1;
17 for (p = path; p; p = p->up) {
19 if (p->elem_len)
20 len += p->elem_len + 1;
21 }
22 n = xmalloc(len);
23 m = n + len - (nlen + 1);
24 strcpy(m, name);
25 for (p = path; p; p = p->up) {
26 if (p->elem_len) {
27 m -= p->elem_len + 1;
28 memcpy(m, p->elem, p->elem_len);
29 m[p->elem_len] = '/';
30 }
31 }
32 return n;
33}
34void add_object(struct object *obj,
36 struct object_array *p,
37 struct name_path *path,
38 const char *name)
39{
40 add_object_array(obj, path_name(path, name), p);
41}
42static void mark_blob_uninteresting(struct blob *blob)
44{
45 if (blob->object.flags & UNINTERESTING)
46 return;
47 blob->object.flags |= UNINTERESTING;
48}
49void mark_tree_uninteresting(struct tree *tree)
51{
52 struct tree_desc desc;
53 struct name_entry entry;
54 struct object *obj = &tree->object;
55 if (obj->flags & UNINTERESTING)
57 return;
58 obj->flags |= UNINTERESTING;
59 if (!has_sha1_file(obj->sha1))
60 return;
61 if (parse_tree(tree) < 0)
62 die("bad tree %s", sha1_to_hex(obj->sha1));
63 desc.buf = tree->buffer;
65 desc.size = tree->size;
66 while (tree_entry(&desc, &entry)) {
67 if (S_ISDIR(entry.mode))
68 mark_tree_uninteresting(lookup_tree(entry.sha1));
69 else
70 mark_blob_uninteresting(lookup_blob(entry.sha1));
71 }
72 /*
74 * We don't care about the tree any more
75 * after it has been marked uninteresting.
76 */
77 free(tree->buffer);
78 tree->buffer = NULL;
79}
80void mark_parents_uninteresting(struct commit *commit)
82{
83 struct commit_list *parents = commit->parents;
84 while (parents) {
86 struct commit *commit = parents->item;
87 if (!(commit->object.flags & UNINTERESTING)) {
88 commit->object.flags |= UNINTERESTING;
89 /*
91 * Normally we haven't parsed the parent
92 * yet, so we won't have a parent of a parent
93 * here. However, it may turn out that we've
94 * reached this commit some other way (where it
95 * wasn't uninteresting), in which case we need
96 * to mark its parents recursively too..
97 */
98 if (commit->parents)
99 mark_parents_uninteresting(commit);
100 }
101 /*
103 * A missing commit is ok iff its parent is marked
104 * uninteresting.
105 *
106 * We just mark such a thing parsed, so that when
107 * it is popped next time around, we won't be trying
108 * to parse it and get an error.
109 */
110 if (!has_sha1_file(commit->object.sha1))
111 commit->object.parsed = 1;
112 parents = parents->next;
113 }
114}
115void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
117{
118 add_object_array(obj, name, &revs->pending);
119}
120static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
122{
123 struct object *object;
124 object = parse_object(sha1);
126 if (!object)
127 die("bad object %s", name);
128 object->flags |= flags;
129 return object;
130}
131static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
133{
134 unsigned long flags = object->flags;
135 /*
137 * Tag object? Look what it points to..
138 */
139 while (object->type == OBJ_TAG) {
140 struct tag *tag = (struct tag *) object;
141 if (revs->tag_objects && !(flags & UNINTERESTING))
142 add_pending_object(revs, object, tag->tag);
143 object = parse_object(tag->tagged->sha1);
144 if (!object)
145 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
146 }
147 /*
149 * Commit object? Just return it, we'll do all the complex
150 * reachability crud.
151 */
152 if (object->type == OBJ_COMMIT) {
153 struct commit *commit = (struct commit *)object;
154 if (parse_commit(commit) < 0)
155 die("unable to parse commit %s", name);
156 if (flags & UNINTERESTING) {
157 commit->object.flags |= UNINTERESTING;
158 mark_parents_uninteresting(commit);
159 revs->limited = 1;
160 }
161 return commit;
162 }
163 /*
165 * Tree object? Either mark it uniniteresting, or add it
166 * to the list of objects to look at later..
167 */
168 if (object->type == OBJ_TREE) {
169 struct tree *tree = (struct tree *)object;
170 if (!revs->tree_objects)
171 return NULL;
172 if (flags & UNINTERESTING) {
173 mark_tree_uninteresting(tree);
174 return NULL;
175 }
176 add_pending_object(revs, object, "");
177 return NULL;
178 }
179 /*
181 * Blob object? You know the drill by now..
182 */
183 if (object->type == OBJ_BLOB) {
184 struct blob *blob = (struct blob *)object;
185 if (!revs->blob_objects)
186 return NULL;
187 if (flags & UNINTERESTING) {
188 mark_blob_uninteresting(blob);
189 return NULL;
190 }
191 add_pending_object(revs, object, "");
192 return NULL;
193 }
194 die("%s is unknown object", name);
195}
196static int everybody_uninteresting(struct commit_list *orig)
198{
199 struct commit_list *list = orig;
200 while (list) {
201 struct commit *commit = list->item;
202 list = list->next;
203 if (commit->object.flags & UNINTERESTING)
204 continue;
205 return 0;
206 }
207 return 1;
208}
209static int tree_difference = REV_TREE_SAME;
211static void file_add_remove(struct diff_options *options,
213 int addremove, unsigned mode,
214 const unsigned char *sha1,
215 const char *base, const char *path)
216{
217 int diff = REV_TREE_DIFFERENT;
218 /*
220 * Is it an add of a new file? It means that the old tree
221 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
222 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
223 * (and if it already was "REV_TREE_NEW", we'll keep it
224 * "REV_TREE_NEW" of course).
225 */
226 if (addremove == '+') {
227 diff = tree_difference;
228 if (diff != REV_TREE_SAME)
229 return;
230 diff = REV_TREE_NEW;
231 }
232 tree_difference = diff;
233}
234static void file_change(struct diff_options *options,
236 unsigned old_mode, unsigned new_mode,
237 const unsigned char *old_sha1,
238 const unsigned char *new_sha1,
239 const char *base, const char *path)
240{
241 tree_difference = REV_TREE_DIFFERENT;
242}
243int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
245{
246 if (!t1)
247 return REV_TREE_NEW;
248 if (!t2)
249 return REV_TREE_DIFFERENT;
250 tree_difference = REV_TREE_SAME;
251 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
252 &revs->pruning) < 0)
253 return REV_TREE_DIFFERENT;
254 return tree_difference;
255}
256int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
258{
259 int retval;
260 void *tree;
261 struct tree_desc empty, real;
262 if (!t1)
264 return 0;
265 tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
267 if (!tree)
268 return 0;
269 real.buf = tree;
270 empty.buf = "";
272 empty.size = 0;
273 tree_difference = 0;
275 retval = diff_tree(&empty, &real, "", &revs->pruning);
276 free(tree);
277 return retval >= 0 && !tree_difference;
279}
280static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
282{
283 struct commit_list **pp, *parent;
284 int tree_changed = 0, tree_same = 0;
285 if (!commit->tree)
287 return;
288 if (!commit->parents) {
290 if (!rev_same_tree_as_empty(revs, commit->tree))
291 commit->object.flags |= TREECHANGE;
292 return;
293 }
294 pp = &commit->parents;
296 while ((parent = *pp) != NULL) {
297 struct commit *p = parent->item;
298 parse_commit(p);
300 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
301 case REV_TREE_SAME:
302 tree_same = 1;
303 if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
304 /* Even if a merge with an uninteresting
305 * side branch brought the entire change
306 * we are interested in, we do not want
307 * to lose the other branches of this
308 * merge, so we just keep going.
309 */
310 pp = &parent->next;
311 continue;
312 }
313 parent->next = NULL;
314 commit->parents = parent;
315 return;
316 case REV_TREE_NEW:
318 if (revs->remove_empty_trees &&
319 rev_same_tree_as_empty(revs, p->tree)) {
320 /* We are adding all the specified
321 * paths from this parent, so the
322 * history beyond this parent is not
323 * interesting. Remove its parents
324 * (they are grandparents for us).
325 * IOW, we pretend this parent is a
326 * "root" commit.
327 */
328 parse_commit(p);
329 p->parents = NULL;
330 }
331 /* fallthrough */
332 case REV_TREE_DIFFERENT:
333 tree_changed = 1;
334 pp = &parent->next;
335 continue;
336 }
337 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
338 }
339 if (tree_changed && !tree_same)
340 commit->object.flags |= TREECHANGE;
341}
342static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
344{
345 struct commit_list *parent = commit->parents;
346 unsigned left_flag;
347 if (commit->object.flags & ADDED)
349 return;
350 commit->object.flags |= ADDED;
351 /*
353 * If the commit is uninteresting, don't try to
354 * prune parents - we want the maximal uninteresting
355 * set.
356 *
357 * Normally we haven't parsed the parent
358 * yet, so we won't have a parent of a parent
359 * here. However, it may turn out that we've
360 * reached this commit some other way (where it
361 * wasn't uninteresting), in which case we need
362 * to mark its parents recursively too..
363 */
364 if (commit->object.flags & UNINTERESTING) {
365 while (parent) {
366 struct commit *p = parent->item;
367 parent = parent->next;
368 parse_commit(p);
369 p->object.flags |= UNINTERESTING;
370 if (p->parents)
371 mark_parents_uninteresting(p);
372 if (p->object.flags & SEEN)
373 continue;
374 p->object.flags |= SEEN;
375 insert_by_date(p, list);
376 }
377 return;
378 }
379 /*
381 * Ok, the commit wasn't uninteresting. Try to
382 * simplify the commit history and find the parent
383 * that has no differences in the path set if one exists.
384 */
385 if (revs->prune_fn)
386 revs->prune_fn(revs, commit);
387 if (revs->no_walk)
389 return;
390 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
392 parent = commit->parents;
393 while (parent) {
394 struct commit *p = parent->item;
395 parent = parent->next;
397 parse_commit(p);
399 p->object.flags |= left_flag;
400 if (p->object.flags & SEEN)
401 continue;
402 p->object.flags |= SEEN;
403 insert_by_date(p, list);
404 }
405}
406static void limit_list(struct rev_info *revs)
408{
409 struct commit_list *list = revs->commits;
410 struct commit_list *newlist = NULL;
411 struct commit_list **p = &newlist;
412 while (list) {
414 struct commit_list *entry = list;
415 struct commit *commit = list->item;
416 struct object *obj = &commit->object;
417 list = list->next;
419 free(entry);
420 if (revs->max_age != -1 && (commit->date < revs->max_age))
422 obj->flags |= UNINTERESTING;
423 add_parents_to_list(revs, commit, &list);
424 if (obj->flags & UNINTERESTING) {
425 mark_parents_uninteresting(commit);
426 if (everybody_uninteresting(list))
427 break;
428 continue;
429 }
430 if (revs->min_age != -1 && (commit->date > revs->min_age))
431 continue;
432 p = &commit_list_insert(commit, p)->next;
433 }
434 if (revs->boundary) {
435 /* mark the ones that are on the result list first */
436 for (list = newlist; list; list = list->next) {
437 struct commit *commit = list->item;
438 commit->object.flags |= TMP_MARK;
439 }
440 for (list = newlist; list; list = list->next) {
441 struct commit *commit = list->item;
442 struct object *obj = &commit->object;
443 struct commit_list *parent;
444 if (obj->flags & UNINTERESTING)
445 continue;
446 for (parent = commit->parents;
447 parent;
448 parent = parent->next) {
449 struct commit *pcommit = parent->item;
450 if (!(pcommit->object.flags & UNINTERESTING))
451 continue;
452 pcommit->object.flags |= BOUNDARY;
453 if (pcommit->object.flags & TMP_MARK)
454 continue;
455 pcommit->object.flags |= TMP_MARK;
456 p = &commit_list_insert(pcommit, p)->next;
457 }
458 }
459 for (list = newlist; list; list = list->next) {
460 struct commit *commit = list->item;
461 commit->object.flags &= ~TMP_MARK;
462 }
463 }
464 revs->commits = newlist;
465}
466static int all_flags;
468static struct rev_info *all_revs;
469static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
471{
472 struct object *object = get_reference(all_revs, path, sha1, all_flags);
473 add_pending_object(all_revs, object, "");
474 return 0;
475}
476static void handle_all(struct rev_info *revs, unsigned flags)
478{
479 all_revs = revs;
480 all_flags = flags;
481 for_each_ref(handle_one_ref, NULL);
482}
483static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
485{
486 unsigned char sha1[20];
487 struct object *it;
488 struct commit *commit;
489 struct commit_list *parents;
490 if (*arg == '^') {
492 flags ^= UNINTERESTING;
493 arg++;
494 }
495 if (get_sha1(arg, sha1))
496 return 0;
497 while (1) {
498 it = get_reference(revs, arg, sha1, 0);
499 if (it->type != OBJ_TAG)
500 break;
501 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
502 }
503 if (it->type != OBJ_COMMIT)
504 return 0;
505 commit = (struct commit *)it;
506 for (parents = commit->parents; parents; parents = parents->next) {
507 it = &parents->item->object;
508 it->flags |= flags;
509 add_pending_object(revs, it, arg);
510 }
511 return 1;
512}
513void init_revisions(struct rev_info *revs, const char *prefix)
515{
516 memset(revs, 0, sizeof(*revs));
517 revs->abbrev = DEFAULT_ABBREV;
519 revs->ignore_merges = 1;
520 revs->simplify_history = 1;
521 revs->pruning.recursive = 1;
522 revs->pruning.add_remove = file_add_remove;
523 revs->pruning.change = file_change;
524 revs->lifo = 1;
525 revs->dense = 1;
526 revs->prefix = prefix;
527 revs->max_age = -1;
528 revs->min_age = -1;
529 revs->max_count = -1;
530 revs->prune_fn = NULL;
532 revs->prune_data = NULL;
533 revs->topo_setter = topo_sort_default_setter;
535 revs->topo_getter = topo_sort_default_getter;
536 revs->commit_format = CMIT_FMT_DEFAULT;
538 diff_setup(&revs->diffopt);
540}
541static void add_pending_commit_list(struct rev_info *revs,
543 struct commit_list *commit_list,
544 unsigned int flags)
545{
546 while (commit_list) {
547 struct object *object = &commit_list->item->object;
548 object->flags |= flags;
549 add_pending_object(revs, object, sha1_to_hex(object->sha1));
550 commit_list = commit_list->next;
551 }
552}
553static void prepare_show_merge(struct rev_info *revs)
555{
556 struct commit_list *bases;
557 struct commit *head, *other;
558 unsigned char sha1[20];
559 const char **prune = NULL;
560 int i, prune_num = 1; /* counting terminating NULL */
561 if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
563 die("--merge without HEAD?");
564 if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
565 die("--merge without MERGE_HEAD?");
566 add_pending_object(revs, &head->object, "HEAD");
567 add_pending_object(revs, &other->object, "MERGE_HEAD");
568 bases = get_merge_bases(head, other, 1);
569 while (bases) {
570 struct commit *it = bases->item;
571 struct commit_list *n = bases->next;
572 free(bases);
573 bases = n;
574 it->object.flags |= UNINTERESTING;
575 add_pending_object(revs, &it->object, "(merge-base)");
576 }
577 if (!active_nr)
579 read_cache();
580 for (i = 0; i < active_nr; i++) {
581 struct cache_entry *ce = active_cache[i];
582 if (!ce_stage(ce))
583 continue;
584 if (ce_path_match(ce, revs->prune_data)) {
585 prune_num++;
586 prune = xrealloc(prune, sizeof(*prune) * prune_num);
587 prune[prune_num-2] = ce->name;
588 prune[prune_num-1] = NULL;
589 }
590 while ((i+1 < active_nr) &&
591 ce_same_name(ce, active_cache[i+1]))
592 i++;
593 }
594 revs->prune_data = prune;
595}
596int handle_revision_arg(const char *arg, struct rev_info *revs,
598 int flags,
599 int cant_be_filename)
600{
601 char *dotdot;
602 struct object *object;
603 unsigned char sha1[20];
604 int local_flags;
605 dotdot = strstr(arg, "..");
607 if (dotdot) {
608 unsigned char from_sha1[20];
609 const char *next = dotdot + 2;
610 const char *this = arg;
611 int symmetric = *next == '.';
612 unsigned int flags_exclude = flags ^ UNINTERESTING;
613 *dotdot = 0;
615 next += symmetric;
616 if (!*next)
618 next = "HEAD";
619 if (dotdot == arg)
620 this = "HEAD";
621 if (!get_sha1(this, from_sha1) &&
622 !get_sha1(next, sha1)) {
623 struct commit *a, *b;
624 struct commit_list *exclude;
625 a = lookup_commit_reference(from_sha1);
627 b = lookup_commit_reference(sha1);
628 if (!a || !b) {
629 die(symmetric ?
630 "Invalid symmetric difference expression %s...%s" :
631 "Invalid revision range %s..%s",
632 arg, next);
633 }
634 if (!cant_be_filename) {
636 *dotdot = '.';
637 verify_non_filename(revs->prefix, arg);
638 }
639 if (symmetric) {
641 exclude = get_merge_bases(a, b, 1);
642 add_pending_commit_list(revs, exclude,
643 flags_exclude);
644 free_commit_list(exclude);
645 a->object.flags |= flags | SYMMETRIC_LEFT;
646 } else
647 a->object.flags |= flags_exclude;
648 b->object.flags |= flags;
649 add_pending_object(revs, &a->object, this);
650 add_pending_object(revs, &b->object, next);
651 return 0;
652 }
653 *dotdot = '.';
654 }
655 dotdot = strstr(arg, "^@");
656 if (dotdot && !dotdot[2]) {
657 *dotdot = 0;
658 if (add_parents_only(revs, arg, flags))
659 return 0;
660 *dotdot = '^';
661 }
662 dotdot = strstr(arg, "^!");
663 if (dotdot && !dotdot[2]) {
664 *dotdot = 0;
665 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
666 *dotdot = '^';
667 }
668 local_flags = 0;
670 if (*arg == '^') {
671 local_flags = UNINTERESTING;
672 arg++;
673 }
674 if (get_sha1(arg, sha1))
675 return -1;
676 if (!cant_be_filename)
677 verify_non_filename(revs->prefix, arg);
678 object = get_reference(revs, arg, sha1, flags ^ local_flags);
679 add_pending_object(revs, object, arg);
680 return 0;
681}
682static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
684{
685 if (!revs->grep_filter) {
686 struct grep_opt *opt = xcalloc(1, sizeof(*opt));
687 opt->status_only = 1;
688 opt->pattern_tail = &(opt->pattern_list);
689 opt->regflags = REG_NEWLINE;
690 revs->grep_filter = opt;
691 }
692 append_grep_pattern(revs->grep_filter, ptn,
693 "command line", 0, what);
694}
695static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
697{
698 char *pat;
699 const char *prefix;
700 int patlen, fldlen;
701 fldlen = strlen(field);
703 patlen = strlen(pattern);
704 pat = xmalloc(patlen + fldlen + 10);
705 prefix = ".*";
706 if (*pattern == '^') {
707 prefix = "";
708 pattern++;
709 }
710 sprintf(pat, "^%s %s%s", field, prefix, pattern);
711 add_grep(revs, pat, GREP_PATTERN_HEAD);
712}
713static void add_message_grep(struct rev_info *revs, const char *pattern)
715{
716 add_grep(revs, pattern, GREP_PATTERN_BODY);
717}
718static void add_ignore_packed(struct rev_info *revs, const char *name)
720{
721 int num = ++revs->num_ignore_packed;
722 revs->ignore_packed = xrealloc(revs->ignore_packed,
724 sizeof(const char **) * (num + 1));
725 revs->ignore_packed[num-1] = name;
726 revs->ignore_packed[num] = NULL;
727}
728/*
730 * Parse revision information, filling in the "rev_info" structure,
731 * and removing the used arguments from the argument list.
732 *
733 * Returns the number of arguments left that weren't recognized
734 * (which are also moved to the head of the argument list)
735 */
736int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
737{
738 int i, flags, seen_dashdash, show_merge;
739 const char **unrecognized = argv + 1;
740 int left = 1;
741 int all_match = 0;
742 /* First, search for "--" */
744 seen_dashdash = 0;
745 for (i = 1; i < argc; i++) {
746 const char *arg = argv[i];
747 if (strcmp(arg, "--"))
748 continue;
749 argv[i] = NULL;
750 argc = i;
751 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
752 seen_dashdash = 1;
753 break;
754 }
755 flags = show_merge = 0;
757 for (i = 1; i < argc; i++) {
758 const char *arg = argv[i];
759 if (*arg == '-') {
760 int opts;
761 if (!strncmp(arg, "--max-count=", 12)) {
762 revs->max_count = atoi(arg + 12);
763 continue;
764 }
765 /* accept -<digit>, like traditional "head" */
766 if ((*arg == '-') && isdigit(arg[1])) {
767 revs->max_count = atoi(arg + 1);
768 continue;
769 }
770 if (!strcmp(arg, "-n")) {
771 if (argc <= i + 1)
772 die("-n requires an argument");
773 revs->max_count = atoi(argv[++i]);
774 continue;
775 }
776 if (!strncmp(arg,"-n",2)) {
777 revs->max_count = atoi(arg + 2);
778 continue;
779 }
780 if (!strncmp(arg, "--max-age=", 10)) {
781 revs->max_age = atoi(arg + 10);
782 continue;
783 }
784 if (!strncmp(arg, "--since=", 8)) {
785 revs->max_age = approxidate(arg + 8);
786 continue;
787 }
788 if (!strncmp(arg, "--after=", 8)) {
789 revs->max_age = approxidate(arg + 8);
790 continue;
791 }
792 if (!strncmp(arg, "--min-age=", 10)) {
793 revs->min_age = atoi(arg + 10);
794 continue;
795 }
796 if (!strncmp(arg, "--before=", 9)) {
797 revs->min_age = approxidate(arg + 9);
798 continue;
799 }
800 if (!strncmp(arg, "--until=", 8)) {
801 revs->min_age = approxidate(arg + 8);
802 continue;
803 }
804 if (!strcmp(arg, "--all")) {
805 handle_all(revs, flags);
806 continue;
807 }
808 if (!strcmp(arg, "--not")) {
809 flags ^= UNINTERESTING;
810 continue;
811 }
812 if (!strcmp(arg, "--default")) {
813 if (++i >= argc)
814 die("bad --default argument");
815 def = argv[i];
816 continue;
817 }
818 if (!strcmp(arg, "--merge")) {
819 show_merge = 1;
820 continue;
821 }
822 if (!strcmp(arg, "--topo-order")) {
823 revs->topo_order = 1;
824 continue;
825 }
826 if (!strcmp(arg, "--date-order")) {
827 revs->lifo = 0;
828 revs->topo_order = 1;
829 continue;
830 }
831 if (!strcmp(arg, "--parents")) {
832 revs->parents = 1;
833 continue;
834 }
835 if (!strcmp(arg, "--dense")) {
836 revs->dense = 1;
837 continue;
838 }
839 if (!strcmp(arg, "--sparse")) {
840 revs->dense = 0;
841 continue;
842 }
843 if (!strcmp(arg, "--remove-empty")) {
844 revs->remove_empty_trees = 1;
845 continue;
846 }
847 if (!strcmp(arg, "--no-merges")) {
848 revs->no_merges = 1;
849 continue;
850 }
851 if (!strcmp(arg, "--boundary")) {
852 revs->boundary = 1;
853 continue;
854 }
855 if (!strcmp(arg, "--left-right")) {
856 revs->left_right = 1;
857 continue;
858 }
859 if (!strcmp(arg, "--objects")) {
860 revs->tag_objects = 1;
861 revs->tree_objects = 1;
862 revs->blob_objects = 1;
863 continue;
864 }
865 if (!strcmp(arg, "--objects-edge")) {
866 revs->tag_objects = 1;
867 revs->tree_objects = 1;
868 revs->blob_objects = 1;
869 revs->edge_hint = 1;
870 continue;
871 }
872 if (!strcmp(arg, "--unpacked")) {
873 revs->unpacked = 1;
874 free(revs->ignore_packed);
875 revs->ignore_packed = NULL;
876 revs->num_ignore_packed = 0;
877 continue;
878 }
879 if (!strncmp(arg, "--unpacked=", 11)) {
880 revs->unpacked = 1;
881 add_ignore_packed(revs, arg+11);
882 continue;
883 }
884 if (!strcmp(arg, "-r")) {
885 revs->diff = 1;
886 revs->diffopt.recursive = 1;
887 continue;
888 }
889 if (!strcmp(arg, "-t")) {
890 revs->diff = 1;
891 revs->diffopt.recursive = 1;
892 revs->diffopt.tree_in_recursive = 1;
893 continue;
894 }
895 if (!strcmp(arg, "-m")) {
896 revs->ignore_merges = 0;
897 continue;
898 }
899 if (!strcmp(arg, "-c")) {
900 revs->diff = 1;
901 revs->dense_combined_merges = 0;
902 revs->combine_merges = 1;
903 continue;
904 }
905 if (!strcmp(arg, "--cc")) {
906 revs->diff = 1;
907 revs->dense_combined_merges = 1;
908 revs->combine_merges = 1;
909 continue;
910 }
911 if (!strcmp(arg, "-v")) {
912 revs->verbose_header = 1;
913 continue;
914 }
915 if (!strncmp(arg, "--pretty", 8)) {
916 revs->verbose_header = 1;
917 revs->commit_format = get_commit_format(arg+8);
918 continue;
919 }
920 if (!strcmp(arg, "--root")) {
921 revs->show_root_diff = 1;
922 continue;
923 }
924 if (!strcmp(arg, "--no-commit-id")) {
925 revs->no_commit_id = 1;
926 continue;
927 }
928 if (!strcmp(arg, "--always")) {
929 revs->always_show_header = 1;
930 continue;
931 }
932 if (!strcmp(arg, "--no-abbrev")) {
933 revs->abbrev = 0;
934 continue;
935 }
936 if (!strcmp(arg, "--abbrev")) {
937 revs->abbrev = DEFAULT_ABBREV;
938 continue;
939 }
940 if (!strncmp(arg, "--abbrev=", 9)) {
941 revs->abbrev = strtoul(arg + 9, NULL, 10);
942 if (revs->abbrev < MINIMUM_ABBREV)
943 revs->abbrev = MINIMUM_ABBREV;
944 else if (revs->abbrev > 40)
945 revs->abbrev = 40;
946 continue;
947 }
948 if (!strcmp(arg, "--abbrev-commit")) {
949 revs->abbrev_commit = 1;
950 continue;
951 }
952 if (!strcmp(arg, "--full-diff")) {
953 revs->diff = 1;
954 revs->full_diff = 1;
955 continue;
956 }
957 if (!strcmp(arg, "--full-history")) {
958 revs->simplify_history = 0;
959 continue;
960 }
961 if (!strcmp(arg, "--relative-date")) {
962 revs->relative_date = 1;
963 continue;
964 }
965 /*
967 * Grepping the commit log
968 */
969 if (!strncmp(arg, "--author=", 9)) {
970 add_header_grep(revs, "author", arg+9);
971 continue;
972 }
973 if (!strncmp(arg, "--committer=", 12)) {
974 add_header_grep(revs, "committer", arg+12);
975 continue;
976 }
977 if (!strncmp(arg, "--grep=", 7)) {
978 add_message_grep(revs, arg+7);
979 continue;
980 }
981 if (!strcmp(arg, "--all-match")) {
982 all_match = 1;
983 continue;
984 }
985 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
987 if (opts > 0) {
988 revs->diff = 1;
989 i += opts - 1;
990 continue;
991 }
992 *unrecognized++ = arg;
993 left++;
994 continue;
995 }
996 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
998 int j;
999 if (seen_dashdash || *arg == '^')
1000 die("bad revision '%s'", arg);
1001 /* If we didn't have a "--":
1003 * (1) all filenames must exist;
1004 * (2) all rev-args must not be interpretable
1005 * as a valid filename.
1006 * but the latter we have checked in the main loop.
1007 */
1008 for (j = i; j < argc; j++)
1009 verify_filename(revs->prefix, argv[j]);
1010 revs->prune_data = get_pathspec(revs->prefix,
1012 argv + i);
1013 break;
1014 }
1015 }
1016 if (show_merge)
1018 prepare_show_merge(revs);
1019 if (def && !revs->pending.nr) {
1020 unsigned char sha1[20];
1021 struct object *object;
1022 if (get_sha1(def, sha1))
1023 die("bad default revision '%s'", def);
1024 object = get_reference(revs, def, sha1, 0);
1025 add_pending_object(revs, object, def);
1026 }
1027 if (revs->topo_order)
1029 revs->limited = 1;
1030 if (revs->prune_data) {
1032 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1033 revs->prune_fn = try_to_simplify_commit;
1034 if (!revs->full_diff)
1035 diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1036 }
1037 if (revs->combine_merges) {
1038 revs->ignore_merges = 0;
1039 if (revs->dense_combined_merges && !revs->diffopt.output_format)
1040 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1041 }
1042 revs->diffopt.abbrev = revs->abbrev;
1043 if (diff_setup_done(&revs->diffopt) < 0)
1044 die("diff_setup_done failed");
1045 if (revs->grep_filter) {
1047 revs->grep_filter->all_match = all_match;
1048 compile_grep_patterns(revs->grep_filter);
1049 }
1050 return left;
1052}
1053void prepare_revision_walk(struct rev_info *revs)
1055{
1056 int nr = revs->pending.nr;
1057 struct object_array_entry *list = revs->pending.objects;
1058 revs->pending.nr = 0;
1060 revs->pending.alloc = 0;
1061 revs->pending.objects = NULL;
1062 while (--nr >= 0) {
1063 struct commit *commit = handle_commit(revs, list->item, list->name);
1064 if (commit) {
1065 if (!(commit->object.flags & SEEN)) {
1066 commit->object.flags |= SEEN;
1067 insert_by_date(commit, &revs->commits);
1068 }
1069 }
1070 list++;
1071 }
1072 if (revs->no_walk)
1074 return;
1075 if (revs->limited)
1076 limit_list(revs);
1077 if (revs->topo_order)
1078 sort_in_topological_order_fn(&revs->commits, revs->lifo,
1079 revs->topo_setter,
1080 revs->topo_getter);
1081}
1082static int rewrite_one(struct rev_info *revs, struct commit **pp)
1084{
1085 for (;;) {
1086 struct commit *p = *pp;
1087 if (!revs->limited)
1088 add_parents_to_list(revs, p, &revs->commits);
1089 if (p->parents && p->parents->next)
1090 return 0;
1091 if (p->object.flags & (TREECHANGE | UNINTERESTING))
1092 return 0;
1093 if (!p->parents)
1094 return -1;
1095 *pp = p->parents->item;
1096 }
1097}
1098static void rewrite_parents(struct rev_info *revs, struct commit *commit)
1100{
1101 struct commit_list **pp = &commit->parents;
1102 while (*pp) {
1103 struct commit_list *parent = *pp;
1104 if (rewrite_one(revs, &parent->item) < 0) {
1105 *pp = parent->next;
1106 continue;
1107 }
1108 pp = &parent->next;
1109 }
1110}
1111static void mark_boundary_to_show(struct commit *commit)
1113{
1114 struct commit_list *p = commit->parents;
1115 while (p) {
1116 commit = p->item;
1117 p = p->next;
1118 if (commit->object.flags & BOUNDARY)
1119 commit->object.flags |= BOUNDARY_SHOW;
1120 }
1121}
1122static int commit_match(struct commit *commit, struct rev_info *opt)
1124{
1125 if (!opt->grep_filter)
1126 return 1;
1127 return grep_buffer(opt->grep_filter,
1128 NULL, /* we say nothing, not even filename */
1129 commit->buffer, strlen(commit->buffer));
1130}
1131struct commit *get_revision(struct rev_info *revs)
1133{
1134 struct commit_list *list = revs->commits;
1135 if (!list)
1137 return NULL;
1138 /* Check the max_count ... */
1140 switch (revs->max_count) {
1141 case -1:
1142 break;
1143 case 0:
1144 return NULL;
1145 default:
1146 revs->max_count--;
1147 }
1148 do {
1150 struct commit_list *entry = revs->commits;
1151 struct commit *commit = entry->item;
1152 revs->commits = entry->next;
1154 free(entry);
1155 /*
1157 * If we haven't done the list limiting, we need to look at
1158 * the parents here. We also need to do the date-based limiting
1159 * that we'd otherwise have done in limit_list().
1160 */
1161 if (!revs->limited) {
1162 if (revs->max_age != -1 &&
1163 (commit->date < revs->max_age))
1164 continue;
1165 add_parents_to_list(revs, commit, &revs->commits);
1166 }
1167 if (commit->object.flags & SHOWN)
1168 continue;
1169 if (revs->unpacked && has_sha1_pack(commit->object.sha1,
1171 revs->ignore_packed))
1172 continue;
1173 /* We want to show boundary commits only when their
1175 * children are shown. When path-limiter is in effect,
1176 * rewrite_parents() drops some commits from getting shown,
1177 * and there is no point showing boundary parents that
1178 * are not shown. After rewrite_parents() rewrites the
1179 * parents of a commit that is shown, we mark the boundary
1180 * parents with BOUNDARY_SHOW.
1181 */
1182 if (commit->object.flags & BOUNDARY_SHOW) {
1183 commit->object.flags |= SHOWN;
1184 return commit;
1185 }
1186 if (commit->object.flags & UNINTERESTING)
1187 continue;
1188 if (revs->min_age != -1 && (commit->date > revs->min_age))
1189 continue;
1190 if (revs->no_merges &&
1191 commit->parents && commit->parents->next)
1192 continue;
1193 if (!commit_match(commit, revs))
1194 continue;
1195 if (revs->prune_fn && revs->dense) {
1196 /* Commit without changes? */
1197 if (!(commit->object.flags & TREECHANGE)) {
1198 /* drop merges unless we want parenthood */
1199 if (!revs->parents)
1200 continue;
1201 /* non-merge - always ignore it */
1202 if (!commit->parents || !commit->parents->next)
1203 continue;
1204 }
1205 if (revs->parents)
1206 rewrite_parents(revs, commit);
1207 }
1208 if (revs->boundary)
1209 mark_boundary_to_show(commit);
1210 commit->object.flags |= SHOWN;
1211 return commit;
1212 } while (revs->commits);
1213 return NULL;
1214}