Add a ref structure for backend methods. Start by adding method pointers
for the transaction functions.
Rename the existing transaction functions to files_* and make them static.
Add new transaction functions that just pass through to the appropriate
methods for the backend.
Signed-off-by: Ronnie Sahlberg <sahlberg@xxxxxxxxxx>
---
refs-be-files.c | 68 ++++++++++++++++++++++++++++++++++-----------------------
refs.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++
refs.h | 35 +++++++++++++++++++++++++++++
3 files changed, 131 insertions(+), 27 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index e58a7e1..27eafd0 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -2777,12 +2777,12 @@ struct ref_transaction {
enum ref_transaction_state state;
};
-struct ref_transaction *transaction_begin(struct strbuf *err)
+static struct ref_transaction *files_transaction_begin(struct strbuf *err)
{
return xcalloc(1, sizeof(struct ref_transaction));
}
-void transaction_free(struct ref_transaction *transaction)
+static void files_transaction_free(struct ref_transaction *transaction)
{
int i;
@@ -2812,13 +2812,13 @@ static struct ref_update *add_update(struct ref_transaction *transaction,
return update;
}
-int transaction_update_reflog(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *new_sha1,
- const unsigned char *old_sha1,
- struct reflog_committer_info *ci,
- const char *msg, int flags,
- struct strbuf *err)
+static int files_transaction_update_reflog(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *new_sha1,
+ const unsigned char *old_sha1,
+ struct reflog_committer_info *ci,
+ const char *msg, int flags,
+ struct strbuf *err)
{
struct ref_update *update;
int i;
@@ -2865,12 +2865,13 @@ int transaction_update_reflog(struct ref_transaction *transaction,
return 0;
}
-int transaction_update_sha1(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *new_sha1,
- const unsigned char *old_sha1,
- int flags, int have_old, const char *msg,
- struct strbuf *err)
+static int files_transaction_update_sha1(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *new_sha1,
+ const unsigned char *old_sha1,
+ int flags, int have_old,
+ const char *msg,
+ struct strbuf *err)
{
struct ref_update *update;
@@ -2897,11 +2898,11 @@ int transaction_update_sha1(struct ref_transaction *transaction,
return 0;
}
-int transaction_create_sha1(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *new_sha1,
- int flags, const char *msg,
- struct strbuf *err)
+static int files_transaction_create_sha1(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *new_sha1,
+ int flags, const char *msg,
+ struct strbuf *err)
{
if (transaction->state != REF_TRANSACTION_OPEN)
die("BUG: create called for transaction that is not open");
@@ -2913,11 +2914,12 @@ int transaction_create_sha1(struct ref_transaction *transaction,
null_sha1, flags, 1, msg, err);
}
-int transaction_delete_sha1(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *old_sha1,
- int flags, int have_old, const char *msg,
- struct strbuf *err)
+static int files_transaction_delete_sha1(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *old_sha1,
+ int flags, int have_old,
+ const char *msg,
+ struct strbuf *err)
{
if (transaction->state != REF_TRANSACTION_OPEN)
die("BUG: delete called for transaction that is not open");
@@ -2959,8 +2961,8 @@ static int ref_update_reject_duplicates(struct ref_update **updates, int n,
return 0;
}
-int transaction_commit(struct ref_transaction *transaction,
- struct strbuf *err)
+static int files_transaction_commit(struct ref_transaction *transaction,
+ struct strbuf *err)
{
int ret = 0, delnum = 0, i, df_conflict = 0, need_repack = 0;
int num_updates = 0;
@@ -3284,3 +3286,15 @@ cleanup:
ret = -2;
return ret;
}
+
+struct ref_be refs_files = {
+ files_transaction_begin,
+ files_transaction_update_sha1,
+ files_transaction_create_sha1,
+ files_transaction_delete_sha1,
+ files_transaction_update_reflog,
+ files_transaction_commit,
+ files_transaction_free,
+};
+
+struct ref_be *refs = &refs_files;
diff --git a/refs.c b/refs.c
index 6b434ad..b8c942f 100644
--- a/refs.c
+++ b/refs.c
@@ -801,3 +801,58 @@ int head_ref_namespaced(each_ref_fn fn, void *cb_data)
return ret;
}
+
+
+/* backend functions */
+struct ref_transaction *transaction_begin(struct strbuf *err)
+{
+ return refs->transaction_begin(err);
+}
+
+int transaction_update_sha1(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ const unsigned char *old_sha1, int flags,
+ int have_old, const char *msg, struct strbuf *err)
+{
+ return refs->transaction_update_sha1(transaction, refname, new_sha1,
+ old_sha1, flags, have_old, msg,
+ err);
+}
+
+int transaction_create_sha1(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ int flags, const char *msg, struct strbuf *err)
+{
+ return refs->transaction_create_sha1(transaction, refname, new_sha1,
+ flags, msg, err);
+}
+int transaction_delete_sha1(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *old_sha1,
+ int flags, int have_old, const char *msg,
+ struct strbuf *err)
+{
+ return refs->transaction_delete_sha1(transaction, refname, old_sha1,
+ flags, have_old, msg, err);
+}
+
+int transaction_update_reflog(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *new_sha1,
+ const unsigned char *old_sha1,
+ struct reflog_committer_info *ci,
+ const char *msg, int flags,
+ struct strbuf *err)
+{
+ return refs->transaction_update_reflog(transaction, refname, new_sha1,
+ old_sha1, ci, msg, flags, err);
+}
+
+int transaction_commit(struct ref_transaction *transaction, struct strbuf *err)
+{
+ return refs->transaction_commit(transaction, err);
+}
+
+void transaction_free(struct ref_transaction *transaction)
+{
+ return refs->transaction_free(transaction);
+}
diff --git a/refs.h b/refs.h
index a14fc5d..4b669f5 100644
--- a/refs.h
+++ b/refs.h
@@ -350,4 +350,39 @@ int update_ref(const char *action, const char *refname,
extern int parse_hide_refs_config(const char *var, const char *value, const char *);
extern int ref_is_hidden(const char *);
+
+/* refs backends */
+typedef struct ref_transaction *(*transaction_begin_fn)(struct strbuf *err);
+typedef int (*transaction_update_sha1_fn)(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ const unsigned char *old_sha1, int flags, int have_old,
+ const char *msg, struct strbuf *err);
+typedef int (*transaction_create_sha1_fn)(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ int flags, const char *msg, struct strbuf *err);
+typedef int (*transaction_delete_sha1_fn)(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *old_sha1,
+ int flags, int have_old, const char *msg, struct strbuf *err);
+typedef int (*transaction_update_reflog_fn)(
+ struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ const unsigned char *old_sha1,
+ struct reflog_committer_info *ci,
+ const char *msg, int flags, struct strbuf *err);
+typedef int (*transaction_commit_fn)(struct ref_transaction *transaction,
+ struct strbuf *err);
+typedef void (*transaction_free_fn)(struct ref_transaction *transaction);
+
+struct ref_be {
+ transaction_begin_fn transaction_begin;
+ transaction_update_sha1_fn transaction_update_sha1;
+ transaction_create_sha1_fn transaction_create_sha1;
+ transaction_delete_sha1_fn transaction_delete_sha1;
+ transaction_update_reflog_fn transaction_update_reflog;
+ transaction_commit_fn transaction_commit;
+ transaction_free_fn transaction_free;
+};
+
+extern struct ref_be *refs;
+
#endif /* REFS_H */
--
2.0.1.552.g1af257a
--
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