From: Ronnie Sahlberg <sahlb...@google.com>
Add ref backend methods for:
resolve_ref_unsafe, verify_refname_available, pack_refs, peel_ref,
create_symref, resolve_gitlink_ref.
Signed-off-by: Ronnie Sahlberg <sahlb...@google.com>
Signed-off-by: David Turner <dtur...@twopensource.com>
---
builtin/init-db.c | 1 +
refs.c | 36 ++++++++++++++++++++++++++++++++++++
refs/files-backend.c | 33 +++++++++++++++++++++++----------
refs/refs-internal.h | 23 +++++++++++++++++++++++
4 files changed, 83 insertions(+), 10 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 07229d6..26e1cc3 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -8,6 +8,7 @@
#include "builtin.h"
#include "exec_cmd.h"
#include "parse-options.h"
+#include "refs.h"
#ifndef DEFAULT_GIT_TEMPLATE_DIR
#define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates"
diff --git a/refs.c b/refs.c
index 1c646f5..afdde7d 100644
--- a/refs.c
+++ b/refs.c
@@ -1122,3 +1122,39 @@ int ref_transaction_commit(struct ref_transaction
*transaction,
{
return the_refs_backend->transaction_commit(transaction, err);
}
+
+const char *resolve_ref_unsafe(const char *ref, int resolve_flags,
+ unsigned char *sha1, int *flags)
+{
+ return the_refs_backend->resolve_ref_unsafe(ref, resolve_flags, sha1,
+ flags);
+}
+
+int verify_refname_available(const char *refname, struct string_list *extra,
+ struct string_list *skip, struct strbuf *err)
+{
+ return the_refs_backend->verify_refname_available(refname, extra, skip,
err);
+}
+
+int pack_refs(unsigned int flags)
+{
+ return the_refs_backend->pack_refs(flags);
+}
+
+int peel_ref(const char *refname, unsigned char *sha1)
+{
+ return the_refs_backend->peel_ref(refname, sha1);
+}
+
+int create_symref(const char *ref_target, const char *refs_heads_master,
+ const char *logmsg)
+{
+ return the_refs_backend->create_symref(ref_target, refs_heads_master,
+ logmsg);
+}
+
+int resolve_gitlink_ref(const char *path, const char *refname,
+ unsigned char *sha1)
+{
+ return the_refs_backend->resolve_gitlink_ref(path, refname, sha1);
+}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 2a73564..882d830 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1343,7 +1343,8 @@ static int resolve_gitlink_ref_recursive(struct ref_cache
*refs,
return resolve_gitlink_ref_recursive(refs, p, sha1, recursion+1);
}
-int resolve_gitlink_ref(const char *path, const char *refname, unsigned char
*sha1)
+static int files_resolve_gitlink_ref(const char *path, const char *refname,
+ unsigned char *sha1)
{
int len = strlen(path), retval;
struct strbuf submodule = STRBUF_INIT;
@@ -1583,8 +1584,10 @@ static const char *resolve_ref_1(const char *refname,
}
}
-const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags)
+static const char *files_resolve_ref_unsafe(const char *refname,
+ int resolve_flags,
+ unsigned char *sha1,
+ int *flags)
{
static struct strbuf sb_refname = STRBUF_INIT;
struct strbuf sb_contents = STRBUF_INIT;
@@ -1633,7 +1636,7 @@ static enum peel_status peel_entry(struct ref_entry
*entry, int repeel)
return status;
}
-int peel_ref(const char *refname, unsigned char *sha1)
+static int files_peel_ref(const char *refname, unsigned char *sha1)
{
int flag;
unsigned char base[20];
@@ -2270,7 +2273,7 @@ static void prune_refs(struct ref_to_prune *r)
}
}
-int pack_refs(unsigned int flags)
+static int files_pack_refs(unsigned int flags)
{
struct pack_refs_cb_data cbdata;
@@ -2461,10 +2464,10 @@ out:
return ret;
}
-int verify_refname_available(const char *newname,
- struct string_list *extras,
- struct string_list *skip,
- struct strbuf *err)
+static int files_verify_refname_available(const char *newname,
+ struct string_list *extras,
+ struct string_list *skip,
+ struct strbuf *err)
{
struct ref_dir *packed_refs = get_packed_refs(&ref_cache);
struct ref_dir *loose_refs = get_loose_refs(&ref_cache);
@@ -2884,7 +2887,9 @@ static int create_symref_locked(struct ref_lock *lock,
const char *refname,
return 0;
}
-int create_symref(const char *refname, const char *target, const char *logmsg)
+static int files_create_symref(const char *refname,
+ const char *target,
+ const char *logmsg)
{
struct strbuf err = STRBUF_INIT;
struct ref_lock *lock;
@@ -3538,4 +3543,12 @@ struct ref_storage_be refs_be_files = {
NULL,
"files",
files_transaction_commit,
+
+ files_pack_refs,
+ files_peel_ref,
+ files_create_symref,
+
+ files_resolve_ref_unsafe,
+ files_verify_refname_available,
+ files_resolve_gitlink_ref,
};
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index fc0e852..e83bc22 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -201,10 +201,33 @@ int rename_ref_available(const char *oldname, const char
*newname);
typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
struct strbuf *err);
+/* misc methods */
+typedef int pack_refs_fn(unsigned int flags);
+typedef int peel_ref_fn(const char *refname, unsigned char *sha1);
+typedef int create_symref_fn(const char *ref_target,
+ const char *refs_heads_master,
+ const char *logmsg);
+
+/* resolution methods */
+typedef const char *resolve_ref_unsafe_fn(const char *ref,
+ int resolve_flags,
+ unsigned char *sha1, int *flags);
+typedef int verify_refname_available_fn(const char *refname, struct
string_list *extra, struct string_list *skip, struct strbuf *err);
+typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,
+ unsigned char *sha1);
+
struct ref_storage_be {
struct ref_storage_be *next;
const char *name;
ref_transaction_commit_fn *transaction_commit;
+
+ pack_refs_fn *pack_refs;
+ peel_ref_fn *peel_ref;
+ create_symref_fn *create_symref;
+
+ resolve_ref_unsafe_fn *resolve_ref_unsafe;
+ verify_refname_available_fn *verify_refname_available;
+ resolve_gitlink_ref_fn *resolve_gitlink_ref;
};
extern struct ref_storage_be refs_be_files;
--
2.4.2.749.g730654d-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
