From: Ronnie Sahlberg <sahlb...@google.com>
Add ref backend methods for:
read_raw_ref, verify_refname_available, pack_refs, peel_ref,
create_symref, resolve_gitlink_ref.
read_raw_ref becomes static because it's not used outside refs.c
Signed-off-by: Ronnie Sahlberg <sahlb...@google.com>
Signed-off-by: David Turner <dtur...@twopensource.com>
Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
refs.c | 37 +++++++++++++++++++++++++++++++++++++
refs/files-backend.c | 33 ++++++++++++++++++++++-----------
refs/refs-internal.h | 27 +++++++++++++++++++++++----
3 files changed, 82 insertions(+), 15 deletions(-)
diff --git a/refs.c b/refs.c
index 2e8efa9..f4873d6 100644
--- a/refs.c
+++ b/refs.c
@@ -1194,6 +1194,14 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)
DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
}
+static int read_raw_ref(const char *refname, unsigned char *sha1,
+ struct strbuf *symref, struct strbuf *sb_path,
+ unsigned int *flags)
+{
+ return the_refs_backend->read_raw_ref(refname, sha1, symref, sb_path,
+ flags);
+}
+
/* This function needs to return a meaningful errno on failure */
static const char *resolve_ref_1(const char *refname,
int resolve_flags,
@@ -1305,3 +1313,32 @@ int ref_transaction_commit(struct ref_transaction
*transaction,
{
return the_refs_backend->transaction_commit(transaction, err);
}
+
+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 a509240..96be63c 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1330,7 +1330,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;
@@ -1413,9 +1414,9 @@ static int resolve_missing_loose_ref(const char *refname,
*
* sb_path is workspace: the caller should allocate and free it.
*/
-int read_raw_ref(const char *refname, unsigned char *sha1,
- struct strbuf *symref, struct strbuf *sb_path,
- unsigned int *flags)
+static int files_read_raw_ref(const char *refname, unsigned char *sha1,
+ struct strbuf *symref, struct strbuf *sb_path,
+ unsigned int *flags)
{
struct strbuf sb_contents = STRBUF_INIT;
int ret = -1;
@@ -1568,7 +1569,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];
@@ -2127,7 +2128,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;
@@ -2318,10 +2319,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);
@@ -2741,7 +2742,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;
@@ -3395,4 +3398,12 @@ struct ref_storage_be refs_be_files = {
NULL,
"files",
files_transaction_commit,
+
+ files_pack_refs,
+ files_peel_ref,
+ files_create_symref,
+
+ files_read_raw_ref,
+ files_verify_refname_available,
+ files_resolve_gitlink_ref,
};
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 62ba0c0..c5f5ef7 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -209,18 +209,37 @@ int rename_ref_available(const char *oldname, const char
*newname);
int do_for_each_ref(const char *submodule, const char *base,
each_ref_fn fn, int trim, int flags, void *cb_data);
-int read_raw_ref(const char *refname, unsigned char *sha1,
- struct strbuf *symref, struct strbuf *sb_path,
- unsigned int *flags);
-
/* refs backends */
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 int read_raw_ref_fn(const char *refname, unsigned char *sha1,
+ struct strbuf *symref, struct strbuf *sb_path,
+ unsigned 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;
+
+ read_raw_ref_fn *read_raw_ref;
+ 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.767.g62658d5-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
