From: Ronnie Sahlberg <sahlberg@xxxxxxxxxx>
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 <sahlberg@xxxxxxxxxx>
Signed-off-by: David Turner <dturner@xxxxxxxxxxx>
---
builtin/init-db.c | 1 +
cache.h | 7 +++++++
refs-be-files.c | 36 +++++++++++++++++++++++++++---------
refs.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
refs.h | 18 ++++++++++++++++++
5 files changed, 100 insertions(+), 9 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index cf6a3c8..313d13f 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/cache.h b/cache.h
index 497d296..1c45b62 100644
--- a/cache.h
+++ b/cache.h
@@ -1104,6 +1104,13 @@ extern char *oid_to_hex(const struct object_id *oid); /* same static buffer as s
extern int interpret_branch_name(const char *str, int len, struct strbuf *);
extern int get_sha1_mb(const char *str, unsigned char *sha1);
+/*
+ * Return true iff abbrev_name is a possible abbreviation for
+ * full_name according to the rules defined by ref_rev_parse_rules in
+ * refs.c.
+ */
+extern int refname_match(const char *abbrev_name, const char *full_name);
+
extern int validate_headref(const char *ref);
extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
diff --git a/refs-be-files.c b/refs-be-files.c
index 3050f1d..116d72d 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -1386,7 +1386,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;
char *submodule;
@@ -1618,8 +1619,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;
@@ -1721,7 +1724,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];
@@ -2355,7 +2358,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;
@@ -2677,8 +2680,16 @@ static int should_autocreate_reflog(const char *refname)
!strcmp(refname, "HEAD");
}
-int verify_refname_available(const char *newname, struct string_list *extra,
- struct string_list *skip, struct strbuf *err)
+/*
+ * Create a reflog for a ref. If force_create = 0, the reflog will
+ * only be created for certain refs (those for which
+ * should_autocreate_reflog returns non-zero. Otherwise, create it
+ * regardless of the ref name. Fill in *err and return -1 on failure.
+ */
+static int files_verify_refname_available(const char *newname,
+ struct string_list *extra,
+ 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);
@@ -2913,8 +2924,9 @@ static int commit_ref_update(struct ref_lock *lock,
return 0;
}
-int create_symref(const char *ref_target, const char *refs_heads_master,
- const char *logmsg)
+static int files_create_symref(const char *ref_target,
+ const char *refs_heads_master,
+ const char *logmsg)
{
char *lockpath = NULL;
char ref[1000];
@@ -3617,4 +3629,10 @@ struct ref_be refs_be_files = {
NULL,
"files",
files_transaction_commit,
+ files_resolve_ref_unsafe,
+ files_verify_refname_available,
+ files_pack_refs,
+ files_peel_ref,
+ files_create_symref,
+ files_resolve_gitlink_ref,
};
diff --git a/refs.c b/refs.c
index f930fe0..61d90f5 100644
--- a/refs.c
+++ b/refs.c
@@ -1015,3 +1015,50 @@ 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)
+{
+ struct strbuf err = STRBUF_INIT;
+ struct ref_transaction *transaction = ref_transaction_begin(&err);
+ if (!transaction)
+ return -1;
+
+ if (the_refs_backend->create_symref(transaction, ref_target,
+ refs_heads_master, logmsg))
+ return -1;
+
+ if (ref_transaction_commit(transaction, &err))
+ return -1;
+
+ return 0;
+}
+
+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.h b/refs.h
index 419abf4..ee06a20 100644
--- a/refs.h
+++ b/refs.h
@@ -623,11 +623,29 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,
typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
struct strbuf *err);
typedef void ref_transaction_free_fn(struct ref_transaction *transaction);
+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 pack_refs_fn(unsigned int flags);
+typedef int peel_ref_fn(const char *refname, unsigned char *sha1);
+typedef int create_symref_fn(struct ref_transaction *transaction,
+ const char *ref_target,
+ const char *refs_heads_master,
+ const char *logmsg);
+typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,
+ unsigned char *sha1);
struct ref_be {
struct ref_be *next;
const char *name;
ref_transaction_commit_fn *transaction_commit;
+ resolve_ref_unsafe_fn *resolve_ref_unsafe;
+ verify_refname_available_fn *verify_refname_available;
+ pack_refs_fn *pack_refs;
+ peel_ref_fn *peel_ref;
+ create_symref_fn *create_symref;
+ resolve_gitlink_ref_fn *resolve_gitlink_ref;
};
--
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