11 static char *path_name(struct name_path *path, const char *name)
15 int nlen = strlen(name);
18 for (p = path; p; p = p->up) {
20 len += p->elem_len + 1;
23 m = n + len - (nlen + 1);
25 for (p = path; p; p = p->up) {
28 memcpy(m, p->elem, p->elem_len);
35 void add_object(struct object *obj,
36 struct object_array *p,
37 struct name_path *path,
40 add_object_array(obj, path_name(path, name), p);
43 static void mark_blob_uninteresting(struct blob *blob)
45 if (blob->object.flags & UNINTERESTING)
47 blob->object.flags |= UNINTERESTING;
50 void mark_tree_uninteresting(struct tree *tree)
52 struct tree_desc desc;
53 struct name_entry entry;
54 struct object *obj = &tree->object;
56 if (obj->flags & UNINTERESTING)
58 obj->flags |= UNINTERESTING;
59 if (!has_sha1_file(obj->sha1))
61 if (parse_tree(tree) < 0)
62 die("bad tree %s", sha1_to_hex(obj->sha1));
64 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));
70 mark_blob_uninteresting(lookup_blob(entry.sha1));
74 * We don't care about the tree any more
75 * after it has been marked uninteresting.
81 void mark_parents_uninteresting(struct commit *commit)
83 struct commit_list *parents = commit->parents;
86 struct commit *commit = parents->item;
87 if (!(commit->object.flags & UNINTERESTING)) {
88 commit->object.flags |= UNINTERESTING;
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..
99 mark_parents_uninteresting(commit);
103 * A missing commit is ok iff its parent is marked
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.
110 if (!has_sha1_file(commit->object.sha1))
111 commit->object.parsed = 1;
112 parents = parents->next;
116 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
118 add_object_array(obj, name, &revs->pending);
121 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
123 struct object *object;
125 object = parse_object(sha1);
127 die("bad object %s", name);
128 object->flags |= flags;
132 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
134 unsigned long flags = object->flags;
137 * Tag object? Look what it points to..
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);
145 die("bad object %s", sha1_to_hex(tag->tagged->sha1));
149 * Commit object? Just return it, we'll do all the complex
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);
165 * Tree object? Either mark it uniniteresting, or add it
166 * to the list of objects to look at later..
168 if (object->type == OBJ_TREE) {
169 struct tree *tree = (struct tree *)object;
170 if (!revs->tree_objects)
172 if (flags & UNINTERESTING) {
173 mark_tree_uninteresting(tree);
176 add_pending_object(revs, object, "");
181 * Blob object? You know the drill by now..
183 if (object->type == OBJ_BLOB) {
184 struct blob *blob = (struct blob *)object;
185 if (!revs->blob_objects)
187 if (flags & UNINTERESTING) {
188 mark_blob_uninteresting(blob);
191 add_pending_object(revs, object, "");
194 die("%s is unknown object", name);
197 static int everybody_uninteresting(struct commit_list *orig)
199 struct commit_list *list = orig;
201 struct commit *commit = list->item;
203 if (commit->object.flags & UNINTERESTING)
210 static int tree_difference = REV_TREE_SAME;
212 static 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)
217 int diff = REV_TREE_DIFFERENT;
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).
226 if (addremove == '+') {
227 diff = tree_difference;
228 if (diff != REV_TREE_SAME)
232 tree_difference = diff;
235 static 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)
241 tree_difference = REV_TREE_DIFFERENT;
244 int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
249 return REV_TREE_DIFFERENT;
250 tree_difference = REV_TREE_SAME;
251 if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
253 return REV_TREE_DIFFERENT;
254 return tree_difference;
257 int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
261 struct tree_desc empty, real;
266 tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
275 retval = diff_tree(&empty, &real, "", &revs->pruning);
278 return retval >= 0 && !tree_difference;
281 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
283 struct commit_list **pp, *parent;
284 int tree_changed = 0, tree_same = 0;
289 if (!commit->parents) {
290 if (!rev_same_tree_as_empty(revs, commit->tree))
291 commit->object.flags |= TREECHANGE;
295 pp = &commit->parents;
296 while ((parent = *pp) != NULL) {
297 struct commit *p = parent->item;
300 switch (rev_compare_tree(revs, p->tree, commit->tree)) {
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.
314 commit->parents = parent;
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
332 case REV_TREE_DIFFERENT:
337 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
339 if (tree_changed && !tree_same)
340 commit->object.flags |= TREECHANGE;
343 static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
345 struct commit_list *parent = commit->parents;
348 if (commit->object.flags & ADDED)
350 commit->object.flags |= ADDED;
353 * If the commit is uninteresting, don't try to
354 * prune parents - we want the maximal uninteresting
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..
364 if (commit->object.flags & UNINTERESTING) {
366 struct commit *p = parent->item;
367 parent = parent->next;
369 p->object.flags |= UNINTERESTING;
371 mark_parents_uninteresting(p);
372 if (p->object.flags & SEEN)
374 p->object.flags |= SEEN;
375 insert_by_date(p, list);
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.
386 revs->prune_fn(revs, commit);
391 left_flag = (commit->object.flags & SYMMETRIC_LEFT);
392 parent = commit->parents;
394 struct commit *p = parent->item;
396 parent = parent->next;
399 p->object.flags |= left_flag;
400 if (p->object.flags & SEEN)
402 p->object.flags |= SEEN;
403 insert_by_date(p, list);
407 static void limit_list(struct rev_info *revs)
409 struct commit_list *list = revs->commits;
410 struct commit_list *newlist = NULL;
411 struct commit_list **p = &newlist;
414 struct commit_list *entry = list;
415 struct commit *commit = list->item;
416 struct object *obj = &commit->object;
421 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))
430 if (revs->min_age != -1 && (commit->date > revs->min_age))
432 p = &commit_list_insert(commit, p)->next;
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;
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)
446 for (parent = commit->parents;
448 parent = parent->next) {
449 struct commit *pcommit = parent->item;
450 if (!(pcommit->object.flags & UNINTERESTING))
452 pcommit->object.flags |= BOUNDARY;
453 if (pcommit->object.flags & TMP_MARK)
455 pcommit->object.flags |= TMP_MARK;
456 p = &commit_list_insert(pcommit, p)->next;
459 for (list = newlist; list; list = list->next) {
460 struct commit *commit = list->item;
461 commit->object.flags &= ~TMP_MARK;
464 revs->commits = newlist;
467 static int all_flags;
468 static struct rev_info *all_revs;
470 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
472 struct object *object = get_reference(all_revs, path, sha1, all_flags);
473 add_pending_object(all_revs, object, "");
477 static void handle_all(struct rev_info *revs, unsigned flags)
481 for_each_ref(handle_one_ref, NULL);
484 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
486 unsigned char sha1[20];
488 struct commit *commit;
489 struct commit_list *parents;
492 flags ^= UNINTERESTING;
495 if (get_sha1(arg, sha1))
498 it = get_reference(revs, arg, sha1, 0);
499 if (it->type != OBJ_TAG)
501 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
503 if (it->type != OBJ_COMMIT)
505 commit = (struct commit *)it;
506 for (parents = commit->parents; parents; parents = parents->next) {
507 it = &parents->item->object;
509 add_pending_object(revs, it, arg);
514 void init_revisions(struct rev_info *revs, const char *prefix)
516 memset(revs, 0, sizeof(*revs));
518 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;
526 revs->prefix = prefix;
529 revs->max_count = -1;
531 revs->prune_fn = NULL;
532 revs->prune_data = NULL;
534 revs->topo_setter = topo_sort_default_setter;
535 revs->topo_getter = topo_sort_default_getter;
537 revs->commit_format = CMIT_FMT_DEFAULT;
539 diff_setup(&revs->diffopt);
542 static void add_pending_commit_list(struct rev_info *revs,
543 struct commit_list *commit_list,
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;
554 static void prepare_show_merge(struct rev_info *revs)
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 */
562 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);
570 struct commit *it = bases->item;
571 struct commit_list *n = bases->next;
574 it->object.flags |= UNINTERESTING;
575 add_pending_object(revs, &it->object, "(merge-base)");
580 for (i = 0; i < active_nr; i++) {
581 struct cache_entry *ce = active_cache[i];
584 if (ce_path_match(ce, revs->prune_data)) {
586 prune = xrealloc(prune, sizeof(*prune) * prune_num);
587 prune[prune_num-2] = ce->name;
588 prune[prune_num-1] = NULL;
590 while ((i+1 < active_nr) &&
591 ce_same_name(ce, active_cache[i+1]))
594 revs->prune_data = prune;
597 int handle_revision_arg(const char *arg, struct rev_info *revs,
599 int cant_be_filename)
602 struct object *object;
603 unsigned char sha1[20];
606 dotdot = strstr(arg, "..");
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;
621 if (!get_sha1(this, from_sha1) &&
622 !get_sha1(next, sha1)) {
623 struct commit *a, *b;
624 struct commit_list *exclude;
626 a = lookup_commit_reference(from_sha1);
627 b = lookup_commit_reference(sha1);
630 "Invalid symmetric difference expression %s...%s" :
631 "Invalid revision range %s..%s",
635 if (!cant_be_filename) {
637 verify_non_filename(revs->prefix, arg);
641 exclude = get_merge_bases(a, b, 1);
642 add_pending_commit_list(revs, exclude,
644 free_commit_list(exclude);
645 a->object.flags |= flags | SYMMETRIC_LEFT;
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);
655 dotdot = strstr(arg, "^@");
656 if (dotdot && !dotdot[2]) {
658 if (add_parents_only(revs, arg, flags))
662 dotdot = strstr(arg, "^!");
663 if (dotdot && !dotdot[2]) {
665 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
671 local_flags = UNINTERESTING;
674 if (get_sha1(arg, sha1))
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);
683 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
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;
692 append_grep_pattern(revs->grep_filter, ptn,
693 "command line", 0, what);
696 static void add_header_grep(struct rev_info *revs, const char *field, const char *pattern)
702 fldlen = strlen(field);
703 patlen = strlen(pattern);
704 pat = xmalloc(patlen + fldlen + 10);
706 if (*pattern == '^') {
710 sprintf(pat, "^%s %s%s", field, prefix, pattern);
711 add_grep(revs, pat, GREP_PATTERN_HEAD);
714 static void add_message_grep(struct rev_info *revs, const char *pattern)
716 add_grep(revs, pattern, GREP_PATTERN_BODY);
719 static void add_ignore_packed(struct rev_info *revs, const char *name)
721 int num = ++revs->num_ignore_packed;
723 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;
730 * Parse revision information, filling in the "rev_info" structure,
731 * and removing the used arguments from the argument list.
733 * Returns the number of arguments left that weren't recognized
734 * (which are also moved to the head of the argument list)
736 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
738 int i, flags, seen_dashdash, show_merge;
739 const char **unrecognized = argv + 1;
743 /* First, search for "--" */
745 for (i = 1; i < argc; i++) {
746 const char *arg = argv[i];
747 if (strcmp(arg, "--"))
751 revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
756 flags = show_merge = 0;
757 for (i = 1; i < argc; i++) {
758 const char *arg = argv[i];
761 if (!strncmp(arg, "--max-count=", 12)) {
762 revs->max_count = atoi(arg + 12);
765 /* accept -<digit>, like traditional "head" */
766 if ((*arg == '-') && isdigit(arg[1])) {
767 revs->max_count = atoi(arg + 1);
770 if (!strcmp(arg, "-n")) {
772 die("-n requires an argument");
773 revs->max_count = atoi(argv[++i]);
776 if (!strncmp(arg,"-n",2)) {
777 revs->max_count = atoi(arg + 2);
780 if (!strncmp(arg, "--max-age=", 10)) {
781 revs->max_age = atoi(arg + 10);
784 if (!strncmp(arg, "--since=", 8)) {
785 revs->max_age = approxidate(arg + 8);
788 if (!strncmp(arg, "--after=", 8)) {
789 revs->max_age = approxidate(arg + 8);
792 if (!strncmp(arg, "--min-age=", 10)) {
793 revs->min_age = atoi(arg + 10);
796 if (!strncmp(arg, "--before=", 9)) {
797 revs->min_age = approxidate(arg + 9);
800 if (!strncmp(arg, "--until=", 8)) {
801 revs->min_age = approxidate(arg + 8);
804 if (!strcmp(arg, "--all")) {
805 handle_all(revs, flags);
808 if (!strcmp(arg, "--not")) {
809 flags ^= UNINTERESTING;
812 if (!strcmp(arg, "--default")) {
814 die("bad --default argument");
818 if (!strcmp(arg, "--merge")) {
822 if (!strcmp(arg, "--topo-order")) {
823 revs->topo_order = 1;
826 if (!strcmp(arg, "--date-order")) {
828 revs->topo_order = 1;
831 if (!strcmp(arg, "--parents")) {
835 if (!strcmp(arg, "--dense")) {
839 if (!strcmp(arg, "--sparse")) {
843 if (!strcmp(arg, "--remove-empty")) {
844 revs->remove_empty_trees = 1;
847 if (!strcmp(arg, "--no-merges")) {
851 if (!strcmp(arg, "--boundary")) {
855 if (!strcmp(arg, "--left-right")) {
856 revs->left_right = 1;
859 if (!strcmp(arg, "--objects")) {
860 revs->tag_objects = 1;
861 revs->tree_objects = 1;
862 revs->blob_objects = 1;
865 if (!strcmp(arg, "--objects-edge")) {
866 revs->tag_objects = 1;
867 revs->tree_objects = 1;
868 revs->blob_objects = 1;
872 if (!strcmp(arg, "--unpacked")) {
874 free(revs->ignore_packed);
875 revs->ignore_packed = NULL;
876 revs->num_ignore_packed = 0;
879 if (!strncmp(arg, "--unpacked=", 11)) {
881 add_ignore_packed(revs, arg+11);
884 if (!strcmp(arg, "-r")) {
886 revs->diffopt.recursive = 1;
889 if (!strcmp(arg, "-t")) {
891 revs->diffopt.recursive = 1;
892 revs->diffopt.tree_in_recursive = 1;
895 if (!strcmp(arg, "-m")) {
896 revs->ignore_merges = 0;
899 if (!strcmp(arg, "-c")) {
901 revs->dense_combined_merges = 0;
902 revs->combine_merges = 1;
905 if (!strcmp(arg, "--cc")) {
907 revs->dense_combined_merges = 1;
908 revs->combine_merges = 1;
911 if (!strcmp(arg, "-v")) {
912 revs->verbose_header = 1;
915 if (!strncmp(arg, "--pretty", 8)) {
916 revs->verbose_header = 1;
917 revs->commit_format = get_commit_format(arg+8);
920 if (!strcmp(arg, "--root")) {
921 revs->show_root_diff = 1;
924 if (!strcmp(arg, "--no-commit-id")) {
925 revs->no_commit_id = 1;
928 if (!strcmp(arg, "--always")) {
929 revs->always_show_header = 1;
932 if (!strcmp(arg, "--no-abbrev")) {
936 if (!strcmp(arg, "--abbrev")) {
937 revs->abbrev = DEFAULT_ABBREV;
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)
948 if (!strcmp(arg, "--abbrev-commit")) {
949 revs->abbrev_commit = 1;
952 if (!strcmp(arg, "--full-diff")) {
957 if (!strcmp(arg, "--full-history")) {
958 revs->simplify_history = 0;
961 if (!strcmp(arg, "--relative-date")) {
962 revs->relative_date = 1;
967 * Grepping the commit log
969 if (!strncmp(arg, "--author=", 9)) {
970 add_header_grep(revs, "author", arg+9);
973 if (!strncmp(arg, "--committer=", 12)) {
974 add_header_grep(revs, "committer", arg+12);
977 if (!strncmp(arg, "--grep=", 7)) {
978 add_message_grep(revs, arg+7);
981 if (!strcmp(arg, "--all-match")) {
986 opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
992 *unrecognized++ = arg;
997 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
999 if (seen_dashdash || *arg == '^')
1000 die("bad revision '%s'", arg);
1002 /* 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.
1008 for (j = i; j < argc; j++)
1009 verify_filename(revs->prefix, argv[j]);
1011 revs->prune_data = get_pathspec(revs->prefix,
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);
1028 if (revs->topo_order)
1031 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);
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;
1042 revs->diffopt.abbrev = revs->abbrev;
1043 if (diff_setup_done(&revs->diffopt) < 0)
1044 die("diff_setup_done failed");
1046 if (revs->grep_filter) {
1047 revs->grep_filter->all_match = all_match;
1048 compile_grep_patterns(revs->grep_filter);
1054 void prepare_revision_walk(struct rev_info *revs)
1056 int nr = revs->pending.nr;
1057 struct object_array_entry *list = revs->pending.objects;
1059 revs->pending.nr = 0;
1060 revs->pending.alloc = 0;
1061 revs->pending.objects = NULL;
1063 struct commit *commit = handle_commit(revs, list->item, list->name);
1065 if (!(commit->object.flags & SEEN)) {
1066 commit->object.flags |= SEEN;
1067 insert_by_date(commit, &revs->commits);
1077 if (revs->topo_order)
1078 sort_in_topological_order_fn(&revs->commits, revs->lifo,
1083 static int rewrite_one(struct rev_info *revs, struct commit **pp)
1086 struct commit *p = *pp;
1088 add_parents_to_list(revs, p, &revs->commits);
1089 if (p->parents && p->parents->next)
1091 if (p->object.flags & (TREECHANGE | UNINTERESTING))
1095 *pp = p->parents->item;
1099 static void rewrite_parents(struct rev_info *revs, struct commit *commit)
1101 struct commit_list **pp = &commit->parents;
1103 struct commit_list *parent = *pp;
1104 if (rewrite_one(revs, &parent->item) < 0) {
1112 static void mark_boundary_to_show(struct commit *commit)
1114 struct commit_list *p = commit->parents;
1118 if (commit->object.flags & BOUNDARY)
1119 commit->object.flags |= BOUNDARY_SHOW;
1123 static int commit_match(struct commit *commit, struct rev_info *opt)
1125 if (!opt->grep_filter)
1127 return grep_buffer(opt->grep_filter,
1128 NULL, /* we say nothing, not even filename */
1129 commit->buffer, strlen(commit->buffer));
1132 struct commit *get_revision(struct rev_info *revs)
1134 struct commit_list *list = revs->commits;
1139 /* Check the max_count ... */
1140 switch (revs->max_count) {
1150 struct commit_list *entry = revs->commits;
1151 struct commit *commit = entry->item;
1153 revs->commits = entry->next;
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().
1161 if (!revs->limited) {
1162 if (revs->max_age != -1 &&
1163 (commit->date < revs->max_age))
1165 add_parents_to_list(revs, commit, &revs->commits);
1167 if (commit->object.flags & SHOWN)
1170 if (revs->unpacked && has_sha1_pack(commit->object.sha1,
1171 revs->ignore_packed))
1174 /* 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.
1182 if (commit->object.flags & BOUNDARY_SHOW) {
1183 commit->object.flags |= SHOWN;
1186 if (commit->object.flags & UNINTERESTING)
1188 if (revs->min_age != -1 && (commit->date > revs->min_age))
1190 if (revs->no_merges &&
1191 commit->parents && commit->parents->next)
1193 if (!commit_match(commit, revs))
1195 if (revs->prune_fn && revs->dense) {
1196 /* Commit without changes? */
1197 if (!(commit->object.flags & TREECHANGE)) {
1198 /* drop merges unless we want parenthood */
1201 /* non-merge - always ignore it */
1202 if (!commit->parents || !commit->parents->next)
1206 rewrite_parents(revs, commit);
1209 mark_boundary_to_show(commit);
1210 commit->object.flags |= SHOWN;
1212 } while (revs->commits);