refs: store the main ref store inside the repository struct

stefanbeller · gitster · commit 64a741619d27 · 2018-04-12T11:38:56.000+09:00
This moves the 'main_ref_store', which was a global variable in refs.c
into the repository struct.

This patch does not deal with the parts in the refs subsystem which deal
with the submodules there. A later patch needs to get rid of the submodule
exposure in the refs API, such as 'get_submodule_ref_store(path)'.

Acked-by: Michael Haggerty &lt;mhagger@alum.mit.edu&gt;
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/refs.c b/refs.c
@@ -1608,9 +1608,6 @@ static struct ref_store_hash_entry *alloc_ref_store_hash_entry(
 	return entry;
 }
 
-/* A pointer to the ref_store for the main repository: */
-static struct ref_store *main_ref_store;
-
 /* A hashmap of ref_stores, stored by submodule name: */
 static struct hashmap submodule_ref_stores;
 
@@ -1652,13 +1649,13 @@ static struct ref_store *ref_store_init(const char *gitdir,
 	return refs;
 }
 
-struct ref_store *get_main_ref_store_the_repository(void)
+struct ref_store *get_main_ref_store(struct repository *r)
 {
-	if (main_ref_store)
-		return main_ref_store;
+	if (r->refs)
+		return r->refs;
 
-	main_ref_store = ref_store_init(get_git_dir(), REF_STORE_ALL_CAPS);
-	return main_ref_store;
+	r->refs = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS);
+	return r->refs;
 }
 
 /*
diff --git a/refs.h b/refs.h
@@ -760,9 +760,7 @@ int reflog_expire(const char *refname, const struct object_id *oid,
 
 int ref_storage_backend_exists(const char *name);
 
-#define get_main_ref_store(r) \
-	get_main_ref_store_##r()
-struct ref_store *get_main_ref_store_the_repository(void);
+struct ref_store *get_main_ref_store(struct repository *r);
 /*
  * Return the ref_store instance for the specified submodule. For the
  * main repository, use submodule==NULL; such a call cannot fail. For
diff --git a/refs/files-backend.c b/refs/files-backend.c
@@ -61,10 +61,6 @@ struct ref_lock {
 	struct object_id old_oid;
 };
 
-/*
- * Future: need to be in "struct repository"
- * when doing a full libification.
- */
 struct files_ref_store {
 	struct ref_store base;
 	unsigned int store_flags;
diff --git a/repository.h b/repository.h
@@ -26,6 +26,9 @@ struct repository {
 	 */
 	struct raw_object_store *objects;
 
+	/* The store in which the refs are held. */
+	struct ref_store *refs;
+
 	/*
 	 * Path to the repository's graft file.
 	 * Cannot be NULL after initialization.

Original file line number	Diff line number	Diff line change
`@@ -1608,9 +1608,6 @@ static struct ref_store_hash_entry *alloc_ref_store_hash_entry(`
`1608`	`1608`	`return entry;`
`1609`	`1609`	`}`
`1610`	`1610`
`1611`		`-/* A pointer to the ref_store for the main repository: */`
`1612`		`-static struct ref_store *main_ref_store;`
`1613`		`-`
`1614`	`1611`	`/* A hashmap of ref_stores, stored by submodule name: */`
`1615`	`1612`	`static struct hashmap submodule_ref_stores;`
`1616`	`1613`
`@@ -1652,13 +1649,13 @@ static struct ref_store ref_store_init(const char gitdir,`
`1652`	`1649`	`return refs;`
`1653`	`1650`	`}`
`1654`	`1651`
`1655`		`-struct ref_store *get_main_ref_store_the_repository(void)`
	`1652`	`+struct ref_store get_main_ref_store(struct repository r)`
`1656`	`1653`	`{`
`1657`		`- if (main_ref_store)`
`1658`		`- return main_ref_store;`
	`1654`	`+ if (r->refs)`
	`1655`	`+ return r->refs;`
`1659`	`1656`
`1660`		`- main_ref_store = ref_store_init(get_git_dir(), REF_STORE_ALL_CAPS);`
`1661`		`- return main_ref_store;`
	`1657`	`+ r->refs = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS);`
	`1658`	`+ return r->refs;`
`1662`	`1659`	`}`
`1663`	`1660`
`1664`	`1661`	`/*`