Merge branch 'eb/apply' into next

diff --git a/revision.c b/revision.c
index 1224a2de624047eebd24969852af6833dbea2874..fe265623817c7c6b5b4c1af399f4522a75fdaf30 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -260,7 +260,7 @@ int rev_same_tree_as_empty(struct tree *t1)
        if (!t1)
                return 0;
 
-       tree = read_object_with_reference(t1->object.sha1, "tree", &real.size, NULL);
+       tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
        if (!tree)
                return 0;
        real.buf = tree;
@@ -340,6 +340,10 @@ static void add_parents_to_list(struct rev_info *revs, struct commit *commit, st
 {
        struct commit_list *parent = commit->parents;
 
+       if (commit->object.flags & ADDED)
+               return;
+       commit->object.flags |= ADDED;
+
        /*
         * If the commit is uninteresting, don't try to
         * prune parents - we want the maximal uninteresting
@@ -552,32 +556,26 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                        }
                        if (!strncmp(arg, "--max-age=", 10)) {
                                revs->max_age = atoi(arg + 10);
-                               revs->limited = 1;
-                               continue;
-                       }
-                       if (!strncmp(arg, "--min-age=", 10)) {
-                               revs->min_age = atoi(arg + 10);
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strncmp(arg, "--since=", 8)) {
                                revs->max_age = approxidate(arg + 8);
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strncmp(arg, "--after=", 8)) {
                                revs->max_age = approxidate(arg + 8);
-                               revs->limited = 1;
+                               continue;
+                       }
+                       if (!strncmp(arg, "--min-age=", 10)) {
+                               revs->min_age = atoi(arg + 10);
                                continue;
                        }
                        if (!strncmp(arg, "--before=", 9)) {
                                revs->min_age = approxidate(arg + 9);
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strncmp(arg, "--until=", 8)) {
                                revs->min_age = approxidate(arg + 8);
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--all")) {
@@ -596,13 +594,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                        }
                        if (!strcmp(arg, "--topo-order")) {
                                revs->topo_order = 1;
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--date-order")) {
                                revs->lifo = 0;
                                revs->topo_order = 1;
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--parents")) {
@@ -644,7 +640,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                        }
                        if (!strcmp(arg, "--unpacked")) {
                                revs->unpacked = 1;
-                               revs->limited = 1;
                                continue;
                        }
                        *unrecognized++ = arg;
@@ -708,10 +703,12 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                add_one_commit(commit, revs);
        }
 
+       if (revs->topo_order || revs->unpacked)
+               revs->limited = 1;
+
        if (revs->prune_data) {
                diff_tree_setup_paths(revs->prune_data);
                revs->prune_fn = try_to_simplify_commit;
-               revs->limited = 1;
        }
 
        return left;
@@ -728,10 +725,12 @@ void prepare_revision_walk(struct rev_info *revs)
                                             revs->topo_getter);
 }
 
-static int rewrite_one(struct commit **pp)
+static int rewrite_one(struct rev_info *revs, struct commit **pp)
 {
        for (;;) {
                struct commit *p = *pp;
+               if (!revs->limited)
+                       add_parents_to_list(revs, p, &revs->commits);
                if (p->object.flags & (TREECHANGE | UNINTERESTING))
                        return 0;
                if (!p->parents)
@@ -740,12 +739,12 @@ static int rewrite_one(struct commit **pp)
        }
 }
 
-static void rewrite_parents(struct commit *commit)
+static void rewrite_parents(struct rev_info *revs, struct commit *commit)
 {
        struct commit_list **pp = &commit->parents;
        while (*pp) {
                struct commit_list *parent = *pp;
-               if (rewrite_one(&parent->item) < 0) {
+               if (rewrite_one(revs, &parent->item) < 0) {
                        *pp = parent->next;
                        continue;
                }
@@ -773,41 +772,39 @@ struct commit *get_revision(struct rev_info *revs)
        do {
                struct commit *commit = revs->commits->item;
 
+               revs->commits = revs->commits->next;
+
+               /*
+                * If we haven't done the list limiting, we need to look at
+                * the parents here. We also need to do the date-based limiting
+                * that we'd otherwise have done in limit_list().
+                */
+               if (!revs->limited) {
+                       if ((revs->unpacked &&
+                            has_sha1_pack(commit->object.sha1)) ||
+                           (revs->max_age != -1 &&
+                            (commit->date < revs->max_age)))
+                               continue;
+                       add_parents_to_list(revs, commit, &revs->commits);
+               }
                if (commit->object.flags & SHOWN)
-                       goto next;
+                       continue;
                if (!(commit->object.flags & BOUNDARY) &&
                    (commit->object.flags & UNINTERESTING))
-                       goto next;
+                       continue;
                if (revs->min_age != -1 && (commit->date > revs->min_age))
-                       goto next;
-               if (revs->max_age != -1 && (commit->date < revs->max_age))
-                       return NULL;
+                       continue;
                if (revs->no_merges &&
                    commit->parents && commit->parents->next)
-                       goto next;
+                       continue;
                if (revs->prune_fn && revs->dense) {
                        if (!(commit->object.flags & TREECHANGE))
-                               goto next;
-                       rewrite_parents(commit);
-               }
-               /* More to go? */
-               if (revs->max_count) {
-                       if (commit->object.flags & BOUNDARY) {
-                               /* this is already uninteresting,
-                                * so there is no point popping its
-                                * parents into the list.
-                                */
-                               struct commit_list *it = revs->commits;
-                               revs->commits = it->next;
-                               free(it);
-                       }
-                       else
-                               pop_most_recent_commit(&revs->commits, SEEN);
+                               continue;
+                       if (revs->parents)
+                               rewrite_parents(revs, commit);
                }
                commit->object.flags |= SHOWN;
                return commit;
-next:
-               pop_most_recent_commit(&revs->commits, SEEN);
        } while (revs->commits);
        return NULL;
 }