From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Cc: Ronnie Sahlberg <sahlberg@google.com>,
David Turner <dturner@twopensource.com>
Subject: [PATCH v2 02/21] refs: add methods for misc ref operations
Date: Mon, 11 Jan 2016 20:22:01 -0500 [thread overview]
Message-ID: <1452561740-8668-3-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1452561740-8668-1-git-send-email-dturner@twopensource.com>
From: Ronnie Sahlberg <sahlberg@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 <sahlberg@google.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
builtin/init-db.c | 1 +
refs.c | 36 ++++++++++++++++++++++++++++++++++++
refs/files-backend.c | 34 +++++++++++++++++++++++-----------
refs/refs-internal.h | 23 +++++++++++++++++++++++
4 files changed, 83 insertions(+), 11 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 831ee12..6875ff9 100644
--- a/refs.c
+++ b/refs.c
@@ -1111,3 +1111,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 684a517..e65afff 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1333,7 +1333,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;
@@ -1565,8 +1566,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;
@@ -1615,7 +1618,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];
@@ -2246,7 +2249,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;
@@ -2437,10 +2440,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);
@@ -2811,8 +2814,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];
@@ -3515,4 +3519,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 b110c77..0528239 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;
};
#endif /* REFS_REFS_INTERNAL_H */
--
2.4.2.749.g730654d-twtrsrc
next prev parent reply other threads:[~2016-01-12 1:22 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 1:21 [PATCH v2 00/21] refs backend reroll David Turner
2016-01-12 1:22 ` [PATCH v2 01/21] refs: add a backend method structure with transaction functions David Turner
2016-01-12 1:22 ` David Turner [this message]
2016-01-12 1:22 ` [PATCH v2 03/21] refs: add methods for the ref iterators David Turner
2016-01-12 1:22 ` [PATCH v2 04/21] refs: add do_for_each_per_worktree_ref David Turner
2016-01-12 1:22 ` [PATCH v2 05/21] refs: add methods for reflog David Turner
2016-01-12 1:22 ` [PATCH v2 06/21] refs: add method for initial ref transaction commit David Turner
2016-01-12 1:22 ` [PATCH v2 07/21] refs: add method for delete_refs David Turner
2016-01-12 1:22 ` [PATCH v2 08/21] refs: add methods to init refs db David Turner
2016-01-12 1:22 ` [PATCH v2 09/21] refs: add method to rename refs David Turner
2016-01-12 1:22 ` [PATCH v2 10/21] refs: make lock generic David Turner
2016-01-12 1:22 ` [PATCH v2 11/21] refs: move duplicate check to common code David Turner
2016-01-12 1:22 ` [PATCH v2 12/21] refs: allow log-only updates David Turner
2016-01-12 1:22 ` [PATCH v2 13/21] refs: resolve symbolic refs first David Turner
2016-01-13 0:19 ` Junio C Hamano
2016-01-13 16:33 ` David Turner
2016-01-12 1:22 ` [PATCH v2 14/21] refs: always handle non-normal refs in files backend David Turner
2016-01-13 0:19 ` Junio C Hamano
2016-01-13 16:34 ` David Turner
2016-01-12 1:22 ` [PATCH v2 15/21] init: allow alternate backends to be set for new repos David Turner
2016-01-12 1:22 ` [PATCH v2 16/21] refs: check submodules ref storage config David Turner
2016-01-13 0:19 ` Junio C Hamano
2016-01-13 16:32 ` David Turner
2016-01-13 17:02 ` Junio C Hamano
2016-01-12 1:22 ` [PATCH v2 17/21] clone: use child_process for recursive checkouts David Turner
2016-01-12 1:22 ` [PATCH v2 18/21] refs: allow ref backend to be set for clone David Turner
2016-01-12 1:22 ` [PATCH v2 19/21] svn: learn ref-storage argument David Turner
2016-01-12 1:22 ` [PATCH v2 20/21] refs: add LMDB refs backend David Turner
2016-01-14 20:52 ` Jeff King
2016-01-14 22:30 ` David Turner
2016-01-12 1:22 ` [PATCH v2 21/21] refs: tests for lmdb backend David Turner
2016-01-13 0:22 ` [PATCH v2 00/21] refs backend reroll Junio C Hamano
2016-01-14 9:26 ` Jeff King
2016-01-14 16:25 ` David Turner
2016-01-14 20:12 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452561740-8668-3-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=sahlberg@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).