commit-reach: prepare in_merge_bases[_many] to handle any repo

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit-reach.c b/commit-reach.c
index 657a4e9b5a8fe91050f18019942e1afb21ff6193..8715008fef964a446e3ba8c221734b667b54c170 100644 (file)
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -312,16 +312,17 @@ int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
 /*
  * Is "commit" an ancestor of one of the "references"?
  */
 /*
  * Is "commit" an ancestor of one of the "references"?
  */

-int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference)
+int repo_in_merge_bases_many(struct repository *r, struct commit *commit,
+                            int nr_reference, struct commit **reference)

 {
        struct commit_list *bases;
        int ret = 0, i;
        uint32_t min_generation = GENERATION_NUMBER_INFINITY;
 
 {
        struct commit_list *bases;
        int ret = 0, i;
        uint32_t min_generation = GENERATION_NUMBER_INFINITY;
 

-       if (parse_commit(commit))
+       if (repo_parse_commit(r, commit))

                return ret;
        for (i = 0; i < nr_reference; i++) {
                return ret;
        for (i = 0; i < nr_reference; i++) {

-               if (parse_commit(reference[i]))
+               if (repo_parse_commit(r, reference[i]))

                        return ret;
                if (reference[i]->generation < min_generation)
                        min_generation = reference[i]->generation;
                        return ret;
                if (reference[i]->generation < min_generation)
                        min_generation = reference[i]->generation;


@@ -330,7 +331,7 @@ int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit *
        if (commit->generation > min_generation)
                return ret;
 
        if (commit->generation > min_generation)
                return ret;
 

-       bases = paint_down_to_common(the_repository, commit,
+       bases = paint_down_to_common(r, commit,

                                     nr_reference, reference,
                                     commit->generation);
        if (commit->object.flags & PARENT2)
                                     nr_reference, reference,
                                     commit->generation);
        if (commit->object.flags & PARENT2)


@@ -344,9 +345,11 @@ int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit *
 /*
  * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
  */
 /*
  * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
  */

-int in_merge_bases(struct commit *commit, struct commit *reference)
+int repo_in_merge_bases(struct repository *r,
+                       struct commit *commit,
+                       struct commit *reference)

 {
 {

-       return in_merge_bases_many(commit, 1, &reference);
+       return repo_in_merge_bases_many(r, commit, 1, &reference);

 }
 
 struct commit_list *reduce_heads(struct commit_list *heads)
 }
 
 struct commit_list *reduce_heads(struct commit_list *heads)

diff --git a/commit-reach.h b/commit-reach.h
index 52667d64ac8765fc6edba4702070d3057c70d0af..a0d4a29d259ae8e4bc08463d848d28f5fa06728e 100644 (file)
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -27,8 +27,16 @@ struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r,
 struct commit_list *get_octopus_merge_bases(struct commit_list *in);
 
 int is_descendant_of(struct commit *commit, struct commit_list *with_commit);
 struct commit_list *get_octopus_merge_bases(struct commit_list *in);
 
 int is_descendant_of(struct commit *commit, struct commit_list *with_commit);

-int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference);
-int in_merge_bases(struct commit *commit, struct commit *reference);
+int repo_in_merge_bases(struct repository *r,
+                       struct commit *commit,
+                       struct commit *reference);
+int repo_in_merge_bases_many(struct repository *r,
+                            struct commit *commit,
+                            int nr_reference, struct commit **reference);
+#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#define in_merge_bases(c1, c2) repo_in_merge_bases(the_repository, c1, c2)
+#define in_merge_bases_many(c1, n, cs) repo_in_merge_bases_many(the_repository, c1, n, cs)
+#endif

 
 /*
  * Takes a list of commits and returns a new list where those
 
 /*
  * Takes a list of commits and returns a new list where those

diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
index f6c2915a4e03be9688405963f987b9d1ea352e19..8c6a71bf6480e36d6e6ae6aaa5dbfe830a6cf0c0 100644 (file)
--- a/contrib/coccinelle/the_repository.pending.cocci
+++ b/contrib/coccinelle/the_repository.pending.cocci
@@ -90,3 +90,20 @@ expression G;
 - get_merge_bases_many_dirty(
 + repo_get_merge_bases_many_dirty(the_repository,
   E, F, G);
 - get_merge_bases_many_dirty(
 + repo_get_merge_bases_many_dirty(the_repository,
   E, F, G);

+
+@@
+expression E;
+expression F;
+@@
+- in_merge_bases(
++ repo_in_merge_bases(the_repository,
+  E, F);
+
+@@
+expression E;
+expression F;
+expression G;
+@@
+- in_merge_bases_many(
++ repo_in_merge_bases_many(the_repository,
+  E, F, G);