From: Ronnie Sahlberg <sahlberg@xxxxxxxxxx>
Add a ref structure for backend methods. Start by adding method pointers
for the transaction functions.
Add a function set_refs_backend to switch between backends. The files
based backend is the default.
Signed-off-by: Ronnie Sahlberg <sahlberg@xxxxxxxxxx>
Signed-off-by: David Turner <dturner@xxxxxxxxxxxxxxxx>
---
refs-be-files.c | 62 +++++++++++++++++++++++++++-------------------
refs.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
refs.h | 36 +++++++++++++++++++++++++++
3 files changed, 150 insertions(+), 25 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 05a4b88..6e6f092 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -3310,14 +3310,14 @@ struct ref_transaction {
enum ref_transaction_state state;
};
-struct ref_transaction *ref_transaction_begin(struct strbuf *err)
+static struct ref_transaction *files_transaction_begin(struct strbuf *err)
{
assert(err);
return xcalloc(1, sizeof(struct ref_transaction));
}
-void ref_transaction_free(struct ref_transaction *transaction)
+static void files_transaction_free(struct ref_transaction *transaction)
{
int i;
@@ -3344,12 +3344,12 @@ static struct ref_update *add_update(struct ref_transaction *transaction,
return update;
}
-int ref_transaction_update(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *new_sha1,
- const unsigned char *old_sha1,
- unsigned int flags, const char *msg,
- struct strbuf *err)
+static int files_transaction_update(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *new_sha1,
+ const unsigned char *old_sha1,
+ unsigned int flags, const char *msg,
+ struct strbuf *err)
{
struct ref_update *update;
@@ -3380,11 +3380,11 @@ int ref_transaction_update(struct ref_transaction *transaction,
return 0;
}
-int ref_transaction_create(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *new_sha1,
- unsigned int flags, const char *msg,
- struct strbuf *err)
+static int files_transaction_create(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *new_sha1,
+ unsigned int flags, const char *msg,
+ struct strbuf *err)
{
if (!new_sha1 || is_null_sha1(new_sha1))
die("BUG: create called without valid new_sha1");
@@ -3392,11 +3392,11 @@ int ref_transaction_create(struct ref_transaction *transaction,
null_sha1, flags, msg, err);
}
-int ref_transaction_delete(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *old_sha1,
- unsigned int flags, const char *msg,
- struct strbuf *err)
+static int files_transaction_delete(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *old_sha1,
+ unsigned int flags, const char *msg,
+ struct strbuf *err)
{
if (old_sha1 && is_null_sha1(old_sha1))
die("BUG: delete called with old_sha1 set to zeros");
@@ -3405,11 +3405,11 @@ int ref_transaction_delete(struct ref_transaction *transaction,
flags, msg, err);
}
-int ref_transaction_verify(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *old_sha1,
- unsigned int flags,
- struct strbuf *err)
+int files_transaction_verify(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *old_sha1,
+ unsigned int flags,
+ struct strbuf *err)
{
if (!old_sha1)
die("BUG: verify called with old_sha1 set to NULL");
@@ -3435,8 +3435,8 @@ static int ref_update_reject_duplicates(struct string_list *refnames,
return 0;
}
-int ref_transaction_commit(struct ref_transaction *transaction,
- struct strbuf *err)
+static int files_transaction_commit(struct ref_transaction *transaction,
+ struct strbuf *err)
{
int ret = 0, i;
int n = transaction->nr;
@@ -3822,3 +3822,15 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
unlock_ref(lock);
return -1;
}
+
+struct ref_be refs_be_files = {
+ NULL,
+ "files",
+ files_transaction_begin,
+ files_transaction_update,
+ files_transaction_create,
+ files_transaction_delete,
+ files_transaction_verify,
+ files_transaction_commit,
+ files_transaction_free,
+};
diff --git a/refs.c b/refs.c
index 0f4e19a..98aa357 100644
--- a/refs.c
+++ b/refs.c
@@ -4,6 +4,29 @@
#include "cache.h"
#include "refs.h"
#include "lockfile.h"
+/*
+ * We always have a files backend and it is the default.
+ */
+struct ref_be *the_refs_backend = &refs_be_files;
+/*
+ * List of all available backends
+ */
+struct ref_be *refs_backends = &refs_be_files;
+
+/*
+ * This function is used to switch to an alternate backend.
+ */
+int set_refs_backend(const char *name)
+{
+ struct ref_be *be;
+
+ for (be = refs_backends; be; be = be->next)
+ if (!strcmp(be->name, name)) {
+ the_refs_backend = be;
+ return 0;
+ }
+ return 1;
+}
static int is_per_worktree_ref(const char *refname)
{
@@ -877,3 +900,57 @@ int head_ref_namespaced(each_ref_fn fn, void *cb_data)
return ret;
}
+
+
+/* backend functions */
+struct ref_transaction *ref_transaction_begin(struct strbuf *err)
+{
+ return the_refs_backend->transaction_begin(err);
+}
+
+
+int ref_transaction_update(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ const unsigned char *old_sha1, unsigned int flags,
+ const char *msg, struct strbuf *err)
+{
+ return the_refs_backend->transaction_update(transaction,
+ refname, new_sha1, old_sha1, flags, msg, err);
+}
+
+int ref_transaction_create(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ unsigned int flags, const char *msg,
+ struct strbuf *err)
+{
+ return the_refs_backend->transaction_create(transaction,
+ refname, new_sha1, flags, msg, err);
+}
+int ref_transaction_delete(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *old_sha1,
+ unsigned int flags, const char *msg,
+ struct strbuf *err)
+{
+ return the_refs_backend->transaction_delete(transaction,
+ refname, old_sha1, flags, msg, err);
+}
+
+int ref_transaction_verify(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *old_sha1,
+ unsigned int flags,
+ struct strbuf *err)
+{
+ return the_refs_backend->transaction_verify(transaction,
+ refname, old_sha1, flags, err);
+}
+
+int ref_transaction_commit(struct ref_transaction *transaction,
+ struct strbuf *err)
+{
+ return the_refs_backend->transaction_commit(transaction, err);
+}
+
+void ref_transaction_free(struct ref_transaction *transaction)
+{
+ return the_refs_backend->transaction_free(transaction);
+}
diff --git a/refs.h b/refs.h
index 729bc3c..a1db3ef 100644
--- a/refs.h
+++ b/refs.h
@@ -530,4 +530,40 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,
reflog_expiry_cleanup_fn cleanup_fn,
void *policy_cb_data);
+/* refs backends */
+typedef struct ref_transaction *(*ref_transaction_begin_fn)(struct strbuf *err);
+typedef int (*ref_transaction_update_fn)(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ const unsigned char *old_sha1, unsigned int flags,
+ const char *msg, struct strbuf *err);
+typedef int (*ref_transaction_create_fn)(
+ struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ unsigned int flags, const char *msg, struct strbuf *err);
+typedef int (*ref_transaction_delete_fn)(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *old_sha1,
+ unsigned int flags, const char *msg, struct strbuf *err);
+typedef int (*ref_transaction_verify_fn)(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *old_sha1,
+ unsigned int flags, struct strbuf *err);
+typedef int (*ref_transaction_commit_fn)(struct ref_transaction *transaction,
+ struct strbuf *err);
+typedef void (*ref_transaction_free_fn)(struct ref_transaction *transaction);
+
+struct ref_be {
+ struct ref_be *next;
+ const char *name;
+ ref_transaction_begin_fn transaction_begin;
+ ref_transaction_update_fn transaction_update;
+ ref_transaction_create_fn transaction_create;
+ ref_transaction_delete_fn transaction_delete;
+ ref_transaction_verify_fn transaction_verify;
+ ref_transaction_commit_fn transaction_commit;
+ ref_transaction_free_fn transaction_free;
+};
+
+
+extern struct ref_be refs_be_files;
+int set_refs_backend(const char *name);
+
#endif /* REFS_H */
--
2.4.2.644.g97b850b-twtrsrc
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html