Re: [PATCH 01/16] refs: add a backend method structure with transaction functions

2015-12-04 Thread Junio C Hamano
David Turner  writes:

> diff --git a/refs.c b/refs.c
> index 0f7628d..babba8a 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -10,6 +10,31 @@
>  #include "tag.h"
>  
>  /*
> + * We always have a files backend and it is the default.
> + */
> +extern struct ref_be refs_be_files;

It is customary to s/extern //; in C sources.

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 01/16] refs: add a backend method structure with transaction functions

2015-12-02 Thread David Turner
From: Ronnie Sahlberg 

Add a ref structure for backend methods. Start by adding a method pointer
for the transaction commit function.

Add a function set_refs_backend to switch between backends. The files
based backend is the default.

Signed-off-by: Ronnie Sahlberg 
Signed-off-by: David Turner 
---
 refs.c   | 32 
 refs.h   |  2 ++
 refs/files-backend.c | 10 --
 refs/refs-internal.h | 10 ++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/refs.c b/refs.c
index 0f7628d..babba8a 100644
--- a/refs.c
+++ b/refs.c
@@ -10,6 +10,31 @@
 #include "tag.h"
 
 /*
+ * We always have a files backend and it is the default.
+ */
+extern struct ref_be refs_be_files;
+struct ref_be *the_refs_backend = _be_files;
+/*
+ * List of all available backends
+ */
+struct ref_be *refs_backends = _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;
+}
+
+/*
  * How to handle various characters in refnames:
  * 0: An acceptable character for refs
  * 1: End-of-component
@@ -1082,3 +1107,10 @@ int rename_ref_available(const char *oldname, const char 
*newname)
strbuf_release();
return ret;
 }
+
+/* backend functions */
+int ref_transaction_commit(struct ref_transaction *transaction,
+  struct strbuf *err)
+{
+   return the_refs_backend->transaction_commit(transaction, err);
+}
diff --git a/refs.h b/refs.h
index 7a04077..4e5477d 100644
--- a/refs.h
+++ b/refs.h
@@ -508,4 +508,6 @@ extern int reflog_expire(const char *refname, const 
unsigned char *sha1,
 reflog_expiry_cleanup_fn cleanup_fn,
 void *policy_cb_data);
 
+int set_refs_backend(const char *name);
+
 #endif /* REFS_H */
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 4db3e36..be34772 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3123,8 +3123,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;
@@ -3510,3 +3510,9 @@ 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_commit,
+};
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index c7dded3..f2c74f3 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -197,4 +197,14 @@ const char *find_descendant_ref(const char *dirname,
 
 int rename_ref_available(const char *oldname, const char *newname);
 
+/* refs backends */
+typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
+ struct strbuf *err);
+
+struct ref_be {
+   struct ref_be *next;
+   const char *name;
+   ref_transaction_commit_fn *transaction_commit;
+};
+
 #endif /* REFS_REFS_INTERNAL_H */
-- 
2.4.2.749.g0ed01d8-twtrsrc

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html