commit-reach: prepare get_merge_bases to handle any repo

stefanbeller · gitster · commit 21a9651ba3fb · 2018-11-14T17:22:40.000+09:00
Similarly to previous patches, the get_merge_base functions are used
often in the code base, which makes migrating them hard.

Implement the new functions, prefixed with 'repo_' and hide the old
functions behind a wrapper macro.

Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/commit-reach.c b/commit-reach.c
@@ -258,23 +258,27 @@ static struct commit_list *get_merge_bases_many_0(struct repository *r,
 	return result;
 }
 
-struct commit_list *get_merge_bases_many(struct commit *one,
-					 int n,
-					 struct commit **twos)
+struct commit_list *repo_get_merge_bases_many(struct repository *r,
+					      struct commit *one,
+					      int n,
+					      struct commit **twos)
 {
-	return get_merge_bases_many_0(the_repository, one, n, twos, 1);
+	return get_merge_bases_many_0(r, one, n, twos, 1);
 }
 
-struct commit_list *get_merge_bases_many_dirty(struct commit *one,
-					       int n,
-					       struct commit **twos)
+struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r,
+						    struct commit *one,
+						    int n,
+						    struct commit **twos)
 {
-	return get_merge_bases_many_0(the_repository, one, n, twos, 0);
+	return get_merge_bases_many_0(r, one, n, twos, 0);
 }
 
-struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
+struct commit_list *repo_get_merge_bases(struct repository *r,
+					 struct commit *one,
+					 struct commit *two)
 {
-	return get_merge_bases_many_0(the_repository, one, 1, &two, 1);
+	return get_merge_bases_many_0(r, one, 1, &two, 1);
 }
 
 /*
diff --git a/commit-reach.h b/commit-reach.h
@@ -8,17 +8,23 @@ struct commit_list;
 struct contains_cache;
 struct ref_filter;
 
-struct commit_list *get_merge_bases_many(struct commit *one,
-					 int n,
-					 struct commit **twos);
-struct commit_list *get_merge_bases_many_dirty(struct commit *one,
-					       int n,
-					       struct commit **twos);
-struct commit_list *get_merge_bases(struct commit *one, struct commit *two);
-struct commit_list *get_octopus_merge_bases(struct commit_list *in);
-
+struct commit_list *repo_get_merge_bases(struct repository *r,
+					 struct commit *rev1,
+					 struct commit *rev2);
+struct commit_list *repo_get_merge_bases_many(struct repository *r,
+					      struct commit *one, int n,
+					      struct commit **twos);
 /* To be used only when object flags after this call no longer matter */
-struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos);
+struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r,
+						    struct commit *one, int n,
+						    struct commit **twos);
+#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#define get_merge_bases(r1, r2)           repo_get_merge_bases(the_repository, r1, r2)
+#define get_merge_bases_many(one, n, two) repo_get_merge_bases_many(the_repository, one, n, two)
+#define get_merge_bases_many_dirty(one, n, twos) repo_get_merge_bases_many_dirty(the_repository, one, n, twos)
+#endif
+
+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);
diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
@@ -64,3 +64,29 @@ expression E;
 - parse_commit(
 + repo_parse_commit(the_repository,
   E)
+
+@@
+expression E;
+expression F;
+@@
+- get_merge_bases(
++ repo_get_merge_bases(the_repository,
+  E, F);
+
+@@
+expression E;
+expression F;
+expression G;
+@@
+- get_merge_bases_many(
++ repo_get_merge_bases_many(the_repository,
+  E, F, G);
+
+@@
+expression E;
+expression F;
+expression G;
+@@
+- get_merge_bases_many_dirty(
++ repo_get_merge_bases_many_dirty(the_repository,
+  E, F, G);

Original file line number	Diff line number	Diff line change
`@@ -258,23 +258,27 @@ static struct commit_list get_merge_bases_many_0(struct repository r,`
`258`	`258`	`return result;`
`259`	`259`	`}`
`260`	`260`
`261`		`-struct commit_list get_merge_bases_many(struct commit one,`
`262`		`- int n,`
`263`		`- struct commit **twos)`
	`261`	`+struct commit_list repo_get_merge_bases_many(struct repository r,`
	`262`	`+ struct commit *one,`
	`263`	`+ int n,`
	`264`	`+ struct commit **twos)`
`264`	`265`	`{`
`265`		`- return get_merge_bases_many_0(the_repository, one, n, twos, 1);`
	`266`	`+ return get_merge_bases_many_0(r, one, n, twos, 1);`
`266`	`267`	`}`
`267`	`268`
`268`		`-struct commit_list get_merge_bases_many_dirty(struct commit one,`
`269`		`- int n,`
`270`		`- struct commit **twos)`
	`269`	`+struct commit_list repo_get_merge_bases_many_dirty(struct repository r,`
	`270`	`+ struct commit *one,`
	`271`	`+ int n,`
	`272`	`+ struct commit **twos)`
`271`	`273`	`{`
`272`		`- return get_merge_bases_many_0(the_repository, one, n, twos, 0);`
	`274`	`+ return get_merge_bases_many_0(r, one, n, twos, 0);`
`273`	`275`	`}`
`274`	`276`
`275`		`-struct commit_list get_merge_bases(struct commit one, struct commit *two)`
	`277`	`+struct commit_list repo_get_merge_bases(struct repository r,`
	`278`	`+ struct commit *one,`
	`279`	`+ struct commit *two)`
`276`	`280`	`{`
`277`		`- return get_merge_bases_many_0(the_repository, one, 1, &two, 1);`
	`281`	`+ return get_merge_bases_many_0(r, one, 1, &two, 1);`
`278`	`282`	`}`
`279`	`283`
`280`	`284`	`/*`