Introduce the repository object 'struct repository' which can be used to
hold all state pertaining to a git repository.
Some of the benefits of object-ifying a repository are:
1. Make the code base more readable and easier to reason about.
2. Allow for working on multiple repositories, specifically
submodules, within the same process. Currently the process for
working on a submodule involves setting up an argv_array of options
for a particular command and then launching a child process to
execute the command in the context of the submodule. This is
clunky and can require lots of little hacks in order to ensure
correctness. Ideally it would be nice to simply pass a repository
and an options struct to a command.
3. Eliminating reliance on global state will make it easier to
enable the use of threading to improve performance.
Signed-off-by: Brandon Williams <bmwill@xxxxxxxxxx>
---
Makefile | 1 +
cache.h | 1 +
environment.c | 2 +-
repository.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
repository.h | 25 +++++++++
5 files changed, 199 insertions(+), 1 deletion(-)
create mode 100644 repository.c
create mode 100644 repository.h
diff --git a/Makefile b/Makefile
index 2ed6db728..ac82d93f6 100644
--- a/Makefile
+++ b/Makefile
@@ -821,6 +821,7 @@ LIB_OBJS += refs/ref-cache.o
LIB_OBJS += ref-filter.o
LIB_OBJS += remote.o
LIB_OBJS += replace_object.o
+LIB_OBJS += repository.o
LIB_OBJS += rerere.o
LIB_OBJS += resolve-undo.o
LIB_OBJS += revision.o
diff --git a/cache.h b/cache.h
index d41aab82f..c0b4c8d83 100644
--- a/cache.h
+++ b/cache.h
@@ -483,6 +483,7 @@ extern char *get_graft_file(void);
extern int set_git_dir(const char *path);
extern int get_common_dir_noenv(struct strbuf *sb, const char *gitdir);
extern int get_common_dir(struct strbuf *sb, const char *gitdir);
+extern char *expand_namespace(const char *raw_namespace);
extern const char *get_git_namespace(void);
extern const char *strip_namespace(const char *namespaced_ref);
extern const char *get_super_prefix(void);
diff --git a/environment.c b/environment.c
index e035f6372..77900b31a 100644
--- a/environment.c
+++ b/environment.c
@@ -127,7 +127,7 @@ const char * const local_repo_env[] = {
NULL
};
-static char *expand_namespace(const char *raw_namespace)
+char *expand_namespace(const char *raw_namespace)
{
struct strbuf buf = STRBUF_INIT;
struct strbuf **components, **c;
diff --git a/repository.c b/repository.c
new file mode 100644
index 000000000..e952238d1
--- /dev/null
+++ b/repository.c
@@ -0,0 +1,171 @@
+#include "cache.h"
+#include "repository.h"
+
+/* The main repository */
+static struct repository the_repo;
+struct repository *the_repository = &the_repo;
+
+static char *git_path_from_env(const char *envvar, const char *git_dir,
+ const char *path, int fromenv)
+{
+ if (fromenv) {
+ const char *value = getenv(envvar);
+ if (value)
+ return xstrdup(value);
+ }
+
+ return xstrfmt("%s/%s", git_dir, path);
+}
+
+static int find_common_dir(struct strbuf *sb, const char *gitdir, int fromenv)
+{
+ if (fromenv) {
+ const char *value = getenv(GIT_COMMON_DIR_ENVIRONMENT);
+ if (value) {
+ strbuf_addstr(sb, value);
+ return 1;
+ }
+ }
+
+ return get_common_dir_noenv(sb, gitdir);
+}
+
+/* called after setting gitdir */
+static void repo_setup_env(struct repository *repo)
+{
+ struct strbuf sb = STRBUF_INIT;
+
+ if (!repo->gitdir)
+ BUG("gitdir wasn't set before setting up the environment");
+
+ repo->different_commondir = find_common_dir(&sb, repo->gitdir,
+ !repo->ignore_env);
+ repo->commondir = strbuf_detach(&sb, NULL);
+ repo->objectdir = git_path_from_env(DB_ENVIRONMENT, repo->commondir,
+ "objects", !repo->ignore_env);
+ repo->index_file = git_path_from_env(INDEX_ENVIRONMENT, repo->gitdir,
+ "index", !repo->ignore_env);
+ repo->graft_file = git_path_from_env(GRAFT_ENVIRONMENT, repo->commondir,
+ "info/grafts", !repo->ignore_env);
+ repo->namespace = expand_namespace(repo->ignore_env ? NULL :
+ getenv(GIT_NAMESPACE_ENVIRONMENT));
+}
+
+void repo_set_gitdir(struct repository *repo, const char *path)
+{
+ const char *gitfile = read_gitfile(path);
+
+ /*
+ * NEEDSWORK: Eventually we want to be able to free gitdir and the rest
+ * of the environment before reinitializing it again, but we have some
+ * crazy code paths where we try to set gitdir with the current gitdir
+ * and we don't want to free gitdir before copying the passed in value.
+ */
+ repo->gitdir = xstrdup(gitfile ? gitfile : path);
+
+ repo_setup_env(repo);
+}
+
+/*
+ * Attempt to resolve and set the provided 'gitdir' for repository 'repo'.
+ * Return 0 upon success and a non-zero value upon failure.
+ */
+static int repo_init_gitdir(struct repository *repo, const char *gitdir)
+{
+ int ret = 0;
+ int error = 0;
+ char *abspath = NULL;
+ char *suspect = NULL;
+ const char *resolved_gitdir;
+
+ abspath = real_pathdup(gitdir, 0);
+ if (!abspath) {
+ ret = -1;
+ goto out;
+ }
+
+ /* First assume 'gitdir' references the gitdir directly */
+ resolved_gitdir = resolve_gitdir_gently(abspath, &error);
+ /* otherwise; try 'gitdir'.git */
+ if (!resolved_gitdir) {
+ suspect = xstrfmt("%s/.git", abspath);
+ resolved_gitdir = resolve_gitdir_gently(suspect, &error);
+ if (!resolved_gitdir) {
+ ret = -1;
+ goto out;
+ }
+ }
+
+ repo_set_gitdir(repo, resolved_gitdir);
+
+out:
+ free(abspath);
+ free(suspect);
+ return ret;
+}
+
+static int verify_repo_format(struct repository_format *format,
+ const char *commondir)
+{
+ int ret = 0;
+ struct strbuf sb = STRBUF_INIT;
+
+ strbuf_addf(&sb, "%s/config", commondir);
+ read_repository_format(format, sb.buf);
+ strbuf_reset(&sb);
+
+ if (verify_repository_format(format, &sb) < 0) {
+ warning("%s", sb.buf);
+ ret = -1;
+ }
+
+ strbuf_release(&sb);
+ return ret;
+}
+
+/*
+ * Initialize 'repo' based on the provided 'gitdir'.
+ * Return 0 upon success and a non-zero value upon failure.
+ */
+int repo_init(struct repository *repo, const char *gitdir)
+{
+ struct repository_format format;
+ memset(repo, 0, sizeof(*repo));
+
+ repo->ignore_env = 1;
+
+ if (repo_init_gitdir(repo, gitdir))
+ goto error;
+
+ if (verify_repo_format(&format, repo->commondir))
+ goto error;
+
+ return 0;
+
+error:
+ repo_clear(repo);
+ return -1;
+}
+
+static void repo_clear_env(struct repository *repo)
+{
+ free(repo->gitdir);
+ repo->gitdir = NULL;
+ free(repo->commondir);
+ repo->commondir = NULL;
+ free(repo->objectdir);
+ repo->objectdir = NULL;
+ free(repo->index_file);
+ repo->index_file = NULL;
+ free(repo->graft_file);
+ repo->graft_file = NULL;
+ free(repo->namespace);
+ repo->namespace = NULL;
+}
+
+void repo_clear(struct repository *repo)
+{
+ repo_clear_env(repo);
+
+ memset(repo, 0, sizeof(*repo));
+}
diff --git a/repository.h b/repository.h
new file mode 100644
index 000000000..174ab0f2d
--- /dev/null
+++ b/repository.h
@@ -0,0 +1,25 @@
+#ifndef REPOSITORY_H
+#define REPOSITORY_H
+
+struct repository {
+ /* Environment */
+ char *gitdir;
+ char *commondir;
+ char *objectdir;
+ char *index_file;
+ char *graft_file;
+ char *namespace;
+
+ /* Configurations */
+ unsigned ignore_env:1;
+ /* Indicates if a repository has a different 'commondir' from 'gitdir' */
+ unsigned different_commondir:1;
+};
+
+extern struct repository *the_repository;
+
+extern void repo_set_gitdir(struct repository *repo, const char *path);
+extern int repo_init(struct repository *repo, const char *path);
+extern void repo_clear(struct repository *repo);
+
+#endif /* REPOSITORY_H */
--
2.13.1.508.gb3defc5cc-goog