* [PATCH v4 00/20] refs backend
@ 2016-02-05 19:44 David Turner
2016-02-05 19:44 ` [PATCH v4 01/21] refs: add a backend method structure with transaction functions David Turner
` (21 more replies)
0 siblings, 22 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
Changes to this version:
re-rolled on top of pu as-of 9db66d9f1aa.
Bug fixes include:
For submodules: memory leaks; segfault on bad config. (thanks to Peff)
In symref splitting: check that would always succeed (thanks to Peff)
A bogus double-declaration of a var (thanks to Ramsay Jones)
Two memory leaks (thanks to Thomas Gummerer)
An unused var (thanks to Duy Nguyen)
Other improvements are:
Strings prepped for 18n (thanks to Duy Nguyen)
Cleaner submodule handling (thanks to Peff)
Whitelisting instead of blacklisting in git-new-workdir (thanks to
Thomas Gummerer)
Allow older gits to recognize lmdb-backend git repos (thanks to Duy Nguyen)
Tab completion and cleaner commit messages (thanks SZEDER Gábor)
Removed some #ifdefs, moving all backend setup to one place (thanks to Duy
Nguyen)
Thanks to all for reviews.
David Turner (18):
refs: add do_for_each_per_worktree_ref
refs: add methods for reflog
refs: add method for initial ref transaction commit
refs: add method for delete_refs
refs: add methods to init refs db
refs: add method to rename refs
refs: make lock generic
refs: move duplicate check to common code
refs: allow log-only updates
refs: resolve symbolic refs first
refs: always handle non-normal refs in files backend
init: allow alternate ref strorage to be set for new repos
refs: check submodules ref storage config
clone: allow ref storage backend to be set for clone
svn: learn ref-storage argument
refs: add register_ref_storage_backends()
refs: add LMDB refs storage backend
refs: tests for lmdb backend
Ronnie Sahlberg (3):
refs: add a backend method structure with transaction functions
refs: add methods for misc ref operations
refs: add methods for the ref iterators
.gitignore | 1 +
Documentation/config.txt | 7 +
Documentation/git-clone.txt | 6 +
Documentation/git-init-db.txt | 2 +-
Documentation/git-init.txt | 7 +-
Documentation/technical/refs-lmdb-backend.txt | 52 +
Documentation/technical/repository-version.txt | 5 +
Makefile | 12 +
builtin/clone.c | 5 +
builtin/init-db.c | 57 +-
builtin/submodule--helper.c | 2 +-
cache.h | 2 +
config.c | 25 +
configure.ac | 33 +
contrib/completion/git-completion.bash | 6 +-
contrib/workdir/git-new-workdir | 3 +
git-submodule.sh | 13 +
git-svn.perl | 6 +-
path.c | 29 +-
refs.c | 486 +++++-
refs.h | 21 +
refs/files-backend.c | 404 ++---
refs/lmdb-backend.c | 2052 ++++++++++++++++++++++++
refs/refs-internal.h | 128 +-
setup.c | 23 +-
t/t0001-init.sh | 25 +
t/t1460-refs-lmdb-backend.sh | 1109 +++++++++++++
t/t1470-refs-lmdb-backend-reflog.sh | 359 +++++
t/t1480-refs-lmdb-submodule.sh | 85 +
t/test-lib.sh | 1 +
test-refs-lmdb-backend.c | 64 +
transport.c | 7 +-
32 files changed, 4825 insertions(+), 212 deletions(-)
create mode 100644 Documentation/technical/refs-lmdb-backend.txt
create mode 100644 refs/lmdb-backend.c
create mode 100755 t/t1460-refs-lmdb-backend.sh
create mode 100755 t/t1470-refs-lmdb-backend-reflog.sh
create mode 100755 t/t1480-refs-lmdb-submodule.sh
create mode 100644 test-refs-lmdb-backend.c
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v4 01/21] refs: add a backend method structure with transaction functions
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-05 19:44 ` [PATCH v4 02/21] refs: add methods for misc ref operations David Turner
` (20 subsequent siblings)
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: Ronnie Sahlberg, David Turner
From: Ronnie Sahlberg <sahlberg@google.com>
Add a ref structure for storage backend methods. Start by adding a
method pointer for the transaction commit function.
Add a function set_refs_backend to switch between storage
backends. The files based storage backend is the default.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 40 ++++++++++++++++++++++++++++++++++++++++
refs.h | 7 +++++++
refs/files-backend.c | 10 ++++++++--
refs/refs-internal.h | 12 ++++++++++++
4 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c
index e2d34b2..1c646f5 100644
--- a/refs.c
+++ b/refs.c
@@ -10,6 +10,39 @@
#include "tag.h"
/*
+ * We always have a files backend and it is the default.
+ */
+static struct ref_storage_be *the_refs_backend = &refs_be_files;
+/*
+ * List of all available backends
+ */
+static struct ref_storage_be *refs_backends = &refs_be_files;
+
+int set_ref_storage_backend(const char *name)
+{
+ struct ref_storage_be *be;
+
+ for (be = refs_backends; be; be = be->next)
+ if (!strcmp(be->name, name)) {
+ the_refs_backend = be;
+ return 0;
+ }
+ return 1;
+}
+
+int ref_storage_backend_exists(const char *name)
+{
+ struct ref_storage_be *be;
+
+ for (be = refs_backends; be; be = be->next)
+ if (!strcmp(be->name, name)) {
+ the_refs_backend = be;
+ return 1;
+ }
+ return 0;
+}
+
+/*
* How to handle various characters in refnames:
* 0: An acceptable character for refs
* 1: End-of-component
@@ -1082,3 +1115,10 @@ int rename_ref_available(const char *oldname, const char *newname)
strbuf_release(&err);
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 3c3da29..5bc3fbc 100644
--- a/refs.h
+++ b/refs.h
@@ -508,4 +508,11 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,
reflog_expiry_cleanup_fn cleanup_fn,
void *policy_cb_data);
+/*
+ * Switch to an alternate ref storage backend.
+ */
+int set_ref_storage_backend(const char *name);
+
+int ref_storage_backend_exists(const char *name);
+
#endif /* REFS_H */
diff --git a/refs/files-backend.c b/refs/files-backend.c
index b569762..2a73564 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3146,8 +3146,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;
@@ -3533,3 +3533,9 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
unlock_ref(lock);
return -1;
}
+
+struct ref_storage_be refs_be_files = {
+ NULL,
+ "files",
+ files_transaction_commit,
+};
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index c7dded3..fc0e852 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -197,4 +197,16 @@ 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_storage_be {
+ struct ref_storage_be *next;
+ const char *name;
+ ref_transaction_commit_fn *transaction_commit;
+};
+
+extern struct ref_storage_be refs_be_files;
+
#endif /* REFS_REFS_INTERNAL_H */
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 02/21] refs: add methods for misc ref operations
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
2016-02-05 19:44 ` [PATCH v4 01/21] refs: add a backend method structure with transaction functions David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-11 7:45 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 03/21] refs: add methods for the ref iterators David Turner
` (19 subsequent siblings)
21 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: Ronnie Sahlberg, David Turner
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 | 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
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 03/21] refs: add methods for the ref iterators
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
2016-02-05 19:44 ` [PATCH v4 01/21] refs: add a backend method structure with transaction functions David Turner
2016-02-05 19:44 ` [PATCH v4 02/21] refs: add methods for misc ref operations David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-11 8:42 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 04/21] refs: add do_for_each_per_worktree_ref David Turner
` (18 subsequent siblings)
21 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: Ronnie Sahlberg, David Turner
From: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
refs/files-backend.c | 41 +++++++++++++++++++++++++++------------
refs/refs-internal.h | 29 ++++++++++++++++++++++++++++
3 files changed, 112 insertions(+), 12 deletions(-)
diff --git a/refs.c b/refs.c
index afdde7d..e598b73 100644
--- a/refs.c
+++ b/refs.c
@@ -1158,3 +1158,57 @@ int resolve_gitlink_ref(const char *path, const char *refname,
{
return the_refs_backend->resolve_gitlink_ref(path, refname, sha1);
}
+
+int head_ref(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->head_ref(fn, cb_data);
+}
+
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->head_ref_submodule(submodule, fn, cb_data);
+}
+
+int for_each_ref(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_ref(fn, cb_data);
+}
+
+int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_ref_submodule(submodule, fn, cb_data);
+}
+
+int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_ref_in(prefix, fn, cb_data);
+}
+
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
+ unsigned int broken)
+{
+ return the_refs_backend->for_each_fullref_in(prefix, fn, cb_data,
+ broken);
+}
+
+int for_each_ref_in_submodule(const char *submodule, const char *prefix,
+ each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_ref_in_submodule(submodule, prefix,
+ fn, cb_data);
+}
+
+int for_each_rawref(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_rawref(fn, cb_data);
+}
+
+int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_namespaced_ref(fn, cb_data);
+}
+
+int for_each_replace_ref(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_replace_ref(fn, cb_data);
+}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 882d830..0772a02 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1774,32 +1774,36 @@ static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)
return 0;
}
-int head_ref(each_ref_fn fn, void *cb_data)
+static int files_head_ref(each_ref_fn fn, void *cb_data)
{
return do_head_ref(NULL, fn, cb_data);
}
-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+static int files_head_ref_submodule(const char *submodule, each_ref_fn fn,
+ void *cb_data)
{
return do_head_ref(submodule, fn, cb_data);
}
-int for_each_ref(each_ref_fn fn, void *cb_data)
+static int files_for_each_ref(each_ref_fn fn, void *cb_data)
{
return do_for_each_ref(&ref_cache, "", fn, 0, 0, cb_data);
}
-int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+static int files_for_each_ref_submodule(const char *submodule, each_ref_fn fn,
+ void *cb_data)
{
return do_for_each_ref(get_ref_cache(submodule), "", fn, 0, 0, cb_data);
}
-int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
+static int files_for_each_ref_in(const char *prefix, each_ref_fn fn,
+ void *cb_data)
{
return do_for_each_ref(&ref_cache, prefix, fn, strlen(prefix), 0, cb_data);
}
-int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken)
+static int files_for_each_fullref_in(const char *prefix, each_ref_fn fn,
+ void *cb_data, unsigned int broken)
{
unsigned int flag = 0;
@@ -1808,19 +1812,21 @@ int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsig
return do_for_each_ref(&ref_cache, prefix, fn, 0, flag, cb_data);
}
-int for_each_ref_in_submodule(const char *submodule, const char *prefix,
- each_ref_fn fn, void *cb_data)
+static int files_for_each_ref_in_submodule(const char *submodule,
+ const char *prefix,
+ each_ref_fn fn, void *cb_data)
{
- return do_for_each_ref(get_ref_cache(submodule), prefix, fn, strlen(prefix), 0, cb_data);
+ return do_for_each_ref(get_ref_cache(submodule), prefix, fn,
+ strlen(prefix), 0, cb_data);
}
-int for_each_replace_ref(each_ref_fn fn, void *cb_data)
+static int files_for_each_replace_ref(each_ref_fn fn, void *cb_data)
{
return do_for_each_ref(&ref_cache, git_replace_ref_base, fn,
strlen(git_replace_ref_base), 0, cb_data);
}
-int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
+static int files_for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
{
struct strbuf buf = STRBUF_INIT;
int ret;
@@ -1830,7 +1836,7 @@ int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
return ret;
}
-int for_each_rawref(each_ref_fn fn, void *cb_data)
+static int files_for_each_rawref(each_ref_fn fn, void *cb_data)
{
return do_for_each_ref(&ref_cache, "", fn, 0,
DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
@@ -3551,4 +3557,15 @@ struct ref_storage_be refs_be_files = {
files_resolve_ref_unsafe,
files_verify_refname_available,
files_resolve_gitlink_ref,
+
+ files_head_ref,
+ files_head_ref_submodule,
+ files_for_each_ref,
+ files_for_each_ref_submodule,
+ files_for_each_ref_in,
+ files_for_each_fullref_in,
+ files_for_each_ref_in_submodule,
+ files_for_each_rawref,
+ files_for_each_namespaced_ref,
+ files_for_each_replace_ref,
};
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index e83bc22..4a1d215 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -216,6 +216,24 @@ typedef int verify_refname_available_fn(const char *refname, struct string_list
typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,
unsigned char *sha1);
+/* iteration methods */
+typedef int head_ref_fn(each_ref_fn fn, void *cb_data);
+typedef int head_ref_submodule_fn(const char *submodule, each_ref_fn fn,
+ void *cb_data);
+typedef int for_each_ref_fn(each_ref_fn fn, void *cb_data);
+typedef int for_each_ref_submodule_fn(const char *submodule, each_ref_fn fn,
+ void *cb_data);
+typedef int for_each_ref_in_fn(const char *prefix, each_ref_fn fn,
+ void *cb_data);
+typedef int for_each_fullref_in_fn(const char *prefix, each_ref_fn fn,
+ void *cb_data, unsigned int broken);
+typedef int for_each_ref_in_submodule_fn(const char *submodule,
+ const char *prefix,
+ each_ref_fn fn, void *cb_data);
+typedef int for_each_rawref_fn(each_ref_fn fn, void *cb_data);
+typedef int for_each_namespaced_ref_fn(each_ref_fn fn, void *cb_data);
+typedef int for_each_replace_ref_fn(each_ref_fn fn, void *cb_data);
+
struct ref_storage_be {
struct ref_storage_be *next;
const char *name;
@@ -228,6 +246,17 @@ struct ref_storage_be {
resolve_ref_unsafe_fn *resolve_ref_unsafe;
verify_refname_available_fn *verify_refname_available;
resolve_gitlink_ref_fn *resolve_gitlink_ref;
+
+ head_ref_fn *head_ref;
+ head_ref_submodule_fn *head_ref_submodule;
+ for_each_ref_fn *for_each_ref;
+ for_each_ref_submodule_fn *for_each_ref_submodule;
+ for_each_ref_in_fn *for_each_ref_in;
+ for_each_fullref_in_fn *for_each_fullref_in;
+ for_each_ref_in_submodule_fn *for_each_ref_in_submodule;
+ for_each_rawref_fn *for_each_rawref;
+ for_each_namespaced_ref_fn *for_each_namespaced_ref;
+ for_each_replace_ref_fn *for_each_replace_ref;
};
extern struct ref_storage_be refs_be_files;
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 04/21] refs: add do_for_each_per_worktree_ref
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (2 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 03/21] refs: add methods for the ref iterators David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-05 19:44 ` [PATCH v4 05/21] refs: add methods for reflog David Turner
` (17 subsequent siblings)
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
Alternate refs backends might still use files to store per-worktree
refs. So the files backend's ref-loading infrastructure should be
available to those backends, just for use on per-worktree refs. Add
do_for_each_per_worktree_ref, which iterates over per-worktree refs.
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs/files-backend.c | 15 ++++++++++++---
refs/refs-internal.h | 10 ++++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 0772a02..3d678ad 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -518,9 +518,6 @@ static void sort_ref_dir(struct ref_dir *dir)
dir->sorted = dir->nr = i;
}
-/* Include broken references in a do_for_each_ref*() iteration: */
-#define DO_FOR_EACH_INCLUDE_BROKEN 0x01
-
/*
* Return true iff the reference described by entry can be resolved to
* an object in the database. Emit a warning if the referred-to
@@ -568,6 +565,10 @@ static int do_one_ref(struct ref_entry *entry, void *cb_data)
struct ref_entry *old_current_ref;
int retval;
+ if (data->flags & DO_FOR_EACH_PER_WORKTREE_ONLY &&
+ ref_type(entry->name) != REF_TYPE_PER_WORKTREE)
+ return 0;
+
if (!starts_with(entry->name, data->base))
return 0;
@@ -1756,6 +1757,14 @@ static int do_for_each_ref(struct ref_cache *refs, const char *base,
return do_for_each_entry(refs, base, do_one_ref, &data);
}
+int do_for_each_per_worktree_ref(const char *submodule, const char *base,
+ each_ref_fn fn, int trim, int flags,
+ void *cb_data)
+{
+ return do_for_each_ref(get_ref_cache(submodule), base, fn, trim,
+ flags | DO_FOR_EACH_PER_WORKTREE_ONLY, cb_data);
+}
+
static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)
{
struct object_id oid;
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 4a1d215..cb949c5 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -57,6 +57,16 @@
*/
int refname_is_safe(const char *refname);
+/* Include broken references in a do_for_each_ref*() iteration */
+#define DO_FOR_EACH_INCLUDE_BROKEN 0x01
+
+/* Only include per-worktree refs in a do_for_each_ref*() iteration */
+#define DO_FOR_EACH_PER_WORKTREE_ONLY 0x02
+
+int do_for_each_per_worktree_ref(const char *submodule, const char *base,
+ each_ref_fn fn, int trim, int flags,
+ void *cb_data);
+
enum peel_status {
/* object was peeled successfully: */
PEEL_PEELED = 0,
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 05/21] refs: add methods for reflog
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (3 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 04/21] refs: add do_for_each_per_worktree_ref David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-05 19:44 ` [PATCH v4 06/21] refs: add method for initial ref transaction commit David Turner
` (16 subsequent siblings)
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner, Ronnie Sahlberg
In the file-based backend, the reflog piggybacks on the ref lock.
Since other backends won't have the same sort of ref lock, ref backends
must also handle reflogs.
Signed-off-by: Ronnie Sahlberg <rsahlberg@google.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
refs/files-backend.c | 36 ++++++++++++++++++++++++------------
refs/refs-internal.h | 27 +++++++++++++++++++++++++++
3 files changed, 97 insertions(+), 12 deletions(-)
diff --git a/refs.c b/refs.c
index e598b73..3254378 100644
--- a/refs.c
+++ b/refs.c
@@ -1212,3 +1212,49 @@ int for_each_replace_ref(each_ref_fn fn, void *cb_data)
{
return the_refs_backend->for_each_replace_ref(fn, cb_data);
}
+
+int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn,
+ void *cb_data)
+{
+ return the_refs_backend->for_each_reflog_ent_reverse(refname, fn,
+ cb_data);
+}
+
+int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn,
+ void *cb_data)
+{
+ return the_refs_backend->for_each_reflog_ent(refname, fn, cb_data);
+}
+
+int for_each_reflog(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_reflog(fn, cb_data);
+}
+
+int reflog_exists(const char *refname)
+{
+ return the_refs_backend->reflog_exists(refname);
+}
+
+int safe_create_reflog(const char *refname, int force_create,
+ struct strbuf *err)
+{
+ return the_refs_backend->create_reflog(refname, force_create, err);
+}
+
+int delete_reflog(const char *refname)
+{
+ return the_refs_backend->delete_reflog(refname);
+}
+
+int reflog_expire(const char *refname, const unsigned char *sha1,
+ unsigned int flags,
+ reflog_expiry_prepare_fn prepare_fn,
+ reflog_expiry_should_prune_fn should_prune_fn,
+ reflog_expiry_cleanup_fn cleanup_fn,
+ void *policy_cb_data)
+{
+ return the_refs_backend->reflog_expire(refname, sha1, flags,
+ prepare_fn, should_prune_fn,
+ cleanup_fn, policy_cb_data);
+}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 3d678ad..b3372e6 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2667,7 +2667,8 @@ static int log_ref_setup(const char *refname, struct strbuf *logfile, struct str
}
-int safe_create_reflog(const char *refname, int force_create, struct strbuf *err)
+static int files_create_reflog(const char *refname, int force_create,
+ struct strbuf *err)
{
int ret;
struct strbuf sb = STRBUF_INIT;
@@ -2923,7 +2924,7 @@ static int files_create_symref(const char *refname,
return ret;
}
-int reflog_exists(const char *refname)
+static int files_reflog_exists(const char *refname)
{
struct stat st;
@@ -2931,7 +2932,7 @@ int reflog_exists(const char *refname)
S_ISREG(st.st_mode);
}
-int delete_reflog(const char *refname)
+static int files_delete_reflog(const char *refname)
{
return remove_path(git_path("logs/%s", refname));
}
@@ -2975,7 +2976,9 @@ static char *find_beginning_of_line(char *bob, char *scan)
return scan;
}
-int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data)
+static int files_for_each_reflog_ent_reverse(const char *refname,
+ each_reflog_ent_fn fn,
+ void *cb_data)
{
struct strbuf sb = STRBUF_INIT;
FILE *logfp;
@@ -3077,7 +3080,8 @@ int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void
return ret;
}
-int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data)
+static int files_for_each_reflog_ent(const char *refname,
+ each_reflog_ent_fn fn, void *cb_data)
{
FILE *logfp;
struct strbuf sb = STRBUF_INIT;
@@ -3139,7 +3143,7 @@ static int do_for_each_reflog(struct strbuf *name, each_ref_fn fn, void *cb_data
return retval;
}
-int for_each_reflog(each_ref_fn fn, void *cb_data)
+static int files_for_each_reflog(each_ref_fn fn, void *cb_data)
{
int retval;
struct strbuf name;
@@ -3449,12 +3453,12 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
return 0;
}
-int reflog_expire(const char *refname, const unsigned char *sha1,
- unsigned int flags,
- reflog_expiry_prepare_fn prepare_fn,
- reflog_expiry_should_prune_fn should_prune_fn,
- reflog_expiry_cleanup_fn cleanup_fn,
- void *policy_cb_data)
+static int files_reflog_expire(const char *refname, const unsigned char *sha1,
+ unsigned int flags,
+ reflog_expiry_prepare_fn prepare_fn,
+ reflog_expiry_should_prune_fn should_prune_fn,
+ reflog_expiry_cleanup_fn cleanup_fn,
+ void *policy_cb_data)
{
static struct lock_file reflog_lock;
struct expire_reflog_cb cb;
@@ -3559,6 +3563,14 @@ struct ref_storage_be refs_be_files = {
"files",
files_transaction_commit,
+ files_for_each_reflog_ent,
+ files_for_each_reflog_ent_reverse,
+ files_for_each_reflog,
+ files_reflog_exists,
+ files_create_reflog,
+ files_delete_reflog,
+ files_reflog_expire,
+
files_pack_refs,
files_peel_ref,
files_create_symref,
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index cb949c5..ee2bea6 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -211,6 +211,25 @@ int rename_ref_available(const char *oldname, const char *newname);
typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
struct strbuf *err);
+/* reflog functions */
+typedef int for_each_reflog_ent_fn(const char *refname,
+ each_reflog_ent_fn fn,
+ void *cb_data);
+typedef int for_each_reflog_ent_reverse_fn(const char *refname,
+ each_reflog_ent_fn fn,
+ void *cb_data);
+typedef int for_each_reflog_fn(each_ref_fn fn, void *cb_data);
+typedef int reflog_exists_fn(const char *refname);
+typedef int create_reflog_fn(const char *refname, int force_create,
+ struct strbuf *err);
+typedef int delete_reflog_fn(const char *refname);
+typedef int reflog_expire_fn(const char *refname, const unsigned char *sha1,
+ unsigned int flags,
+ reflog_expiry_prepare_fn prepare_fn,
+ reflog_expiry_should_prune_fn should_prune_fn,
+ reflog_expiry_cleanup_fn cleanup_fn,
+ void *policy_cb_data);
+
/* misc methods */
typedef int pack_refs_fn(unsigned int flags);
typedef int peel_ref_fn(const char *refname, unsigned char *sha1);
@@ -249,6 +268,14 @@ struct ref_storage_be {
const char *name;
ref_transaction_commit_fn *transaction_commit;
+ for_each_reflog_ent_fn *for_each_reflog_ent;
+ for_each_reflog_ent_reverse_fn *for_each_reflog_ent_reverse;
+ for_each_reflog_fn *for_each_reflog;
+ reflog_exists_fn *reflog_exists;
+ create_reflog_fn *create_reflog;
+ delete_reflog_fn *delete_reflog;
+ reflog_expire_fn *reflog_expire;
+
pack_refs_fn *pack_refs;
peel_ref_fn *peel_ref;
create_symref_fn *create_symref;
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 06/21] refs: add method for initial ref transaction commit
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (4 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 05/21] refs: add methods for reflog David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-05 19:44 ` [PATCH v4 07/21] refs: add method for delete_refs David Turner
` (15 subsequent siblings)
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner, Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg <rsahlberg@google.com>
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 6 ++++++
refs/files-backend.c | 5 +++--
refs/refs-internal.h | 1 +
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c
index 3254378..d481a94 100644
--- a/refs.c
+++ b/refs.c
@@ -1258,3 +1258,9 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
prepare_fn, should_prune_fn,
cleanup_fn, policy_cb_data);
}
+
+int initial_ref_transaction_commit(struct ref_transaction *transaction,
+ struct strbuf *err)
+{
+ return the_refs_backend->initial_transaction_commit(transaction, err);
+}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index b3372e6..723127e 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3337,8 +3337,8 @@ static int ref_present(const char *refname,
return string_list_has_string(affected_refnames, refname);
}
-int initial_ref_transaction_commit(struct ref_transaction *transaction,
- struct strbuf *err)
+static int files_initial_transaction_commit(struct ref_transaction *transaction,
+ struct strbuf *err)
{
int ret = 0, i;
int n = transaction->nr;
@@ -3562,6 +3562,7 @@ struct ref_storage_be refs_be_files = {
NULL,
"files",
files_transaction_commit,
+ files_initial_transaction_commit,
files_for_each_reflog_ent,
files_for_each_reflog_ent_reverse,
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index ee2bea6..142c663 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -267,6 +267,7 @@ struct ref_storage_be {
struct ref_storage_be *next;
const char *name;
ref_transaction_commit_fn *transaction_commit;
+ ref_transaction_commit_fn *initial_transaction_commit;
for_each_reflog_ent_fn *for_each_reflog_ent;
for_each_reflog_ent_reverse_fn *for_each_reflog_ent_reverse;
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 07/21] refs: add method for delete_refs
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (5 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 06/21] refs: add method for initial ref transaction commit David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-05 19:44 ` [PATCH v4 08/21] refs: add methods to init refs db David Turner
` (14 subsequent siblings)
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
In the file-based backend, delete_refs has some special optimization
to deal with packed refs. In other backends, we might be able to make
ref deletion faster by putting all deletions into a single
transaction. So we need a special backend function for this.
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 5 +++++
refs/files-backend.c | 3 ++-
refs/refs-internal.h | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index d481a94..5fbe794 100644
--- a/refs.c
+++ b/refs.c
@@ -1123,6 +1123,11 @@ int ref_transaction_commit(struct ref_transaction *transaction,
return the_refs_backend->transaction_commit(transaction, err);
}
+int delete_refs(struct string_list *refnames)
+{
+ return the_refs_backend->delete_refs(refnames);
+}
+
const char *resolve_ref_unsafe(const char *ref, int resolve_flags,
unsigned char *sha1, int *flags)
{
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 723127e..e86849c 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2380,7 +2380,7 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
return 0;
}
-int delete_refs(struct string_list *refnames)
+static int files_delete_refs(struct string_list *refnames)
{
struct strbuf err = STRBUF_INIT;
int i, result = 0;
@@ -3575,6 +3575,7 @@ struct ref_storage_be refs_be_files = {
files_pack_refs,
files_peel_ref,
files_create_symref,
+ files_delete_refs,
files_resolve_ref_unsafe,
files_verify_refname_available,
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 142c663..1d9e5e0 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -236,6 +236,7 @@ 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);
+typedef int delete_refs_fn(struct string_list *refnames);
/* resolution methods */
typedef const char *resolve_ref_unsafe_fn(const char *ref,
@@ -280,6 +281,7 @@ struct ref_storage_be {
pack_refs_fn *pack_refs;
peel_ref_fn *peel_ref;
create_symref_fn *create_symref;
+ delete_refs_fn *delete_refs;
resolve_ref_unsafe_fn *resolve_ref_unsafe;
verify_refname_available_fn *verify_refname_available;
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 08/21] refs: add methods to init refs db
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (6 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 07/21] refs: add method for delete_refs David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-11 8:54 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 09/21] refs: add method to rename refs David Turner
` (13 subsequent siblings)
21 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
Alternate refs backends might not need the refs/heads directory and so
on, so we make ref db initialization part of the backend.
Signed-off-by: David Turner <dturner@twopensource.com>
---
builtin/init-db.c | 20 ++++++++++----------
refs.c | 5 +++++
refs.h | 2 ++
refs/files-backend.c | 16 ++++++++++++++++
refs/refs-internal.h | 2 ++
5 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 26e1cc3..801e977 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -178,13 +178,7 @@ static int create_default_files(const char *template_path)
char junk[2];
int reinit;
int filemode;
-
- /*
- * Create .git/refs/{heads,tags}
- */
- safe_create_dir(git_path_buf(&buf, "refs"), 1);
- safe_create_dir(git_path_buf(&buf, "refs/heads"), 1);
- safe_create_dir(git_path_buf(&buf, "refs/tags"), 1);
+ struct strbuf err = STRBUF_INIT;
/* Just look for `init.templatedir` */
git_config(git_init_db_config, NULL);
@@ -208,12 +202,18 @@ static int create_default_files(const char *template_path)
*/
if (shared_repository) {
adjust_shared_perm(get_git_dir());
- adjust_shared_perm(git_path_buf(&buf, "refs"));
- adjust_shared_perm(git_path_buf(&buf, "refs/heads"));
- adjust_shared_perm(git_path_buf(&buf, "refs/tags"));
}
/*
+ * We need to create a "refs" dir in any case so that older
+ * versions of git can tell that this is a repository.
+ */
+ safe_create_dir(git_path("refs"), 1);
+
+ if (refs_init_db(&err, shared_repository))
+ die("failed to set up refs db: %s", err.buf);
+
+ /*
* Create the default symlink from ".git/HEAD" to the "master"
* branch, if it does not exist yet.
*/
diff --git a/refs.c b/refs.c
index 5fbe794..7758bdc 100644
--- a/refs.c
+++ b/refs.c
@@ -1117,6 +1117,11 @@ int rename_ref_available(const char *oldname, const char *newname)
}
/* backend functions */
+int refs_init_db(struct strbuf *err, int shared)
+{
+ return the_refs_backend->init_db(err, shared);
+}
+
int ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err)
{
diff --git a/refs.h b/refs.h
index 5bc3fbc..c5ecc52 100644
--- a/refs.h
+++ b/refs.h
@@ -66,6 +66,8 @@ extern int ref_exists(const char *refname);
extern int is_branch(const char *refname);
+extern int refs_init_db(struct strbuf *err, int shared);
+
/*
* If refname is a non-symbolic reference that refers to a tag object,
* and the tag can be (recursively) dereferenced to a non-tag object,
diff --git a/refs/files-backend.c b/refs/files-backend.c
index e86849c..45da091 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3558,9 +3558,25 @@ static int files_reflog_expire(const char *refname, const unsigned char *sha1,
return -1;
}
+static int files_init_db(struct strbuf *err, int shared)
+{
+ /*
+ * Create .git/refs/{heads,tags}
+ */
+ safe_create_dir(git_path("refs/heads"), 1);
+ safe_create_dir(git_path("refs/tags"), 1);
+ if (shared) {
+ adjust_shared_perm(git_path("refs"));
+ adjust_shared_perm(git_path("refs/heads"));
+ adjust_shared_perm(git_path("refs/tags"));
+ }
+ return 0;
+}
+
struct ref_storage_be refs_be_files = {
NULL,
"files",
+ files_init_db,
files_transaction_commit,
files_initial_transaction_commit,
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 1d9e5e0..5768fee 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -208,6 +208,7 @@ const char *find_descendant_ref(const char *dirname,
int rename_ref_available(const char *oldname, const char *newname);
/* refs backends */
+typedef int ref_init_db_fn(struct strbuf *err, int shared);
typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
struct strbuf *err);
@@ -267,6 +268,7 @@ typedef int for_each_replace_ref_fn(each_ref_fn fn, void *cb_data);
struct ref_storage_be {
struct ref_storage_be *next;
const char *name;
+ ref_init_db_fn *init_db;
ref_transaction_commit_fn *transaction_commit;
ref_transaction_commit_fn *initial_transaction_commit;
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 09/21] refs: add method to rename refs
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (7 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 08/21] refs: add methods to init refs db David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-11 9:00 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 10/21] refs: make lock generic David Turner
` (12 subsequent siblings)
21 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 5 +++++
refs/files-backend.c | 4 +++-
refs/refs-internal.h | 9 +++++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index 7758bdc..e04fddc 100644
--- a/refs.c
+++ b/refs.c
@@ -1133,6 +1133,11 @@ int delete_refs(struct string_list *refnames)
return the_refs_backend->delete_refs(refnames);
}
+int rename_ref(const char *oldref, const char *newref, const char *logmsg)
+{
+ return the_refs_backend->rename_ref(oldref, newref, logmsg);
+}
+
const char *resolve_ref_unsafe(const char *ref, int resolve_flags,
unsigned char *sha1, int *flags)
{
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 45da091..685fc6f 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2502,7 +2502,8 @@ static int commit_ref_update(struct ref_lock *lock,
const unsigned char *sha1, const char *logmsg,
int flags, struct strbuf *err);
-int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)
+static int files_rename_ref(const char *oldrefname, const char *newrefname,
+ const char *logmsg)
{
unsigned char sha1[20], orig_sha1[20];
int flag = 0, logmoved = 0;
@@ -3592,6 +3593,7 @@ struct ref_storage_be refs_be_files = {
files_peel_ref,
files_create_symref,
files_delete_refs,
+ files_rename_ref,
files_resolve_ref_unsafe,
files_verify_refname_available,
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 5768fee..15fa99c 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -67,6 +67,13 @@ int do_for_each_per_worktree_ref(const char *submodule, const char *base,
each_ref_fn fn, int trim, int flags,
void *cb_data);
+/*
+ * Check if the new name does not conflict with any existing refs
+ * (other than possibly the old ref). Return 0 if the ref can be
+ * renamed to the new name.
+ */
+int rename_ref_available(const char *oldname, const char *newname);
+
enum peel_status {
/* object was peeled successfully: */
PEEL_PEELED = 0,
@@ -246,6 +253,7 @@ typedef const char *resolve_ref_unsafe_fn(const char *ref,
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);
+typedef int rename_ref_fn(const char *oldref, const char *newref, const char *logmsg);
/* iteration methods */
typedef int head_ref_fn(each_ref_fn fn, void *cb_data);
@@ -284,6 +292,7 @@ struct ref_storage_be {
peel_ref_fn *peel_ref;
create_symref_fn *create_symref;
delete_refs_fn *delete_refs;
+ rename_ref_fn *rename_ref;
resolve_ref_unsafe_fn *resolve_ref_unsafe;
verify_refname_available_fn *verify_refname_available;
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 10/21] refs: make lock generic
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (8 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 09/21] refs: add method to rename refs David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-05 19:44 ` [PATCH v4 11/21] refs: move duplicate check to common code David Turner
` (11 subsequent siblings)
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
Instead of using a files-backend-specific struct ref_lock, the generic
ref_transaction struct should provide a void pointer that backends can use
for their own lock data.
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs/files-backend.c | 29 ++++++++++++++++-------------
refs/refs-internal.h | 2 +-
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 685fc6f..aa11ba2 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3208,11 +3208,12 @@ static int files_transaction_commit(struct ref_transaction *transaction,
*/
for (i = 0; i < n; i++) {
struct ref_update *update = updates[i];
+ struct ref_lock *lock;
if ((update->flags & REF_HAVE_NEW) &&
is_null_sha1(update->new_sha1))
update->flags |= REF_DELETING;
- update->lock = lock_ref_sha1_basic(
+ lock = lock_ref_sha1_basic(
update->refname,
((update->flags & REF_HAVE_OLD) ?
update->old_sha1 : NULL),
@@ -3220,7 +3221,8 @@ static int files_transaction_commit(struct ref_transaction *transaction,
update->flags,
&update->type,
err);
- if (!update->lock) {
+ update->backend_data = lock;
+ if (!lock) {
char *reason;
ret = (errno == ENOTDIR)
@@ -3238,12 +3240,12 @@ static int files_transaction_commit(struct ref_transaction *transaction,
(update->flags & REF_NODEREF));
if (!overwriting_symref &&
- !hashcmp(update->lock->old_oid.hash, update->new_sha1)) {
+ !hashcmp(lock->old_oid.hash, update->new_sha1)) {
/*
* The reference already has the desired
* value, so we don't need to write it.
*/
- } else if (write_ref_to_lockfile(update->lock,
+ } else if (write_ref_to_lockfile(lock,
update->new_sha1,
err)) {
char *write_err = strbuf_detach(err, NULL);
@@ -3252,7 +3254,7 @@ static int files_transaction_commit(struct ref_transaction *transaction,
* The lock was freed upon failure of
* write_ref_to_lockfile():
*/
- update->lock = NULL;
+ update->backend_data = NULL;
strbuf_addf(err,
"cannot update the ref '%s': %s",
update->refname, write_err);
@@ -3268,7 +3270,7 @@ static int files_transaction_commit(struct ref_transaction *transaction,
* We didn't have to write anything to the lockfile.
* Close it to free up the file descriptor:
*/
- if (close_ref(update->lock)) {
+ if (close_ref(lock)) {
strbuf_addf(err, "Couldn't close %s.lock",
update->refname);
goto cleanup;
@@ -3281,16 +3283,16 @@ static int files_transaction_commit(struct ref_transaction *transaction,
struct ref_update *update = updates[i];
if (update->flags & REF_NEEDS_COMMIT) {
- if (commit_ref_update(update->lock,
+ if (commit_ref_update(update->backend_data,
update->new_sha1, update->msg,
update->flags, err)) {
/* freed by commit_ref_update(): */
- update->lock = NULL;
+ update->backend_data = NULL;
ret = TRANSACTION_GENERIC_ERROR;
goto cleanup;
} else {
/* freed by commit_ref_update(): */
- update->lock = NULL;
+ update->backend_data = NULL;
}
}
}
@@ -3298,16 +3300,17 @@ static int files_transaction_commit(struct ref_transaction *transaction,
/* Perform deletes now that updates are safely completed */
for (i = 0; i < n; i++) {
struct ref_update *update = updates[i];
+ struct ref_lock *lock = update->backend_data;
if (update->flags & REF_DELETING) {
- if (delete_ref_loose(update->lock, update->type, err)) {
+ if (delete_ref_loose(lock, update->type, err)) {
ret = TRANSACTION_GENERIC_ERROR;
goto cleanup;
}
if (!(update->flags & REF_ISPRUNING))
string_list_append(&refs_to_delete,
- update->lock->ref_name);
+ lock->ref_name);
}
}
@@ -3323,8 +3326,8 @@ cleanup:
transaction->state = REF_TRANSACTION_CLOSED;
for (i = 0; i < n; i++)
- if (updates[i]->lock)
- unlock_ref(updates[i]->lock);
+ if (updates[i]->backend_data)
+ unlock_ref(updates[i]->backend_data);
string_list_clear(&refs_to_delete, 0);
string_list_clear(&affected_refnames, 0);
return ret;
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 15fa99c..3dec075 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -161,7 +161,7 @@ struct ref_update {
* REF_DELETING, and REF_ISPRUNING:
*/
unsigned int flags;
- struct ref_lock *lock;
+ void *backend_data;
int type;
char *msg;
const char refname[FLEX_ARRAY];
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 11/21] refs: move duplicate check to common code
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (9 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 10/21] refs: make lock generic David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-05 19:44 ` [PATCH v4 12/21] refs: allow log-only updates David Turner
` (10 subsequent siblings)
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
The check for duplicate refnames in a transaction is needed for
all backends, so move it to the common code.
ref_transaction_commit_fn gains a new argument, the sorted
string_list of affected refnames.
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++--
refs/files-backend.c | 57 ++++---------------------------------------
refs/refs-internal.h | 1 +
3 files changed, 73 insertions(+), 54 deletions(-)
diff --git a/refs.c b/refs.c
index e04fddc..283a5ec 100644
--- a/refs.c
+++ b/refs.c
@@ -1116,6 +1116,36 @@ int rename_ref_available(const char *oldname, const char *newname)
return ret;
}
+/*
+ * Return 1 if there are any duplicate refnames in the updates in
+ * `transaction`, and fill in err with an appropriate error message.
+ * Fill in `refnames` with the refnames from the transaction.
+ */
+static int get_affected_refnames(struct ref_transaction *transaction,
+ struct string_list *refnames,
+ struct strbuf *err)
+{
+ int i, n = transaction->nr;
+ struct ref_update **updates;
+
+ assert(err);
+
+ updates = transaction->updates;
+ /* Fail if a refname appears more than once in the transaction: */
+ for (i = 0; i < n; i++)
+ string_list_append(refnames, updates[i]->refname);
+ string_list_sort(refnames);
+
+ for (i = 1; i < n; i++)
+ if (!strcmp(refnames->items[i - 1].string, refnames->items[i].string)) {
+ strbuf_addf(err,
+ "Multiple updates for ref '%s' not allowed.",
+ refnames->items[i].string);
+ return 1;
+ }
+ return 0;
+}
+
/* backend functions */
int refs_init_db(struct strbuf *err, int shared)
{
@@ -1125,7 +1155,29 @@ int refs_init_db(struct strbuf *err, int shared)
int ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err)
{
- return the_refs_backend->transaction_commit(transaction, err);
+ int ret = -1;
+ struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
+
+ assert(err);
+
+ if (transaction->state != REF_TRANSACTION_OPEN)
+ die("BUG: commit called for transaction that is not open");
+
+ if (!transaction->nr) {
+ transaction->state = REF_TRANSACTION_CLOSED;
+ return 0;
+ }
+
+ if (get_affected_refnames(transaction, &affected_refnames, err)) {
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto done;
+ }
+
+ ret = the_refs_backend->transaction_commit(transaction,
+ &affected_refnames, err);
+done:
+ string_list_clear(&affected_refnames, 0);
+ return ret;
}
int delete_refs(struct string_list *refnames)
@@ -1277,5 +1329,18 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
int initial_ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err)
{
- return the_refs_backend->initial_transaction_commit(transaction, err);
+ struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
+ int ret;
+
+ if (get_affected_refnames(transaction,
+ &affected_refnames, err)) {
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto done;
+ }
+ ret = the_refs_backend->initial_transaction_commit(transaction,
+ &affected_refnames,
+ err);
+done:
+ string_list_clear(&affected_refnames, 0);
+ return ret;
}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index aa11ba2..0ad60bc 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3154,24 +3154,8 @@ static int files_for_each_reflog(each_ref_fn fn, void *cb_data)
return retval;
}
-static int ref_update_reject_duplicates(struct string_list *refnames,
- struct strbuf *err)
-{
- int i, n = refnames->nr;
-
- assert(err);
-
- for (i = 1; i < n; i++)
- if (!strcmp(refnames->items[i - 1].string, refnames->items[i].string)) {
- strbuf_addf(err,
- "Multiple updates for ref '%s' not allowed.",
- refnames->items[i].string);
- return 1;
- }
- return 0;
-}
-
static int files_transaction_commit(struct ref_transaction *transaction,
+ struct string_list *affected_refnames,
struct strbuf *err)
{
int ret = 0, i;
@@ -3179,26 +3163,6 @@ static int files_transaction_commit(struct ref_transaction *transaction,
struct ref_update **updates = transaction->updates;
struct string_list refs_to_delete = STRING_LIST_INIT_NODUP;
struct string_list_item *ref_to_delete;
- struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
-
- assert(err);
-
- if (transaction->state != REF_TRANSACTION_OPEN)
- die("BUG: commit called for transaction that is not open");
-
- if (!n) {
- transaction->state = REF_TRANSACTION_CLOSED;
- return 0;
- }
-
- /* Fail if a refname appears more than once in the transaction: */
- for (i = 0; i < n; i++)
- string_list_append(&affected_refnames, updates[i]->refname);
- string_list_sort(&affected_refnames);
- if (ref_update_reject_duplicates(&affected_refnames, err)) {
- ret = TRANSACTION_GENERIC_ERROR;
- goto cleanup;
- }
/*
* Acquire all locks, verify old values if provided, check
@@ -3217,7 +3181,7 @@ static int files_transaction_commit(struct ref_transaction *transaction,
update->refname,
((update->flags & REF_HAVE_OLD) ?
update->old_sha1 : NULL),
- &affected_refnames, NULL,
+ affected_refnames, NULL,
update->flags,
&update->type,
err);
@@ -3329,7 +3293,6 @@ cleanup:
if (updates[i]->backend_data)
unlock_ref(updates[i]->backend_data);
string_list_clear(&refs_to_delete, 0);
- string_list_clear(&affected_refnames, 0);
return ret;
}
@@ -3342,27 +3305,18 @@ static int ref_present(const char *refname,
}
static int files_initial_transaction_commit(struct ref_transaction *transaction,
+ struct string_list *affected_refnames,
struct strbuf *err)
{
int ret = 0, i;
int n = transaction->nr;
struct ref_update **updates = transaction->updates;
- struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
assert(err);
if (transaction->state != REF_TRANSACTION_OPEN)
die("BUG: commit called for transaction that is not open");
- /* Fail if a refname appears more than once in the transaction: */
- for (i = 0; i < n; i++)
- string_list_append(&affected_refnames, updates[i]->refname);
- string_list_sort(&affected_refnames);
- if (ref_update_reject_duplicates(&affected_refnames, err)) {
- ret = TRANSACTION_GENERIC_ERROR;
- goto cleanup;
- }
-
/*
* It's really undefined to call this function in an active
* repository or when there are existing references: we are
@@ -3375,7 +3329,7 @@ static int files_initial_transaction_commit(struct ref_transaction *transaction,
* so here we really only check that none of the references
* that we are creating already exists.
*/
- if (for_each_rawref(ref_present, &affected_refnames))
+ if (for_each_rawref(ref_present, affected_refnames))
die("BUG: initial ref transaction called with existing refs");
for (i = 0; i < n; i++) {
@@ -3385,7 +3339,7 @@ static int files_initial_transaction_commit(struct ref_transaction *transaction,
!is_null_sha1(update->old_sha1))
die("BUG: initial ref transaction with old_sha1 set");
if (verify_refname_available(update->refname,
- &affected_refnames, NULL,
+ affected_refnames, NULL,
err)) {
ret = TRANSACTION_NAME_CONFLICT;
goto cleanup;
@@ -3416,7 +3370,6 @@ static int files_initial_transaction_commit(struct ref_transaction *transaction,
cleanup:
transaction->state = REF_TRANSACTION_CLOSED;
- string_list_clear(&affected_refnames, 0);
return ret;
}
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 3dec075..fc5d1db 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -217,6 +217,7 @@ int rename_ref_available(const char *oldname, const char *newname);
/* refs backends */
typedef int ref_init_db_fn(struct strbuf *err, int shared);
typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
+ struct string_list *affected_refnames,
struct strbuf *err);
/* reflog functions */
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 12/21] refs: allow log-only updates
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (10 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 11/21] refs: move duplicate check to common code David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-11 10:03 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 13/21] refs: resolve symbolic refs first David Turner
` (9 subsequent siblings)
21 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
The refs infrastructure learns about log-only ref updates, which only
update the reflog. Later, we will use this to separate symbolic
reference resolution from ref updating.
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs/files-backend.c | 15 ++++++++++-----
refs/refs-internal.h | 2 ++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 0ad60bc..0fdcdc7 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2845,7 +2845,7 @@ static int commit_ref_update(struct ref_lock *lock,
}
}
}
- if (commit_ref(lock)) {
+ if (!(flags & REF_LOG_ONLY) && commit_ref(lock)) {
error("Couldn't set %s", lock->ref_name);
unlock_ref(lock);
return -1;
@@ -3199,7 +3199,8 @@ static int files_transaction_commit(struct ref_transaction *transaction,
goto cleanup;
}
if ((update->flags & REF_HAVE_NEW) &&
- !(update->flags & REF_DELETING)) {
+ !(update->flags & REF_DELETING) &&
+ !(update->flags & REF_LOG_ONLY)) {
int overwriting_symref = ((update->type & REF_ISSYMREF) &&
(update->flags & REF_NODEREF));
@@ -3229,7 +3230,9 @@ static int files_transaction_commit(struct ref_transaction *transaction,
update->flags |= REF_NEEDS_COMMIT;
}
}
- if (!(update->flags & REF_NEEDS_COMMIT)) {
+
+ if (!(update->flags & REF_LOG_ONLY) &&
+ !(update->flags & REF_NEEDS_COMMIT)) {
/*
* We didn't have to write anything to the lockfile.
* Close it to free up the file descriptor:
@@ -3246,7 +3249,8 @@ static int files_transaction_commit(struct ref_transaction *transaction,
for (i = 0; i < n; i++) {
struct ref_update *update = updates[i];
- if (update->flags & REF_NEEDS_COMMIT) {
+ if (update->flags & REF_NEEDS_COMMIT ||
+ update->flags & REF_LOG_ONLY) {
if (commit_ref_update(update->backend_data,
update->new_sha1, update->msg,
update->flags, err)) {
@@ -3266,7 +3270,8 @@ static int files_transaction_commit(struct ref_transaction *transaction,
struct ref_update *update = updates[i];
struct ref_lock *lock = update->backend_data;
- if (update->flags & REF_DELETING) {
+ if (update->flags & REF_DELETING &&
+ !(update->flags & REF_LOG_ONLY)) {
if (delete_ref_loose(lock, update->type, err)) {
ret = TRANSACTION_GENERIC_ERROR;
goto cleanup;
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index fc5d1db..b5d0ab8 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -42,6 +42,8 @@
* value to ref_update::flags
*/
+#define REF_LOG_ONLY 0x80
+
/*
* Return true iff refname is minimally safe. "Safe" here means that
* deleting a loose reference by this name will not do any damage, for
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 13/21] refs: resolve symbolic refs first
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (11 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 12/21] refs: allow log-only updates David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-12 14:09 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 14/21] refs: always handle non-normal refs in files backend David Turner
` (8 subsequent siblings)
21 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
Before committing ref updates, split symbolic ref updates into two
parts: an update to the underlying ref, and a log-only update to the
symbolic ref. This ensures that both references are locked correctly
while their reflogs are updated.
It is still possible to confuse git by concurrent updates, since the
splitting of symbolic refs does not happen under lock. So a symbolic ref
could be replaced by a plain ref in the middle of this operation, which
would lead to reflog discontinuities and missed old-ref checks.
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 69 +++++++++++++++++++++++++++
refs/files-backend.c | 132 ++++++++++++++++++++++++++-------------------------
refs/refs-internal.h | 8 ++++
3 files changed, 145 insertions(+), 64 deletions(-)
diff --git a/refs.c b/refs.c
index 283a5ec..227c018 100644
--- a/refs.c
+++ b/refs.c
@@ -1152,6 +1152,71 @@ int refs_init_db(struct strbuf *err, int shared)
return the_refs_backend->init_db(err, shared);
}
+/*
+ * Special case for symbolic refs when REF_NODEREF is not turned on.
+ * Dereference them here, mark them REF_LOG_ONLY, and add an update
+ * for the underlying ref.
+ */
+static int dereference_symrefs(struct ref_transaction *transaction,
+ struct strbuf *err)
+{
+ int i;
+ int nr = transaction->nr;
+
+ for (i = 0; i < nr; i++) {
+ struct ref_update *update = transaction->updates[i];
+ const char *resolved;
+ unsigned char sha1[20];
+ int resolve_flags = 0;
+ int mustexist = update->flags & REF_HAVE_OLD &&
+ !is_null_sha1(update->old_sha1);
+ int deleting = (update->flags & REF_HAVE_NEW) &&
+ is_null_sha1(update->new_sha1);
+
+ if (mustexist)
+ resolve_flags |= RESOLVE_REF_READING;
+ if (deleting)
+ resolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME |
+ RESOLVE_REF_NO_RECURSE;
+
+ if (strcmp(update->refname, "HEAD"))
+ update->flags |= REF_IS_NOT_HEAD;
+
+ resolved = resolve_ref_unsafe(update->refname, resolve_flags,
+ sha1, &update->type);
+ if (!resolved) {
+ /*
+ * We may notice this breakage later and die
+ * with a sensible error message
+ */
+ update->type |= REF_ISBROKEN;
+ continue;
+ }
+
+ hashcpy(update->read_sha1, sha1);
+
+ if (update->flags & REF_NODEREF ||
+ !(update->type & REF_ISSYMREF))
+ continue;
+
+ /* Create a new transaction for the underlying ref */
+ if (ref_transaction_update(transaction,
+ resolved,
+ update->new_sha1,
+ (update->flags & REF_HAVE_OLD) ?
+ update->old_sha1 : NULL,
+ update->flags & ~REF_IS_NOT_HEAD,
+ update->msg, err))
+ return -1;
+
+ /* Make the symbolic ref update non-recursive */
+ update->flags |= REF_LOG_ONLY | REF_NODEREF;
+ update->flags &= ~REF_HAVE_OLD;
+ }
+
+ return 0;
+}
+
int ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err)
{
@@ -1168,6 +1233,10 @@ int ref_transaction_commit(struct ref_transaction *transaction,
return 0;
}
+ ret = dereference_symrefs(transaction, err);
+ if (ret)
+ goto done;
+
if (get_affected_refnames(transaction, &affected_refnames, err)) {
ret = TRANSACTION_GENERIC_ERROR;
goto done;
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 0fdcdc7..d4f9040 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -7,7 +7,6 @@
struct ref_lock {
char *ref_name;
- char *orig_ref_name;
struct lock_file *lk;
struct object_id old_oid;
};
@@ -1857,7 +1856,6 @@ static void unlock_ref(struct ref_lock *lock)
if (lock->lk)
rollback_lock_file(lock->lk);
free(lock->ref_name);
- free(lock->orig_ref_name);
free(lock);
}
@@ -1913,6 +1911,7 @@ static int remove_empty_directories(struct strbuf *path)
*/
static struct ref_lock *lock_ref_sha1_basic(const char *refname,
const unsigned char *old_sha1,
+ const unsigned char *read_sha1,
const struct string_list *extras,
const struct string_list *skip,
unsigned int flags, int *type_p,
@@ -1920,14 +1919,14 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
{
struct strbuf ref_file = STRBUF_INIT;
struct strbuf orig_ref_file = STRBUF_INIT;
- const char *orig_refname = refname;
struct ref_lock *lock;
int last_errno = 0;
int type;
int lflags = 0;
int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
- int resolve_flags = 0;
+ int resolve_flags = RESOLVE_REF_NO_RECURSE;
int attempts_remaining = 3;
+ int resolved;
assert(err);
@@ -1937,65 +1936,65 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
resolve_flags |= RESOLVE_REF_READING;
if (flags & REF_DELETING)
resolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME;
- if (flags & REF_NODEREF) {
- resolve_flags |= RESOLVE_REF_NO_RECURSE;
+ if (flags & REF_NODEREF)
lflags |= LOCK_NO_DEREF;
- }
- refname = resolve_ref_unsafe(refname, resolve_flags,
- lock->old_oid.hash, &type);
- if (!refname && errno == EISDIR) {
- /*
- * we are trying to lock foo but we used to
- * have foo/bar which now does not exist;
- * it is normal for the empty directory 'foo'
- * to remain.
- */
- strbuf_git_path(&orig_ref_file, "%s", orig_refname);
- if (remove_empty_directories(&orig_ref_file)) {
+ if (type_p && *type_p & REF_ISSYMREF) {
+ hashcpy(lock->old_oid.hash, read_sha1);
+ } else {
+ resolved = !!resolve_ref_unsafe(refname, resolve_flags,
+ lock->old_oid.hash, &type);
+ if (!resolved && errno == EISDIR) {
+ /*
+ * we are trying to lock foo but we used to
+ * have foo/bar which now does not exist;
+ * it is normal for the empty directory 'foo'
+ * to remain.
+ */
+ strbuf_git_path(&orig_ref_file, "%s", refname);
+ if (remove_empty_directories(&orig_ref_file)) {
+ struct ref_dir *loose_refs;
+ loose_refs = get_loose_refs(&ref_cache);
+ last_errno = errno;
+ if (!verify_refname_available_dir(refname, extras, skip,
+ loose_refs, err))
+ strbuf_addf(err, "there are still refs under '%s'",
+ refname);
+ goto error_return;
+ }
+ resolved = !!resolve_ref_unsafe(refname, resolve_flags,
+ lock->old_oid.hash, &type);
+ }
+
+ if (type_p)
+ *type_p = type;
+ if (!resolved) {
last_errno = errno;
- if (!verify_refname_available_dir(orig_refname, extras, skip,
+ if (last_errno != ENOTDIR ||
+ !verify_refname_available_dir(refname, extras, skip,
get_loose_refs(&ref_cache), err))
- strbuf_addf(err, "there are still refs under '%s'",
- orig_refname);
+ strbuf_addf(err,
+ "unable to resolve reference %s: %s",
+ refname, strerror(last_errno));
+
+ goto error_return;
+ }
+ /*
+ * If the ref did not exist and we are creating it, make sure
+ * there is no existing packed ref whose name begins with our
+ * refname, nor a packed ref whose name is a proper prefix of
+ * our refname.
+ */
+ if (is_null_oid(&lock->old_oid) &&
+ verify_refname_available_dir(refname, extras, skip,
+ get_packed_refs(&ref_cache), err)) {
+ last_errno = ENOTDIR;
goto error_return;
}
- refname = resolve_ref_unsafe(orig_refname, resolve_flags,
- lock->old_oid.hash, &type);
- }
- if (type_p)
- *type_p = type;
- if (!refname) {
- last_errno = errno;
- if (last_errno != ENOTDIR ||
- !verify_refname_available_dir(orig_refname, extras, skip,
- get_loose_refs(&ref_cache), err))
- strbuf_addf(err, "unable to resolve reference %s: %s",
- orig_refname, strerror(last_errno));
-
- goto error_return;
- }
-
- if (flags & REF_NODEREF)
- refname = orig_refname;
-
- /*
- * If the ref did not exist and we are creating it, make sure
- * there is no existing packed ref whose name begins with our
- * refname, nor a packed ref whose name is a proper prefix of
- * our refname.
- */
- if (is_null_oid(&lock->old_oid) &&
- verify_refname_available_dir(refname, extras, skip,
- get_packed_refs(&ref_cache), err)) {
- last_errno = ENOTDIR;
- goto error_return;
}
-
lock->lk = xcalloc(1, sizeof(struct lock_file));
lock->ref_name = xstrdup(refname);
- lock->orig_ref_name = xstrdup(orig_refname);
strbuf_git_path(&ref_file, "%s", refname);
retry:
@@ -2027,7 +2026,13 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
goto error_return;
}
}
- if (verify_lock(lock, old_sha1, mustexist, err)) {
+
+ if (type_p && *type_p & REF_ISSYMREF && !(*type_p & REF_ISBROKEN)) {
+ /*
+ * Old hash verification for symrefs happens on their
+ * base ref.
+ */
+ } else if (verify_lock(lock, old_sha1, mustexist, err)) {
last_errno = errno;
goto error_return;
}
@@ -2561,7 +2566,7 @@ static int files_rename_ref(const char *oldrefname, const char *newrefname,
logmoved = log;
- lock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, 0, NULL, &err);
+ lock = lock_ref_sha1_basic(newrefname, NULL, NULL, NULL, NULL, 0, NULL, &err);
if (!lock) {
error("unable to rename '%s' to '%s': %s", oldrefname, newrefname, err.buf);
strbuf_release(&err);
@@ -2579,7 +2584,7 @@ static int files_rename_ref(const char *oldrefname, const char *newrefname,
return 0;
rollback:
- lock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, 0, NULL, &err);
+ lock = lock_ref_sha1_basic(oldrefname, NULL, NULL, NULL, NULL, 0, NULL, &err);
if (!lock) {
error("unable to lock %s for rollback: %s", oldrefname, err.buf);
strbuf_release(&err);
@@ -2807,9 +2812,7 @@ static int commit_ref_update(struct ref_lock *lock,
int flags, struct strbuf *err)
{
clear_loose_ref_cache(&ref_cache);
- if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0 ||
- (strcmp(lock->ref_name, lock->orig_ref_name) &&
- log_ref_write(lock->orig_ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0)) {
+ if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0) {
char *old_msg = strbuf_detach(err, NULL);
strbuf_addf(err, "Cannot update the ref '%s': %s",
lock->ref_name, old_msg);
@@ -2817,7 +2820,7 @@ static int commit_ref_update(struct ref_lock *lock,
unlock_ref(lock);
return -1;
}
- if (strcmp(lock->orig_ref_name, "HEAD") != 0) {
+ if (flags & REF_IS_NOT_HEAD) {
/*
* Special hack: If a branch is updated directly and HEAD
* points to it (may happen on the remote side of a push
@@ -2912,8 +2915,8 @@ static int files_create_symref(const char *refname,
struct ref_lock *lock;
int ret;
- lock = lock_ref_sha1_basic(refname, NULL, NULL, NULL, REF_NODEREF, NULL,
- &err);
+ lock = lock_ref_sha1_basic(refname, NULL, NULL, NULL, NULL, REF_NODEREF,
+ NULL, &err);
if (!lock) {
error("%s", err.buf);
strbuf_release(&err);
@@ -3181,6 +3184,7 @@ static int files_transaction_commit(struct ref_transaction *transaction,
update->refname,
((update->flags & REF_HAVE_OLD) ?
update->old_sha1 : NULL),
+ update->read_sha1,
affected_refnames, NULL,
update->flags,
&update->type,
@@ -3427,7 +3431,7 @@ static int files_reflog_expire(const char *refname, const unsigned char *sha1,
struct ref_lock *lock;
char *log_file;
int status = 0;
- int type;
+ int type = 0;
struct strbuf err = STRBUF_INIT;
memset(&cb, 0, sizeof(cb));
@@ -3440,7 +3444,7 @@ static int files_reflog_expire(const char *refname, const unsigned char *sha1,
* reference itself, plus we might need to update the
* reference if --updateref was specified:
*/
- lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, 0, &type, &err);
+ lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, NULL, 0, &type, &err);
if (!lock) {
error("cannot lock ref '%s': %s", refname, err.buf);
strbuf_release(&err);
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index b5d0ab8..75b4389 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -44,6 +44,8 @@
#define REF_LOG_ONLY 0x80
+#define REF_IS_NOT_HEAD 0x100
+
/*
* Return true iff refname is minimally safe. "Safe" here means that
* deleting a loose reference by this name will not do any damage, for
@@ -159,6 +161,12 @@ struct ref_update {
*/
unsigned char old_sha1[20];
/*
+ * During the symbolic ref split stage, we resolve refs.
+ * We'll re-resolve non-symbolic refs once they are locked,
+ * but we store this to avoid re-resolving symbolic refs.
+ */
+ unsigned char read_sha1[20];
+ /*
* One or more of REF_HAVE_NEW, REF_HAVE_OLD, REF_NODEREF,
* REF_DELETING, and REF_ISPRUNING:
*/
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 14/21] refs: always handle non-normal refs in files backend
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (12 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 13/21] refs: resolve symbolic refs first David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-12 15:07 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 15/21] init: allow alternate ref strorage to be set for new repos David Turner
` (7 subsequent siblings)
21 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
Always handle non-normal (per-worktree or pseudo) refs in the files
backend instead of alternate backends.
Sometimes a ref transaction will update both a per-worktree ref and a
normal ref. For instance, an ordinary commit might update
refs/heads/master and HEAD (or at least HEAD's reflog).
Updates to normal refs continue to go through the chosen backend.
Updates to non-normal refs are moved to a separate files backend
transaction.
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 79 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c
index 227c018..18ba356 100644
--- a/refs.c
+++ b/refs.c
@@ -9,6 +9,11 @@
#include "object.h"
#include "tag.h"
+static const char split_transaction_fail_warning[] = N_(
+ "A ref transaction was split across two refs backends. Part of the "
+ "transaction succeeded, but then the update to the per-worktree refs "
+ "failed. Your repository may be in an inconsistent state.");
+
/*
* We always have a files backend and it is the default.
*/
@@ -791,6 +796,13 @@ void ref_transaction_free(struct ref_transaction *transaction)
free(transaction);
}
+static void add_update_obj(struct ref_transaction *transaction,
+ struct ref_update *update)
+{
+ ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);
+ transaction->updates[transaction->nr++] = update;
+}
+
static struct ref_update *add_update(struct ref_transaction *transaction,
const char *refname)
{
@@ -798,8 +810,7 @@ static struct ref_update *add_update(struct ref_transaction *transaction,
struct ref_update *update = xcalloc(1, sizeof(*update) + len);
memcpy((char *)update->refname, refname, len); /* includes NUL */
- ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);
- transaction->updates[transaction->nr++] = update;
+ add_update_obj(transaction, update);
return update;
}
@@ -1217,11 +1228,38 @@ static int dereference_symrefs(struct ref_transaction *transaction,
return 0;
}
+/*
+ * Move all non-normal ref updates into a specially-created
+ * files-backend transaction
+ */
+static int move_abnormal_ref_updates(struct ref_transaction *transaction,
+ struct ref_transaction *files_transaction,
+ struct strbuf *err)
+{
+ int i;
+
+ for (i = 0; i < transaction->nr; i++) {
+ int last;
+ struct ref_update *update = transaction->updates[i];
+
+ if (ref_type(update->refname) == REF_TYPE_NORMAL)
+ continue;
+
+ last = --transaction->nr;
+ transaction->updates[i] = transaction->updates[last];
+ add_update_obj(files_transaction, update);
+ }
+
+ return 0;
+}
+
int ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err)
{
int ret = -1;
struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
+ struct string_list files_affected_refnames = STRING_LIST_INIT_NODUP;
+ struct ref_transaction *files_transaction = NULL;
assert(err);
@@ -1237,6 +1275,26 @@ int ref_transaction_commit(struct ref_transaction *transaction,
if (ret)
goto done;
+ if (the_refs_backend != &refs_be_files) {
+ files_transaction = ref_transaction_begin(err);
+ if (!files_transaction)
+ goto done;
+
+ ret = move_abnormal_ref_updates(transaction, files_transaction,
+ err);
+ if (ret)
+ goto done;
+
+ /* files backend commit */
+ if (get_affected_refnames(files_transaction,
+ &files_affected_refnames,
+ err)) {
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto done;
+ }
+ }
+
+ /* main backend commit */
if (get_affected_refnames(transaction, &affected_refnames, err)) {
ret = TRANSACTION_GENERIC_ERROR;
goto done;
@@ -1244,8 +1302,24 @@ int ref_transaction_commit(struct ref_transaction *transaction,
ret = the_refs_backend->transaction_commit(transaction,
&affected_refnames, err);
+ if (ret)
+ goto done;
+
+ if (files_transaction) {
+ ret = refs_be_files.transaction_commit(files_transaction,
+ &files_affected_refnames,
+ err);
+ if (ret) {
+ warning(split_transaction_fail_warning);
+ goto done;
+ }
+ }
+
done:
string_list_clear(&affected_refnames, 0);
+ string_list_clear(&files_affected_refnames, 0);
+ if (files_transaction)
+ ref_transaction_free(files_transaction);
return ret;
}
@@ -1285,6 +1359,9 @@ int peel_ref(const char *refname, unsigned char *sha1)
int create_symref(const char *ref_target, const char *refs_heads_master,
const char *logmsg)
{
+ if (ref_type(ref_target) != REF_TYPE_NORMAL)
+ return refs_be_files.create_symref(ref_target, refs_heads_master,
+ logmsg);
return the_refs_backend->create_symref(ref_target, refs_heads_master,
logmsg);
}
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 15/21] init: allow alternate ref strorage to be set for new repos
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (13 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 14/21] refs: always handle non-normal refs in files backend David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-12 15:26 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 16/21] refs: check submodules ref storage config David Turner
` (6 subsequent siblings)
21 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner, SZEDER Gábor
git init learns a new argument --ref-storage. Presently, only
"files" is supported, but later we will add other storage backends.
When this argument is used, the repository's extensions.refStorage
configuration value is set (as well as core.repositoryformatversion),
and the ref storage backend's initdb function is used to set up the
ref database.
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
Documentation/git-init-db.txt | 2 +-
Documentation/git-init.txt | 7 +++++-
builtin/init-db.c | 44 +++++++++++++++++++++++++++-------
cache.h | 2 ++
contrib/completion/git-completion.bash | 3 ++-
path.c | 29 ++++++++++++++++++++--
refs.c | 8 +++++++
refs.h | 8 +++++++
setup.c | 12 ++++++++++
t/t0001-init.sh | 25 +++++++++++++++++++
10 files changed, 127 insertions(+), 13 deletions(-)
diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt
index 648a6cd..d03fb69 100644
--- a/Documentation/git-init-db.txt
+++ b/Documentation/git-init-db.txt
@@ -9,7 +9,7 @@ git-init-db - Creates an empty Git repository
SYNOPSIS
--------
[verse]
-'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]
+'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]] [--ref-storage=<name>]
DESCRIPTION
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 8174d27..d2b150f 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -12,7 +12,7 @@ SYNOPSIS
'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
[--separate-git-dir <git dir>]
[--shared[=<permissions>]] [directory]
-
+ [--ref-storage=<name>]
DESCRIPTION
-----------
@@ -113,6 +113,11 @@ does not exist, it will be created.
--
+--ref-storage=<name>::
+Type of refs storage backend. Default is to use the original "files"
+storage, which stores ref data in files in .git/refs and
+.git/packed-refs.
+
TEMPLATE DIRECTORY
------------------
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 801e977..d331ce8 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -24,6 +24,7 @@ static int init_is_bare_repository = 0;
static int init_shared_repository = -1;
static const char *init_db_template_dir;
static const char *git_link;
+static char *requested_ref_storage_backend;
static void copy_templates_1(struct strbuf *path, struct strbuf *template,
DIR *dir)
@@ -179,6 +180,7 @@ static int create_default_files(const char *template_path)
int reinit;
int filemode;
struct strbuf err = STRBUF_INIT;
+ int repo_version = 0;
/* Just look for `init.templatedir` */
git_config(git_init_db_config, NULL);
@@ -205,6 +207,32 @@ static int create_default_files(const char *template_path)
}
/*
+ * Create the default symlink from ".git/HEAD" to the "master"
+ * branch, if it does not exist yet.
+ */
+ path = git_path_buf(&buf, "HEAD");
+ reinit = (!access(path, R_OK)
+ || readlink(path, junk, sizeof(junk)-1) != -1);
+ if (reinit) {
+ if (requested_ref_storage_backend &&
+ strcmp(ref_storage_backend, requested_ref_storage_backend))
+ die(_("You can't change the refs storage type (was %s; you requested %s)"),
+ ref_storage_backend,
+ requested_ref_storage_backend);
+ }
+
+ if (requested_ref_storage_backend)
+ ref_storage_backend = requested_ref_storage_backend;
+ if (strcmp(ref_storage_backend, "files")) {
+ git_config_set("extensions.refStorage", ref_storage_backend);
+ git_config_set("core.repositoryformatversion", ref_storage_backend);
+ if (set_ref_storage_backend(ref_storage_backend))
+ die(_("Unknown ref storage backend %s"),
+ ref_storage_backend);
+ repo_version = 1;
+ }
+
+ /*
* We need to create a "refs" dir in any case so that older
* versions of git can tell that this is a repository.
*/
@@ -213,13 +241,6 @@ static int create_default_files(const char *template_path)
if (refs_init_db(&err, shared_repository))
die("failed to set up refs db: %s", err.buf);
- /*
- * Create the default symlink from ".git/HEAD" to the "master"
- * branch, if it does not exist yet.
- */
- path = git_path_buf(&buf, "HEAD");
- reinit = (!access(path, R_OK)
- || readlink(path, junk, sizeof(junk)-1) != -1);
if (!reinit) {
if (create_symref("HEAD", "refs/heads/master", NULL) < 0)
exit(1);
@@ -227,7 +248,7 @@ static int create_default_files(const char *template_path)
/* This forces creation of new config file */
xsnprintf(repo_version_string, sizeof(repo_version_string),
- "%d", GIT_REPO_VERSION);
+ "%d", repo_version);
git_config_set("core.repositoryformatversion", repo_version_string);
/* Check filemode trustability */
@@ -475,11 +496,18 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
OPT_BIT('q', "quiet", &flags, N_("be quiet"), INIT_DB_QUIET),
OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"),
N_("separate git dir from working tree")),
+ OPT_STRING(0, "ref-storage", &requested_ref_storage_backend,
+ N_("name"), N_("name of backend type to use")),
OPT_END()
};
argc = parse_options(argc, argv, prefix, init_db_options, init_db_usage, 0);
+ if (requested_ref_storage_backend &&
+ !ref_storage_backend_exists(requested_ref_storage_backend))
+ die(_("Unknown ref storage backend %s"),
+ requested_ref_storage_backend);
+
if (real_git_dir && !is_absolute_path(real_git_dir))
real_git_dir = xstrdup(real_path(real_git_dir));
diff --git a/cache.h b/cache.h
index 4307174..a54c97b 100644
--- a/cache.h
+++ b/cache.h
@@ -734,6 +734,8 @@ extern enum object_creation_mode object_creation_mode;
extern char *notes_ref_name;
+extern const char *ref_storage_backend;
+
extern int grafts_replace_parents;
/*
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 45ec47f..0138d03 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1362,7 +1362,8 @@ _git_init ()
return
;;
--*)
- __gitcomp "--quiet --bare --template= --shared --shared="
+ __gitcomp "--quiet --bare --template= --shared --shared=
+ --ref-storage="
return
;;
esac
diff --git a/path.c b/path.c
index 8b7e168..2e67a2b 100644
--- a/path.c
+++ b/path.c
@@ -2,6 +2,7 @@
* Utilities for paths and pathnames
*/
#include "cache.h"
+#include "refs.h"
#include "strbuf.h"
#include "string-list.h"
#include "dir.h"
@@ -511,8 +512,32 @@ int validate_headref(const char *path)
int fd;
ssize_t len;
- if (lstat(path, &st) < 0)
- return -1;
+ if (lstat(path, &st) < 0) {
+ int backend_type_set;
+ struct strbuf config_path = STRBUF_INIT;
+ char *pathdup = xstrdup(path);
+ char *git_dir = dirname(pathdup);
+ char *storage = NULL;
+
+ strbuf_addf(&config_path, "%s/%s", git_dir, "config");
+ free(pathdup);
+
+ if (git_config_from_file(ref_storage_backend_config,
+ config_path.buf, &storage)) {
+ strbuf_release(&config_path);
+ return -1;
+ }
+
+ backend_type_set = !!storage;
+ free((void *)storage);
+ strbuf_release(&config_path);
+ /*
+ * Alternate backends are assumed to keep HEAD
+ * in a valid state, so there's no need to do
+ * further validation.
+ */
+ return backend_type_set ? 0 : -1;
+ }
/* Make sure it is a "refs/.." symlink */
if (S_ISLNK(st.st_mode)) {
diff --git a/refs.c b/refs.c
index 18ba356..191b0a2 100644
--- a/refs.c
+++ b/refs.c
@@ -23,6 +23,14 @@ static struct ref_storage_be *the_refs_backend = &refs_be_files;
*/
static struct ref_storage_be *refs_backends = &refs_be_files;
+const char *ref_storage_backend = "files";
+
+void register_ref_storage_backend(struct ref_storage_be *be)
+{
+ be->next = refs_backends;
+ refs_backends = be;
+}
+
int set_ref_storage_backend(const char *name)
{
struct ref_storage_be *be;
diff --git a/refs.h b/refs.h
index c5ecc52..680a535 100644
--- a/refs.h
+++ b/refs.h
@@ -511,10 +511,18 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,
void *policy_cb_data);
/*
+ * Read the refdb storage backend name out of the config file
+ */
+int ref_storage_backend_config(const char *var, const char *value, void *ptr);
+
+struct ref_storage_be;
+/*
* Switch to an alternate ref storage backend.
*/
int set_ref_storage_backend(const char *name);
int ref_storage_backend_exists(const char *name);
+void register_ref_storage_backend(struct ref_storage_be *be);
+
#endif /* REFS_H */
diff --git a/setup.c b/setup.c
index 0deb022..1a62277 100644
--- a/setup.c
+++ b/setup.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "dir.h"
+#include "refs.h"
#include "string-list.h"
static int inside_git_dir = -1;
@@ -263,6 +264,15 @@ int get_common_dir_noenv(struct strbuf *sb, const char *gitdir)
return ret;
}
+int ref_storage_backend_config(const char *var, const char *value, void *ptr)
+{
+ char **cdata = ptr;
+
+ if (!strcmp(var, "extensions.refstorage"))
+ *cdata = xstrdup(value);
+ return 0;
+}
+
/*
* Test if it looks like we're at a git directory.
* We want to see:
@@ -390,6 +400,8 @@ static int check_repo_format(const char *var, const char *value, void *cb)
;
else if (!strcmp(ext, "preciousobjects"))
repository_format_precious_objects = git_config_bool(var, value);
+ else if (!strcmp(ext, "refstorage"))
+ ref_storage_backend = xstrdup(value);
else
string_list_append(&unknown_extensions, ext);
}
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 295aa59..31c8279 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -174,6 +174,31 @@ test_expect_success 'reinit' '
test_i18ncmp again/empty again/err2
'
+test_expect_success 'init with bogus storage backend fails' '
+
+ (
+ mkdir again2 &&
+ cd again2 &&
+ test_must_fail git init --ref-storage=test >out2 2>err2 &&
+ test_i18ngrep "Unknown ref storage backend test" err2
+ )
+'
+
+test_expect_failure 'reinit with changed storage backend fails' '
+
+ (
+ mkdir again3 &&
+ cd again3 &&
+ git init >out1 2>err1 &&
+ git init --ref-storage=test >out2 2>err2
+ ) &&
+ test_i18ngrep "Initialized empty" again3/out1 &&
+ test_i18ngrep "Reinitialized existing" again3/out2 &&
+ >again3/empty &&
+ test_i18ncmp again3/empty again3/err1 &&
+ test_i18ncmp again3/empty again3/err2
+'
+
test_expect_success 'init with --template' '
mkdir template-source &&
echo content >template-source/file &&
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 16/21] refs: check submodules ref storage config
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (14 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 15/21] init: allow alternate ref strorage to be set for new repos David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-05 19:44 ` [PATCH v4 17/21] clone: allow ref storage backend to be set for clone David Turner
` (5 subsequent siblings)
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
All submodules must have the same ref storage (for now). Confirm that
this is so before attempting to do anything with submodule refs.
Signed-off-by: David Turner <dturner@twopensource.com>
---
refs.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++
refs/files-backend.c | 8 ++------
2 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/refs.c b/refs.c
index 191b0a2..715a492 100644
--- a/refs.c
+++ b/refs.c
@@ -308,6 +308,54 @@ int for_each_tag_ref(each_ref_fn fn, void *cb_data)
return for_each_ref_in("refs/tags/", fn, cb_data);
}
+static int submodule_backend(const char *key, const char *value, void *data)
+{
+ const char **path = data;
+ char **old_path = data;
+ if (!strcmp(key, "extensions.refstorage") &&
+ !git_config_string(path, key, "extensions.refstorage"))
+ free(*old_path);
+
+ return 0;
+}
+
+/*
+ * Check that a submodule exists. If its ref storage backend differs
+ * from the current backend, die. If the submodule exists, return
+ * 0. Else return -1.
+ */
+static int check_submodule_backend(const char *submodule)
+{
+ struct strbuf sb = STRBUF_INIT;
+ char *submodule_storage_backend;
+ int result = -1;
+
+ if (!submodule)
+ return 0;
+
+ submodule_storage_backend = xstrdup("files");
+
+ strbuf_addstr(&sb, submodule);
+ if (!is_nonbare_repository_dir(&sb))
+ goto done;
+
+ strbuf_reset(&sb);
+ strbuf_git_path_submodule(&sb, submodule, "config");
+
+ git_config_from_file(submodule_backend, sb.buf,
+ &submodule_storage_backend);
+ if (strcmp(submodule_storage_backend, ref_storage_backend))
+ die(_("Ref storage '%s' for submodule '%s' does not match our storage, '%s'"),
+ submodule_storage_backend, submodule, ref_storage_backend);
+
+ result = 0;
+done:
+ free(submodule_storage_backend);
+ strbuf_release(&sb);
+
+ return result;
+}
+
int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
{
return for_each_ref_in_submodule(submodule, "refs/tags/", fn, cb_data);
@@ -320,6 +368,7 @@ int for_each_branch_ref(each_ref_fn fn, void *cb_data)
int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return for_each_ref_in_submodule(submodule, "refs/heads/", fn, cb_data);
}
@@ -330,6 +379,7 @@ int for_each_remote_ref(each_ref_fn fn, void *cb_data)
int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return for_each_ref_in_submodule(submodule, "refs/remotes/", fn, cb_data);
}
@@ -1377,6 +1427,9 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
int resolve_gitlink_ref(const char *path, const char *refname,
unsigned char *sha1)
{
+ if (check_submodule_backend(path))
+ return -1;
+
return the_refs_backend->resolve_gitlink_ref(path, refname, sha1);
}
@@ -1387,6 +1440,7 @@ int head_ref(each_ref_fn fn, void *cb_data)
int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return the_refs_backend->head_ref_submodule(submodule, fn, cb_data);
}
@@ -1397,6 +1451,7 @@ int for_each_ref(each_ref_fn fn, void *cb_data)
int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return the_refs_backend->for_each_ref_submodule(submodule, fn, cb_data);
}
@@ -1415,6 +1470,7 @@ int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
int for_each_ref_in_submodule(const char *submodule, const char *prefix,
each_ref_fn fn, void *cb_data)
{
+ check_submodule_backend(submodule);
return the_refs_backend->for_each_ref_in_submodule(submodule, prefix,
fn, cb_data);
}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index d4f9040..00cd1be 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1357,13 +1357,9 @@ static int files_resolve_gitlink_ref(const char *path, const char *refname,
strbuf_add(&submodule, path, len);
refs = lookup_ref_cache(submodule.buf);
- if (!refs) {
- if (!is_nonbare_repository_dir(&submodule)) {
- strbuf_release(&submodule);
- return -1;
- }
+ if (!refs)
refs = create_ref_cache(submodule.buf);
- }
+
strbuf_release(&submodule);
retval = resolve_gitlink_ref_recursive(refs, refname, sha1, 0);
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 17/21] clone: allow ref storage backend to be set for clone
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (15 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 16/21] refs: check submodules ref storage config David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-05 19:44 ` [PATCH v4 18/21] svn: learn ref-storage argument David Turner
` (4 subsequent siblings)
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner, SZEDER Gábor
Add a new option, --ref-storage, to allow the ref storage backend to
be set on new clones.
Submodules must use the same ref storage as the parent repository, so
we also pass the --ref-storage option option when cloning
submodules.
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
Documentation/git-clone.txt | 5 +++++
builtin/clone.c | 5 +++++
builtin/submodule--helper.c | 2 +-
contrib/completion/git-completion.bash | 1 +
git-submodule.sh | 13 +++++++++++++
5 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 45d74be..68f56a7 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -14,6 +14,7 @@ SYNOPSIS
[-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
[--dissociate] [--separate-git-dir <git dir>]
[--depth <depth>] [--[no-]single-branch]
+ [--ref-storage=<name>]
[--recursive | --recurse-submodules] [--jobs <n>] [--] <repository>
[<directory>]
@@ -224,6 +225,10 @@ objects from the source repository into a pack in the cloned repository.
The number of submodules fetched at the same time.
Defaults to the `submodule.fetchJobs` option.
+--ref-storage=<name>::
+ Type of ref storage backend. Default is to use the original files
+ based ref storage.
+
<repository>::
The (possibly remote) repository to clone from. See the
<<URLS,URLS>> section below for more information on specifying
diff --git a/builtin/clone.c b/builtin/clone.c
index 191f522..5ba0514 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -95,6 +95,8 @@ static struct option builtin_clone_options[] = {
N_("separate git dir from working tree")),
OPT_STRING_LIST('c', "config", &option_config, N_("key=value"),
N_("set config inside the new repository")),
+ OPT_STRING(0, "ref-storage", &ref_storage_backend,
+ N_("name"), N_("name of backend type to use")),
OPT_END()
};
@@ -733,6 +735,9 @@ static int checkout(void)
if (max_jobs != -1)
argv_array_pushf(&args, "--jobs=%d", max_jobs);
+ argv_array_pushl(&args, "--ref-storage",
+ ref_storage_backend, NULL);
+
err = run_command_v_opt(args.argv, RUN_GIT_CMD);
argv_array_clear(&args);
}
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 689c354..879d6fb 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -457,7 +457,7 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url
argv_array_pushl(&cp.args, "--reference", reference, NULL);
if (gitdir && *gitdir)
argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
-
+ argv_array_pushl(&cp.args, "--ref-storage", ref_storage_backend, NULL);
argv_array_push(&cp.args, url);
argv_array_push(&cp.args, path);
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 0138d03..cb9c473 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1092,6 +1092,7 @@ _git_clone ()
--depth
--single-branch
--branch
+ --ref-storage=
"
return
;;
diff --git a/git-submodule.sh b/git-submodule.sh
index 6fce0dc..e7ac98b 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -527,6 +527,14 @@ cmd_update()
--checkout)
update="checkout"
;;
+ --ref-storage=*)
+ ref_storage="$1"
+ ;;
+ --ref-storage)
+ case "$2" in '') usage ;; esac
+ ref_storage="$2"
+ shift
+ ;;
--depth)
case "$2" in '') usage ;; esac
depth="--depth=$2"
@@ -560,6 +568,11 @@ cmd_update()
if test -n "$init"
then
cmd_init "--" "$@" || return
+ else
+ if test -n "$ref_storage"
+ then
+ usage
+ fi
fi
git submodule--helper update-clone ${GIT_QUIET:+--quiet} \
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 18/21] svn: learn ref-storage argument
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (16 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 17/21] clone: allow ref storage backend to be set for clone David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-05 19:44 ` [PATCH v4 19/21] refs: add register_ref_storage_backends() David Turner
` (3 subsequent siblings)
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner, SZEDER Gábor
git svn learns to pass the ref-storage command-line argument (to init
and clone) through to git init.
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
contrib/completion/git-completion.bash | 2 +-
git-svn.perl | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index cb9c473..ba4137d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2477,7 +2477,7 @@ _git_svn ()
--branches= --stdlayout --minimize-url
--no-metadata --use-svm-props --use-svnsync-props
--rewrite-root= --prefix= --use-log-author
- --add-author-from $remote_opts
+ --add-author-from --ref-storage= $remote_opts
"
local cmt_opts="
--edit --rmdir --find-copies-harder --copy-similarity=
diff --git a/git-svn.perl b/git-svn.perl
index fa5f253..15d1544 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -141,7 +141,7 @@ my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
'localtime' => \$Git::SVN::_localtime,
%remote_opts );
-my ($_trunk, @_tags, @_branches, $_stdlayout);
+my ($_trunk, @_tags, @_branches, $_stdlayout, $_ref_storage);
my %icv;
my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
'trunk|T=s' => \$_trunk, 'tags|t=s@' => \@_tags,
@@ -153,6 +153,7 @@ my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared,
'use-svnsync-props' => sub { $icv{useSvnsyncProps} = 1 },
'rewrite-root=s' => sub { $icv{rewriteRoot} = $_[1] },
'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] },
+ 'ref-storage=s' => \$_ref_storage,
%remote_opts );
my %cmt_opts = ( 'edit|e' => \$_edit,
'rmdir' => \$Git::SVN::Editor::_rmdir,
@@ -469,6 +470,9 @@ sub do_git_init_db {
push @init_db, "--shared";
}
}
+ if (defined $_ref_storage) {
+ push @init_db, "--ref-storage=" . $_ref_storage;
+ }
command_noisy(@init_db);
$_repository = Git->repository(Repository => ".git");
}
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 19/21] refs: add register_ref_storage_backends()
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (17 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 18/21] svn: learn ref-storage argument David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-12 15:42 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 20/21] refs: add LMDB refs storage backend David Turner
` (2 subsequent siblings)
21 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
This new function will register all known ref storage backends... once
there are any other than the default. For now, it's a no-op.
Signed-off-by: David Turner <dturner@twopensource.com>
---
builtin/init-db.c | 3 +++
config.c | 25 +++++++++++++++++++++++++
refs.c | 8 ++++++++
refs.h | 2 ++
4 files changed, 38 insertions(+)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index d331ce8..4209b67 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -226,6 +226,7 @@ static int create_default_files(const char *template_path)
if (strcmp(ref_storage_backend, "files")) {
git_config_set("extensions.refStorage", ref_storage_backend);
git_config_set("core.repositoryformatversion", ref_storage_backend);
+ register_ref_storage_backends();
if (set_ref_storage_backend(ref_storage_backend))
die(_("Unknown ref storage backend %s"),
ref_storage_backend);
@@ -503,6 +504,8 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, init_db_options, init_db_usage, 0);
+ register_ref_storage_backends();
+
if (requested_ref_storage_backend &&
!ref_storage_backend_exists(requested_ref_storage_backend))
die(_("Unknown ref storage backend %s"),
diff --git a/config.c b/config.c
index b95ac3a..b9ef223 100644
--- a/config.c
+++ b/config.c
@@ -11,6 +11,7 @@
#include "strbuf.h"
#include "quote.h"
#include "hashmap.h"
+#include "refs.h"
#include "string-list.h"
#include "utf8.h"
@@ -1207,6 +1208,30 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
}
if (repo_config && !access_or_die(repo_config, R_OK, 0)) {
+ char *storage = NULL;
+
+ /*
+ * make sure we always read the ref storage config
+ * from the extensions section on startup
+ */
+ ret += git_config_from_file(ref_storage_backend_config,
+ repo_config, &storage);
+
+ register_ref_storage_backends();
+ if (!storage)
+ storage = xstrdup("");
+
+ if ((!*storage) ||
+ (!strcmp(storage, "files"))) {
+ /* default backend, nothing to do */
+ free(storage);
+ } else {
+ ref_storage_backend = storage;
+ if (set_ref_storage_backend(ref_storage_backend))
+ die(_("Unknown ref storage backend %s"),
+ ref_storage_backend);
+ }
+
ret += git_config_from_file(fn, repo_config, data);
found += 1;
}
diff --git a/refs.c b/refs.c
index 715a492..e50cca0 100644
--- a/refs.c
+++ b/refs.c
@@ -1554,3 +1554,11 @@ done:
string_list_clear(&affected_refnames, 0);
return ret;
}
+
+void register_ref_storage_backends(void) {
+ /*
+ * No need to register the files backend; it's registered by
+ * default. Add register_ref_storage_backend(ptr-to-backend)
+ * entries below when you add a new backend.
+ */
+}
diff --git a/refs.h b/refs.h
index 680a535..81aab6b 100644
--- a/refs.h
+++ b/refs.h
@@ -525,4 +525,6 @@ int ref_storage_backend_exists(const char *name);
void register_ref_storage_backend(struct ref_storage_be *be);
+void register_ref_storage_backends(void);
+
#endif /* REFS_H */
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 20/21] refs: add LMDB refs storage backend
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (18 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 19/21] refs: add register_ref_storage_backends() David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-11 8:48 ` Michael Haggerty
` (2 more replies)
2016-02-05 19:44 ` [PATCH v4 21/21] refs: tests for lmdb backend David Turner
2016-02-08 23:37 ` [PATCH v4 00/20] refs backend Junio C Hamano
21 siblings, 3 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
Add a database backend for refs using LMDB. This backend runs git
for-each-ref about 30% faster than the files backend with fully-packed
refs on a repo with ~120k refs. It's also about 4x faster than using
fully-unpacked refs. In addition, and perhaps more importantly, it
avoids case-conflict issues on OS X.
LMDB has a few features that make it suitable for usage in git:
1. It is relatively lightweight; it requires only one header file, and
the library code takes under 64k at runtime.
2. It is well-tested: it's been used in OpenLDAP for years.
3. It's very fast. LMDB's benchmarks show that it is among
the fastest key-value stores.
4. It has a relatively simple concurrency story; readers don't
block writers and writers don't block readers.
Ronnie Sahlberg's original version of this patchset used tdb. The
major disadvantage of tdb is that tdb is hard to build on OS X. It's
also not in homebrew. So lmdb seemed simpler.
To test this backend's correctness, I hacked test-lib.sh and
test-lib-functions.sh to run all tests under the refs backend. Dozens
of tests use manual ref/reflog reading/writing, or create submodules
without passing --ref-storage to git init. If those tests are
changed to use the update-ref machinery or test-refs-lmdb-backend (or,
in the case of packed-refs, corrupt refs, and dumb fetch tests, are
skipped), the only remaining failing tests are the git-new-workdir
tests and the gitweb tests.
Signed-off-by: David Turner <dturner@twopensource.com>
---
.gitignore | 1 +
Documentation/config.txt | 7 +
Documentation/git-clone.txt | 3 +-
Documentation/git-init.txt | 2 +-
Documentation/technical/refs-lmdb-backend.txt | 52 +
Documentation/technical/repository-version.txt | 5 +
Makefile | 12 +
configure.ac | 33 +
contrib/workdir/git-new-workdir | 3 +
refs.c | 3 +
refs.h | 2 +
refs/lmdb-backend.c | 2052 ++++++++++++++++++++++++
setup.c | 11 +-
test-refs-lmdb-backend.c | 64 +
transport.c | 7 +-
15 files changed, 2250 insertions(+), 7 deletions(-)
create mode 100644 Documentation/technical/refs-lmdb-backend.txt
create mode 100644 refs/lmdb-backend.c
create mode 100644 test-refs-lmdb-backend.c
diff --git a/.gitignore b/.gitignore
index 1c2f832..87d45a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -199,6 +199,7 @@
/test-path-utils
/test-prio-queue
/test-read-cache
+/test-refs-lmdb-backend
/test-regex
/test-revision-walking
/test-run-command
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 06d3659..bc222c9 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1153,6 +1153,13 @@ difftool.<tool>.cmd::
difftool.prompt::
Prompt before each invocation of the diff tool.
+extensions.refsStorage::
+ Type of refs storage backend. Default is to use the original
+ files based ref storage. When set to "lmdb", refs are stored in
+ the lmdb database backend. This setting reflects the refs
+ backend that is currently in use; it is not possible to change
+ the backend by changing this setting.
+
fetch.recurseSubmodules::
This option can be either set to a boolean value or to 'on-demand'.
Setting it to a boolean changes the behavior of fetch and pull to
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 68f56a7..b9c52ce 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -227,7 +227,8 @@ objects from the source repository into a pack in the cloned repository.
--ref-storage=<name>::
Type of ref storage backend. Default is to use the original files
- based ref storage.
+ based ref storage. Set to "lmdb" to store refs in the lmdb database
+ backend.
<repository>::
The (possibly remote) repository to clone from. See the
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index d2b150f..3b30bf3 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -116,7 +116,7 @@ does not exist, it will be created.
--ref-storage=<name>::
Type of refs storage backend. Default is to use the original "files"
storage, which stores ref data in files in .git/refs and
-.git/packed-refs.
+.git/packed-refs. Set to "lmdb" to activate the lmdb storage backend.
TEMPLATE DIRECTORY
------------------
diff --git a/Documentation/technical/refs-lmdb-backend.txt b/Documentation/technical/refs-lmdb-backend.txt
new file mode 100644
index 0000000..d2cddb6
--- /dev/null
+++ b/Documentation/technical/refs-lmdb-backend.txt
@@ -0,0 +1,52 @@
+Notes on the LMDB refs backend
+==============================
+
+Design:
+------
+
+Refs and reflogs are stored in a lmdb database in .git/refdb. All
+keys and values are \0-terminated.
+
+Keys for refs are the name of the ref (e.g. refs/heads/master).
+Values are the value of the ref, in hex
+(e.g. 61f23eb0f81357c19fa91e2b8c6f3906c3a8f9b0).
+
+All per-worktree refs (refs/bisect/* and HEAD) are stored using
+the traditional files-based backend.
+
+Reflogs are stored as a series of database entries.
+
+For non-empty reflogs, there is one entry per logged ref update. The
+key format is logs/[refname]\0[timestamp]. The timestamp is a 64-bit
+unsigned integer number of nanoseconds since 1/1/1970, stored in
+network byte order. This means that reflog entries are
+chronologically ordered. Because LMDB is a btree database, we can
+efficiently iterate over these keys.
+
+For an empty reflog, there is a "header" entry to show that a reflog
+exists. The header has the same format as an ordinary reflog, but with
+a timestamp of all zeros and an empty value.
+
+Reflog values are in the same format as the original files-based
+reflog, including the trailing LF. The date in the reflog value
+matches the date in the timestamp field.
+
+Weaknesses:
+-----------
+
+The reflog format is somewhat inefficient: a binary format could store
+reflog date/time information in somewhat less space.
+
+The rsync and file:// transports don't work yet, because they
+don't use the refs API.
+
+git new-workdir is incompatible with the lmdb backend. Fortunately,
+git new-workdir is deprecated, and worktrees work fine.
+
+LMDB locks the entire database for write. Any other writer waits
+until the first writer is done before beginning. Readers do not wait
+for writers, and writers do not wait for readers. The underlying
+scheme is approximately MVCC; each reader's queries see the state of
+the database as-of the time that the reader acquired its read lock.
+This is not too far off from the files backend, which loads all refs
+into memory when one is requested.
diff --git a/Documentation/technical/repository-version.txt b/Documentation/technical/repository-version.txt
index 00ad379..fca5ecd 100644
--- a/Documentation/technical/repository-version.txt
+++ b/Documentation/technical/repository-version.txt
@@ -86,3 +86,8 @@ for testing format-1 compatibility.
When the config key `extensions.preciousObjects` is set to `true`,
objects in the repository MUST NOT be deleted (e.g., by `git-prune` or
`git repack -d`).
+
+`refStorage`
+~~~~~~~~~~~~
+This extension allows the use of alternate ref storage backends. The
+only defined value is `lmdb`.
diff --git a/Makefile b/Makefile
index 10566d6..fd80e94 100644
--- a/Makefile
+++ b/Makefile
@@ -1042,6 +1042,17 @@ ifdef USE_LIBPCRE
EXTLIBS += -lpcre
endif
+ifdef USE_LIBLMDB
+ BASIC_CFLAGS += -DUSE_LIBLMDB
+ ifdef LIBLMDBDIR
+ BASIC_CFLAGS += -I$(LIBLMDBDIR)/include
+ EXTLIBS += -L$(LIBLMDBDIR)/$(lib) $(CC_LD_DYNPATH)$(LIBLMDBDIR)/$(lib)
+ endif
+ EXTLIBS += -llmdb
+ LIB_OBJS += refs/lmdb-backend.o
+ TEST_PROGRAMS_NEED_X += test-refs-lmdb-backend
+endif
+
ifdef HAVE_ALLOCA_H
BASIC_CFLAGS += -DHAVE_ALLOCA_H
endif
@@ -2140,6 +2151,7 @@ GIT-BUILD-OPTIONS: FORCE
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@+
@echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@+
@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@+
+ @echo USE_LIBLMDB=\''$(subst ','\'',$(subst ','\'',$(USE_LIBLMDB)))'\' >>$@+
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@+
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@+
@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@+
diff --git a/configure.ac b/configure.ac
index 89e2590..3853bec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,6 +271,24 @@ AS_HELP_STRING([], [ARG can be also prefix for libpcre library and hea
dnl it yet.
GIT_CONF_SUBST([LIBPCREDIR])
fi)
+
+USE_LIBLMDB=YesPlease
+AC_ARG_WITH(liblmdb,
+AS_HELP_STRING([--with-liblmdb],[support lmdb (default is YES])
+AS_HELP_STRING([], [ARG can be also prefix for liblmdb library and headers]),
+ if test "$withval" = "no"; then
+ USE_LIBLMDB=
+ elif test "$withval" = "yes"; then
+ USE_LIBLMDB=YesPlease
+ else
+ USE_LIBLMDB=YesPlease
+ LIBLMDBDIR=$withval
+ AC_MSG_NOTICE([Setting LIBLMDBDIR to $LIBLMDBDIR])
+ dnl USE_LIBLMDB can still be modified below, so don't substitute
+ dnl it yet.
+ GIT_CONF_SUBST([LIBLMDBDIR])
+ fi)
+
#
# Define HAVE_ALLOCA_H if you have working alloca(3) defined in that header.
AC_FUNC_ALLOCA
@@ -510,6 +528,21 @@ GIT_CONF_SUBST([USE_LIBPCRE])
fi
+if test -n "$USE_LIBLMDB"; then
+
+GIT_STASH_FLAGS($LIBLMDBDIR)
+
+AC_CHECK_LIB([lmdb], [mdb_env_open],
+[USE_LIBLMDB=YesPlease],
+[USE_LIBLMDB=])
+
+GIT_UNSTASH_FLAGS($LIBLMDBDIR)
+
+GIT_CONF_SUBST([USE_LIBLMDB])
+
+fi
+
+
#
# Define NO_CURL if you do not have libcurl installed. git-http-pull and
# git-http-push are not built, and you cannot use http:// and https://
diff --git a/contrib/workdir/git-new-workdir b/contrib/workdir/git-new-workdir
index 888c34a..d153ddf 100755
--- a/contrib/workdir/git-new-workdir
+++ b/contrib/workdir/git-new-workdir
@@ -28,6 +28,9 @@ git_dir=$(cd "$orig_git" 2>/dev/null &&
git rev-parse --git-dir 2>/dev/null) ||
die "Not a git repository: \"$orig_git\""
+ref_storage=$(git config extensions.refstorage || echo "files")
+test "$ref_storage" != "files" && die "git-new-workdir is incompatible with ref storage other than 'files'"
+
case "$git_dir" in
.git)
git_dir="$orig_git/.git"
diff --git a/refs.c b/refs.c
index e50cca0..ba871d5 100644
--- a/refs.c
+++ b/refs.c
@@ -1561,4 +1561,7 @@ void register_ref_storage_backends(void) {
* default. Add register_ref_storage_backend(ptr-to-backend)
* entries below when you add a new backend.
*/
+#ifdef USE_LIBLMDB
+ register_ref_storage_backend(&refs_be_lmdb);
+#endif
}
diff --git a/refs.h b/refs.h
index 81aab6b..d57fe54 100644
--- a/refs.h
+++ b/refs.h
@@ -516,6 +516,8 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,
int ref_storage_backend_config(const char *var, const char *value, void *ptr);
struct ref_storage_be;
+
+extern struct ref_storage_be refs_be_lmdb;
/*
* Switch to an alternate ref storage backend.
*/
diff --git a/refs/lmdb-backend.c b/refs/lmdb-backend.c
new file mode 100644
index 0000000..138f391
--- /dev/null
+++ b/refs/lmdb-backend.c
@@ -0,0 +1,2052 @@
+/*
+ * This file implements a lmdb backend for refs.
+ *
+ * The design of this backend relies on lmdb's write lock -- that is, any
+ * write transaction blocks all other writers. Thus, as soon as a ref
+ * transaction is opened, we know that any values we read won't
+ * change out from under us, and we have a fully-consistent view of the
+ * database.
+ *
+ * We store the content of refs including the trailing \0 so that
+ * standard C string functions can handle them. Just like struct
+ * strbuf.
+ */
+#include "../cache.h"
+#include <lmdb.h>
+#include "../object.h"
+#include "../refs.h"
+#include "refs-internal.h"
+#include "../tag.h"
+#include "../lockfile.h"
+
+static MDB_env *env;
+
+static char *db_path;
+
+struct lmdb_transaction {
+ MDB_txn *txn;
+ MDB_dbi dbi;
+ MDB_cursor *cursor;
+ const char *submodule;
+ int flags;
+};
+
+struct lmdb_transaction transaction;
+
+static char *get_refdb_path(const char *base)
+{
+ static struct strbuf path_buf = STRBUF_INIT;
+ strbuf_reset(&path_buf);
+ strbuf_addf(&path_buf, "%s/refdb", base);
+ return path_buf.buf;
+}
+
+static int in_write_transaction(void)
+{
+ return transaction.txn && !(transaction.flags & MDB_RDONLY);
+}
+
+static void init_env(MDB_env **env, const char *path)
+{
+ int ret;
+ if (*env)
+ return;
+
+ assert(path);
+
+ ret = mdb_env_create(env);
+ if (ret)
+ die("BUG: mdb_env_create failed: %s", mdb_strerror(ret));
+ ret = mdb_env_set_maxreaders(*env, 1000);
+ if (ret)
+ die("BUG: mdb_env_set_maxreaders failed: %s", mdb_strerror(ret));
+ ret = mdb_env_set_mapsize(*env, (1<<30));
+ if (ret)
+ die("BUG: mdb_set_mapsize failed: %s", mdb_strerror(ret));
+ ret = mdb_env_open(*env, path, 0 , 0664);
+ if (ret)
+ die("BUG: mdb_env_open (%s) failed: %s", path,
+ mdb_strerror(ret));
+}
+
+static int lmdb_init_db(struct strbuf *err, int shared)
+{
+ /*
+ * To create a db, all we need to do is make a directory for
+ * it to live in; lmdb will do the rest.
+ */
+
+ if (!db_path)
+ db_path = xstrdup(real_path(get_refdb_path(get_git_common_dir())));
+
+ if (mkdir(db_path, 0775) && errno != EEXIST) {
+ strbuf_addf(err, "%s", strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+
+static void mdb_cursor_open_or_die(struct lmdb_transaction *transaction,
+ MDB_cursor **cursor)
+{
+ int ret = mdb_cursor_open(transaction->txn, transaction->dbi, cursor);
+ if (ret)
+ die("BUG: mdb_cursor_open failed: %s", mdb_strerror(ret));
+}
+
+static void submodule_path(struct strbuf *sb, const char *submodule,
+ const char *refname)
+{
+ if (submodule)
+ strbuf_git_path_submodule(sb, submodule, "%s", refname);
+ else
+ strbuf_git_path(sb, "%s", refname);
+}
+
+static int read_per_worktree_ref(const char *submodule, const char *refname,
+ struct MDB_val *val, int *needs_free)
+{
+ struct strbuf sb = STRBUF_INIT;
+ struct strbuf path = STRBUF_INIT;
+ struct stat st;
+ int ret = -1;
+
+ submodule_path(&path, submodule, refname);
+
+#ifndef NO_SYMLINK_HEAD
+ if (lstat(path.buf, &st)) {
+ if (errno == ENOENT)
+ ret = MDB_NOTFOUND;
+ goto done;
+ }
+ if (S_ISLNK(st.st_mode)) {
+ strbuf_readlink(&sb, path.buf, 0);
+ if (starts_with(sb.buf, "refs/") &&
+ !check_refname_format(sb.buf, 0)) {
+ val->mv_data = xstrfmt("ref: %s", sb.buf);
+ val->mv_size = strlen(val->mv_data) + 1;
+ ret = 0;
+ } else {
+ ret = MDB_NOTFOUND;
+ }
+ strbuf_release(&sb);
+ goto done;
+ }
+#endif
+
+ if (strbuf_read_file(&sb, path.buf, 200) < 0) {
+ strbuf_release(&sb);
+ if (errno == ENOENT)
+ ret = MDB_NOTFOUND;
+ goto done;
+ }
+ strbuf_rtrim(&sb);
+
+ val->mv_data = strbuf_detach(&sb, &val->mv_size);
+ val->mv_size++;
+
+ ret = 0;
+done:
+ strbuf_release(&path);
+ *needs_free = !ret;
+ return ret;
+}
+
+static void write_per_worktree_ref(const char *submodule, const char *refname,
+ MDB_val *val)
+{
+ static struct lock_file lock;
+ int fd;
+ int len = val->mv_size - 1;
+ struct strbuf path = STRBUF_INIT;
+
+ submodule_path(&path, submodule, refname);
+ safe_create_leading_directories(path.buf);
+
+ fd = hold_lock_file_for_update(&lock, path.buf, LOCK_DIE_ON_ERROR);
+ strbuf_release(&path);
+
+ if (write_in_full(fd, val->mv_data, len) != len ||
+ write_in_full(fd, "\n", 1) != 1)
+ die_errno(_("failed to write new HEAD"));
+
+ if (commit_lock_file(&lock))
+ die_errno(_("failed to write new HEAD"));
+}
+
+static int del_per_worktree_ref(const char *submodule, const char *refname,
+ MDB_val *val)
+{
+ struct strbuf path = STRBUF_INIT;
+ int result;
+
+ /*
+ * Returning deleted ref data is not yet implemented, but no
+ * callers need it.
+ */
+ assert(val == NULL);
+
+ submodule_path(&path, submodule, refname);
+
+ result = unlink(path.buf);
+ strbuf_release(&path);
+ if (result && errno != ENOENT)
+ return 1;
+
+ return 0;
+}
+
+/*
+ * Read a ref. If the ref is a per-worktree ref, read it from disk.
+ * Otherwise, read it from LMDB. LMDB manages its own memory, so the
+ * data returned in *val will ordinarily not need to be freed. But
+ * when a per-worktree ref is (successfully) read, non-LMDB memory is
+ * allocated. In this case, *needs_free is set so that the caller can
+ * free the memory when it is done with it.
+ */
+static int mdb_get_or_die(struct lmdb_transaction *transaction, MDB_val *key,
+ MDB_val *val, int *needs_free)
+{
+ int ret;
+
+ if (ref_type(key->mv_data) != REF_TYPE_NORMAL)
+ return read_per_worktree_ref(transaction->submodule,
+ key->mv_data, val, needs_free);
+
+ *needs_free = 0;
+ ret = mdb_get(transaction->txn, transaction->dbi, key, val);
+ if (ret) {
+ if (ret != MDB_NOTFOUND)
+ die("BUG: mdb_get failed: %s", mdb_strerror(ret));
+ return ret;
+ }
+ return 0;
+}
+
+static int mdb_del_or_die(struct lmdb_transaction *transaction, MDB_val *key,
+ MDB_val *val)
+{
+ int ret;
+
+ if (ref_type(key->mv_data) != REF_TYPE_NORMAL)
+ die("BUG: this backend should only try to delete normal refs");
+
+ ret = mdb_del(transaction->txn, transaction->dbi, key, val);
+ if (ret) {
+ if (ret != MDB_NOTFOUND)
+ die("BUG: mdb_del failed: %s", mdb_strerror(ret));
+ return ret;
+ }
+ return 0;
+}
+
+static void mdb_put_or_die(struct lmdb_transaction *transaction, MDB_val *key,
+ MDB_val *val, int mode)
+{
+ int ret;
+
+ if (ref_type(key->mv_data) != REF_TYPE_NORMAL)
+ die("BUG: this backend should only try to write normal refs");
+
+ ret = mdb_put(transaction->txn, transaction->dbi, key, val, mode);
+ if (ret) {
+ if (ret == MDB_BAD_VALSIZE)
+ die(_("Ref name %s too long (max size is %d)"),
+ (const char *)key->mv_data,
+ mdb_env_get_maxkeysize(env));
+ else
+ die("BUG: mdb_put failed: (%s -> %s) %s",
+ (const char *)key->mv_data,
+ (const char *)val->mv_data, mdb_strerror(ret));
+ }
+}
+
+static int mdb_cursor_get_or_die(MDB_cursor *cursor, MDB_val *key, MDB_val *val, int mode)
+{
+ int ret;
+
+ ret = mdb_cursor_get(cursor, key, val, mode);
+ if (ret) {
+ if (ret != MDB_NOTFOUND)
+ die("BUG: mdb_cursor_get failed: %s", mdb_strerror(ret));
+ return ret;
+ }
+ assert(((char *)val->mv_data)[val->mv_size - 1] == 0);
+ return 0;
+}
+
+static int mdb_cursor_del_or_die(MDB_cursor *cursor, int flags)
+{
+ int ret = mdb_cursor_del(cursor, flags);
+ if (ret) {
+ if (ret != MDB_NOTFOUND)
+ die("BUG: mdb_cursor_del failed: %s", mdb_strerror(ret));
+ return ret;
+ }
+ return 0;
+}
+
+/*
+ * Begin a transaction. Because only one transaction per thread is
+ * permitted, we use a global transaction object. If a read-write
+ * transaction is presently already in-progress, and a read-only
+ * transaction is requested, the read-write transaction will be
+ * returned instead. If a read-write transaction is requested and a
+ * read-only transaction is open, the read-only transaction will be
+ * closed.
+ *
+ * It is a bug to request a read-write transaction during another
+ * read-write transaction.
+ *
+ * As a result, it is unsafe to retain read-only transactions past the
+ * point where a read-write transaction might be needed. For
+ * instance, any call that has callbacks outside this module must
+ * conclude all of its reads from the database before calling those
+ * callbacks, or must reacquire the transaction after its callbacks
+ * are completed.
+ */
+int lmdb_transaction_begin_flags(struct strbuf *err, unsigned int flags)
+{
+ int ret;
+ MDB_txn *txn;
+ static size_t last_txnid = 0;
+ int force_restart = 0;
+ MDB_envinfo stat;
+
+ if (!db_path)
+ db_path = xstrdup(real_path(get_refdb_path(get_git_common_dir())));
+ init_env(&env, db_path);
+
+ /*
+ * Since each transaction sees a consistent view of the db,
+ * downstream processes that write the db won't be seen in
+ * this transaction. We can check if the last transaction id
+ * has changed since this read transaction was started, and if
+ * so, we want to reopen the transaction.
+ */
+
+ mdb_env_info(env, &stat);
+ if (stat.me_last_txnid != last_txnid) {
+ force_restart = 1;
+ last_txnid = stat.me_last_txnid;
+ }
+
+ if (!transaction.txn) {
+ ret = mdb_txn_begin(env, NULL, flags, &txn);
+ if (ret) {
+ strbuf_addf(err, "BUG: mdb_txn_begin failed: %s",
+ mdb_strerror(ret));
+ return -1;
+ }
+ ret = mdb_dbi_open(txn, NULL, 0, &transaction.dbi);
+ if (ret) {
+ strbuf_addf(err, "BUG: mdb_txn_open failed: %s",
+ mdb_strerror(ret));
+ return -1;
+ }
+ transaction.txn = txn;
+ transaction.flags = flags;
+ return 0;
+ }
+
+ if (transaction.flags == flags && !(flags & MDB_RDONLY))
+ die("BUG: rw transaction started during another rw txn");
+
+ if (force_restart || (transaction.flags != flags && transaction.flags & MDB_RDONLY)) {
+ /*
+ * RO -> RW, or forced restart due to possible changes
+ * from downstream processes.
+ */
+ mdb_txn_abort(transaction.txn);
+ ret = mdb_txn_begin(env, NULL, flags, &txn);
+ if (ret) {
+ strbuf_addf(err, "BUG: restarting txn: mdb_txn_begin failed: %s",
+ mdb_strerror(ret));
+ return -1;
+ }
+ ret = mdb_dbi_open(txn, NULL, 0, &transaction.dbi);
+ if (ret) {
+ strbuf_addf(err, "BUG: mdb_txn_open failed: %s",
+ mdb_strerror(ret));
+ return -1;
+ }
+ transaction.txn = txn;
+ transaction.flags = flags;
+ }
+ /* RW -> RO just keeps the RW txn */
+ return 0;
+}
+
+static struct lmdb_transaction *lmdb_transaction_begin_flags_or_die(int flags)
+{
+ struct strbuf err = STRBUF_INIT;
+ if (lmdb_transaction_begin_flags(&err, flags))
+ die("%s", err.buf);
+ return &transaction;
+}
+
+#define MAXDEPTH 5
+
+static const char *parse_ref_data(struct lmdb_transaction *transaction,
+ const char *refname, const char *ref_data,
+ unsigned char *sha1, int resolve_flags,
+ int *flags, int bad_name)
+{
+ int depth = MAXDEPTH;
+ const char *buf;
+ static struct strbuf refname_buffer = STRBUF_INIT;
+ static struct strbuf refdata_buffer = STRBUF_INIT;
+ MDB_val key, val;
+ int needs_free = 0;
+
+ for (;;) {
+ if (--depth < 0)
+ return NULL;
+
+ if (!starts_with(ref_data, "ref:")) {
+ if (get_sha1_hex(ref_data, sha1) ||
+ (ref_data[40] != '\0' && !isspace(ref_data[40]))) {
+ if (flags)
+ *flags |= REF_ISBROKEN;
+ errno = EINVAL;
+ return NULL;
+ }
+
+ if (bad_name) {
+ hashclr(sha1);
+ if (flags)
+ *flags |= REF_ISBROKEN;
+ } else if (is_null_sha1(sha1)) {
+ if (flags)
+ *flags |= REF_ISBROKEN;
+ }
+ return refname;
+ }
+ if (flags)
+ *flags |= REF_ISSYMREF;
+ buf = ref_data + 4;
+ while (isspace(*buf))
+ buf++;
+ strbuf_reset(&refname_buffer);
+ strbuf_addstr(&refname_buffer, buf);
+ refname = refname_buffer.buf;
+ if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
+ hashclr(sha1);
+ return refname;
+ }
+ if (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) {
+ if (flags)
+ *flags |= REF_ISBROKEN;
+
+ if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
+ !refname_is_safe(buf)) {
+ errno = EINVAL;
+ return NULL;
+ }
+ bad_name = 1;
+ }
+
+ key.mv_data = (char *)refname;
+ key.mv_size = strlen(refname) + 1;
+ if (mdb_get_or_die(transaction, &key, &val, &needs_free)) {
+ hashclr(sha1);
+ if (bad_name) {
+ if (flags)
+ *flags |= REF_ISBROKEN;
+ }
+ if (resolve_flags & RESOLVE_REF_READING)
+ return NULL;
+
+ return refname;
+ }
+ strbuf_reset(&refdata_buffer);
+ strbuf_add(&refdata_buffer, val.mv_data, val.mv_size);
+ if (needs_free)
+ free(val.mv_data);
+ ref_data = refdata_buffer.buf;
+ }
+ return refname;
+}
+
+static int verify_refname_available_txn(struct lmdb_transaction *transaction,
+ const char *refname,
+ struct string_list *extras,
+ struct string_list *skip,
+ struct strbuf *err)
+{
+ MDB_cursor *cursor;
+ MDB_val key;
+ MDB_val val;
+ int mdb_ret;
+ size_t refname_len;
+ char *search_key;
+ const char *extra_refname;
+ int ret = 1;
+ size_t i;
+
+ mdb_cursor_open_or_die(transaction, &cursor);
+
+ refname_len = strlen(refname) + 2;
+ key.mv_size = refname_len;
+ search_key = xmalloc(refname_len);
+ memcpy(search_key, refname, refname_len - 2);
+ search_key[refname_len - 2] = '/';
+ search_key[refname_len - 1] = 0;
+ key.mv_data = search_key;
+
+ /* Check for subdirs of refname: we start at refname/ */
+ mdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE);
+
+ while (!mdb_ret) {
+ if (starts_with(key.mv_data, refname) &&
+ ((char *)key.mv_data)[refname_len - 2] == '/') {
+ if (skip && string_list_has_string(skip, key.mv_data))
+ goto next;
+
+ strbuf_addf(err, _("'%s' exists; cannot create '%s'"), (char *)key.mv_data, refname);
+ goto done;
+ }
+ break;
+ next:
+ mdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_NEXT);
+ }
+
+ /* Check for parent dirs of refname. */
+ for (i = 0; i < refname_len - 2; i++) {
+ if (search_key[i] == '/') {
+ search_key[i] = 0;
+ if (skip && string_list_has_string(skip, search_key)) {
+ search_key[i] = '/';
+ continue;
+ }
+
+ if (extras && string_list_has_string(extras, search_key)) {
+ strbuf_addf(err, _("cannot process '%s' and '%s' at the same time"),
+ refname, search_key);
+ goto done;
+ }
+
+ key.mv_data = search_key;
+ key.mv_size = i + 1;
+ if (!mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET)) {
+ strbuf_addf(err, _("'%s' exists; cannot create '%s'"), (char *)key.mv_data, refname);
+ goto done;
+ }
+ search_key[i] = '/';
+ }
+ }
+
+ extra_refname = find_descendant_ref(refname, extras, skip);
+ if (extra_refname) {
+ strbuf_addf(err,
+ _("cannot process '%s' and '%s' at the same time"),
+ refname, extra_refname);
+ ret = 1;
+ } else {
+ ret = 0;
+ }
+done:
+ mdb_cursor_close(cursor);
+ free(search_key);
+ return ret;
+}
+
+static const char *resolve_ref_unsafe_txn(struct lmdb_transaction *transaction,
+ const char *refname,
+ int resolve_flags,
+ unsigned char *sha1,
+ int *flags)
+{
+ int bad_name = 0;
+ char *ref_data;
+ struct MDB_val key, val;
+ struct strbuf err = STRBUF_INIT;
+ int needs_free = 0;
+ const char *ret;
+
+ val.mv_size = 0;
+ val.mv_data = NULL;
+
+ if (flags)
+ *flags = 0;
+
+ if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
+ if (flags)
+ *flags |= REF_BAD_NAME;
+
+ if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
+ !refname_is_safe(refname)) {
+ errno = EINVAL;
+ return NULL;
+ }
+ /*
+ * dwim_ref() uses REF_ISBROKEN to distinguish between
+ * missing refs and refs that were present but invalid,
+ * to complain about the latter to stderr.
+ *
+ * We don't know whether the ref exists, so don't set
+ * REF_ISBROKEN yet.
+ */
+ bad_name = 1;
+ }
+
+ key.mv_data = (void *)refname;
+ key.mv_size = strlen(refname) + 1;
+ if (mdb_get_or_die(transaction, &key, &val, &needs_free)) {
+ if (bad_name) {
+ hashclr(sha1);
+ if (flags)
+ *flags |= REF_ISBROKEN;
+ }
+
+ if (resolve_flags & RESOLVE_REF_READING)
+ return NULL;
+
+ if (verify_refname_available_txn(transaction, refname, NULL, NULL, &err)) {
+ error("%s", err.buf);
+ strbuf_release(&err);
+ return NULL;
+ }
+
+ hashclr(sha1);
+ return refname;
+ }
+
+ ref_data = val.mv_data;
+ assert(ref_data[val.mv_size - 1] == 0);
+
+ ret = parse_ref_data(transaction, refname, ref_data, sha1,
+ resolve_flags, flags, bad_name);
+ if (needs_free)
+ free(ref_data);
+ return ret;
+}
+
+static const char *lmdb_resolve_ref_unsafe(const char *refname, int resolve_flags,
+ unsigned char *sha1, int *flags)
+{
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+ return resolve_ref_unsafe_txn(&transaction, refname,
+ resolve_flags, sha1, flags);
+}
+
+static void write_u64(char *buf, uint64_t number)
+{
+ int i;
+
+ for (i = 0; i < 8; i++)
+ buf[i] = (number >> (i * 8)) & 0xff;
+}
+
+static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *cb_data)
+{
+ unsigned char osha1[20], nsha1[20];
+ char *email_end, *message;
+ unsigned long timestamp;
+ int tz;
+
+ /* old (raw sha) new (raw sha) name <email> SP time TAB msg LF */
+ if (sb->len < 41 || sb->buf[sb->len - 1] != '\n' ||
+ !(email_end = strchr(sb->buf + 40, '>')) ||
+ email_end[1] != ' ')
+ return 0; /* corrupt? */
+
+ timestamp = strtoul(email_end + 2, &message, 10);
+
+ if (!timestamp ||
+ !message || message[0] != ' ' ||
+ (message[1] != '+' && message[1] != '-') ||
+ !isdigit(message[2]) || !isdigit(message[3]) ||
+ !isdigit(message[4]) || !isdigit(message[5]))
+ return 0; /* corrupt? */
+
+ hashcpy(osha1, (const unsigned char *)sb->buf);
+ hashcpy(nsha1, (const unsigned char *)sb->buf + 20);
+
+ email_end[1] = '\0';
+ tz = strtol(message + 1, NULL, 10);
+ if (message[6] != '\t')
+ message += 6;
+ else
+ message += 7;
+ return fn(osha1, nsha1, sb->buf + 40, timestamp, tz, message, cb_data);
+}
+
+static void format_reflog_entry(struct strbuf *buf,
+ const unsigned char *old_sha1,
+ const unsigned char *new_sha1,
+ const char *committer, const char *msg)
+{
+ int len;
+ int msglen;
+
+ assert(buf->len == 0);
+ strbuf_add(buf, old_sha1, 20);
+ strbuf_add(buf, new_sha1, 20);
+ strbuf_addstr(buf, committer);
+ strbuf_addch(buf, '\n');
+
+ len = buf->len;
+ msglen = msg ? strlen(msg) : 0;
+ if (msglen) {
+ int copied;
+ strbuf_grow(buf, msglen + 1);
+ copied = copy_reflog_msg(buf->buf + 40 + strlen(committer), msg) - 1;
+ buf->len = len + copied;
+ buf->buf[buf->len] = 0;
+ }
+}
+
+static int log_ref_write(const char *refname,
+ const unsigned char *old_sha1,
+ const unsigned char *new_sha1,
+ const char *msg,
+ int flags,
+ struct strbuf *err)
+{
+ MDB_val key, val;
+ uint64_t now = getnanotime();
+ int result;
+ struct strbuf log_key = STRBUF_INIT;
+ int refname_len;
+ MDB_cursor *cursor;
+ struct strbuf buf = STRBUF_INIT;
+ const char *timestamp;
+ uint64_t zero = 0;
+
+ if (log_all_ref_updates < 0)
+ log_all_ref_updates = !is_bare_repository();
+
+ /* it is assumed that we are in a ref transaction here */
+ assert(transaction.txn);
+
+ result = safe_create_reflog(refname, flags & REF_FORCE_CREATE_REFLOG, err);
+ if (result)
+ return result;
+
+ /* "logs/" + refname + \0 + 8-byte timestamp for sorting and expiry. */
+ refname_len = strlen(refname);
+
+ strbuf_addf(&log_key, "logs/%s", refname);
+ strbuf_add(&log_key, &zero, 8);
+ key.mv_data = log_key.buf;
+ key.mv_size = log_key.len + 1;
+
+ mdb_cursor_open_or_die(&transaction, &cursor);
+
+ /* if no reflog exists, we're done */
+ if (mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE) ||
+ strcmp(key.mv_data, log_key.buf))
+ goto done;
+
+ /* Is this a header? We only need the header for empty reflogs */
+ timestamp = (const char *)key.mv_data + refname_len + 6;
+ if (ntohll(*(uint64_t *)timestamp) == 0)
+ mdb_cursor_del_or_die(cursor, 0);
+
+ key.mv_data = log_key.buf;
+
+ write_u64((char *)key.mv_data + refname_len + 6, htonll(now));
+
+ format_reflog_entry(&buf, old_sha1, new_sha1,
+ git_committer_info(0), msg);
+ assert(buf.len >= 42);
+ val.mv_data = buf.buf;
+ val.mv_size = buf.len + 1;
+
+ mdb_put_or_die(&transaction, &key, &val, 0);
+ strbuf_release(&buf);
+
+done:
+ strbuf_release(&log_key);
+ mdb_cursor_close(cursor);
+ return 0;
+}
+
+static int lmdb_verify_refname_available(const char *refname,
+ struct string_list *extras,
+ struct string_list *skip,
+ struct strbuf *err)
+{
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+ return verify_refname_available_txn(&transaction, refname, extras, skip, err);
+}
+
+/*
+ * Attempt to resolve `refname` to `old_sha1` (if old_sha1 is
+ * non-null). The return value is a pointer to a newly-allocated
+ * string containing the next ref name that this resolves to. So if
+ * HEAD is a symbolic ref to refs/heads/example, which is itself a
+ * symbolic ref to refs/heads/foo, return refs/heads/example,
+ * and fill in resolved_sha1 with the sha of refs/heads/foo.
+ */
+static char *check_ref(MDB_txn *txn, const char *refname,
+ const unsigned char *old_sha1,
+ unsigned char *resolved_sha1, int flags,
+ int *type_p)
+{
+ int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
+ int resolve_flags = 0;
+ int type;
+ char *resolved_refname;
+
+ if (mustexist)
+ resolve_flags |= RESOLVE_REF_READING;
+ if (flags & REF_DELETING) {
+ resolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME;
+ if (flags & REF_NODEREF)
+ resolve_flags |= RESOLVE_REF_NO_RECURSE;
+ }
+
+ /*
+ * The first time we resolve the refname, we're just trying to
+ * see if there is any ref at all by this name, even if it is
+ * a broken symref.
+ */
+ refname = resolve_ref_unsafe(refname, resolve_flags,
+ resolved_sha1, &type);
+ if (type_p)
+ *type_p = type;
+
+ if (!refname)
+ return NULL;
+
+ /*
+ * Need to copy refname here because the resolve_ref_unsafe
+ * returns a pointer to a static buffer that could get mangled
+ * by the second call.
+ */
+ resolved_refname = xstrdup(refname);
+
+ if (old_sha1) {
+ if (flags & REF_NODEREF) {
+ resolve_flags &= ~RESOLVE_REF_NO_RECURSE;
+
+ resolve_ref_unsafe(refname, resolve_flags,
+ resolved_sha1, &type);
+ }
+ if (hashcmp(old_sha1, resolved_sha1)) {
+ error(_("ref %s is at %s but expected %s"), refname,
+ sha1_to_hex(resolved_sha1), sha1_to_hex(old_sha1));
+
+ return NULL;
+ }
+ }
+ return resolved_refname;
+}
+
+static int mdb_transaction_commit(struct lmdb_transaction *transaction,
+ struct strbuf *err)
+{
+ int result;
+
+ result = mdb_txn_commit(transaction->txn);
+ if (result && err)
+ strbuf_addstr(err, mdb_strerror(result));
+
+ transaction->txn = NULL;
+ return result;
+}
+
+static int lmdb_delete_reflog(const char *refname)
+{
+ MDB_val key, val;
+ char *log_path;
+ int len;
+ MDB_cursor *cursor;
+ int ret = 0;
+ int mdb_ret;
+ struct strbuf err = STRBUF_INIT;
+ int in_transaction;
+
+ if (ref_type(refname) != REF_TYPE_NORMAL)
+ return refs_be_files.delete_reflog(refname);
+
+ in_transaction = in_write_transaction();
+
+ log_path = xstrfmt("logs/%s", refname);
+ len = strlen(log_path) + 1;
+
+ key.mv_data = log_path;
+ key.mv_size = len;
+
+ if (!in_transaction)
+ lmdb_transaction_begin_flags_or_die(0);
+
+ mdb_cursor_open_or_die(&transaction, &cursor);
+
+ mdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE);
+
+ while (!mdb_ret) {
+ if (key.mv_size < len)
+ break;
+
+ if (!starts_with(key.mv_data, log_path) ||
+ ((char *)key.mv_data)[len - 1] != 0)
+ break;
+
+ mdb_cursor_del_or_die(cursor, 0);
+ mdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_NEXT);
+ }
+
+ free(log_path);
+ mdb_cursor_close(cursor);
+ transaction.cursor = NULL;
+
+ if (!in_transaction && mdb_transaction_commit(&transaction, &err)) {
+ warning("%s", err.buf);
+ ret = 01;
+ }
+ strbuf_release(&err);
+ return ret;
+}
+
+#define REF_NO_REFLOG 0x8000
+
+static int lmdb_transaction_update(const char *refname,
+ const unsigned char *new_sha1,
+ const unsigned char *old_sha1,
+ unsigned int flags, const char *msg,
+ struct strbuf *err)
+{
+ const char *orig_refname = refname;
+ MDB_val key, val;
+ unsigned char resolved_sha1[20];
+ int type;
+ int ret = -1;
+
+ if ((flags & REF_HAVE_NEW) && is_null_sha1(new_sha1))
+ flags |= REF_DELETING;
+
+ if (new_sha1 && !is_null_sha1(new_sha1) &&
+ check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
+ strbuf_addf(err, _("refusing to update ref with bad name %s"),
+ refname);
+ return TRANSACTION_GENERIC_ERROR;
+ }
+
+ refname = check_ref(transaction.txn, orig_refname, old_sha1,
+ resolved_sha1, flags, &type);
+ if (refname == NULL) {
+ strbuf_addf(err, _("cannot lock the ref '%s'"), orig_refname);
+ return TRANSACTION_GENERIC_ERROR;
+ }
+
+ if (!(flags & REF_DELETING) && is_null_sha1(resolved_sha1) &&
+ verify_refname_available_txn(&transaction, refname, NULL, NULL, err))
+ return TRANSACTION_NAME_CONFLICT;
+
+ if (flags & REF_NODEREF) {
+ free((void *)refname);
+ refname = orig_refname;
+ }
+
+ key.mv_size = strlen(refname) + 1;
+ key.mv_data = (void *)refname;
+
+ if ((flags & REF_HAVE_NEW) && !is_null_sha1(new_sha1)) {
+ int overwriting_symref = ((type & REF_ISSYMREF) &&
+ (flags & REF_NODEREF));
+
+ struct object *o = parse_object(new_sha1);
+ if (!o) {
+ strbuf_addf(err,
+ _("Trying to write ref %s with nonexistent object %s"),
+ refname, sha1_to_hex(new_sha1));
+ goto done;
+ }
+ if (o->type != OBJ_COMMIT && is_branch(refname)) {
+ strbuf_addf(err,
+ _("Trying to write non-commit object %s to branch %s"),
+ sha1_to_hex(new_sha1), refname);
+ goto done;
+ }
+
+ if (!overwriting_symref
+ && !hashcmp(resolved_sha1, new_sha1)) {
+ /*
+ * The reference already has the desired
+ * value, so we don't need to write it.
+ */
+ flags |= REF_NO_REFLOG;
+ } else {
+ val.mv_size = 41;
+ if (new_sha1)
+ val.mv_data = sha1_to_hex(new_sha1);
+ else
+ val.mv_data = sha1_to_hex(null_sha1);
+ mdb_put_or_die(&transaction, &key, &val, 0);
+ }
+ }
+
+ if (flags & REF_DELETING) {
+ if (mdb_del_or_die(&transaction, &key, NULL)) {
+ if (old_sha1 && !is_null_sha1(old_sha1)) {
+ strbuf_addf(err, _("No such ref %s"), refname);
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto done;
+ }
+ }
+ lmdb_delete_reflog(orig_refname);
+ } else if (!(flags & REF_NO_REFLOG)) {
+ if (!new_sha1)
+ new_sha1 = null_sha1;
+ if (log_ref_write(orig_refname, resolved_sha1,
+ new_sha1, msg, flags, err) < 0)
+ goto done;
+ if (strcmp(refname, orig_refname) &&
+ log_ref_write(refname, resolved_sha1,
+ new_sha1, msg, flags, err) < 0)
+ goto done;
+ }
+
+ ret = 0;
+done:
+ if (refname != orig_refname)
+ free((void *) refname);
+ return ret;
+}
+
+static int lmdb_transaction_commit(struct ref_transaction *ref_transaction,
+ struct string_list *affected_refnames,
+ struct strbuf *err)
+{
+ int ret = 0, i;
+ int n = ref_transaction->nr;
+ struct ref_update **updates = ref_transaction->updates;
+
+ /*
+ * We might already be in a write transaction, because some
+ * lmdb backend functionality is implemented in terms of
+ * (other stuff) + ref_transaction_commit
+ */
+ if (!in_write_transaction())
+ lmdb_transaction_begin_flags_or_die(0);
+
+ for (i = 0; i < n; i++) {
+ struct ref_update *update = updates[i];
+
+ if (lmdb_transaction_update(update->refname,
+ update->new_sha1,
+ (update->flags & REF_HAVE_OLD) ?
+ update->old_sha1 : NULL,
+ update->flags,
+ update->msg,
+ err)) {
+ mdb_txn_abort(transaction.txn);
+ ret = -1;
+ goto cleanup;
+ }
+
+ }
+ ret = mdb_transaction_commit(&transaction, err);
+
+cleanup:
+ ref_transaction->state = REF_TRANSACTION_CLOSED;
+ return ret;
+}
+
+static int rename_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
+ const char *email, unsigned long timestamp, int tz,
+ const char *message, void *cb_data)
+{
+
+ const char *newrefname = cb_data;
+ MDB_val key, new_key, val;
+ struct strbuf new_key_buf = STRBUF_INIT;
+
+ assert(transaction.cursor);
+
+ if (mdb_cursor_get_or_die(transaction.cursor, &key, &val, MDB_GET_CURRENT))
+ die("BUG: renaming ref: mdb_cursor_get failed to get current");
+
+ /* This must really be a reflog entry */
+ assert(val.mv_size > 42);
+
+ strbuf_addf(&new_key_buf, "logs/%s", newrefname);
+ strbuf_add(&new_key_buf, key.mv_data + key.mv_size - 8, 8);
+
+ new_key.mv_size = new_key_buf.len + 1;
+ new_key.mv_data = new_key_buf.buf;
+ mdb_put_or_die(&transaction, &new_key, &val, 0);
+ mdb_cursor_del_or_die(transaction.cursor, 0);
+ strbuf_release(&new_key_buf);
+ return 0;
+}
+
+static int lmdb_rename_ref(const char *oldref, const char *newref, const char *logmsg)
+{
+ unsigned char orig_sha1[20];
+ int flag = 0;
+ int log = reflog_exists(oldref);
+ const char *symref = NULL;
+ struct strbuf err = STRBUF_INIT;
+ struct ref_transaction *ref_transaction;
+
+ if (!strcmp(oldref, newref))
+ return 0;
+
+ lmdb_transaction_begin_flags_or_die(0);
+
+ ref_transaction = ref_transaction_begin(&err);
+ if (!ref_transaction)
+ die("%s", err.buf);
+
+ symref = resolve_ref_unsafe(oldref, RESOLVE_REF_READING,
+ orig_sha1, &flag);
+ if (flag & REF_ISSYMREF) {
+ error(_("refname %s is a symbolic ref, renaming it is not supported"),
+ oldref);
+ goto fail;
+ }
+ if (!symref) {
+ mdb_txn_abort(transaction.txn);
+ error(_("refname %s not found"), oldref);
+ goto fail;
+ }
+ if (!rename_ref_available(oldref, newref))
+ goto fail;
+
+ /* Copy the reflog from the old to the new */
+ if (log) {
+ struct strbuf old_log_sentinel = STRBUF_INIT;
+ MDB_val key;
+ int log_all;
+
+ log_all = log_all_ref_updates;
+ log_all_ref_updates = 1;
+ if (safe_create_reflog(newref, 0, &err)) {
+ error(_("can't create reflog for %s: %s"), newref, err.buf);
+ strbuf_release(&err);
+ goto fail;
+ }
+ log_all_ref_updates = log_all;
+
+ for_each_reflog_ent(oldref, rename_reflog_ent, (void *)newref);
+ strbuf_addf(&old_log_sentinel, "logs/%sxxxxxxxx", oldref);
+ memset(old_log_sentinel.buf + old_log_sentinel.len - 8, 0, 8);
+
+ key.mv_size = old_log_sentinel.len;
+ key.mv_data = old_log_sentinel.buf;
+
+ /* It's OK if the old reflog is missing */
+ mdb_del_or_die(&transaction, &key, NULL);
+ strbuf_release(&old_log_sentinel);
+ }
+
+ if (ref_transaction_delete(ref_transaction, oldref,
+ orig_sha1, REF_NODEREF, NULL, &err)) {
+ error(_("unable to delete old %s"), oldref);
+ goto fail;
+ }
+
+ if (ref_transaction_update(ref_transaction, newref, orig_sha1, NULL,
+ 0, logmsg, &err)) {
+ error("%s", err.buf);
+ goto fail;
+ }
+
+ if (ref_transaction_commit(ref_transaction, &err)) {
+ error("%s", err.buf);
+ goto fail;
+ }
+
+ return 0;
+
+fail:
+ ref_transaction_free(ref_transaction);
+ strbuf_release(&err);
+ mdb_txn_abort(transaction.txn);
+ return 1;
+}
+
+static int lmdb_delete_refs(struct string_list *refnames)
+{
+ int i;
+ struct strbuf err = STRBUF_INIT;
+ int result = 0;
+
+ if (!refnames->nr)
+ return 0;
+
+ lmdb_transaction_begin_flags_or_die(0);
+
+ for (i = 0; i < refnames->nr; i++) {
+ const char *refname = refnames->items[i].string;
+
+ if (lmdb_transaction_update(refname, null_sha1, NULL,
+ REF_DELETING, NULL, &err))
+ result |= error(_("could not remove reference %s: %s"),
+ refname, err.buf);
+ }
+
+ result |= mdb_transaction_commit(&transaction, &err);
+ strbuf_release(&err);
+ return 0;
+}
+
+static int lmdb_for_each_reflog_ent_order(const char *refname,
+ each_reflog_ent_fn fn,
+ void *cb_data, int reverse)
+{
+ MDB_val key, val;
+ char *search_key;
+ char *log_path;
+ int len;
+ MDB_cursor *cursor;
+ int ret = 0;
+ struct strbuf sb = STRBUF_INIT;
+ enum MDB_cursor_op direction = reverse ? MDB_PREV : MDB_NEXT;
+ uint64_t zero = 0ULL;
+
+ log_path = xstrfmt("logs/%s", refname);
+ len = strlen(log_path) + 1;
+
+ if (reverse) {
+ /*
+ * For a reverse search, start at the key
+ * lexicographically after the searched-for key.
+ * That's the one with \1 appended to the key.
+ */
+ search_key = xstrfmt("%s\1", log_path);
+ key.mv_size = len + 1;
+ } else {
+ search_key = xstrdup(log_path);
+ key.mv_size = len;
+ }
+
+ key.mv_data = search_key;
+
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+
+ mdb_cursor_open_or_die(&transaction, &cursor);
+
+ transaction.cursor = cursor;
+
+ /*
+ * MDB's cursor API requires that the first mdb_cursor_get be
+ * called with MDB_SET_RANGE. For reverse searches, this will
+ * give us the entry one-past the entry we're looking for, so
+ * we should jump back using MDB_PREV.
+ */
+ mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE);
+ if (direction == MDB_PREV)
+ mdb_cursor_get_or_die(cursor, &key, &val, direction);
+
+ do {
+ if (key.mv_size < len)
+ break;
+
+ if (!starts_with(key.mv_data, log_path) || ((char *)key.mv_data)[len - 1] != 0)
+ break;
+
+ if (!memcmp(&zero, ((char *)key.mv_data) + key.mv_size - 8, 8))
+ continue;
+
+ assert(val.mv_size != 0);
+
+ strbuf_add(&sb, val.mv_data, val.mv_size - 1);
+ ret = show_one_reflog_ent(&sb, fn, cb_data);
+ if (ret)
+ break;
+
+ strbuf_reset(&sb);
+ } while (!mdb_cursor_get_or_die(cursor, &key, &val, direction));
+
+ strbuf_release(&sb);
+ free(log_path);
+ free(search_key);
+ mdb_cursor_close(cursor);
+ return ret;
+}
+
+static int lmdb_for_each_reflog_ent(const char *refname,
+ each_reflog_ent_fn fn,
+ void *cb_data)
+{
+ if (ref_type(refname) != REF_TYPE_NORMAL)
+ return refs_be_files.for_each_reflog_ent(refname, fn, cb_data);
+ return lmdb_for_each_reflog_ent_order(refname, fn, cb_data, 0);
+}
+
+static int lmdb_for_each_reflog_ent_reverse(const char *refname,
+ each_reflog_ent_fn fn,
+ void *cb_data)
+{
+ if (ref_type(refname) != REF_TYPE_NORMAL)
+ return refs_be_files.for_each_reflog_ent_reverse(refname, fn, cb_data);
+ return lmdb_for_each_reflog_ent_order(refname, fn, cb_data, 1);
+}
+
+static int lmdb_reflog_exists(const char *refname)
+{
+ MDB_val key, val;
+ char *log_path;
+ int len;
+ MDB_cursor *cursor;
+ int ret = 1;
+
+ if (ref_type(refname) != REF_TYPE_NORMAL)
+ return refs_be_files.reflog_exists(refname);
+
+ log_path = xstrfmt("logs/%s", refname);
+ len = strlen(log_path) + 1;
+
+ key.mv_data = log_path;
+ key.mv_size = len;
+
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+ mdb_cursor_open_or_die(&transaction, &cursor);
+
+ if (mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE) ||
+ !starts_with(key.mv_data, log_path))
+ ret = 0;
+
+ free(log_path);
+ mdb_cursor_close(cursor);
+
+ return ret;
+}
+
+struct wrapped_each_ref_fn {
+ each_ref_fn *fn;
+ void *cb_data;
+};
+
+static int check_reflog(const char *refname,
+ const struct object_id *oid, int flags, void *cb_data)
+{
+ struct wrapped_each_ref_fn *wrapped = cb_data;
+
+ if (reflog_exists(refname))
+ return wrapped->fn(refname, oid, 0, wrapped->cb_data);
+
+ return 0;
+}
+
+static int lmdb_for_each_reflog(each_ref_fn fn, void *cb_data)
+{
+ struct wrapped_each_ref_fn wrapped = {fn, cb_data};
+ int result = head_ref(fn, cb_data);
+ if (result)
+ return result;
+ return for_each_ref(check_reflog, &wrapped);
+}
+
+static void strbuf_reflog_header(struct strbuf *sb, const char *refname)
+{
+ uint64_t zero = 0;
+
+ strbuf_addf(sb, "logs/%s", refname);
+ strbuf_add(sb, &zero, 8);
+}
+
+static int lmdb_create_reflog(const char *refname, int force_create, struct strbuf *err)
+{
+ /*
+ * We mark that there is a reflog by creating a key of the
+ * form logs/$refname followed by nine \0 (one for
+ * string-termination, 8 in lieu of a timestamp), with an empty
+ * value.
+ */
+
+ int in_transaction = in_write_transaction();
+ MDB_val key, val;
+ struct strbuf key_buf = STRBUF_INIT;
+
+ if (!force_create && !should_autocreate_reflog(refname))
+ return 0;
+
+ if (!in_transaction)
+ lmdb_transaction_begin_flags_or_die(0);
+
+ strbuf_reflog_header(&key_buf, refname);
+ key.mv_size = key_buf.len + 1;
+ key.mv_data = key_buf.buf;
+
+ val.mv_size = 0;
+ val.mv_data = NULL;
+ mdb_put_or_die(&transaction, &key, &val, 0);
+
+ strbuf_release(&key_buf);
+ if (!in_transaction)
+ return mdb_transaction_commit(&transaction, err);
+ return 0;
+}
+
+struct expire_reflog_cb {
+ unsigned int flags;
+ reflog_expiry_should_prune_fn *should_prune_fn;
+ void *policy_cb;
+ unsigned char last_kept_sha1[20];
+};
+
+static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
+ const char *email, unsigned long timestamp, int tz,
+ const char *message, void *cb_data)
+{
+ struct expire_reflog_cb *cb = cb_data;
+ struct expire_reflog_policy_cb *policy_cb = cb->policy_cb;
+
+ if (cb->flags & EXPIRE_REFLOGS_REWRITE)
+ osha1 = cb->last_kept_sha1;
+
+ if ((*cb->should_prune_fn)(osha1, nsha1, email, timestamp, tz,
+ message, policy_cb)) {
+ if (cb->flags & EXPIRE_REFLOGS_DRY_RUN)
+ printf("would prune %s", message);
+ else {
+ if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
+ printf("prune %s", message);
+
+ mdb_cursor_del_or_die(transaction.cursor, 0);
+ }
+ } else {
+ hashcpy(cb->last_kept_sha1, nsha1);
+ if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
+ printf("keep %s", message);
+ }
+ return 0;
+}
+
+static int write_ref(const char *refname, const unsigned char *sha1)
+{
+ struct strbuf err = STRBUF_INIT;
+ struct ref_transaction *transaction;
+
+ transaction = ref_transaction_begin(&err);
+ if (!transaction) {
+ error("%s", err.buf);
+ strbuf_release(&err);
+ return -1;
+ }
+
+ if (ref_transaction_update(transaction, refname, sha1, NULL,
+ REF_NO_REFLOG, NULL, &err)) {
+ error("%s", err.buf);
+ strbuf_release(&err);
+ return -1;
+ }
+
+ if (ref_transaction_commit(transaction, &err)) {
+ error("%s", err.buf);
+ strbuf_release(&err);
+ return -1;
+ }
+
+ return 0;
+}
+
+int lmdb_reflog_expire(const char *refname, const unsigned char *sha1,
+ unsigned int flags,
+ reflog_expiry_prepare_fn prepare_fn,
+ reflog_expiry_should_prune_fn should_prune_fn,
+ reflog_expiry_cleanup_fn cleanup_fn,
+ void *policy_cb_data)
+{
+ struct expire_reflog_cb cb;
+ int dry_run = flags & EXPIRE_REFLOGS_DRY_RUN;
+ int status = 0;
+ struct strbuf err = STRBUF_INIT;
+ unsigned char resolved_sha1[20];
+ int type;
+ char *resolved;
+
+ if (ref_type(refname) != REF_TYPE_NORMAL)
+ return refs_be_files.reflog_expire(refname, sha1, flags, prepare_fn,
+ should_prune_fn, cleanup_fn,
+ policy_cb_data);
+
+ memset(&cb, 0, sizeof(cb));
+ cb.flags = flags;
+ cb.policy_cb = policy_cb_data;
+ cb.should_prune_fn = should_prune_fn;
+
+ lmdb_transaction_begin_flags_or_die(dry_run ? MDB_RDONLY : 0);
+
+ resolved = check_ref(transaction.txn, refname, sha1,
+ resolved_sha1, 0, &type);
+ if (!resolved)
+ die(_("Failed to resolve %s"), refname);
+ free(resolved);
+
+ (*prepare_fn)(refname, sha1, cb.policy_cb);
+ lmdb_for_each_reflog_ent(refname, expire_reflog_ent, &cb);
+ (*cleanup_fn)(cb.policy_cb);
+
+ if (!dry_run) {
+ /*
+ * It doesn't make sense to adjust a reference pointed
+ * to by a symbolic ref based on expiring entries in
+ * the symbolic reference's reflog. Nor can we update
+ * a reference if there are no remaining reflog
+ * entries.
+ */
+ int update = (flags & EXPIRE_REFLOGS_UPDATE_REF) &&
+ !(type & REF_ISSYMREF) &&
+ !is_null_sha1(cb.last_kept_sha1);
+
+ if (mdb_transaction_commit(&transaction, &err)) {
+ status |= error(_("couldn't write logs/%s: %s"),
+ refname, err.buf);
+ strbuf_release(&err);
+ } else if (update && write_ref(refname, cb.last_kept_sha1)) {
+ status |= error(_("couldn't set %s"),
+ refname);
+ }
+ }
+ return status;
+}
+
+static int lmdb_pack_refs(unsigned int flags)
+{
+ /* This concept does not exist in this backend. */
+ return 0;
+}
+
+static int lmdb_peel_ref(const char *refname, unsigned char *sha1)
+{
+ int flag;
+ unsigned char base[20];
+
+ if (read_ref_full(refname, RESOLVE_REF_READING, base, &flag))
+ return -1;
+
+ return peel_object(base, sha1);
+}
+
+static int lmdb_create_symref(const char *ref_target,
+ const char *refs_heads_master,
+ const char *logmsg)
+{
+
+ struct strbuf err = STRBUF_INIT;
+ unsigned char old_sha1[20], new_sha1[20];
+ MDB_val key, val;
+ char *valdata;
+ int ret = 0;
+ int in_transaction;
+
+ in_transaction = in_write_transaction();
+
+ if (logmsg && read_ref(ref_target, old_sha1))
+ hashclr(old_sha1);
+
+ key.mv_size = strlen(ref_target) + 1;
+ key.mv_data = xstrdup(ref_target);
+
+ valdata = xstrfmt("ref: %s", refs_heads_master);
+ val.mv_data = valdata;
+ val.mv_size = strlen(valdata) + 1;
+
+ if (!in_transaction)
+ lmdb_transaction_begin_flags_or_die(0);
+
+ mdb_put_or_die(&transaction, &key, &val, 0);
+
+ /* TODO: Don't create ref d/f conflicts */
+
+ if (logmsg && !read_ref(refs_heads_master, new_sha1) &&
+ log_ref_write(ref_target, old_sha1, new_sha1, logmsg, 0, &err)) {
+ error(_("create_symref: log_ref_write failed: %s"), err.buf);
+ ret = -1;
+ goto done;
+ }
+
+ if (!in_transaction && mdb_transaction_commit(&transaction, &err)) {
+ error(_("create_symref: commit failed: %s"), err.buf);
+ ret = -1;
+ }
+
+done:
+ strbuf_release(&err);
+ free(key.mv_data);
+ free(valdata);
+
+ return ret;
+}
+
+MDB_env *submodule_txn_begin(struct lmdb_transaction *transaction)
+{
+ int ret;
+ MDB_env *submodule_env = NULL;
+ struct strbuf path = STRBUF_INIT;
+
+ strbuf_git_path_submodule(&path, transaction->submodule, "refdb");
+
+ if (!is_directory(path.buf))
+ goto done;
+
+ mkdir(path.buf, 0775);
+
+ init_env(&submodule_env, path.buf);
+
+ ret = mdb_txn_begin(submodule_env, NULL, MDB_RDONLY, &transaction->txn);
+ if (ret)
+ die("BUG: mdb_txn_begin failed: %s", mdb_strerror(ret));
+
+ ret = mdb_dbi_open(transaction->txn, NULL, 0, &transaction->dbi);
+ if (ret)
+ die("BUG: mdb_txn_open failed: %s", mdb_strerror(ret));
+
+done:
+ strbuf_release(&path);
+ return submodule_env;
+}
+
+static int lmdb_resolve_gitlink_ref(const char *submodule, const char *refname,
+ unsigned char *sha1)
+{
+ struct lmdb_transaction transaction;
+ MDB_env *submodule_env;
+ int result;
+
+ transaction.txn = NULL;
+ transaction.submodule = submodule;
+ submodule_env = submodule_txn_begin(&transaction);
+ if (!submodule_env)
+ return -1;
+ result = !resolve_ref_unsafe_txn(&transaction, refname,
+ RESOLVE_REF_READING, sha1, NULL);
+
+ mdb_txn_abort(transaction.txn);
+ mdb_env_close(submodule_env);
+
+ return result ? -1 : 0;
+}
+
+static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+ struct object_id oid;
+ int flag;
+
+ if (submodule) {
+ if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
+ return fn("HEAD", &oid, 0, cb_data);
+
+ return 0;
+ }
+
+ if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
+ return fn("HEAD", &oid, flag, cb_data);
+
+ return 0;
+}
+
+static int lmdb_head_ref(each_ref_fn fn, void *cb_data)
+{
+ return do_head_ref(NULL, fn, cb_data);
+}
+
+static int lmdb_head_ref_submodule(const char *submodule, each_ref_fn fn,
+ void *cb_data)
+{
+ return do_head_ref(submodule, fn, cb_data);
+}
+
+/*
+ * Call fn for each reference for which the refname begins with base.
+ * If trim is non-zero, then trim that many characters off the
+ * beginning of each refname before passing the refname to fn. flags
+ * can be DO_FOR_EACH_INCLUDE_BROKEN to include broken references in
+ * the iteration. If fn ever returns a non-zero value, stop the
+ * iteration and return that value; otherwise, return 0.
+ */
+static int do_for_each_ref(struct lmdb_transaction *transaction,
+ const char *base, each_ref_fn fn, int trim,
+ int flags, void *cb_data)
+{
+
+ MDB_val key, val;
+ MDB_cursor *cursor;
+ int baselen;
+ char *search_key;
+ int retval;
+ int mdb_ret;
+
+ retval = do_for_each_per_worktree_ref(transaction->submodule, base, fn,
+ trim, flags, cb_data);
+ if (retval)
+ return retval;
+
+ if (ref_paranoia < 0)
+ ref_paranoia = git_env_bool("GIT_REF_PARANOIA", 0);
+ if (ref_paranoia)
+ flags |= DO_FOR_EACH_INCLUDE_BROKEN;
+
+ if (!base || !*base) {
+ base = "refs/";
+ trim = 0;
+ }
+
+ search_key = xstrdup(base);
+ baselen = strlen(base);
+ key.mv_size = baselen + 1;
+ key.mv_data = search_key;
+
+ mdb_cursor_open_or_die(transaction, &cursor);
+
+ mdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE);
+
+ while (!mdb_ret) {
+ struct object_id oid;
+ int parsed_flags = 0;
+
+ if (memcmp(key.mv_data, base, baselen))
+ break;
+
+ parse_ref_data(transaction, (const char *)key.mv_data + (trim ? baselen : 0),
+ val.mv_data, oid.hash, 0, &parsed_flags, 0);
+
+ if (flags & DO_FOR_EACH_INCLUDE_BROKEN ||
+ (!(parsed_flags & REF_ISBROKEN) &&
+ has_sha1_file(oid.hash))) {
+ retval = fn((const char *)key.mv_data + (trim ? baselen : 0), &oid, parsed_flags, cb_data);
+ if (retval)
+ break;
+ }
+
+ mdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_NEXT);
+ }
+
+ mdb_cursor_close(cursor);
+ free(search_key);
+
+ return retval;
+}
+
+static int lmdb_for_each_ref(each_ref_fn fn, void *cb_data)
+{
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+ return do_for_each_ref(&transaction, "", fn, 0, 0, cb_data);
+}
+
+static int lmdb_for_each_ref_submodule(const char *submodule, each_ref_fn fn,
+ void *cb_data)
+{
+ struct lmdb_transaction transaction;
+ MDB_env *submodule_env;
+ int result;
+
+ if (!submodule)
+ return for_each_ref(fn, cb_data);
+
+ transaction.txn = NULL;
+ transaction.submodule = submodule;
+
+ submodule_env = submodule_txn_begin(&transaction);
+ if (!submodule_env)
+ return 0;
+ result = do_for_each_ref(&transaction, "", fn, 0, 0, cb_data);
+ mdb_txn_abort(transaction.txn);
+ mdb_env_close(submodule_env);
+ return result;
+}
+
+static int lmdb_for_each_ref_in(const char *prefix, each_ref_fn fn,
+ void *cb_data)
+{
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+ return do_for_each_ref(&transaction, prefix, fn, strlen(prefix),
+ 0, cb_data);
+}
+
+static int lmdb_for_each_fullref_in(const char *prefix, each_ref_fn fn,
+ void *cb_data, unsigned int broken)
+{
+ unsigned int flag = 0;
+
+ if (broken)
+ flag = DO_FOR_EACH_INCLUDE_BROKEN;
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+ return do_for_each_ref(&transaction, prefix, fn, 0, flag, cb_data);
+}
+
+static int lmdb_for_each_ref_in_submodule(const char *submodule,
+ const char *prefix,
+ each_ref_fn fn, void *cb_data)
+{
+ struct lmdb_transaction transaction = {NULL};
+ MDB_env *submodule_env;
+ int result;
+
+ if (!submodule)
+ return for_each_ref_in(prefix, fn, cb_data);
+
+ transaction.submodule = submodule;
+ submodule_env = submodule_txn_begin(&transaction);
+ if (!submodule_env)
+ return 0;
+ result = do_for_each_ref(&transaction, prefix, fn,
+ strlen(prefix), 0, cb_data);
+ mdb_txn_abort(transaction.txn);
+ mdb_env_close(submodule_env);
+ return result;
+}
+
+static int lmdb_for_each_replace_ref(each_ref_fn fn, void *cb_data)
+{
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+ return do_for_each_ref(&transaction, git_replace_ref_base, fn,
+ strlen(git_replace_ref_base), 0, cb_data);
+}
+
+static int lmdb_for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
+{
+ struct strbuf buf = STRBUF_INIT;
+ int ret;
+
+ strbuf_addf(&buf, "%srefs/", get_git_namespace());
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+ ret = do_for_each_ref(&transaction, buf.buf, fn, 0, 0, cb_data);
+ strbuf_release(&buf);
+ return ret;
+}
+
+static int lmdb_for_each_rawref(each_ref_fn fn, void *cb_data)
+{
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+ return do_for_each_ref(&transaction, "", fn, 0,
+ DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
+}
+
+/* For testing only! */
+int test_refdb_raw_read(const char *key)
+{
+ MDB_val key_val, val;
+ char *keydup;
+ int ret;
+ int needs_free = 0;
+
+ lmdb_transaction_begin_flags_or_die(MDB_RDONLY);
+ keydup = xstrdup(key);
+ key_val.mv_data = keydup;
+ key_val.mv_size = strlen(key) + 1;
+
+ ret = mdb_get_or_die(&transaction, &key_val, &val, &needs_free);
+ free(keydup);
+ switch (ret) {
+ case 0:
+ printf("%s\n", (char *)val.mv_data);
+ return 0;
+ case MDB_NOTFOUND:
+ fprintf(stderr, "%s not found\n", key);
+ return 1;
+ default:
+ return 2;
+ }
+ if (needs_free)
+ free(val.mv_data);
+}
+
+/* For testing only! */
+void test_refdb_raw_write(const char *key, const char *value)
+{
+ MDB_val key_val, val;
+ char *keydup, *valdup;
+
+ if (ref_type(key) != REF_TYPE_NORMAL) {
+ val.mv_data = (void *)value;
+ val.mv_size = strlen(value) + 1;
+ write_per_worktree_ref(NULL, key, &val);
+ return;
+ }
+
+ lmdb_transaction_begin_flags_or_die(0);
+
+ keydup = xstrdup(key);
+ key_val.mv_data = keydup;
+ key_val.mv_size = strlen(key) + 1;
+
+ valdup = xstrdup(value);
+ val.mv_data = valdup;
+ val.mv_size = strlen(value) + 1;
+
+ mdb_put_or_die(&transaction, &key_val, &val, 0);
+ assert(mdb_transaction_commit(&transaction, NULL) == 0);
+
+ free(keydup);
+ free(valdup);
+}
+
+/* For testing only! */
+int test_refdb_raw_delete(const char *key)
+{
+ MDB_val key_val;
+ char *keydup;
+ int ret;
+
+ if (ref_type(key) != REF_TYPE_NORMAL)
+ return del_per_worktree_ref(NULL, key, NULL);
+
+ lmdb_transaction_begin_flags_or_die(0);
+ keydup = xstrdup(key);
+ key_val.mv_data = keydup;
+ key_val.mv_size = strlen(key) + 1;
+
+ ret = mdb_del_or_die(&transaction, &key_val, NULL);
+
+ assert(mdb_transaction_commit(&transaction, NULL) == 0);
+
+ free(keydup);
+ return ret;
+}
+
+static int print_raw_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
+ const char *email, unsigned long timestamp,
+ int tz, const char *message, void *cb_data)
+{
+ int *any = cb_data;
+ *any = 1;
+
+ if (*message != '\n')
+ printf("%s %s %s %lu %+05d\t%s", sha1_to_hex(osha1),
+ sha1_to_hex(nsha1),
+ email, timestamp, tz, message);
+ else
+ printf("%s %s %s %lu %+05d\n", sha1_to_hex(osha1),
+ sha1_to_hex(nsha1),
+ email, timestamp, tz);
+ return 0;
+}
+
+/* For testing only! */
+int test_refdb_raw_reflog(const char *refname)
+{
+ int any = 0;
+
+ for_each_reflog_ent(refname, print_raw_reflog_ent, &any);
+
+ return !any;
+}
+
+/* For testing only! */
+void test_refdb_raw_delete_reflog(char *refname)
+{
+ MDB_val key, val;
+ int mdb_ret;
+ char *search_key;
+ MDB_cursor *cursor;
+ int len;
+
+ search_key = xstrfmt("logs/%s", refname ? refname : "");
+ len = strlen(search_key) + 1;
+
+ key.mv_data = search_key;
+ key.mv_size = len;
+
+ lmdb_transaction_begin_flags_or_die(0);
+
+ mdb_cursor_open_or_die(&transaction, &cursor);
+
+ mdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_SET_RANGE);
+ while (!mdb_ret) {
+ if (!starts_with(key.mv_data, search_key))
+ break;
+ if (refname && ((char *)val.mv_data)[len - 1] == 0)
+ break;
+
+ mdb_cursor_del_or_die(cursor, 0);
+ mdb_ret = mdb_cursor_get_or_die(cursor, &key, &val, MDB_NEXT);
+ }
+
+ free(search_key);
+ mdb_cursor_close(cursor);
+
+ assert(mdb_transaction_commit(&transaction, NULL) == 0);
+ return;
+}
+
+static void format_lmdb_reflog_ent(struct strbuf *dst, struct strbuf *src)
+{
+ unsigned char osha1[20], nsha1[20];
+ const char *msg;
+
+ get_sha1_hex(src->buf, osha1);
+ get_sha1_hex(src->buf + 41, nsha1);
+
+ msg = strchr(src->buf + 82, '\t');
+ if (msg)
+ msg += 1;
+
+ format_reflog_entry(dst, osha1, nsha1, src->buf + 82, msg);
+}
+
+/* For testing only! */
+void test_refdb_raw_append_reflog(const char *refname)
+{
+ struct strbuf input = STRBUF_INIT;
+ struct strbuf sb = STRBUF_INIT;
+ uint64_t now = getnanotime();
+ MDB_val key, val;
+ struct strbuf key_buf = STRBUF_INIT;
+
+ strbuf_reflog_header(&key_buf, refname);
+ key.mv_size = key_buf.len + 1;
+ key.mv_data = key_buf.buf;
+
+ lmdb_transaction_begin_flags_or_die(0);
+
+ /* We do not remove the header entry here, because this is
+ * just for tests, so it's OK to be a bit inefficient */
+
+ while (strbuf_getline(&input, stdin) != EOF) {
+ /* "logs/" + \0 + 8-byte timestamp for sorting and expiry */
+ write_u64((char *)key.mv_data + key.mv_size - 8, htonll(now++));
+
+ /*
+ * Convert the input from files-reflog format to
+ * lmdb-reflog-format
+ */
+
+ format_lmdb_reflog_ent(&sb, &input);
+ val.mv_data = sb.buf;
+ val.mv_size = sb.len + 1;
+ mdb_put_or_die(&transaction, &key, &val, 0);
+ strbuf_reset(&sb);
+ input.len = 0;
+ }
+
+ strbuf_release(&input);
+ strbuf_release(&sb);
+ assert(mdb_transaction_commit(&transaction, NULL) == 0);
+ strbuf_release(&key_buf);
+}
+
+struct ref_storage_be refs_be_lmdb = {
+ NULL,
+ "lmdb",
+ lmdb_init_db,
+ lmdb_transaction_commit,
+ lmdb_transaction_commit, /* initial commit */
+
+ lmdb_for_each_reflog_ent,
+ lmdb_for_each_reflog_ent_reverse,
+ lmdb_for_each_reflog,
+ lmdb_reflog_exists,
+ lmdb_create_reflog,
+ lmdb_delete_reflog,
+ lmdb_reflog_expire,
+
+ lmdb_pack_refs,
+ lmdb_peel_ref,
+ lmdb_create_symref,
+ lmdb_delete_refs,
+ lmdb_rename_ref,
+
+ lmdb_resolve_ref_unsafe,
+ lmdb_verify_refname_available,
+ lmdb_resolve_gitlink_ref,
+
+ lmdb_head_ref,
+ lmdb_head_ref_submodule,
+ lmdb_for_each_ref,
+ lmdb_for_each_ref_submodule,
+ lmdb_for_each_ref_in,
+ lmdb_for_each_fullref_in,
+ lmdb_for_each_ref_in_submodule,
+ lmdb_for_each_rawref,
+ lmdb_for_each_namespaced_ref,
+ lmdb_for_each_replace_ref,
+};
diff --git a/setup.c b/setup.c
index 1a62277..a47a5b8 100644
--- a/setup.c
+++ b/setup.c
@@ -279,7 +279,7 @@ int ref_storage_backend_config(const char *var, const char *value, void *ptr)
*
* - either an objects/ directory _or_ the proper
* GIT_OBJECT_DIRECTORY environment variable
- * - a refs/ directory
+ * - a refdb/ directory or a refs/ directory
* - either a HEAD symlink or a HEAD file that is formatted as
* a proper "ref:", or a regular file HEAD that has a properly
* formatted sha1 object name.
@@ -313,8 +313,13 @@ int is_git_directory(const char *suspect)
strbuf_setlen(&path, len);
strbuf_addstr(&path, "/refs");
- if (access(path.buf, X_OK))
- goto done;
+
+ if (access(path.buf, X_OK)) {
+ strbuf_setlen(&path, len);
+ strbuf_addstr(&path, "/refdb");
+ if (access(path.buf, X_OK))
+ goto done;
+ }
ret = 1;
done:
diff --git a/test-refs-lmdb-backend.c b/test-refs-lmdb-backend.c
new file mode 100644
index 0000000..5cf61e6
--- /dev/null
+++ b/test-refs-lmdb-backend.c
@@ -0,0 +1,64 @@
+#include "cache.h"
+#include "string-list.h"
+#include "parse-options.h"
+#include "refs.h"
+
+static const char * const test_refs_be_lmdb_usage[] = {
+ "git test-refs-lmdb-backend <key>",
+ "git test-refs-lmdb-backend <key> <value>",
+ NULL,
+};
+
+int test_refdb_raw_read(const char *key);
+void test_refdb_raw_write(const char *key, const char *value);
+int test_refdb_raw_reflog(const char *refname);
+int test_refdb_raw_delete(const char *key);
+void test_refdb_raw_delete_reflog(const char *refname);
+void test_refdb_raw_append_reflog(const char *refname);
+
+int main(int argc, const char **argv)
+{
+ const char *delete = NULL;
+ const char *reflog = NULL;
+ const char *append_reflog = NULL;
+ int delete_missing_error = 0;
+ int clear_reflog = 0;
+
+ struct option options[] = {
+ OPT_STRING('d', NULL, &delete, "branch", "delete refdb entry"),
+ OPT_STRING('l', NULL, &reflog, "branch", "show reflog"),
+ OPT_STRING('a', NULL, &append_reflog, "branch", "append to reflog"),
+ OPT_BOOL('c', NULL, &clear_reflog, "delete reflog. If a branch is provided, the reflog for that branch will be deleted; else all reflogs will be deleted."),
+ OPT_BOOL('x', NULL, &delete_missing_error,
+ "deleting a missing key is an error"),
+ OPT_END(),
+ };
+
+ argc = parse_options(argc, argv, "", options, test_refs_be_lmdb_usage,
+ 0);
+
+ if (!append_reflog && !clear_reflog && !delete && !reflog && argc != 1 && argc != 2)
+ usage_with_options(test_refs_be_lmdb_usage,
+ options);
+
+ git_config(git_default_config, NULL);
+
+ register_ref_storage_backend(&refs_be_lmdb);
+ set_ref_storage_backend("lmdb");
+
+ if (clear_reflog) {
+ test_refdb_raw_delete_reflog(argv[0]);
+ } else if (append_reflog) {
+ test_refdb_raw_append_reflog(append_reflog);
+ } else if (reflog) {
+ return test_refdb_raw_reflog(reflog);
+ } else if (delete) {
+ if (test_refdb_raw_delete(delete) && delete_missing_error)
+ return 1;
+ } else if (argc == 1) {
+ return test_refdb_raw_read(argv[0]);
+ } else {
+ test_refdb_raw_write(argv[0], argv[1]);
+ }
+ return 0;
+}
diff --git a/transport.c b/transport.c
index c92f8ae..67fbdcf 100644
--- a/transport.c
+++ b/transport.c
@@ -1089,8 +1089,11 @@ static int refs_from_alternate_cb(struct alternate_object_database *e,
goto out;
/* Is this a git repository with refs? */
memcpy(other + len - 8, "/refs", 6);
- if (!is_directory(other))
- goto out;
+ if (!is_directory(other)) {
+ memcpy(other + len - 8, "/refdb", 7);
+ if (!is_directory(other))
+ goto out;
+ }
other[len - 8] = '\0';
remote = remote_get(other);
transport = transport_get(remote, other);
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v4 21/21] refs: tests for lmdb backend
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (19 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 20/21] refs: add LMDB refs storage backend David Turner
@ 2016-02-05 19:44 ` David Turner
2016-02-08 23:37 ` [PATCH v4 00/20] refs backend Junio C Hamano
21 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-05 19:44 UTC (permalink / raw)
To: git, mhagger; +Cc: David Turner
Add tests for the database backend.
Signed-off-by: David Turner <dturner@twopensource.com>
Helped-by: Dennis Kaarsemaker <dennis@kaarsemaker.net>
---
t/t1460-refs-lmdb-backend.sh | 1109 +++++++++++++++++++++++++++++++++++
t/t1470-refs-lmdb-backend-reflog.sh | 359 ++++++++++++
t/t1480-refs-lmdb-submodule.sh | 85 +++
t/test-lib.sh | 1 +
4 files changed, 1554 insertions(+)
create mode 100755 t/t1460-refs-lmdb-backend.sh
create mode 100755 t/t1470-refs-lmdb-backend-reflog.sh
create mode 100755 t/t1480-refs-lmdb-submodule.sh
diff --git a/t/t1460-refs-lmdb-backend.sh b/t/t1460-refs-lmdb-backend.sh
new file mode 100755
index 0000000..31442e7
--- /dev/null
+++ b/t/t1460-refs-lmdb-backend.sh
@@ -0,0 +1,1109 @@
+#!/bin/sh
+#
+# Copyright (c) 2015 Twitter, Inc
+# Copyright (c) 2006 Shawn Pearce
+# This test is based on t1400-update-ref.sh
+#
+
+test_description='Test lmdb refs backend'
+TEST_NO_CREATE_REPO=1
+. ./test-lib.sh
+
+if ! test_have_prereq LMDB
+then
+ skip_all="Skipping lmdb refs backend tests, lmdb backend not built"
+ test_done
+fi
+
+raw_ref() {
+ test-refs-lmdb-backend "$1"
+}
+
+delete_ref() {
+ test-refs-lmdb-backend -d "$1"
+}
+
+write_ref() {
+ test-refs-lmdb-backend "$1" "$2"
+}
+
+raw_reflog() {
+ test-refs-lmdb-backend -l "$1"
+}
+
+delete_all_reflogs() {
+ test-refs-lmdb-backend -c
+}
+
+append_reflog() {
+ test-refs-lmdb-backend -a "$1"
+}
+
+Z=$_z40
+
+test_expect_success setup '
+ git init --ref-storage=lmdb &&
+ for name in A B C D E F
+ do
+ test_tick &&
+ T=$(git write-tree) &&
+ sha1=$(echo $name | git commit-tree $T) &&
+ eval $name=$sha1
+ done
+'
+
+m=refs/heads/master
+n_dir=refs/heads/gu
+n=$n_dir/fixes
+
+test_expect_success \
+ "create $m" \
+ "git update-ref $m $A &&
+ test $A"' = $(raw_ref '"$m"')'
+test_expect_success \
+ "create $m" \
+ "git update-ref $m $B $A &&
+ test $B"' = $(raw_ref '"$m"')'
+test_expect_success "fail to delete $m with stale ref" '
+ test_must_fail git update-ref -d $m $A &&
+ test $B = "$(raw_ref $m)"
+'
+test_expect_success "delete $m" '
+ git update-ref -d $m $B &&
+ ! raw_ref $m
+'
+delete_ref $m
+
+test_expect_success "delete $m without oldvalue verification" "
+ git update-ref $m $A &&
+ test $A = \$(raw_ref $m) &&
+ git update-ref -d $m &&
+ ! raw_ref $m
+"
+delete_ref $m
+
+test_expect_success \
+ "fail to create $n" \
+ "git update-ref $n_dir $A &&
+ test_must_fail git update-ref $n $A >out 2>err"
+
+delete_ref $n_dir
+rm -f out err
+
+test_expect_success \
+ "create $m (by HEAD)" \
+ "git update-ref HEAD $A &&
+ test $A"' = $(raw_ref '"$m"')'
+test_expect_success \
+ "create $m (by HEAD)" \
+ "git update-ref HEAD $B $A &&
+ test $B"' = $(raw_ref '"$m"')'
+test_expect_success "fail to delete $m (by HEAD) with stale ref" '
+ test_must_fail git update-ref -d HEAD $A &&
+ test $B = $(raw_ref '"$m"')
+'
+test_expect_success "delete $m (by HEAD)" '
+ git update-ref -d HEAD $B &&
+ ! raw_ref $m
+'
+delete_ref $m
+
+test_expect_success \
+ "create $m (by HEAD)" \
+ "git update-ref HEAD $A &&
+ test $A"' = $(raw_ref '"$m"')'
+test_expect_success \
+ "pack refs" \
+ "git pack-refs --all"
+test_expect_success \
+ "move $m (by HEAD)" \
+ "git update-ref HEAD $B $A &&
+ test $B"' = $(raw_ref '"$m"')'
+test_expect_success "delete $m (by HEAD) should remove both packed and loose $m" '
+ git update-ref -d HEAD $B &&
+ ! raw_ref $m
+'
+delete_ref $m
+
+OLD_HEAD=$(raw_ref HEAD)
+test_expect_success "delete symref without dereference" '
+ git update-ref --no-deref -d HEAD &&
+ ! raw_ref HEAD
+'
+write_ref HEAD "$OLD_HEAD"
+
+test_expect_success "delete symref without dereference when the referred ref is packed" '
+ echo foo >foo.c &&
+ git add foo.c &&
+ git commit -m foo &&
+ git pack-refs --all &&
+ git update-ref --no-deref -d HEAD &&
+ ! raw_ref HEAD
+'
+write_ref HEAD "$OLD_HEAD"
+delete_ref $m
+
+test_expect_success 'update-ref -d is not confused by self-reference' '
+ git symbolic-ref refs/heads/self refs/heads/self &&
+ test_when_finished "delete_ref refs/heads/self" &&
+ test_must_fail git update-ref -d refs/heads/self
+'
+
+test_expect_success 'update-ref --no-deref -d can delete self-reference' '
+ git symbolic-ref refs/heads/self refs/heads/self &&
+ test_when_finished "delete_ref refs/heads/self" &&
+ git update-ref --no-deref -d refs/heads/self
+'
+
+test_expect_success 'update-ref --no-deref -d can delete reference to bad ref' '
+ test-refs-lmdb-backend refs/heads/bad "" &&
+ test_when_finished "delete_ref refs/heads/bad" &&
+ git symbolic-ref refs/heads/ref-to-bad refs/heads/bad &&
+ test_when_finished "delete_ref refs/heads/ref-to-bad" &&
+ raw_ref refs/heads/ref-to-bad &&
+ git update-ref --no-deref -d refs/heads/ref-to-bad &&
+ ! raw_ref refs/heads/ref-to-bad
+'
+
+test_expect_success '(not) create HEAD with old sha1' "
+ test_must_fail git update-ref HEAD $A $B
+"
+test_expect_success "(not) prior created .git/$m" "
+ ! raw_ref $m
+"
+delete_ref $m
+
+test_expect_success \
+ "create HEAD" \
+ "git update-ref HEAD $A"
+test_expect_success '(not) change HEAD with wrong SHA1' "
+ test_must_fail git update-ref HEAD $B $Z
+"
+test_expect_success "(not) changed .git/$m" "
+ ! test $B"' = $(raw_ref '"$m"')
+'
+
+: a repository with working tree always has reflog these days...
+delete_all_reflogs
+: | append_reflog $m
+delete_ref $m
+
+test_expect_success \
+ "create $m (logged by touch)" \
+ 'GIT_COMMITTER_DATE="2005-05-26 23:30" \
+ git update-ref HEAD '"$A"' -m "Initial Creation" &&
+ test '"$A"' = $(raw_ref '"$m"')'
+test_expect_success \
+ "update $m (logged by touch)" \
+ 'GIT_COMMITTER_DATE="2005-05-26 23:31" \
+ git update-ref HEAD'" $B $A "'-m "Switch" &&
+ test '"$B"' = $(raw_ref '"$m"')'
+test_expect_success \
+ "set $m (logged by touch)" \
+ 'GIT_COMMITTER_DATE="2005-05-26 23:41" \
+ git update-ref HEAD'" $A &&
+ test $A"' = $(raw_ref '"$m"')'
+
+cat >expect <<EOF
+$Z $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 Initial Creation
+$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150260 +0000 Switch
+$B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000
+EOF
+test_expect_success \
+ "verifying $m's log" \
+ "raw_reflog $m >actual &&
+ test_cmp expect actual"
+delete_ref $m
+delete_all_reflogs
+: | append_reflog $m
+rm -f actual expect
+
+test_expect_success \
+ 'enable core.logAllRefUpdates' \
+ 'git config core.logAllRefUpdates true &&
+ test true = $(git config --bool --get core.logAllRefUpdates)'
+
+test_expect_success \
+ "create $m (logged by config)" \
+ 'GIT_COMMITTER_DATE="2005-05-26 23:32" \
+ git update-ref HEAD'" $A "'-m "Initial Creation" &&
+ test '"$A"' = $(raw_ref '"$m"')'
+test_expect_success \
+ "update $m (logged by config)" \
+ 'GIT_COMMITTER_DATE="2005-05-26 23:33" \
+ git update-ref HEAD'" $B $A "'-m "Switch" &&
+ test '"$B"' = $(raw_ref '"$m"')'
+test_expect_success \
+ "set $m (logged by config)" \
+ 'GIT_COMMITTER_DATE="2005-05-26 23:43" \
+ git update-ref HEAD '"$A &&
+ test $A"' = $(raw_ref '"$m"')'
+
+cat >expect <<EOF
+$Z $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 +0000 Initial Creation
+$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 +0000 Switch
+$B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 +0000
+EOF
+test_expect_success \
+ "verifying $m's log" \
+ 'raw_reflog $m >actual &&
+ test_cmp expect actual'
+delete_ref $m
+rm -f expect
+
+git update-ref $m $D
+git reflog expire --expire=all $m
+
+append_reflog $m <<EOF
+0000000000000000000000000000000000000000 $C $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 -0500
+$C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150350 -0500
+$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500
+$F $Z $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150680 -0500
+$Z $E $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 -0500
+EOF
+
+ed="Thu, 26 May 2005 18:32:00 -0500"
+gd="Thu, 26 May 2005 18:33:00 -0500"
+ld="Thu, 26 May 2005 18:43:00 -0500"
+test_expect_success \
+ 'Query "master@{May 25 2005}" (before history)' \
+ 'rm -f o e &&
+ git rev-parse --verify "master@{May 25 2005}" >o 2>e &&
+ test '"$C"' = $(cat o) &&
+ test "warning: Log for '\'master\'' only goes back to $ed." = "$(cat e)"'
+test_expect_success \
+ "Query master@{2005-05-25} (before history)" \
+ 'rm -f o e &&
+ git rev-parse --verify master@{2005-05-25} >o 2>e &&
+ test '"$C"' = $(cat o) &&
+ echo test "warning: Log for '\'master\'' only goes back to $ed." = "$(cat e)"'
+test_expect_success \
+ 'Query "master@{May 26 2005 23:31:59}" (1 second before history)' \
+ 'rm -f o e &&
+ git rev-parse --verify "master@{May 26 2005 23:31:59}" >o 2>e &&
+ test '"$C"' = $(cat o) &&
+ test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"'
+test_expect_success \
+ 'Query "master@{May 26 2005 23:32:00}" (exactly history start)' \
+ 'rm -f o e &&
+ git rev-parse --verify "master@{May 26 2005 23:32:00}" >o 2>e &&
+ test '"$C"' = $(cat o) &&
+ test "" = "$(cat e)"'
+test_expect_success \
+ 'Query "master@{May 26 2005 23:32:30}" (first non-creation change)' \
+ 'rm -f o e &&
+ git rev-parse --verify "master@{May 26 2005 23:32:30}" >o 2>e &&
+ test '"$A"' = $(cat o) &&
+ test "" = "$(cat e)"'
+test_expect_success \
+ 'Query "master@{2005-05-26 23:33:01}" (middle of history with gap)' \
+ 'rm -f o e &&
+ git rev-parse --verify "master@{2005-05-26 23:33:01}" >o 2>e &&
+ test '"$B"' = $(cat o) &&
+ test "warning: Log for ref '"$m has gap after $gd"'." = "$(cat e)"'
+test_expect_success \
+ 'Query "master@{2005-05-26 23:38:00}" (middle of history)' \
+ 'rm -f o e &&
+ git rev-parse --verify "master@{2005-05-26 23:38:00}" >o 2>e &&
+ test '"$Z"' = $(cat o) &&
+ test "" = "$(cat e)"'
+test_expect_success \
+ 'Query "master@{2005-05-26 23:43:00}" (exact end of history)' \
+ 'rm -f o e &&
+ git rev-parse --verify "master@{2005-05-26 23:43:00}" >o 2>e &&
+ test '"$E"' = $(cat o) &&
+ test "" = "$(cat e)"'
+test_expect_success \
+ 'Query "master@{2005-05-28}" (past end of history)' \
+ 'rm -f o e &&
+ git rev-parse --verify "master@{2005-05-28}" >o 2>e &&
+ test '"$D"' = $(cat o) &&
+ test "warning: Log for ref '"$m unexpectedly ended on $ld"'." = "$(cat e)"'
+
+
+git reflog expire --expire=all $m
+delete_ref $m
+
+test_expect_success \
+ 'creating initial files' \
+ 'echo TEST >F &&
+ git add F &&
+ GIT_AUTHOR_DATE="2005-05-26 23:30" \
+ GIT_COMMITTER_DATE="2005-05-26 23:30" git commit -m add -a &&
+ h_TEST=$(git rev-parse --verify HEAD) &&
+ echo The other day this did not work. >M &&
+ echo And then Bob told me how to fix it. >>M &&
+ echo OTHER >F &&
+ GIT_AUTHOR_DATE="2005-05-26 23:41" \
+ GIT_COMMITTER_DATE="2005-05-26 23:41" git commit -F M -a &&
+ h_OTHER=$(git rev-parse --verify HEAD) &&
+ GIT_AUTHOR_DATE="2005-05-26 23:44" \
+ GIT_COMMITTER_DATE="2005-05-26 23:44" git commit --amend &&
+ h_FIXED=$(git rev-parse --verify HEAD) &&
+ echo Merged initial commit and a later commit. >M &&
+ echo $h_TEST >.git/MERGE_HEAD &&
+ GIT_AUTHOR_DATE="2005-05-26 23:45" \
+ GIT_COMMITTER_DATE="2005-05-26 23:45" git commit -F M &&
+ h_MERGED=$(git rev-parse --verify HEAD) &&
+ rm -f M'
+
+cat >expect <<EOF
+$Z $h_TEST $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 commit (initial): add
+$h_TEST $h_OTHER $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000 commit: The other day this did not work.
+$h_OTHER $h_FIXED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151040 +0000 commit (amend): The other day this did not work.
+$h_FIXED $h_MERGED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151100 +0000 commit (merge): Merged initial commit and a later commit.
+EOF
+test_expect_success \
+ 'git commit logged updates' \
+ "raw_reflog $m >actual &&
+ test_cmp expect actual"
+unset h_TEST h_OTHER h_FIXED h_MERGED
+
+test_expect_success \
+ 'git cat-file blob master:F (expect OTHER)' \
+ 'test OTHER = $(git cat-file blob master:F)'
+test_expect_success \
+ 'git cat-file blob master@{2005-05-26 23:30}:F (expect TEST)' \
+ 'test TEST = $(git cat-file blob "master@{2005-05-26 23:30}:F")'
+test_expect_success \
+ 'git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)' \
+ 'test OTHER = $(git cat-file blob "master@{2005-05-26 23:42}:F")'
+
+a=refs/heads/a
+b=refs/heads/b
+c=refs/heads/c
+E='""'
+F='%s\0'
+pws='path with space'
+
+test_expect_success 'stdin test setup' '
+ echo "$pws" >"$pws" &&
+ git add -- "$pws" &&
+ git commit -m "$pws"
+'
+
+test_expect_success '-z fails without --stdin' '
+ test_must_fail git update-ref -z $m $m $m 2>err &&
+ grep "usage: git update-ref" err
+'
+
+test_expect_success 'stdin works with no input' '
+ >stdin &&
+ git update-ref --stdin <stdin &&
+ git rev-parse --verify -q $m
+'
+
+test_expect_success 'stdin fails on empty line' '
+ echo "" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: empty command in input" err
+'
+
+test_expect_success 'stdin fails on only whitespace' '
+ echo " " >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: whitespace before command: " err
+'
+
+test_expect_success 'stdin fails on leading whitespace' '
+ echo " create $a $m" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: whitespace before command: create $a $m" err
+'
+
+test_expect_success 'stdin fails on unknown command' '
+ echo "unknown $a" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: unknown command: unknown $a" err
+'
+
+test_expect_success 'stdin fails on unbalanced quotes' '
+ echo "create $a \"master" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: badly quoted argument: \\\"master" err
+'
+
+test_expect_success 'stdin fails on invalid escape' '
+ echo "create $a \"ma\zter\"" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: badly quoted argument: \\\"ma\\\\zter\\\"" err
+'
+
+test_expect_success 'stdin fails on junk after quoted argument' '
+ echo "create \"$a\"master" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: unexpected character after quoted argument: \\\"$a\\\"master" err
+'
+
+test_expect_success 'stdin fails create with no ref' '
+ echo "create " >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: create: missing <ref>" err
+'
+
+test_expect_success 'stdin fails create with no new value' '
+ echo "create $a" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: create $a: missing <newvalue>" err
+'
+
+test_expect_success 'stdin fails create with too many arguments' '
+ echo "create $a $m $m" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: create $a: extra input: $m" err
+'
+
+test_expect_success 'stdin fails update with no ref' '
+ echo "update " >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: update: missing <ref>" err
+'
+
+test_expect_success 'stdin fails update with no new value' '
+ echo "update $a" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: update $a: missing <newvalue>" err
+'
+
+test_expect_success 'stdin fails update with too many arguments' '
+ echo "update $a $m $m $m" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: update $a: extra input: $m" err
+'
+
+test_expect_success 'stdin fails delete with no ref' '
+ echo "delete " >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: delete: missing <ref>" err
+'
+
+test_expect_success 'stdin fails delete with too many arguments' '
+ echo "delete $a $m $m" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: delete $a: extra input: $m" err
+'
+
+test_expect_success 'stdin fails verify with too many arguments' '
+ echo "verify $a $m $m" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: verify $a: extra input: $m" err
+'
+
+test_expect_success 'stdin fails option with unknown name' '
+ echo "option unknown" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: option unknown: unknown" err
+'
+
+test_expect_success 'stdin fails with duplicate refs' '
+ cat >stdin <<-EOF &&
+ create $a $m
+ create $b $m
+ create $a $m
+ EOF
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: Multiple updates for ref '"'"'$a'"'"' not allowed." err
+'
+
+test_expect_success 'stdin create ref works' '
+ echo "create $a $m" >stdin &&
+ git update-ref --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin succeeds with quoted argument' '
+ git update-ref -d $a &&
+ echo "create $a \"$m\"" >stdin &&
+ git update-ref --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin succeeds with escaped character' '
+ git update-ref -d $a &&
+ echo "create $a \"ma\\163ter\"" >stdin &&
+ git update-ref --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin update ref creates with zero old value' '
+ echo "update $b $m $Z" >stdin &&
+ git update-ref --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual &&
+ git update-ref -d $b
+'
+
+test_expect_success 'stdin update ref creates with empty old value' '
+ echo "update $b $m $E" >stdin &&
+ git update-ref --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin create ref works with path with space to blob' '
+ echo "create refs/blobs/pws \"$m:$pws\"" >stdin &&
+ git update-ref --stdin <stdin &&
+ git rev-parse "$m:$pws" >expect &&
+ git rev-parse refs/blobs/pws >actual &&
+ test_cmp expect actual &&
+ git update-ref -d refs/blobs/pws
+'
+
+test_expect_success 'stdin update ref fails with wrong old value' '
+ echo "update $c $m $m~1" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: cannot lock the ref '"'"'$c'"'"'" err &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin update ref fails with bad old value' '
+ echo "update $c $m does-not-exist" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: update $c: invalid <oldvalue>: does-not-exist" err &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin create ref fails with bad new value' '
+ echo "create $c does-not-exist" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: create $c: invalid <newvalue>: does-not-exist" err &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin create ref fails with zero new value' '
+ echo "create $c " >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: create $c: zero <newvalue>" err &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin update ref works with right old value' '
+ echo "update $b $m~1 $m" >stdin &&
+ git update-ref --stdin <stdin &&
+ git rev-parse $m~1 >expect &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin delete ref fails with wrong old value' '
+ echo "delete $a $m~1" >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: cannot lock the ref '"'"'$a'"'"'" err &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin delete ref fails with zero old value' '
+ echo "delete $a " >stdin &&
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: delete $a: zero <oldvalue>" err &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin update symref works option no-deref' '
+ git symbolic-ref refs/TESTSYMREF $b &&
+ cat >stdin <<-EOF &&
+ option no-deref
+ update refs/TESTSYMREF $a $b
+ EOF
+ git update-ref --stdin <stdin &&
+ git rev-parse refs/TESTSYMREF >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual &&
+ git rev-parse $m~1 >expect &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin delete symref works option no-deref' '
+ git symbolic-ref refs/TESTSYMREF $b &&
+ cat >stdin <<-EOF &&
+ option no-deref
+ delete refs/TESTSYMREF $b
+ EOF
+ git update-ref --stdin <stdin &&
+ test_must_fail git rev-parse --verify -q refs/TESTSYMREF &&
+ git rev-parse $m~1 >expect &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin delete ref works with right old value' '
+ echo "delete $b $m~1" >stdin &&
+ git update-ref --stdin <stdin &&
+ test_must_fail git rev-parse --verify -q $b
+'
+
+test_expect_success 'stdin update/create/verify combination works' '
+ cat >stdin <<-EOF &&
+ update $a $m
+ create $b $m
+ verify $c
+ EOF
+ git update-ref --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin verify succeeds for correct value' '
+ git rev-parse $m >expect &&
+ echo "verify $m $m" >stdin &&
+ git update-ref --stdin <stdin &&
+ git rev-parse $m >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin verify succeeds for missing reference' '
+ echo "verify refs/heads/missing $Z" >stdin &&
+ git update-ref --stdin <stdin &&
+ test_must_fail git rev-parse --verify -q refs/heads/missing
+'
+
+test_expect_success 'stdin verify treats no value as missing' '
+ echo "verify refs/heads/missing" >stdin &&
+ git update-ref --stdin <stdin &&
+ test_must_fail git rev-parse --verify -q refs/heads/missing
+'
+
+test_expect_success 'stdin verify fails for wrong value' '
+ git rev-parse $m >expect &&
+ echo "verify $m $m~1" >stdin &&
+ test_must_fail git update-ref --stdin <stdin &&
+ git rev-parse $m >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin verify fails for mistaken null value' '
+ git rev-parse $m >expect &&
+ echo "verify $m $Z" >stdin &&
+ test_must_fail git update-ref --stdin <stdin &&
+ git rev-parse $m >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin verify fails for mistaken empty value' '
+ M=$(git rev-parse $m) &&
+ test_when_finished "git update-ref $m $M" &&
+ git rev-parse $m >expect &&
+ echo "verify $m" >stdin &&
+ test_must_fail git update-ref --stdin <stdin &&
+ git rev-parse $m >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin update refs works with identity updates' '
+ cat >stdin <<-EOF &&
+ update $a $m $m
+ update $b $m $m
+ update $c $Z $E
+ EOF
+ git update-ref --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin update refs fails with wrong old value' '
+ git update-ref $c $m &&
+ cat >stdin <<-EOF &&
+ update $a $m $m
+ update $b $m $m
+ update $c ''
+ EOF
+ test_must_fail git update-ref --stdin <stdin 2>err &&
+ grep "fatal: cannot lock the ref '"'"'$c'"'"'" err &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual &&
+ git rev-parse $c >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin delete refs works with packed and loose refs' '
+ git pack-refs --all &&
+ git update-ref $c $m~1 &&
+ cat >stdin <<-EOF &&
+ delete $a $m
+ update $b $Z $m
+ update $c $E $m~1
+ EOF
+ git update-ref --stdin <stdin &&
+ test_must_fail git rev-parse --verify -q $a &&
+ test_must_fail git rev-parse --verify -q $b &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin -z works on empty input' '
+ >stdin &&
+ git update-ref -z --stdin <stdin &&
+ git rev-parse --verify -q $m
+'
+
+test_expect_success 'stdin -z fails on empty line' '
+ echo "" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: whitespace before command: " err
+'
+
+test_expect_success 'stdin -z fails on empty command' '
+ printf $F "" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: empty command in input" err
+'
+
+test_expect_success 'stdin -z fails on only whitespace' '
+ printf $F " " >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: whitespace before command: " err
+'
+
+test_expect_success 'stdin -z fails on leading whitespace' '
+ printf $F " create $a" "$m" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: whitespace before command: create $a" err
+'
+
+test_expect_success 'stdin -z fails on unknown command' '
+ printf $F "unknown $a" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: unknown command: unknown $a" err
+'
+
+test_expect_success 'stdin -z fails create with no ref' '
+ printf $F "create " >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: create: missing <ref>" err
+'
+
+test_expect_success 'stdin -z fails create with no new value' '
+ printf $F "create $a" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: create $a: unexpected end of input when reading <newvalue>" err
+'
+
+test_expect_success 'stdin -z fails create with too many arguments' '
+ printf $F "create $a" "$m" "$m" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: unknown command: $m" err
+'
+
+test_expect_success 'stdin -z fails update with no ref' '
+ printf $F "update " >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: update: missing <ref>" err
+'
+
+test_expect_success 'stdin -z fails update with too few args' '
+ printf $F "update $a" "$m" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: update $a: unexpected end of input when reading <oldvalue>" err
+'
+
+test_expect_success 'stdin -z emits warning with empty new value' '
+ git update-ref $a $m &&
+ printf $F "update $a" "" "" >stdin &&
+ git update-ref -z --stdin <stdin 2>err &&
+ grep "warning: update $a: missing <newvalue>, treating as zero" err &&
+ test_must_fail git rev-parse --verify -q $a
+'
+
+test_expect_success 'stdin -z fails update with no new value' '
+ printf $F "update $a" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: update $a: unexpected end of input when reading <newvalue>" err
+'
+
+test_expect_success 'stdin -z fails update with no old value' '
+ printf $F "update $a" "$m" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: update $a: unexpected end of input when reading <oldvalue>" err
+'
+
+test_expect_success 'stdin -z fails update with too many arguments' '
+ printf $F "update $m" "$m" "$m" "$m" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: unknown command: $m" err
+'
+
+test_expect_success 'stdin -z fails delete with no ref' '
+ printf $F "delete " >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: delete: missing <ref>" err
+'
+
+test_expect_success 'stdin -z fails delete with no old value' '
+ printf $F "delete $a" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: delete $a: unexpected end of input when reading <oldvalue>" err
+'
+
+test_expect_success 'stdin -z fails delete with too many arguments' '
+ printf $F "delete $m" "$m" "$m" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: unknown command: $m" err
+'
+
+test_expect_success 'stdin -z fails verify with too many arguments' '
+ printf $F "verify $m" "$m" "$m" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: unknown command: $m" err
+'
+
+test_expect_success 'stdin -z fails verify with no old value' '
+ printf $F "verify $a" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: verify $a: unexpected end of input when reading <oldvalue>" err
+'
+
+test_expect_success 'stdin -z fails option with unknown name' '
+ printf $F "option unknown" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: option unknown: unknown" err
+'
+
+test_expect_success 'stdin -z fails with duplicate refs' '
+ printf $F "create $a" "$m" "create $b" "$m" "create $a" "$m" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: Multiple updates for ref '"'"'$a'"'"' not allowed." err
+'
+
+test_expect_success 'stdin -z create ref works' '
+ printf $F "create $a" "$m" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z update ref creates with zero old value' '
+ printf $F "update $b" "$m" "$Z" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual &&
+ git update-ref -d $b
+'
+
+test_expect_success 'stdin -z update ref creates with empty old value' '
+ printf $F "update $b" "$m" "" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z create ref works with path with space to blob' '
+ printf $F "create refs/blobs/pws" "$m:$pws" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ git rev-parse "$m:$pws" >expect &&
+ git rev-parse refs/blobs/pws >actual &&
+ test_cmp expect actual &&
+ git update-ref -d refs/blobs/pws
+'
+
+test_expect_success 'stdin -z update ref fails with wrong old value' '
+ printf $F "update $c" "$m" "$m~1" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: cannot lock the ref '"'"'$c'"'"'" err &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin -z update ref fails with bad old value' '
+ printf $F "update $c" "$m" "does-not-exist" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: update $c: invalid <oldvalue>: does-not-exist" err &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin -z create ref fails when ref exists' '
+ git update-ref $c $m &&
+ git rev-parse "$c" >expect &&
+ printf $F "create $c" "$m~1" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: cannot lock the ref '"'"'$c'"'"'" err &&
+ git rev-parse "$c" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z create ref fails with bad new value' '
+ git update-ref -d "$c" &&
+ printf $F "create $c" "does-not-exist" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: create $c: invalid <newvalue>: does-not-exist" err &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin -z create ref fails with empty new value' '
+ printf $F "create $c" "" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: create $c: missing <newvalue>" err &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin -z update ref works with right old value' '
+ printf $F "update $b" "$m~1" "$m" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ git rev-parse $m~1 >expect &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z delete ref fails with wrong old value' '
+ printf $F "delete $a" "$m~1" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: cannot lock the ref '"'"'$a'"'"'" err &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z delete ref fails with zero old value' '
+ printf $F "delete $a" "$Z" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: delete $a: zero <oldvalue>" err &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z update symref works option no-deref' '
+ git symbolic-ref refs/TESTSYMREF $b &&
+ printf $F "option no-deref" "update refs/TESTSYMREF" "$a" "$b" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ git rev-parse refs/TESTSYMREF >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual &&
+ git rev-parse $m~1 >expect &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z delete symref works option no-deref' '
+ git symbolic-ref refs/TESTSYMREF $b &&
+ printf $F "option no-deref" "delete refs/TESTSYMREF" "$b" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ test_must_fail git rev-parse --verify -q refs/TESTSYMREF &&
+ git rev-parse $m~1 >expect &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z delete ref works with right old value' '
+ printf $F "delete $b" "$m~1" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ test_must_fail git rev-parse --verify -q $b
+'
+
+test_expect_success 'stdin -z update/create/verify combination works' '
+ printf $F "update $a" "$m" "" "create $b" "$m" "verify $c" "" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin -z verify succeeds for correct value' '
+ git rev-parse $m >expect &&
+ printf $F "verify $m" "$m" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ git rev-parse $m >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z verify succeeds for missing reference' '
+ printf $F "verify refs/heads/missing" "$Z" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ test_must_fail git rev-parse --verify -q refs/heads/missing
+'
+
+test_expect_success 'stdin -z verify treats no value as missing' '
+ printf $F "verify refs/heads/missing" "" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ test_must_fail git rev-parse --verify -q refs/heads/missing
+'
+
+test_expect_success 'stdin -z verify fails for wrong value' '
+ git rev-parse $m >expect &&
+ printf $F "verify $m" "$m~1" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin &&
+ git rev-parse $m >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z verify fails for mistaken null value' '
+ git rev-parse $m >expect &&
+ printf $F "verify $m" "$Z" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin &&
+ git rev-parse $m >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z verify fails for mistaken empty value' '
+ M=$(git rev-parse $m) &&
+ test_when_finished "git update-ref $m $M" &&
+ git rev-parse $m >expect &&
+ printf $F "verify $m" "" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin &&
+ git rev-parse $m >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z update refs works with identity updates' '
+ printf $F "update $a" "$m" "$m" "update $b" "$m" "$m" "update $c" "$Z" "" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_expect_success 'stdin -z update refs fails with wrong old value' '
+ git update-ref $c $m &&
+ printf $F "update $a" "$m" "$m" "update $b" "$m" "$m" "update $c" "$m" "$Z" >stdin &&
+ test_must_fail git update-ref -z --stdin <stdin 2>err &&
+ grep "fatal: cannot lock the ref '"'"'$c'"'"'" err &&
+ git rev-parse $m >expect &&
+ git rev-parse $a >actual &&
+ test_cmp expect actual &&
+ git rev-parse $b >actual &&
+ test_cmp expect actual &&
+ git rev-parse $c >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stdin -z delete refs works with packed and loose refs' '
+ git pack-refs --all &&
+ git update-ref $c $m~1 &&
+ printf $F "delete $a" "$m" "update $b" "$Z" "$m" "update $c" "" "$m~1" >stdin &&
+ git update-ref -z --stdin <stdin &&
+ test_must_fail git rev-parse --verify -q $a &&
+ test_must_fail git rev-parse --verify -q $b &&
+ test_must_fail git rev-parse --verify -q $c
+'
+
+test_done
diff --git a/t/t1470-refs-lmdb-backend-reflog.sh b/t/t1470-refs-lmdb-backend-reflog.sh
new file mode 100755
index 0000000..83bfba0
--- /dev/null
+++ b/t/t1470-refs-lmdb-backend-reflog.sh
@@ -0,0 +1,359 @@
+#!/bin/sh
+#
+# Copyright (c) 2015 Twitter, Inc
+# Copyright (c) 2007 Junio C Hamano
+#
+
+test_description='Test prune and reflog expiration'
+TEST_NO_CREATE_REPO=1
+. ./test-lib.sh
+
+if ! test_have_prereq LMDB
+then
+ skip_all="Skipping lmdb refs backend tests, lmdb backend not built"
+ test_done
+fi
+
+raw_reflog() {
+ cat .git/logs/$1 2>/dev/null || test-refs-lmdb-backend -l "$1"
+}
+
+append_reflog() {
+ test-refs-lmdb-backend -a "$1"
+}
+
+check_have () {
+ gaah= &&
+ for N in "$@"
+ do
+ eval "o=\$$N" && git cat-file -t $o || {
+ echo Gaah $N
+ gaah=$N
+ break
+ }
+ done &&
+ test -z "$gaah"
+}
+
+check_fsck () {
+ output=$(git fsck --full)
+ case "$1" in
+ '')
+ test -z "$output" ;;
+ *)
+ echo "$output" | grep "$1" ;;
+ esac
+}
+
+corrupt () {
+ aa=${1%??????????????????????????????????????} zz=${1#??}
+ mv .git/objects/$aa/$zz .git/$aa$zz
+}
+
+recover () {
+ aa=${1%??????????????????????????????????????} zz=${1#??}
+ mkdir -p .git/objects/$aa
+ mv .git/$aa$zz .git/objects/$aa/$zz
+}
+
+check_dont_have () {
+ gaah= &&
+ for N in "$@"
+ do
+ eval "o=\$$N"
+ git cat-file -t $o && {
+ echo Gaah $N
+ gaah=$N
+ break
+ }
+ done
+ test -z "$gaah"
+}
+
+test_expect_success setup '
+ git init --ref-storage=lmdb &&
+ mkdir -p A/B &&
+ echo rat >C &&
+ echo ox >A/D &&
+ echo tiger >A/B/E &&
+ git add . &&
+
+ test_tick && git commit -m rabbit &&
+ H=`git rev-parse --verify HEAD` &&
+ A=`git rev-parse --verify HEAD:A` &&
+ B=`git rev-parse --verify HEAD:A/B` &&
+ C=`git rev-parse --verify HEAD:C` &&
+ D=`git rev-parse --verify HEAD:A/D` &&
+ E=`git rev-parse --verify HEAD:A/B/E` &&
+ check_fsck &&
+
+ test_chmod +x C &&
+ git add C &&
+ test_tick && git commit -m dragon &&
+ L=`git rev-parse --verify HEAD` &&
+ check_fsck &&
+
+ rm -f C A/B/E &&
+ echo snake >F &&
+ echo horse >A/G &&
+ git add F A/G &&
+ test_tick && git commit -a -m sheep &&
+ F=`git rev-parse --verify HEAD:F` &&
+ G=`git rev-parse --verify HEAD:A/G` &&
+ I=`git rev-parse --verify HEAD:A` &&
+ J=`git rev-parse --verify HEAD` &&
+ check_fsck &&
+
+ rm -f A/G &&
+ test_tick && git commit -a -m monkey &&
+ K=`git rev-parse --verify HEAD` &&
+ check_fsck &&
+
+ check_have A B C D E F G H I J K L &&
+
+ git prune &&
+
+ check_have A B C D E F G H I J K L &&
+
+ check_fsck &&
+
+ raw_reflog refs/heads/master >reflog &&
+ test_when_finished rm -f reflog &&
+ test_line_count = 4 reflog
+'
+
+test_expect_success rewind '
+ test_tick && git reset --hard HEAD~2 &&
+ test -f C &&
+ test -f A/B/E &&
+ ! test -f F &&
+ ! test -f A/G &&
+
+ check_have A B C D E F G H I J K L &&
+
+ git prune &&
+
+ check_have A B C D E F G H I J K L &&
+
+ raw_reflog refs/heads/master >reflog &&
+ test_when_finished rm -f reflog &&
+ test_line_count = 5 reflog
+'
+
+test_expect_success 'corrupt and check' '
+
+ corrupt $F &&
+ check_fsck "missing blob $F"
+
+'
+
+test_expect_success 'reflog expire --dry-run should not touch reflog' '
+
+ git reflog expire --dry-run \
+ --expire=$(($test_tick - 10000)) \
+ --expire-unreachable=$(($test_tick - 10000)) \
+ --stale-fix \
+ --all &&
+
+ raw_reflog refs/heads/master >reflog &&
+ test_when_finished rm -f reflog &&
+ test_line_count = 5 reflog &&
+
+ check_fsck "missing blob $F"
+'
+
+test_expect_success 'reflog expire' '
+
+ git reflog expire --verbose \
+ --expire=$(($test_tick - 10000)) \
+ --expire-unreachable=$(($test_tick - 10000)) \
+ --stale-fix \
+ --all &&
+
+ echo git reflog expire --verbose \
+ --expire=$(($test_tick - 10000)) \
+ --expire-unreachable=$(($test_tick - 10000)) \
+ --stale-fix \
+ --all &&
+
+ raw_reflog refs/heads/master >reflog &&
+ test_when_finished rm -f reflog &&
+ test_line_count = 2 reflog &&
+
+ check_fsck "dangling commit $K"
+'
+
+test_expect_success 'prune and fsck' '
+
+ git prune &&
+ check_fsck &&
+
+ check_have A B C D E H L &&
+ check_dont_have F G I J K
+
+'
+
+test_expect_success 'recover and check' '
+
+ recover $F &&
+ check_fsck "dangling blob $F"
+
+'
+
+test_expect_success 'delete' '
+ echo 1 > C &&
+ test_tick &&
+ git commit -m rat C &&
+
+ echo 2 > C &&
+ test_tick &&
+ git commit -m ox C &&
+
+ echo 3 > C &&
+ test_tick &&
+ git commit -m tiger C &&
+
+ HEAD_entry_count=$(git reflog | wc -l) &&
+ master_entry_count=$(git reflog show master | wc -l) &&
+
+ test $HEAD_entry_count = 5 &&
+ test $master_entry_count = 5 &&
+
+
+ git reflog delete master@{1} &&
+ git reflog show master > output &&
+ test $(($master_entry_count - 1)) = $(wc -l < output) &&
+ test $HEAD_entry_count = $(git reflog | wc -l) &&
+ ! grep ox < output &&
+
+ master_entry_count=$(wc -l < output) &&
+
+ git reflog delete HEAD@{1} &&
+ test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
+ test $master_entry_count = $(git reflog show master | wc -l) &&
+
+ HEAD_entry_count=$(git reflog | wc -l) &&
+
+ git reflog delete master@{07.04.2005.15:15:00.-0700} &&
+ git reflog show master > output &&
+ test $(($master_entry_count - 1)) = $(wc -l < output) &&
+ ! grep dragon < output
+
+'
+
+test_expect_success 'rewind2' '
+
+ test_tick && git reset --hard HEAD~2 &&
+ raw_reflog refs/heads/master >reflog &&
+ test_when_finished rm -f reflog &&
+ test_line_count = 4 reflog
+'
+
+test_expect_success '--expire=never' '
+
+ git reflog expire --verbose \
+ --expire=never \
+ --expire-unreachable=never \
+ --all &&
+ raw_reflog refs/heads/master >reflog &&
+ test_when_finished rm -f reflog &&
+ test_line_count = 4 reflog
+'
+
+test_expect_success 'gc.reflogexpire=never' '
+
+ git config gc.reflogexpire never &&
+ git config gc.reflogexpireunreachable never &&
+ git reflog expire --verbose --all &&
+ raw_reflog refs/heads/master >reflog &&
+ test_when_finished rm -f reflog &&
+ test_line_count = 4 reflog
+'
+
+test_expect_success 'gc.reflogexpire=false' '
+
+ git config gc.reflogexpire false &&
+ git config gc.reflogexpireunreachable false &&
+ git reflog expire --verbose --all &&
+ raw_reflog refs/heads/master >reflog &&
+ test_when_finished rm -f reflog &&
+ test_line_count = 4 reflog &&
+
+ git config --unset gc.reflogexpire &&
+ git config --unset gc.reflogexpireunreachable
+
+'
+
+test_expect_success 'checkout should not delete log for packed ref' '
+ test $(git reflog master | wc -l) = 4 &&
+ git branch foo &&
+ git pack-refs --all &&
+ git checkout foo &&
+ test $(git reflog master | wc -l) = 4
+'
+
+test_expect_success 'stale dirs do not cause d/f conflicts (reflogs on)' '
+ test_when_finished "git branch -d one || git branch -d one/two" &&
+
+ git branch one/two master &&
+ echo "one/two@{0} branch: Created from master" >expect &&
+ git log -g --format="%gd %gs" one/two >actual &&
+ test_cmp expect actual &&
+ git branch -d one/two &&
+
+ # now logs/refs/heads/one is a stale directory, but
+ # we should move it out of the way to create "one" reflog
+ git branch one master &&
+ echo "one@{0} branch: Created from master" >expect &&
+ git log -g --format="%gd %gs" one >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
+ test_when_finished "git branch -d one || git branch -d one/two" &&
+
+ git branch one/two master &&
+ echo "one/two@{0} branch: Created from master" >expect &&
+ git log -g --format="%gd %gs" one/two >actual &&
+ test_cmp expect actual &&
+ git branch -d one/two &&
+
+ # same as before, but we only create a reflog for "one" if
+ # it already exists, which it does not
+ git -c core.logallrefupdates=false branch one master &&
+ : >expect &&
+ git log -g --format="%gd %gs" one >actual &&
+ test_cmp expect actual
+'
+
+# Triggering the bug detected by this test requires a newline to fall
+# exactly BUFSIZ-1 bytes from the end of the file. We don't know
+# what that value is, since it's platform dependent. However, if
+# we choose some value N, we also catch any D which divides N evenly
+# (since we will read backwards in chunks of D). So we choose 8K,
+# which catches glibc (with an 8K BUFSIZ) and *BSD (1K).
+#
+# Each line is 114 characters, so we need 75 to still have a few before the
+# last 8K. The 89-character padding on the final entry lines up our
+# newline exactly.
+test_expect_success 'parsing reverse reflogs at BUFSIZ boundaries' '
+ git checkout -b reflogskip &&
+ z38=00000000000000000000000000000000000000 &&
+ ident="abc <xyz> 0000000001 +0000" &&
+ for i in $(test_seq 1 75); do
+ printf "$z38%02d $z38%02d %s\t" $i $(($i+1)) "$ident" &&
+ if test $i = 75; then
+ for j in $(test_seq 1 89); do
+ printf X
+ done
+ else
+ printf X
+ fi &&
+ printf "\n"
+ done | append_reflog refs/heads/reflogskip &&
+ git rev-parse reflogskip@{73} >actual &&
+ echo ${z38}03 >expect &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t1480-refs-lmdb-submodule.sh b/t/t1480-refs-lmdb-submodule.sh
new file mode 100755
index 0000000..c7d911a
--- /dev/null
+++ b/t/t1480-refs-lmdb-submodule.sh
@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+# Copyright (c) 2016 Twitter, Inc
+# Based on t5531-deep-submodule-push.sh
+
+test_description='Test lmdb refs backend'
+TEST_NO_CREATE_REPO=1
+. ./test-lib.sh
+
+if ! test_have_prereq LMDB
+then
+ skip_all="Skipping lmdb refs backend tests, lmdb backend not built"
+ test_done
+fi
+
+test_expect_success setup '
+ mkdir pub.git &&
+ GIT_DIR=pub.git git init --bare &&
+ GIT_DIR=pub.git git config receive.fsckobjects true &&
+ mkdir work &&
+ (
+ cd work &&
+ git init --ref-storage=lmdb &&
+ git config push.default matching &&
+ mkdir -p gar/bage &&
+ (
+ cd gar/bage &&
+ git init --ref-storage=lmdb &&
+ git config push.default matching &&
+ >junk &&
+ git add junk &&
+ git commit -m "Initial junk"
+ ) &&
+ git add gar/bage &&
+ git commit -m "Initial superproject"
+ )
+'
+
+test_expect_success 'submodules have same ref storage' '
+ git init --ref-storage=lmdb test &&
+ (
+ cd test &&
+ git submodule add ../work/gar/bage w
+ ) &&
+ (
+ cd test/w &&
+ git config extensions.refstorage >cfg &&
+ echo lmdb >expect &&
+ test_cmp cfg expect
+ )
+'
+
+test_expect_success 'push with correct backend' '
+ (
+ cd work/gar/bage &&
+ >junk2 &&
+ git add junk2 &&
+ git commit -m "Second junk"
+ ) &&
+ (
+ cd work &&
+ git add gar/bage &&
+ git commit -m "Second commit for gar/bage" &&
+ git push --recurse-submodules=check ../pub.git master
+ )
+'
+
+test_expect_success 'commit with different backend fails' '
+ (
+ cd work/gar/bage &&
+ test_commit junk3 &&
+ # manually convert to files-backend
+ gitdir="$(git rev-parse --git-dir)" &&
+ mkdir -p "$gitdir/refs/heads" &&
+ git rev-parse HEAD >"$gitdir/refs/heads/master" &&
+ git config --local --unset extensions.refStorage &&
+ rm -r "$gitdir/refdb"
+ ) &&
+ (
+ cd work &&
+ test_must_fail git add gar/bage
+ )
+'
+
+test_done
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0b47eb6..ce40770 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -960,6 +960,7 @@ test -z "$NO_PERL" && test_set_prereq PERL
test -z "$NO_PYTHON" && test_set_prereq PYTHON
test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
+test -n "$USE_LIBLMDB" && test_set_prereq LMDB
# Can we rely on git's output in the C locale?
if test -n "$GETTEXT_POISON"
--
2.4.2.749.g730654d-twtrsrc
^ permalink raw reply related [flat|nested] 53+ messages in thread
* Re: [PATCH v4 00/20] refs backend
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
` (20 preceding siblings ...)
2016-02-05 19:44 ` [PATCH v4 21/21] refs: tests for lmdb backend David Turner
@ 2016-02-08 23:37 ` Junio C Hamano
21 siblings, 0 replies; 53+ messages in thread
From: Junio C Hamano @ 2016-02-08 23:37 UTC (permalink / raw)
To: David Turner; +Cc: git, mhagger
David Turner <dturner@twopensource.com> writes:
> Changes to this version:
> re-rolled on top of pu as-of 9db66d9f1aa.
>
> Bug fixes include:
> For submodules: memory leaks; segfault on bad config. (thanks to Peff)
> In symref splitting: check that would always succeed (thanks to Peff)
> A bogus double-declaration of a var (thanks to Ramsay Jones)
> Two memory leaks (thanks to Thomas Gummerer)
> An unused var (thanks to Duy Nguyen)
>
> Other improvements are:
> Strings prepped for 18n (thanks to Duy Nguyen)
> Cleaner submodule handling (thanks to Peff)
> Whitelisting instead of blacklisting in git-new-workdir (thanks to
> Thomas Gummerer)
> Allow older gits to recognize lmdb-backend git repos (thanks to Duy Nguyen)
> Tab completion and cleaner commit messages (thanks SZEDER Gábor)
> Removed some #ifdefs, moving all backend setup to one place (thanks to Duy
> Nguyen)
>
> Thanks to all for reviews.
Thanks for a reroll.
Applied this on top of a merge between the current 'master' and
'sb/submodule-parallel-update' topic to untangle the dependency;
otherwise there is no way for this topic to make progress X-<.
Let's see how well this round goes.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 02/21] refs: add methods for misc ref operations
2016-02-05 19:44 ` [PATCH v4 02/21] refs: add methods for misc ref operations David Turner
@ 2016-02-11 7:45 ` Michael Haggerty
2016-02-12 1:09 ` David Turner
0 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-11 7:45 UTC (permalink / raw)
To: David Turner, git; +Cc: Ronnie Sahlberg
On 02/05/2016 08:44 PM, David Turner wrote:
> 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 | 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"
You can't see it in this diff's context, but there is already an
'#include "refs.h"' in this file.
> [...]
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 03/21] refs: add methods for the ref iterators
2016-02-05 19:44 ` [PATCH v4 03/21] refs: add methods for the ref iterators David Turner
@ 2016-02-11 8:42 ` Michael Haggerty
2016-02-12 1:08 ` David Turner
0 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-11 8:42 UTC (permalink / raw)
To: David Turner, git; +Cc: Ronnie Sahlberg
On 02/05/2016 08:44 PM, David Turner wrote:
> From: Ronnie Sahlberg <sahlberg@google.com>
>
> Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
> refs.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> refs/files-backend.c | 41 +++++++++++++++++++++++++++------------
> refs/refs-internal.h | 29 ++++++++++++++++++++++++++++
> 3 files changed, 112 insertions(+), 12 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index afdde7d..e598b73 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1158,3 +1158,57 @@ int resolve_gitlink_ref(const char *path, const char *refname,
> {
> return the_refs_backend->resolve_gitlink_ref(path, refname, sha1);
> }
> +
> +int head_ref(each_ref_fn fn, void *cb_data)
> +{
> + return the_refs_backend->head_ref(fn, cb_data);
> +}
> +
> +int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
> +{
> + return the_refs_backend->head_ref_submodule(submodule, fn, cb_data);
> +}
> +
I think it is unnecessary to have so many virtual functions. For
example, here you have made head_ref_submodule() virtual. But the files
and lmdb implementations of this function are identical. They both call
do_head_ref(), which are (confusingly) two independent static functions.
But those functions are *also* defined identically, namely
> static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)
> {
> struct object_id oid;
> int flag;
>
> if (submodule) {
> if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
> return fn("HEAD", &oid, 0, cb_data);
>
> return 0;
> }
>
> if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
> return fn("HEAD", &oid, flag, cb_data);
>
> return 0;
> }
>
After all, what else would they possibly want to do? And both
resolve_gitlink_ref() and read_ref_full() are already virtual functions
(actually read_ref_full() only has a single definition but it calls the
virtualized resolve_ref_unsafe()).
So it seems to me that it is unnecessary for head_ref_submodule() to be
virtual, and that there only needs to be one definition of do_head_ref().
(Off-topic: for that matter, do_head_ref() is itself almost pointless.
It could easily be inlined if we were sure that nobody passes it
submodule==NULL.)
Similarly, I bet that if do_for_each_ref() were just a little bit more
capable, then the following functions could also remain non-virtual
(i.e., one definition could be shared across all backend implementations):
* for_each_ref()
* for_each_ref_submodule()
* for_each_ref_in()
* for_each_fullref_in()
* for_each_ref_in_submodule()
* for_each_replace_ref()
* for_each_namespaced_ref()
* for_each_rawref()
> [...]
> diff --git a/refs/refs-internal.h b/refs/refs-internal.h
> index e83bc22..4a1d215 100644
> --- a/refs/refs-internal.h
> +++ b/refs/refs-internal.h
> @@ -216,6 +216,24 @@ typedef int verify_refname_available_fn(const char *refname, struct string_list
> typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,
> unsigned char *sha1);
>
> +/* iteration methods */
> +typedef int head_ref_fn(each_ref_fn fn, void *cb_data);
> +typedef int head_ref_submodule_fn(const char *submodule, each_ref_fn fn,
> + void *cb_data);
> +typedef int for_each_ref_fn(each_ref_fn fn, void *cb_data);
> +typedef int for_each_ref_submodule_fn(const char *submodule, each_ref_fn fn,
> + void *cb_data);
> +typedef int for_each_ref_in_fn(const char *prefix, each_ref_fn fn,
> + void *cb_data);
> +typedef int for_each_fullref_in_fn(const char *prefix, each_ref_fn fn,
> + void *cb_data, unsigned int broken);
> +typedef int for_each_ref_in_submodule_fn(const char *submodule,
> + const char *prefix,
> + each_ref_fn fn, void *cb_data);
> +typedef int for_each_rawref_fn(each_ref_fn fn, void *cb_data);
> +typedef int for_each_namespaced_ref_fn(each_ref_fn fn, void *cb_data);
> +typedef int for_each_replace_ref_fn(each_ref_fn fn, void *cb_data);
> +
> struct ref_storage_be {
> struct ref_storage_be *next;
> const char *name;
> @@ -228,6 +246,17 @@ struct ref_storage_be {
> resolve_ref_unsafe_fn *resolve_ref_unsafe;
> verify_refname_available_fn *verify_refname_available;
> resolve_gitlink_ref_fn *resolve_gitlink_ref;
> +
> + head_ref_fn *head_ref;
> + head_ref_submodule_fn *head_ref_submodule;
> + for_each_ref_fn *for_each_ref;
> + for_each_ref_submodule_fn *for_each_ref_submodule;
> + for_each_ref_in_fn *for_each_ref_in;
> + for_each_fullref_in_fn *for_each_fullref_in;
> + for_each_ref_in_submodule_fn *for_each_ref_in_submodule;
> + for_each_rawref_fn *for_each_rawref;
> + for_each_namespaced_ref_fn *for_each_namespaced_ref;
> + for_each_replace_ref_fn *for_each_replace_ref;
> };
>
> extern struct ref_storage_be refs_be_files;
>
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 20/21] refs: add LMDB refs storage backend
2016-02-05 19:44 ` [PATCH v4 20/21] refs: add LMDB refs storage backend David Turner
@ 2016-02-11 8:48 ` Michael Haggerty
2016-02-11 21:21 ` David Turner
2016-02-12 17:01 ` Michael Haggerty
2016-02-14 12:04 ` Duy Nguyen
2 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-11 8:48 UTC (permalink / raw)
To: David Turner, git
On 02/05/2016 08:44 PM, David Turner wrote:
> Add a database backend for refs using LMDB. This backend runs git
> for-each-ref about 30% faster than the files backend with fully-packed
> refs on a repo with ~120k refs. It's also about 4x faster than using
> fully-unpacked refs. In addition, and perhaps more importantly, it
> avoids case-conflict issues on OS X.
When I compile this using gcc with -Werror=pointer-arith, I get the
following errors:
> refs/lmdb-backend.c: In function ‘rename_reflog_ent’:
> refs/lmdb-backend.c:1068:39: error: pointer of type ‘void *’ used in arithmetic [-Werror=pointer-arith]
> strbuf_add(&new_key_buf, key.mv_data + key.mv_size - 8, 8);
> ^
> refs/lmdb-backend.c:1068:53: error: pointer of type ‘void *’ used in arithmetic [-Werror=pointer-arith]
> strbuf_add(&new_key_buf, key.mv_data + key.mv_size - 8, 8);
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 08/21] refs: add methods to init refs db
2016-02-05 19:44 ` [PATCH v4 08/21] refs: add methods to init refs db David Turner
@ 2016-02-11 8:54 ` Michael Haggerty
2016-02-11 21:15 ` David Turner
0 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-11 8:54 UTC (permalink / raw)
To: David Turner, git
On 02/05/2016 08:44 PM, David Turner wrote:
> Alternate refs backends might not need the refs/heads directory and so
> on, so we make ref db initialization part of the backend.
>
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
> builtin/init-db.c | 20 ++++++++++----------
> refs.c | 5 +++++
> refs.h | 2 ++
> refs/files-backend.c | 16 ++++++++++++++++
> refs/refs-internal.h | 2 ++
> 5 files changed, 35 insertions(+), 10 deletions(-)
>
> [...]
> diff --git a/refs.h b/refs.h
> index 5bc3fbc..c5ecc52 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -66,6 +66,8 @@ extern int ref_exists(const char *refname);
>
> extern int is_branch(const char *refname);
>
> +extern int refs_init_db(struct strbuf *err, int shared);
The convention elsewhere is for "struct strbuf *err" to be the *last*
parameter.
> [...]
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 09/21] refs: add method to rename refs
2016-02-05 19:44 ` [PATCH v4 09/21] refs: add method to rename refs David Turner
@ 2016-02-11 9:00 ` Michael Haggerty
2016-02-11 21:12 ` David Turner
0 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-11 9:00 UTC (permalink / raw)
To: David Turner, git
On 02/05/2016 08:44 PM, David Turner wrote:
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
> refs.c | 5 +++++
> refs/files-backend.c | 4 +++-
> refs/refs-internal.h | 9 +++++++++
> 3 files changed, 17 insertions(+), 1 deletion(-)
>
> [...]
> diff --git a/refs/refs-internal.h b/refs/refs-internal.h
> index 5768fee..15fa99c 100644
> --- a/refs/refs-internal.h
> +++ b/refs/refs-internal.h
> @@ -67,6 +67,13 @@ int do_for_each_per_worktree_ref(const char *submodule, const char *base,
> each_ref_fn fn, int trim, int flags,
> void *cb_data);
>
> +/*
> + * Check if the new name does not conflict with any existing refs
> + * (other than possibly the old ref). Return 0 if the ref can be
> + * renamed to the new name.
> + */
> +int rename_ref_available(const char *oldname, const char *newname);
Thanks for adding a docstring for this function. But this function
already has a declaration later in the file so you should remove one or
the other.
> [...]
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 12/21] refs: allow log-only updates
2016-02-05 19:44 ` [PATCH v4 12/21] refs: allow log-only updates David Turner
@ 2016-02-11 10:03 ` Michael Haggerty
2016-02-11 21:23 ` David Turner
0 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-11 10:03 UTC (permalink / raw)
To: David Turner, git
On 02/05/2016 08:44 PM, David Turner wrote:
> The refs infrastructure learns about log-only ref updates, which only
> update the reflog. Later, we will use this to separate symbolic
> reference resolution from ref updating.
This looks good. I assume it will get some testing later in the series.
> [...]
> diff --git a/refs/refs-internal.h b/refs/refs-internal.h
> index fc5d1db..b5d0ab8 100644
> --- a/refs/refs-internal.h
> +++ b/refs/refs-internal.h
> @@ -42,6 +42,8 @@
> * value to ref_update::flags
> */
>
> +#define REF_LOG_ONLY 0x80
> +
Please add a comment explaining the meaning/purpose of this flag.
> [...]
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 09/21] refs: add method to rename refs
2016-02-11 9:00 ` Michael Haggerty
@ 2016-02-11 21:12 ` David Turner
0 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-11 21:12 UTC (permalink / raw)
To: Michael Haggerty, git
On Thu, 2016-02-11 at 10:00 +0100, Michael Haggerty wrote:
> On 02/05/2016 08:44 PM, David Turner wrote:
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > ---
> > refs.c | 5 +++++
> > refs/files-backend.c | 4 +++-
> > refs/refs-internal.h | 9 +++++++++
> > 3 files changed, 17 insertions(+), 1 deletion(-)
> >
> > [...]
> > diff --git a/refs/refs-internal.h b/refs/refs-internal.h
> > index 5768fee..15fa99c 100644
> > --- a/refs/refs-internal.h
> > +++ b/refs/refs-internal.h
> > @@ -67,6 +67,13 @@ int do_for_each_per_worktree_ref(const char
> > *submodule, const char *base,
> > each_ref_fn fn, int trim, int
> > flags,
> > void *cb_data);
> >
> > +/*
> > + * Check if the new name does not conflict with any existing refs
> > + * (other than possibly the old ref). Return 0 if the ref can be
> > + * renamed to the new name.
> > + */
> > +int rename_ref_available(const char *oldname, const char
> > *newname);
>
> Thanks for adding a docstring for this function. But this function
> already has a declaration later in the file so you should remove one
> or
> the other.
Fixed, thanks.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 08/21] refs: add methods to init refs db
2016-02-11 8:54 ` Michael Haggerty
@ 2016-02-11 21:15 ` David Turner
0 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-11 21:15 UTC (permalink / raw)
To: Michael Haggerty, git
On Thu, 2016-02-11 at 09:54 +0100, Michael Haggerty wrote:
> On 02/05/2016 08:44 PM, David Turner wrote:
> > Alternate refs backends might not need the refs/heads directory and
> > so
> > on, so we make ref db initialization part of the backend.
> >
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > ---
> > builtin/init-db.c | 20 ++++++++++----------
> > refs.c | 5 +++++
> > refs.h | 2 ++
> > refs/files-backend.c | 16 ++++++++++++++++
> > refs/refs-internal.h | 2 ++
> > 5 files changed, 35 insertions(+), 10 deletions(-)
> >
> > [...]
> > diff --git a/refs.h b/refs.h
> > index 5bc3fbc..c5ecc52 100644
> > --- a/refs.h
> > +++ b/refs.h
> > @@ -66,6 +66,8 @@ extern int ref_exists(const char *refname);
> >
> > extern int is_branch(const char *refname);
> >
> > +extern int refs_init_db(struct strbuf *err, int shared);
>
> The convention elsewhere is for "struct strbuf *err" to be the *last*
> parameter.
Fixed, thanks.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 20/21] refs: add LMDB refs storage backend
2016-02-11 8:48 ` Michael Haggerty
@ 2016-02-11 21:21 ` David Turner
0 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-11 21:21 UTC (permalink / raw)
To: Michael Haggerty, git
On Thu, 2016-02-11 at 09:48 +0100, Michael Haggerty wrote:
> On 02/05/2016 08:44 PM, David Turner wrote:
> > Add a database backend for refs using LMDB. This backend runs git
> > for-each-ref about 30% faster than the files backend with fully
> > -packed
> > refs on a repo with ~120k refs. It's also about 4x faster than
> > using
> > fully-unpacked refs. In addition, and perhaps more importantly, it
> > avoids case-conflict issues on OS X.
>
> When I compile this using gcc with -Werror=pointer-arith, I get the
> following errors:
>
> > refs/lmdb-backend.c: In function ‘rename_reflog_ent’:
> > refs/lmdb-backend.c:1068:39: error: pointer of type ‘void *’ used
> > in arithmetic [-Werror=pointer-arith]
> > strbuf_add(&new_key_buf, key.mv_data + key.mv_size - 8, 8);
> > ^
> > refs/lmdb-backend.c:1068:53: error: pointer of type ‘void *’ used
> > in arithmetic [-Werror=pointer-arith]
> > strbuf_add(&new_key_buf, key.mv_data + key.mv_size - 8, 8);
Fixed, thanks.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 12/21] refs: allow log-only updates
2016-02-11 10:03 ` Michael Haggerty
@ 2016-02-11 21:23 ` David Turner
0 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-11 21:23 UTC (permalink / raw)
To: Michael Haggerty; +Cc: git mailing list
On Thu, 2016-02-11 at 11:03 +0100, Michael Haggerty wrote:
> On 02/05/2016 08:44 PM, David Turner wrote:
> > The refs infrastructure learns about log-only ref updates, which
> > only
> > update the reflog. Later, we will use this to separate symbolic
> > reference resolution from ref updating.
>
> This looks good. I assume it will get some testing later in the
> series.
The existing tests cover this pretty well, I think. It's not intended
to have user-visible results, so it's hard to specifically test.
> > [...]
> > diff --git a/refs/refs-internal.h b/refs/refs-internal.h
> > index fc5d1db..b5d0ab8 100644
> > --- a/refs/refs-internal.h
> > +++ b/refs/refs-internal.h
> > @@ -42,6 +42,8 @@
> > * value to ref_update::flags
> > */
> >
> > +#define REF_LOG_ONLY 0x80
> > +
>
> Please add a comment explaining the meaning/purpose of this flag.
Commented, thanks.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 03/21] refs: add methods for the ref iterators
2016-02-11 8:42 ` Michael Haggerty
@ 2016-02-12 1:08 ` David Turner
0 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-12 1:08 UTC (permalink / raw)
To: Michael Haggerty, git mailing list
On Thu, 2016-02-11 at 09:42 +0100, Michael Haggerty wrote:
> On 02/05/2016 08:44 PM, David Turner wrote:
> > From: Ronnie Sahlberg <sahlberg@google.com>
> >
> > Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > ---
> > refs.c | 54
> > ++++++++++++++++++++++++++++++++++++++++++++++++++++
> > refs/files-backend.c | 41 +++++++++++++++++++++++++++------------
> > refs/refs-internal.h | 29 ++++++++++++++++++++++++++++
> > 3 files changed, 112 insertions(+), 12 deletions(-)
> >
> > diff --git a/refs.c b/refs.c
> > index afdde7d..e598b73 100644
> > --- a/refs.c
> > +++ b/refs.c
> > @@ -1158,3 +1158,57 @@ int resolve_gitlink_ref(const char *path,
> > const char *refname,
> > {
> > return the_refs_backend->resolve_gitlink_ref(path,
> > refname, sha1);
> > }
> > +
> > +int head_ref(each_ref_fn fn, void *cb_data)
> > +{
> > + return the_refs_backend->head_ref(fn, cb_data);
> > +}
> > +
> > +int head_ref_submodule(const char *submodule, each_ref_fn fn, void
> > *cb_data)
> > +{
> > + return the_refs_backend->head_ref_submodule(submodule, fn,
> > cb_data);
> > +}
> > +
>
> I think it is unnecessary to have so many virtual functions. For
> example, here you have made head_ref_submodule() virtual. But the
> files
> and lmdb implementations of this function are identical. They both
> call
> do_head_ref(), which are (confusingly) two independent static
> functions.
> But those functions are *also* defined identically, namely
>
> After all, what else would they possibly want to do? And both
> resolve_gitlink_ref() and read_ref_full() are already virtual
> functions
> (actually read_ref_full() only has a single definition but it calls
> the
> virtualized resolve_ref_unsafe()).
>
> So it seems to me that it is unnecessary for head_ref_submodule() to
> be
> virtual, and that there only needs to be one definition of
> do_head_ref().
>
> (Off-topic: for that matter, do_head_ref() is itself almost
> pointless.
> It could easily be inlined if we were sure that nobody passes it
> submodule==NULL.)
Added a commit to move these to common code and inline do_head_ref.
> Similarly, I bet that if do_for_each_ref() were just a little bit
> more
> capable, then the following functions could also remain non-virtual
> (i.e., one definition could be shared across all backend
> implementations):
>
> * for_each_ref()
> ...
Yeah, that makes sense. I think we've grown a few more of those funcs
since Ronnie's version, so virtualizing do_for_each_ref makes more
sense.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 02/21] refs: add methods for misc ref operations
2016-02-11 7:45 ` Michael Haggerty
@ 2016-02-12 1:09 ` David Turner
0 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-12 1:09 UTC (permalink / raw)
To: Michael Haggerty, git; +Cc: Ronnie Sahlberg
On Thu, 2016-02-11 at 08:45 +0100, Michael Haggerty wrote:
> On 02/05/2016 08:44 PM, David Turner wrote:
> > 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 | 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"
>
> You can't see it in this diff's context, but there is already an
> '#include "refs.h"' in this file.
Fixed this.
I think that's all of your comments so far, but I'm going to wait for
your second batch to reroll, to avoid unnecessary churn.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 13/21] refs: resolve symbolic refs first
2016-02-05 19:44 ` [PATCH v4 13/21] refs: resolve symbolic refs first David Turner
@ 2016-02-12 14:09 ` Michael Haggerty
2016-02-18 0:29 ` David Turner
0 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-12 14:09 UTC (permalink / raw)
To: David Turner, git
On 02/05/2016 08:44 PM, David Turner wrote:
> Before committing ref updates, split symbolic ref updates into two
> parts: an update to the underlying ref, and a log-only update to the
> symbolic ref. This ensures that both references are locked correctly
> while their reflogs are updated.
>
> It is still possible to confuse git by concurrent updates, since the
> splitting of symbolic refs does not happen under lock. So a symbolic ref
> could be replaced by a plain ref in the middle of this operation, which
> would lead to reflog discontinuities and missed old-ref checks.
This patch is doing too much at once for my little brain to follow.
My first hangup is the change to setting RESOLVE_REF_NO_RECURSE
unconditionally in lock_ref_sha1_basic(). I count five callers of that
function and see no justification for why the change is OK in the
context of each caller. Here are some thoughts:
* The call from files_create_symref() sets REF_NODEREF, so it is
unaffected by this change.
* The call from files_transaction_commit() is preceded by a call to
dereference_symrefs(), which I assume effectively replaces the need for
RESOLVE_REF_NO_RECURSE.
* There are two calls from files_rename_ref(). Why is it OK to do
without RESOLVE_REF_NO_RECURSE there?
* For the oldrefname call, I suppose the justification is the "(flag &
REF_ISSYMREF)" check earlier in the function. (But does this introduce a
significant TOCTOU race?)
* For the newrefname call, I suppose it's because the code a little
higher up tries to delete any existing reference with that name. It
looks to me like the old code was slightly broken: if newrefname was an
unborn symbolic reference, then: read_ref_full() would fail;
delete_ref() would be skipped; lock_ref_sha1_basic() would lock the
*referred-to* reference; the referred-to reference would be overwritten
instead of newrefname. So it could be that here REF_NODEREF indirectly
fixes a bug?
* The last call, from files_reflog_expire(), is also questionable before
your patch. If refname is a symref, then the function is expiring the
reflog of the symref. But (before this patch) it locks not the symref
but its referent. This was discussed in some length before on the
mailing list [1], and the conclusion was that the current behavior is
wrong, but for backwards compatibility reasons it would be safest to
change it to locking *both* the symref and its referent.
If possible, it would be better to split this patch up into several: the
first few would each add the REF_NODEREF flag at one callsite, with a
careful justification of why that is OK. Once all the callsites (except
the one in files_transaction_commit()) have been changed, then the last
patch could add the dereference_symrefs() machinery and change the last
callsite.
(I'm not certain that those steps are actually doable independently,
given that REF_NODEREF has other effects besides setting
RESOLVE_REF_NO_RECURSE.)
I'm not just being pedantic here. The patch as written is really too big
to review effectively.
Michael
[1]
http://thread.gmane.org/gmane.comp.version-control.git/263552/focus=263555
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 14/21] refs: always handle non-normal refs in files backend
2016-02-05 19:44 ` [PATCH v4 14/21] refs: always handle non-normal refs in files backend David Turner
@ 2016-02-12 15:07 ` Michael Haggerty
2016-02-18 2:44 ` David Turner
0 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-12 15:07 UTC (permalink / raw)
To: David Turner, git
On 02/05/2016 08:44 PM, David Turner wrote:
> Always handle non-normal (per-worktree or pseudo) refs in the files
> backend instead of alternate backends.
>
> Sometimes a ref transaction will update both a per-worktree ref and a
> normal ref. For instance, an ordinary commit might update
> refs/heads/master and HEAD (or at least HEAD's reflog).
>
> Updates to normal refs continue to go through the chosen backend.
>
> Updates to non-normal refs are moved to a separate files backend
> transaction.
>
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
> refs.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 79 insertions(+), 2 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 227c018..18ba356 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -9,6 +9,11 @@
> #include "object.h"
> #include "tag.h"
>
> +static const char split_transaction_fail_warning[] = N_(
> + "A ref transaction was split across two refs backends. Part of the "
> + "transaction succeeded, but then the update to the per-worktree refs "
> + "failed. Your repository may be in an inconsistent state.");
> +
> /*
> * We always have a files backend and it is the default.
> */
> @@ -791,6 +796,13 @@ void ref_transaction_free(struct ref_transaction *transaction)
> free(transaction);
> }
>
> +static void add_update_obj(struct ref_transaction *transaction,
> + struct ref_update *update)
> +{
> + ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);
> + transaction->updates[transaction->nr++] = update;
> +}
> +
> static struct ref_update *add_update(struct ref_transaction *transaction,
> const char *refname)
> {
> @@ -798,8 +810,7 @@ static struct ref_update *add_update(struct ref_transaction *transaction,
> struct ref_update *update = xcalloc(1, sizeof(*update) + len);
>
> memcpy((char *)update->refname, refname, len); /* includes NUL */
> - ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);
> - transaction->updates[transaction->nr++] = update;
> + add_update_obj(transaction, update);
> return update;
> }
>
> @@ -1217,11 +1228,38 @@ static int dereference_symrefs(struct ref_transaction *transaction,
> return 0;
> }
>
> +/*
> + * Move all non-normal ref updates into a specially-created
> + * files-backend transaction
> + */
> +static int move_abnormal_ref_updates(struct ref_transaction *transaction,
> + struct ref_transaction *files_transaction,
> + struct strbuf *err)
> +{
> + int i;
> +
> + for (i = 0; i < transaction->nr; i++) {
> + int last;
> + struct ref_update *update = transaction->updates[i];
> +
> + if (ref_type(update->refname) == REF_TYPE_NORMAL)
> + continue;
> +
> + last = --transaction->nr;
> + transaction->updates[i] = transaction->updates[last];
> + add_update_obj(files_transaction, update);
> + }
> +
> + return 0;
> +}
> +
I think this function is incorrect. The update that was previously at
transaction->updates[i] never gets checked for abnormality. You could
fix that and also avoid gratuitously changing the order of the updates
like this:
static int move_abnormal_ref_updates(struct ref_transaction *transaction,
struct ref_transaction *files_transaction,
struct strbuf *err)
{
int i, normal_nr = 0;
for (i = 0; i < transaction->nr; i++) {
struct ref_update *update = transaction->updates[i];
if (ref_type(update->refname) == REF_TYPE_NORMAL)
transaction->updates[normal_nr++] = update;
else
add_update_obj(files_transaction, update);
}
transaction->nr = normal_nr;
return 0;
}
Another alternative would be to set
update->flags |= REF_ABNORMAL
for the abnormal references and *leave them* in the original transaction
while also adding them to files_transactions. Then teach non-files
backends to skip over updates with REF_ABNORMAL.
The reason I thought of this is that long-term I'd like to make it
possible for some reference updates to fail without aborting the
transaction. To implement that, we would want a way for
ref_transaction_commit() to report back to its caller *which* updates
failed, and an obvious way to do that would be to store the
reference-specific errors in struct ref_update. If you leave the
abnormal ref_updates in the main transaction, then my hoped-for change
would be easier.
But that's a separate and hypothetical idea, so you don't have to let it
influence how you implement this patch.
> int ref_transaction_commit(struct ref_transaction *transaction,
> struct strbuf *err)
> {
> int ret = -1;
> struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
> + struct string_list files_affected_refnames = STRING_LIST_INIT_NODUP;
> + struct ref_transaction *files_transaction = NULL;
>
> assert(err);
>
> @@ -1237,6 +1275,26 @@ int ref_transaction_commit(struct ref_transaction *transaction,
> if (ret)
> goto done;
>
> + if (the_refs_backend != &refs_be_files) {
> + files_transaction = ref_transaction_begin(err);
> + if (!files_transaction)
> + goto done;
> +
> + ret = move_abnormal_ref_updates(transaction, files_transaction,
> + err);
> + if (ret)
> + goto done;
> +
> + /* files backend commit */
> + if (get_affected_refnames(files_transaction,
> + &files_affected_refnames,
> + err)) {
> + ret = TRANSACTION_GENERIC_ERROR;
> + goto done;
> + }
> + }
> +
> + /* main backend commit */
> if (get_affected_refnames(transaction, &affected_refnames, err)) {
> ret = TRANSACTION_GENERIC_ERROR;
> goto done;
> @@ -1244,8 +1302,24 @@ int ref_transaction_commit(struct ref_transaction *transaction,
>
> ret = the_refs_backend->transaction_commit(transaction,
> &affected_refnames, err);
> + if (ret)
> + goto done;
> +
> + if (files_transaction) {
> + ret = refs_be_files.transaction_commit(files_transaction,
> + &files_affected_refnames,
> + err);
> + if (ret) {
> + warning(split_transaction_fail_warning);
> + goto done;
> + }
> + }
> +
> done:
> string_list_clear(&affected_refnames, 0);
> + string_list_clear(&files_affected_refnames, 0);
> + if (files_transaction)
> + ref_transaction_free(files_transaction);
> return ret;
> }
>
> @@ -1285,6 +1359,9 @@ int peel_ref(const char *refname, unsigned char *sha1)
> int create_symref(const char *ref_target, const char *refs_heads_master,
> const char *logmsg)
> {
> + if (ref_type(ref_target) != REF_TYPE_NORMAL)
> + return refs_be_files.create_symref(ref_target, refs_heads_master,
> + logmsg);
> return the_refs_backend->create_symref(ref_target, refs_heads_master,
> logmsg);
> }
>
Does initial_ref_transaction_commit() need the same treatment?
I think files_rename_ref() will break if one of the references is normal
and one is abnormal. I think it would be OK to prohibit renaming
abnormal refs entirely (can anybody think of an important use case?),
but that function should at least do the checks.
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 15/21] init: allow alternate ref strorage to be set for new repos
2016-02-05 19:44 ` [PATCH v4 15/21] init: allow alternate ref strorage to be set for new repos David Turner
@ 2016-02-12 15:26 ` Michael Haggerty
2016-02-17 20:47 ` David Turner
0 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-12 15:26 UTC (permalink / raw)
To: David Turner, git; +Cc: SZEDER Gábor
On 02/05/2016 08:44 PM, David Turner wrote:
> git init learns a new argument --ref-storage. Presently, only
> "files" is supported, but later we will add other storage backends.
>
> When this argument is used, the repository's extensions.refStorage
> configuration value is set (as well as core.repositoryformatversion),
> and the ref storage backend's initdb function is used to set up the
> ref database.
>
> Signed-off-by: David Turner <dturner@twopensource.com>
> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
> ---
> Documentation/git-init-db.txt | 2 +-
> Documentation/git-init.txt | 7 +++++-
> builtin/init-db.c | 44 +++++++++++++++++++++++++++-------
> cache.h | 2 ++
> contrib/completion/git-completion.bash | 3 ++-
> path.c | 29 ++++++++++++++++++++--
> refs.c | 8 +++++++
> refs.h | 8 +++++++
> setup.c | 12 ++++++++++
> t/t0001-init.sh | 25 +++++++++++++++++++
> 10 files changed, 127 insertions(+), 13 deletions(-)
>
> [...]
> diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
> index 8174d27..d2b150f 100644
> --- a/Documentation/git-init.txt
> +++ b/Documentation/git-init.txt
> @@ -12,7 +12,7 @@ SYNOPSIS
> 'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
> [--separate-git-dir <git dir>]
> [--shared[=<permissions>]] [directory]
> -
> + [--ref-storage=<name>]
>
> DESCRIPTION
> -----------
> @@ -113,6 +113,11 @@ does not exist, it will be created.
>
> --
>
> +--ref-storage=<name>::
> +Type of refs storage backend. Default is to use the original "files"
> +storage, which stores ref data in files in .git/refs and
> +.git/packed-refs.
> +
Technically, that should be $GIT_DIR/refs and $GIT_DIR/packed-refs. But
it might be that we are not so picky about the distinction in the user docs.
> TEMPLATE DIRECTORY
> ------------------
>
> diff --git a/builtin/init-db.c b/builtin/init-db.c
> index 801e977..d331ce8 100644
> --- a/builtin/init-db.c
> +++ b/builtin/init-db.c
> @@ -24,6 +24,7 @@ static int init_is_bare_repository = 0;
> static int init_shared_repository = -1;
> static const char *init_db_template_dir;
> static const char *git_link;
> +static char *requested_ref_storage_backend;
>
> static void copy_templates_1(struct strbuf *path, struct strbuf *template,
> DIR *dir)
> @@ -179,6 +180,7 @@ static int create_default_files(const char *template_path)
> int reinit;
> int filemode;
> struct strbuf err = STRBUF_INIT;
> + int repo_version = 0;
>
> /* Just look for `init.templatedir` */
> git_config(git_init_db_config, NULL);
> @@ -205,6 +207,32 @@ static int create_default_files(const char *template_path)
> }
>
> /*
> + * Create the default symlink from ".git/HEAD" to the "master"
I know that you are just moving this comment, but s/symlink/symref/
would make it more up-to-date.
> + * branch, if it does not exist yet.
> + */
> [...]
> diff --git a/setup.c b/setup.c
> index 0deb022..1a62277 100644
> --- a/setup.c
> +++ b/setup.c
> @@ -1,5 +1,6 @@
> #include "cache.h"
> #include "dir.h"
> +#include "refs.h"
> #include "string-list.h"
>
> static int inside_git_dir = -1;
> @@ -263,6 +264,15 @@ int get_common_dir_noenv(struct strbuf *sb, const char *gitdir)
> return ret;
> }
>
> +int ref_storage_backend_config(const char *var, const char *value, void *ptr)
> +{
> + char **cdata = ptr;
> +
> + if (!strcmp(var, "extensions.refstorage"))
> + *cdata = xstrdup(value);
> + return 0;
> +}
> +
> /*
> * Test if it looks like we're at a git directory.
> * We want to see:
> @@ -390,6 +400,8 @@ static int check_repo_format(const char *var, const char *value, void *cb)
> ;
> else if (!strcmp(ext, "preciousobjects"))
> repository_format_precious_objects = git_config_bool(var, value);
> + else if (!strcmp(ext, "refstorage"))
> + ref_storage_backend = xstrdup(value);
> else
> string_list_append(&unknown_extensions, ext);
> }
> diff --git a/t/t0001-init.sh b/t/t0001-init.sh
> index 295aa59..31c8279 100755
> --- a/t/t0001-init.sh
> +++ b/t/t0001-init.sh
> @@ -174,6 +174,31 @@ test_expect_success 'reinit' '
> test_i18ncmp again/empty again/err2
> '
>
> +test_expect_success 'init with bogus storage backend fails' '
> +
> + (
> + mkdir again2 &&
> + cd again2 &&
> + test_must_fail git init --ref-storage=test >out2 2>err2 &&
> + test_i18ngrep "Unknown ref storage backend test" err2
> + )
> +'
> +
> +test_expect_failure 'reinit with changed storage backend fails' '
> +
> + (
> + mkdir again3 &&
> + cd again3 &&
> + git init >out1 2>err1 &&
> + git init --ref-storage=test >out2 2>err2
> + ) &&
> + test_i18ngrep "Initialized empty" again3/out1 &&
> + test_i18ngrep "Reinitialized existing" again3/out2 &&
> + >again3/empty &&
> + test_i18ncmp again3/empty again3/err1 &&
> + test_i18ncmp again3/empty again3/err2
> +'
> +
Is it worth testing re-initializing with the same --ref-storage? Perhaps
not.
> test_expect_success 'init with --template' '
> mkdir template-source &&
> echo content >template-source/file &&
>
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 19/21] refs: add register_ref_storage_backends()
2016-02-05 19:44 ` [PATCH v4 19/21] refs: add register_ref_storage_backends() David Turner
@ 2016-02-12 15:42 ` Michael Haggerty
2016-02-17 20:32 ` David Turner
0 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-12 15:42 UTC (permalink / raw)
To: David Turner, git
On 02/05/2016 08:44 PM, David Turner wrote:
> This new function will register all known ref storage backends... once
> there are any other than the default. For now, it's a no-op.
>
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
> builtin/init-db.c | 3 +++
> config.c | 25 +++++++++++++++++++++++++
> refs.c | 8 ++++++++
> refs.h | 2 ++
> 4 files changed, 38 insertions(+)
>
> [...]
> diff --git a/config.c b/config.c
> index b95ac3a..b9ef223 100644
> --- a/config.c
> +++ b/config.c
> @@ -11,6 +11,7 @@
> #include "strbuf.h"
> #include "quote.h"
> #include "hashmap.h"
> +#include "refs.h"
> #include "string-list.h"
> #include "utf8.h"
>
> @@ -1207,6 +1208,30 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
> }
>
> if (repo_config && !access_or_die(repo_config, R_OK, 0)) {
> + char *storage = NULL;
> +
> + /*
> + * make sure we always read the ref storage config
> + * from the extensions section on startup
> + */
> + ret += git_config_from_file(ref_storage_backend_config,
> + repo_config, &storage);
> +
> + register_ref_storage_backends();
> + if (!storage)
> + storage = xstrdup("");
> +
> + if ((!*storage) ||
> + (!strcmp(storage, "files"))) {
Nit: you have some unnecessary parentheses here.
> + /* default backend, nothing to do */
> + free(storage);
> + } else {
> + ref_storage_backend = storage;
> + if (set_ref_storage_backend(ref_storage_backend))
> + die(_("Unknown ref storage backend %s"),
> + ref_storage_backend);
> + }
> +
> ret += git_config_from_file(fn, repo_config, data);
> found += 1;
> }
> diff --git a/refs.c b/refs.c
> index 715a492..e50cca0 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1554,3 +1554,11 @@ done:
> string_list_clear(&affected_refnames, 0);
> return ret;
> }
> +
> +void register_ref_storage_backends(void) {
> + /*
> + * No need to register the files backend; it's registered by
> + * default. Add register_ref_storage_backend(ptr-to-backend)
> + * entries below when you add a new backend.
> + */
This function must be called every run, right? So why not make it
register the "files" backend explicitly? That would make it obvious
really quick if this function fails to get called in some code path.
Just a thought...
> +}
> [...]
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 20/21] refs: add LMDB refs storage backend
2016-02-05 19:44 ` [PATCH v4 20/21] refs: add LMDB refs storage backend David Turner
2016-02-11 8:48 ` Michael Haggerty
@ 2016-02-12 17:01 ` Michael Haggerty
2016-02-13 1:23 ` David Turner
2016-02-14 12:04 ` Duy Nguyen
2 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-12 17:01 UTC (permalink / raw)
To: David Turner, git
On 02/05/2016 08:44 PM, David Turner wrote:
> Add a database backend for refs using LMDB. This backend runs git
> for-each-ref about 30% faster than the files backend with fully-packed
> refs on a repo with ~120k refs. It's also about 4x faster than using
> fully-unpacked refs. In addition, and perhaps more importantly, it
> avoids case-conflict issues on OS X.
>
> LMDB has a few features that make it suitable for usage in git:
>
0. It is licensed under the OpenLDAP Public License, which is apparently
GPL compatible [1].
[1] http://www.gnu.org/licenses/license-list.en.html#newOpenLDAP
> 1. It is relatively lightweight; it requires only one header file, and
> the library code takes under 64k at runtime.
>
> 2. It is well-tested: it's been used in OpenLDAP for years.
>
> 3. It's very fast. LMDB's benchmarks show that it is among
> the fastest key-value stores.
>
> 4. It has a relatively simple concurrency story; readers don't
> block writers and writers don't block readers.
>
> Ronnie Sahlberg's original version of this patchset used tdb. The
> major disadvantage of tdb is that tdb is hard to build on OS X. It's
> also not in homebrew. So lmdb seemed simpler.
>
> To test this backend's correctness, I hacked test-lib.sh and
> test-lib-functions.sh to run all tests under the refs backend. Dozens
> of tests use manual ref/reflog reading/writing, or create submodules
> without passing --ref-storage to git init. If those tests are
> changed to use the update-ref machinery or test-refs-lmdb-backend (or,
> in the case of packed-refs, corrupt refs, and dumb fetch tests, are
> skipped), the only remaining failing tests are the git-new-workdir
> tests and the gitweb tests.
Would it possible to build your "hack" into the test suite? For example,
perhaps one could implement an option that requests tests to use LMDB
wherever possible and skip the tests that are not LMDB-compatible. Over
time, we could try to increase the fraction of tests that are
LMDB-compatible by (for example) using `git update-ref` and `git
rev-parse` rather than reading/writing reference files via the
filesystem directly.
Otherwise, I'm worried that LMDB support will bitrot quickly because it
will be too much of a nuisance to exercise the code.
> Signed-off-by: David Turner <dturner@twopensource.com>
> ---
> .gitignore | 1 +
> Documentation/config.txt | 7 +
> Documentation/git-clone.txt | 3 +-
> Documentation/git-init.txt | 2 +-
> Documentation/technical/refs-lmdb-backend.txt | 52 +
> Documentation/technical/repository-version.txt | 5 +
> Makefile | 12 +
> configure.ac | 33 +
> contrib/workdir/git-new-workdir | 3 +
> refs.c | 3 +
> refs.h | 2 +
> refs/lmdb-backend.c | 2052 ++++++++++++++++++++++++
> setup.c | 11 +-
> test-refs-lmdb-backend.c | 64 +
> transport.c | 7 +-
> 15 files changed, 2250 insertions(+), 7 deletions(-)
> create mode 100644 Documentation/technical/refs-lmdb-backend.txt
> create mode 100644 refs/lmdb-backend.c
> create mode 100644 test-refs-lmdb-backend.c
>
> diff --git a/.gitignore b/.gitignore
> index 1c2f832..87d45a2 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -199,6 +199,7 @@
> /test-path-utils
> /test-prio-queue
> /test-read-cache
> +/test-refs-lmdb-backend
> /test-regex
> /test-revision-walking
> /test-run-command
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 06d3659..bc222c9 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1153,6 +1153,13 @@ difftool.<tool>.cmd::
> difftool.prompt::
> Prompt before each invocation of the diff tool.
>
> +extensions.refsStorage::
> + Type of refs storage backend. Default is to use the original
> + files based ref storage. When set to "lmdb", refs are stored in
> + the lmdb database backend. This setting reflects the refs
> + backend that is currently in use; it is not possible to change
> + the backend by changing this setting.
> +
Let's give the users a pointer to how they *can* change this setting. Maybe
Type of refs storage backend. Default is to use the original
files based ref storage. When set to "lmdb", refs are stored in
an LMDB database. This setting reflects the refs storage
backend that was chosen via the --ref-storage option when the
repository was originally created. It is currently
not possible to change the refs storage backend of an
existing repository.
> fetch.recurseSubmodules::
> This option can be either set to a boolean value or to 'on-demand'.
> Setting it to a boolean changes the behavior of fetch and pull to
> diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
> index 68f56a7..b9c52ce 100644
> --- a/Documentation/git-clone.txt
> +++ b/Documentation/git-clone.txt
> @@ -227,7 +227,8 @@ objects from the source repository into a pack in the cloned repository.
>
> --ref-storage=<name>::
> Type of ref storage backend. Default is to use the original files
> - based ref storage.
> + based ref storage. Set to "lmdb" to store refs in the lmdb database
> + backend.
Should the second "lmdb" be upper-case? Maybe also in other places where
the LMDB database is being referred to?
>
> <repository>::
> The (possibly remote) repository to clone from. See the
> [...]
I still haven't reviewed the actual lmdb-backend code. I guess I'm going
to have to make myself an LMDB expert one of these days...
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 20/21] refs: add LMDB refs storage backend
2016-02-12 17:01 ` Michael Haggerty
@ 2016-02-13 1:23 ` David Turner
0 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-13 1:23 UTC (permalink / raw)
To: Michael Haggerty, git
On Fri, 2016-02-12 at 18:01 +0100, Michael Haggerty wrote:
> On 02/05/2016 08:44 PM, David Turner wrote:
> > Add a database backend for refs using LMDB. This backend runs git
> > for-each-ref about 30% faster than the files backend with fully
> > -packed
> > refs on a repo with ~120k refs. It's also about 4x faster than
> > using
> > fully-unpacked refs. In addition, and perhaps more importantly, it
> > avoids case-conflict issues on OS X.
> >
> > LMDB has a few features that make it suitable for usage in git:
> >
>
> 0. It is licensed under the OpenLDAP Public License, which is
> apparently
> GPL compatible [1].
>
> [1] http://www.gnu.org/licenses/license-list.en.html#newOpenLDAP
Oh, yeah, I checked that before choosing it and then forgot all about
it.
> > 1. It is relatively lightweight; it requires only one header file,
> > and
> > the library code takes under 64k at runtime.
> >
> > 2. It is well-tested: it's been used in OpenLDAP for years.
> >
> > 3. It's very fast. LMDB's benchmarks show that it is among
> > the fastest key-value stores.
> >
> > 4. It has a relatively simple concurrency story; readers don't
> > block writers and writers don't block readers.
> >
> > Ronnie Sahlberg's original version of this patchset used tdb. The
> > major disadvantage of tdb is that tdb is hard to build on OS X.
> > It's
> > also not in homebrew. So lmdb seemed simpler.
> >
> > To test this backend's correctness, I hacked test-lib.sh and
> > test-lib-functions.sh to run all tests under the refs backend.
> > Dozens
> > of tests use manual ref/reflog reading/writing, or create
> > submodules
> > without passing --ref-storage to git init. If those tests are
> > changed to use the update-ref machinery or test-refs-lmdb-backend
> > (or,
> > in the case of packed-refs, corrupt refs, and dumb fetch tests, are
> > skipped), the only remaining failing tests are the git-new-workdir
> > tests and the gitweb tests.
>
> Would it possible to build your "hack" into the test suite? For
> example,
> perhaps one could implement an option that requests tests to use LMDB
> wherever possible and skip the tests that are not LMDB-compatible.
> Over
> time, we could try to increase the fraction of tests that are
> LMDB-compatible by (for example) using `git update-ref` and `git
> rev-parse` rather than reading/writing reference files via the
> filesystem directly.
>
> Otherwise, I'm worried that LMDB support will bitrot quickly because
> it
> will be too much of a nuisance to exercise the code.
I can add that. It requires minor changes to a large number of tests,
but that's OK.
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > ---
> > .gitignore | 1 +
> > Documentation/config.txt | 7 +
> > Documentation/git-clone.txt | 3 +-
> > Documentation/git-init.txt | 2 +-
> > Documentation/technical/refs-lmdb-backend.txt | 52 +
> > Documentation/technical/repository-version.txt | 5 +
> > Makefile | 12 +
> > configure.ac | 33 +
> > contrib/workdir/git-new-workdir | 3 +
> > refs.c | 3 +
> > refs.h | 2 +
> > refs/lmdb-backend.c | 2052
> > ++++++++++++++++++++++++
> > setup.c | 11 +-
> > test-refs-lmdb-backend.c | 64 +
> > transport.c | 7 +-
> > 15 files changed, 2250 insertions(+), 7 deletions(-)
> > create mode 100644 Documentation/technical/refs-lmdb-backend.txt
> > create mode 100644 refs/lmdb-backend.c
> > create mode 100644 test-refs-lmdb-backend.c
> >
> > diff --git a/.gitignore b/.gitignore
> > index 1c2f832..87d45a2 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -199,6 +199,7 @@
> > /test-path-utils
> > /test-prio-queue
> > /test-read-cache
> > +/test-refs-lmdb-backend
> > /test-regex
> > /test-revision-walking
> > /test-run-command
> > diff --git a/Documentation/config.txt b/Documentation/config.txt
> > index 06d3659..bc222c9 100644
> > --- a/Documentation/config.txt
> > +++ b/Documentation/config.txt
> > @@ -1153,6 +1153,13 @@ difftool.<tool>.cmd::
> > difftool.prompt::
> > Prompt before each invocation of the diff tool.
> >
> > +extensions.refsStorage::
> > + Type of refs storage backend. Default is to use the
> > original
> > + files based ref storage. When set to "lmdb", refs are
> > stored in
> > + the lmdb database backend. This setting reflects the refs
> > + backend that is currently in use; it is not possible to
> > change
> > + the backend by changing this setting.
> > +
>
> Let's give the users a pointer to how they *can* change this setting.
> Maybe
>
> Type of refs storage backend. Default is to use the original
> files based ref storage. When set to "lmdb", refs are stored
> in
> an LMDB database. This setting reflects the refs storage
> backend that was chosen via the --ref-storage option when the
> repository was originally created. It is currently
> not possible to change the refs storage backend of an
> existing repository.
OK.
> > fetch.recurseSubmodules::
> > This option can be either set to a boolean value or to 'on
> > -demand'.
> > Setting it to a boolean changes the behavior of fetch and
> > pull to
> > diff --git a/Documentation/git-clone.txt b/Documentation/git
> > -clone.txt
> > index 68f56a7..b9c52ce 100644
> > --- a/Documentation/git-clone.txt
> > +++ b/Documentation/git-clone.txt
> > @@ -227,7 +227,8 @@ objects from the source repository into a pack
> > in the cloned repository.
> >
> > --ref-storage=<name>::
> > Type of ref storage backend. Default is to use the
> > original files
> > - based ref storage.
> > + based ref storage. Set to "lmdb" to store refs in the lmdb
> > database
> > + backend.
>
> Should the second "lmdb" be upper-case? Maybe also in other places
> where
> the LMDB database is being referred to?
OK, I think I got most of them.
> > <repository>::
> > The (possibly remote) repository to clone from. See the
> > [...]
>
> I still haven't reviewed the actual lmdb-backend code. I guess I'm
> going
> to have to make myself an LMDB expert one of these days...
I highly recommend it! The API is pretty reasonable, and it does seem
to be fast. The error messages could use some work, but that's my only
complaint.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 20/21] refs: add LMDB refs storage backend
2016-02-05 19:44 ` [PATCH v4 20/21] refs: add LMDB refs storage backend David Turner
2016-02-11 8:48 ` Michael Haggerty
2016-02-12 17:01 ` Michael Haggerty
@ 2016-02-14 12:04 ` Duy Nguyen
2016-02-15 9:57 ` Duy Nguyen
2016-02-17 20:32 ` David Turner
2 siblings, 2 replies; 53+ messages in thread
From: Duy Nguyen @ 2016-02-14 12:04 UTC (permalink / raw)
To: David Turner; +Cc: Git Mailing List, Michael Haggerty
On Sat, Feb 6, 2016 at 2:44 AM, David Turner <dturner@twopensource.com> wrote:
> +static char *get_refdb_path(const char *base)
> +{
> + static struct strbuf path_buf = STRBUF_INIT;
> + strbuf_reset(&path_buf);
> + strbuf_addf(&path_buf, "%s/refdb", base);
> + return path_buf.buf;
> +}
...
> +static int lmdb_init_db(struct strbuf *err, int shared)
> +{
> + /*
> + * To create a db, all we need to do is make a directory for
> + * it to live in; lmdb will do the rest.
> + */
> +
> + if (!db_path)
> + db_path = xstrdup(real_path(get_refdb_path(get_git_common_dir())));
This works for multiple worktrees. But scripts may have harder time
getting the path. The recommended way is "git rev-parse --git-path
refdb" but because "refdb" is not registered in path.c:common_list[],
that command becomes git_path("refdb") instead of
get_refdb(get_git_... like here. And I will need to know that
.git/refdb is _not_ per-worktree when I migrate/convert main worktree
(it's very likely I have to go that route to solve .git/config issue
in multi worktree).
The solution is register refdb to common_list[] and you can do
git_path("refdb") here. But then what happens when another backend is
added? Will the new backend use the same path "refdb", or say
"refdb.sqlite"? If all backends share the name "refdb", why can't we
just reuse "refs" instead because the default filesystem-based backend
is technically just another backend?
--
Duy
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 20/21] refs: add LMDB refs storage backend
2016-02-14 12:04 ` Duy Nguyen
@ 2016-02-15 9:57 ` Duy Nguyen
2016-02-16 22:01 ` David Turner
2016-02-17 20:32 ` David Turner
1 sibling, 1 reply; 53+ messages in thread
From: Duy Nguyen @ 2016-02-15 9:57 UTC (permalink / raw)
To: David Turner; +Cc: Git Mailing List, Michael Haggerty
On Sun, Feb 14, 2016 at 7:04 PM, Duy Nguyen <pclouds@gmail.com> wrote:
> On Sat, Feb 6, 2016 at 2:44 AM, David Turner <dturner@twopensource.com> wrote:
>> +static char *get_refdb_path(const char *base)
>> +{
>> + static struct strbuf path_buf = STRBUF_INIT;
>> + strbuf_reset(&path_buf);
>> + strbuf_addf(&path_buf, "%s/refdb", base);
>> + return path_buf.buf;
>> +}
> ...
>> +static int lmdb_init_db(struct strbuf *err, int shared)
>> +{
>> + /*
>> + * To create a db, all we need to do is make a directory for
>> + * it to live in; lmdb will do the rest.
>> + */
>> +
>> + if (!db_path)
>> + db_path = xstrdup(real_path(get_refdb_path(get_git_common_dir())));
>
> This works for multiple worktrees. But scripts may have harder time
> getting the path. The recommended way is "git rev-parse --git-path
> refdb" but because "refdb" is not registered in path.c:common_list[],
> that command becomes git_path("refdb") instead of
> get_refdb(get_git_... like here. And I will need to know that
> .git/refdb is _not_ per-worktree when I migrate/convert main worktree
> (it's very likely I have to go that route to solve .git/config issue
> in multi worktree).
>
> The solution is register refdb to common_list[] and you can do
> git_path("refdb") here. But then what happens when another backend is
> added? Will the new backend use the same path "refdb", or say
> "refdb.sqlite"? If all backends share the name "refdb", why can't we
> just reuse "refs" instead because the default filesystem-based backend
> is technically just another backend?
To answer myself: I forgot that there were per-worktree refs (e.g.
refs/bisect). It makes me wonder if we should put per-worktree refs to
lmdb as well (maybe one per worktree if we don't want to put all in
one db). One of the advantages of moving away from fs-based backend is
the ability to deal with case sensitivity, "nested" refs (e.g. a/b and
a/b/c are both refs). With this split, I think some refs are still
left behind.. Sorry if this was discussed before, I haven't followed
this closely.
--
Duy
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 20/21] refs: add LMDB refs storage backend
2016-02-15 9:57 ` Duy Nguyen
@ 2016-02-16 22:01 ` David Turner
0 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-16 22:01 UTC (permalink / raw)
To: Duy Nguyen; +Cc: Git Mailing List, Michael Haggerty
On Mon, 2016-02-15 at 16:57 +0700, Duy Nguyen wrote:
> On Sun, Feb 14, 2016 at 7:04 PM, Duy Nguyen <pclouds@gmail.com>
> wrote:
> > On Sat, Feb 6, 2016 at 2:44 AM, David Turner <
> > dturner@twopensource.com> wrote:
> > > +static char *get_refdb_path(const char *base)
> > > +{
> > > + static struct strbuf path_buf = STRBUF_INIT;
> > > + strbuf_reset(&path_buf);
> > > + strbuf_addf(&path_buf, "%s/refdb", base);
> > > + return path_buf.buf;
> > > +}
> > ...
> > > +static int lmdb_init_db(struct strbuf *err, int shared)
> > > +{
> > > + /*
> > > + * To create a db, all we need to do is make a directory
> > > for
> > > + * it to live in; lmdb will do the rest.
> > > + */
> > > +
> > > + if (!db_path)
> > > + db_path =
> > > xstrdup(real_path(get_refdb_path(get_git_common_dir())));
> >
> > This works for multiple worktrees. But scripts may have harder time
> > getting the path. The recommended way is "git rev-parse --git-path
> > refdb" but because "refdb" is not registered in
> > path.c:common_list[],
> > that command becomes git_path("refdb") instead of
> > get_refdb(get_git_... like here. And I will need to know that
> > .git/refdb is _not_ per-worktree when I migrate/convert main
> > worktree
> > (it's very likely I have to go that route to solve .git/config
> > issue
> > in multi worktree).
> >
> > The solution is register refdb to common_list[] and you can do
> > git_path("refdb") here. But then what happens when another backend
> > is
> > added? Will the new backend use the same path "refdb", or say
> > "refdb.sqlite"? If all backends share the name "refdb", why can't
> > we
> > just reuse "refs" instead because the default filesystem-based
> > backend
> > is technically just another backend?
>
> To answer myself: I forgot that there were per-worktree refs (e.g.
> refs/bisect). It makes me wonder if we should put per-worktree refs
> to
> lmdb as well (maybe one per worktree if we don't want to put all in
> one db). One of the advantages of moving away from fs-based backend
> is
> the ability to deal with case sensitivity, "nested" refs (e.g. a/b
> and
> a/b/c are both refs).
I don't think case-sensitivity is a huge problem here: per-worktree
refs are now HEAD or refs/bisect/*, and refs/bisect is controlled
entirely by the bisection machinery (that is, it won't have user
-defined refs with case conflicts).
> With this split, I think some refs are still
> left behind.. Sorry if this was discussed before, I haven't followed
> this closely.
Previous discussion:
http://comments.gmane.org/gmane.comp.version-control.git/275097
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 20/21] refs: add LMDB refs storage backend
2016-02-14 12:04 ` Duy Nguyen
2016-02-15 9:57 ` Duy Nguyen
@ 2016-02-17 20:32 ` David Turner
1 sibling, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-17 20:32 UTC (permalink / raw)
To: Duy Nguyen; +Cc: Git Mailing List, Michael Haggerty
On Sun, 2016-02-14 at 19:04 +0700, Duy Nguyen wrote:
> On Sat, Feb 6, 2016 at 2:44 AM, David Turner <
> dturner@twopensource.com> wrote:
> > +static char *get_refdb_path(const char *base)
> > +{
> > + static struct strbuf path_buf = STRBUF_INIT;
> > + strbuf_reset(&path_buf);
> > + strbuf_addf(&path_buf, "%s/refdb", base);
> > + return path_buf.buf;
> > +}
> ...
> > +static int lmdb_init_db(struct strbuf *err, int shared)
> > +{
> > + /*
> > + * To create a db, all we need to do is make a directory
> > for
> > + * it to live in; lmdb will do the rest.
> > + */
> > +
> > + if (!db_path)
> > + db_path =
> > xstrdup(real_path(get_refdb_path(get_git_common_dir())));
>
> This works for multiple worktrees. But scripts may have harder time
> getting the path. The recommended way is "git rev-parse --git-path
> refdb" but because "refdb" is not registered in path.c:common_list[],
> that command becomes git_path("refdb") instead of
> get_refdb(get_git_... like here. And I will need to know that
> .git/refdb is _not_ per-worktree when I migrate/convert main worktree
> (it's very likely I have to go that route to solve .git/config issue
> in multi worktree).
I'll fix common_list.
> The solution is register refdb to common_list[] and you can do
> git_path("refdb") here. But then what happens when another backend is
> added? Will the new backend use the same path "refdb", or say
> "refdb.sqlite"? If all backends share the name "refdb", why can't we
> just reuse "refs" instead because the default filesystem-based
> backend is technically just another backend?
I'll change it to "refs.lmdb".
I don't want to use "refs" because it makes it hard for software to
distinguish the format (in some cases, like sqlite, it won't even be a
directory).
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 19/21] refs: add register_ref_storage_backends()
2016-02-12 15:42 ` Michael Haggerty
@ 2016-02-17 20:32 ` David Turner
0 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-17 20:32 UTC (permalink / raw)
To: Michael Haggerty, git
On Fri, 2016-02-12 at 16:42 +0100, Michael Haggerty wrote:
> On 02/05/2016 08:44 PM, David Turner wrote:
> > This new function will register all known ref storage backends...
> > once
> > there are any other than the default. For now, it's a no-op.
> >
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > ---
> > builtin/init-db.c | 3 +++
> > config.c | 25 +++++++++++++++++++++++++
> > refs.c | 8 ++++++++
> > refs.h | 2 ++
> > 4 files changed, 38 insertions(+)
> >
> > [...]
> > diff --git a/config.c b/config.c
> > index b95ac3a..b9ef223 100644
> > --- a/config.c
> > +++ b/config.c
> > @@ -11,6 +11,7 @@
> > #include "strbuf.h"
> > #include "quote.h"
> > #include "hashmap.h"
> > +#include "refs.h"
> > #include "string-list.h"
> > #include "utf8.h"
> >
> > @@ -1207,6 +1208,30 @@ int git_config_early(config_fn_t fn, void
> > *data, const char *repo_config)
> > }
> >
> > if (repo_config && !access_or_die(repo_config, R_OK, 0)) {
> > + char *storage = NULL;
> > +
> > + /*
> > + * make sure we always read the ref storage config
> > + * from the extensions section on startup
> > + */
> > + ret +=
> > git_config_from_file(ref_storage_backend_config,
> > + repo_config,
> > &storage);
> > +
> > + register_ref_storage_backends();
> > + if (!storage)
> > + storage = xstrdup("");
> > +
> > + if ((!*storage) ||
> > + (!strcmp(storage, "files"))) {
>
> Nit: you have some unnecessary parentheses here.
Fixed, thanks.
> > + /* default backend, nothing to do */
> > + free(storage);
> > + } else {
> > + ref_storage_backend = storage;
> > + if
> > (set_ref_storage_backend(ref_storage_backend))
> > + die(_("Unknown ref storage backend
> > %s"),
> > + ref_storage_backend);
> > + }
> > +
> > ret += git_config_from_file(fn, repo_config,
> > data);
> > found += 1;
> > }
> > diff --git a/refs.c b/refs.c
> > index 715a492..e50cca0 100644
> > --- a/refs.c
> > +++ b/refs.c
> > @@ -1554,3 +1554,11 @@ done:
> > string_list_clear(&affected_refnames, 0);
> > return ret;
> > }
> > +
> > +void register_ref_storage_backends(void) {
> > + /*
> > + * No need to register the files backend; it's registered
> > by
> > + * default. Add register_ref_storage_backend(ptr-to
> > -backend)
> > + * entries below when you add a new backend.
> > + */
>
> This function must be called every run, right? So why not make it
> register the "files" backend explicitly? That would make it obvious
> really quick if this function fails to get called in some code path.
> Just a thought...
Good idea.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 15/21] init: allow alternate ref strorage to be set for new repos
2016-02-12 15:26 ` Michael Haggerty
@ 2016-02-17 20:47 ` David Turner
2016-02-18 14:12 ` Michael Haggerty
0 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-17 20:47 UTC (permalink / raw)
To: Michael Haggerty, git; +Cc: SZEDER Gábor
On Fri, 2016-02-12 at 16:26 +0100, Michael Haggerty wrote:
> On 02/05/2016 08:44 PM, David Turner wrote:
> > git init learns a new argument --ref-storage. Presently, only
> > "files" is supported, but later we will add other storage backends.
> >
> > When this argument is used, the repository's extensions.refStorage
> > configuration value is set (as well as
> > core.repositoryformatversion),
> > and the ref storage backend's initdb function is used to set up the
> > ref database.
> >
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
> > ---
> > Documentation/git-init-db.txt | 2 +-
> > Documentation/git-init.txt | 7 +++++-
> > builtin/init-db.c | 44
> > +++++++++++++++++++++++++++-------
> > cache.h | 2 ++
> > contrib/completion/git-completion.bash | 3 ++-
> > path.c | 29 ++++++++++++++++++++--
> > refs.c | 8 +++++++
> > refs.h | 8 +++++++
> > setup.c | 12 ++++++++++
> > t/t0001-init.sh | 25 +++++++++++++++++++
> > 10 files changed, 127 insertions(+), 13 deletions(-)
> >
> > [...]
> > diff --git a/Documentation/git-init.txt b/Documentation/git
> > -init.txt
> > index 8174d27..d2b150f 100644
> > --- a/Documentation/git-init.txt
> > +++ b/Documentation/git-init.txt
> > @@ -12,7 +12,7 @@ SYNOPSIS
> > 'git init' [-q | --quiet] [--bare] [-
> > -template=<template_directory>]
> > [--separate-git-dir <git dir>]
> > [--shared[=<permissions>]] [directory]
> > -
> > + [--ref-storage=<name>]
> >
> > DESCRIPTION
> > -----------
> > @@ -113,6 +113,11 @@ does not exist, it will be created.
> >
> > --
> >
> > +--ref-storage=<name>::
> > +Type of refs storage backend. Default is to use the original
> > "files"
> > +storage, which stores ref data in files in .git/refs and
> > +.git/packed-refs.
> > +
>
> Technically, that should be $GIT_DIR/refs and $GIT_DIR/packed-refs.
> But
> it might be that we are not so picky about the distinction in the
> user docs.
We're not (according to grep), but we probably should be.
> > TEMPLATE DIRECTORY
> > ------------------
> >
> > diff --git a/builtin/init-db.c b/builtin/init-db.c
> > index 801e977..d331ce8 100644
> > --- a/builtin/init-db.c
> > +++ b/builtin/init-db.c
> > @@ -24,6 +24,7 @@ static int init_is_bare_repository = 0;
> > static int init_shared_repository = -1;
> > static const char *init_db_template_dir;
> > static const char *git_link;
> > +static char *requested_ref_storage_backend;
> >
> > static void copy_templates_1(struct strbuf *path, struct strbuf
> > *template,
> > DIR *dir)
> > @@ -179,6 +180,7 @@ static int create_default_files(const char
> > *template_path)
> > int reinit;
> > int filemode;
> > struct strbuf err = STRBUF_INIT;
> > + int repo_version = 0;
> >
> > /* Just look for `init.templatedir` */
> > git_config(git_init_db_config, NULL);
> > @@ -205,6 +207,32 @@ static int create_default_files(const char
> > *template_path)
> > }
> >
> > /*
> > + * Create the default symlink from ".git/HEAD" to the
> > "master"
>
> I know that you are just moving this comment, but s/symlink/symref/
> would make it more up-to-date.
OK.
> > + * branch, if it does not exist yet.
> > + */
> > [...]
> > diff --git a/setup.c b/setup.c
> > index 0deb022..1a62277 100644
> > --- a/setup.c
> > +++ b/setup.c
> > @@ -1,5 +1,6 @@
> > #include "cache.h"
> > #include "dir.h"
> > +#include "refs.h"
> > #include "string-list.h"
> >
> > static int inside_git_dir = -1;
> > @@ -263,6 +264,15 @@ int get_common_dir_noenv(struct strbuf *sb,
> > const char *gitdir)
> > return ret;
> > }
> >
> > +int ref_storage_backend_config(const char *var, const char *value,
> > void *ptr)
> > +{
> > + char **cdata = ptr;
> > +
> > + if (!strcmp(var, "extensions.refstorage"))
> > + *cdata = xstrdup(value);
> > + return 0;
> > +}
> > +
> > /*
> > * Test if it looks like we're at a git directory.
> > * We want to see:
> > @@ -390,6 +400,8 @@ static int check_repo_format(const char *var,
> > const char *value, void *cb)
> > ;
> > else if (!strcmp(ext, "preciousobjects"))
> > repository_format_precious_objects =
> > git_config_bool(var, value);
> > + else if (!strcmp(ext, "refstorage"))
> > + ref_storage_backend = xstrdup(value);
> > else
> > string_list_append(&unknown_extensions,
> > ext);
> > }
> > diff --git a/t/t0001-init.sh b/t/t0001-init.sh
> > index 295aa59..31c8279 100755
> > --- a/t/t0001-init.sh
> > +++ b/t/t0001-init.sh
> > @@ -174,6 +174,31 @@ test_expect_success 'reinit' '
> > test_i18ncmp again/empty again/err2
> > '
> >
> > +test_expect_success 'init with bogus storage backend fails' '
> > +
> > + (
> > + mkdir again2 &&
> > + cd again2 &&
> > + test_must_fail git init --ref-storage=test >out2
> > 2>err2 &&
> > + test_i18ngrep "Unknown ref storage backend test"
> > err2
> > + )
> > +'
> > +
> > +test_expect_failure 'reinit with changed storage backend fails' '
> > +
> > + (
> > + mkdir again3 &&
> > + cd again3 &&
> > + git init >out1 2>err1 &&
> > + git init --ref-storage=test >out2 2>err2
> > + ) &&
> > + test_i18ngrep "Initialized empty" again3/out1 &&
> > + test_i18ngrep "Reinitialized existing" again3/out2 &&
> > + >again3/empty &&
> > + test_i18ncmp again3/empty again3/err1 &&
> > + test_i18ncmp again3/empty again3/err2
> > +'
> > +
>
> Is it worth testing re-initializing with the same --ref-storage?
> Perhaps
> not.
Would be nice, but since we cannot guarantee that any alternate backend
exists, we have no way to test this. We'd have to add an entire "test"
ref backend just for tests, which seems a bit overboard.
> > test_expect_success 'init with --template' '
> > mkdir template-source &&
> > echo content >template-source/file &&
> >
>
> Michael
>
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 13/21] refs: resolve symbolic refs first
2016-02-12 14:09 ` Michael Haggerty
@ 2016-02-18 0:29 ` David Turner
2016-02-18 11:59 ` Michael Haggerty
0 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-18 0:29 UTC (permalink / raw)
To: Michael Haggerty, git
On Fri, 201-02-12 at 15:09 +0100, Michael Haggerty wrote:]
> On 02/05/2016 08:44 PM, David Turner wrote:
> > Before committing ref updates, split symbolic ref updates into two
> > parts: an update to the underlying ref, and a log-only update to
> > the
> > symbolic ref. This ensures that both references are locked
> > correctly
> > while their reflogs are updated.
> >
> > It is still possible to confuse git by concurrent updates, since
> > the
> > splitting of symbolic refs does not happen under lock. So a
> > symbolic ref
> > could be replaced by a plain ref in the middle of this operation,
> > which
> > would lead to reflog discontinuities and missed old-ref checks.
>
> This patch is doing too much at once for my little brain to follow.
>
> My first hangup is the change to setting RESOLVE_REF_NO_RECURSE
> unconditionally in lock_ref_sha1_basic(). I count five callers of
> that
> function and see no justification for why the change is OK in the
> context of each caller. Here are some thoughts:
>
> * The call from files_create_symref() sets REF_NODEREF, so it is
> unaffected by this change.
Yes.
> * The call from files_transaction_commit() is preceded by a call to
> dereference_symrefs(), which I assume effectively replaces the need
> for
> RESOLVE_REF_NO_RECURSE.
Yes.
> * There are two calls from files_rename_ref(). Why is it OK to do
> without RESOLVE_REF_NO_RECURSE there?
>
> * For the oldrefname call, I suppose the justification is the
> "(flag &
> REF_ISSYMREF)" check earlier in the function. (But does this
> introduce a
> significant TOCTOU race?)
The refs code as a whole seems likely to have TOCTOU issues. In
general, anywhere we check/set flag & REF_ISSYMREF without holding a
lock, we have a potential problem. I haven't generally tried to handle
these cases, since they're not presently handled.
The central problem with this area of the code is that commit interacts
so intimately with the locking machinery. I understand some of why
it's done that way. In particular, your change to ref locking to not
hold lots of open files was a big win for us at Twitter. But this
means that it's hard to deal with cross-backend ref updates: you want
to hold multiple locks, and backends don't have the machinery for it.
We could add backend hooks to specifically lock and unlock refs. Then
the backend commit code would just be handled a bundle of locked refs
and would commit them. This might be hairy, but it could fix the
TOCTOU problems. So, first lock the outer refs, then split out updates
for any which are symbolic refs, and lock those. Finally, commit all
updates (split by backend).
One downside of this is that right now, the backend API is relatively
close to the front-end, and this would leak what should be an
implementation detail. But maybe this is necessary to knit multiple
backends together.
But I'm not sure that this is necessary right now, because I'm not sure
that I'm actually making TOCTOU issues much worse.
> * For the newrefname call, I suppose it's because the code a little
> higher up tries to delete any existing reference with that name. It
> looks to me like the old code was slightly broken: if newrefname was
> an
> unborn symbolic reference, then: read_ref_full() would fail;
> delete_ref() would be skipped; lock_ref_sha1_basic() would lock the
> *referred-to* reference; the referred-to reference would be
> overwritten
> instead of newrefname. So it could be that here REF_NODEREF
> indirectly
> fixes a bug?
Yes, that's correct. These two appears to be separable, so I'll make
it an independent patch (and add a test for that case).
> * The last call, from files_reflog_expire(), is also questionable
> before your patch. If refname is a symref, then the function is
> expiring the reflog of the symref. But (before this patch) it locks
> not the symref but its referent.
I can also separate this one.
> This was discussed in some length before on the mailing list [1], and
> the conclusion was that the current behavior is wrong, but for
> backwards compatibility reasons it would be safest to change it to
> locking *both* the symref and its referent.
Yes, that would be the right thing to do. But for the reasons I
discuss above, that requires a serious change in the way that backends
work.
> If possible, it would be better to split this patch up into several:
> the
> first few would each add the REF_NODEREF flag at one callsite, with a
> careful justification of why that is OK. Once all the callsites
> (except
> the one in files_transaction_commit()) have been changed, then the
> last
> patch could add the dereference_symrefs() machinery and change the
> last
> callsite.
>
> (I'm not certain that those steps are actually doable independently,
> given that REF_NODEREF has other effects besides setting
> RESOLVE_REF_NO_RECURSE.)
>
> I'm not just being pedantic here. The patch as written is really too
> big
> to review effectively.
That's a legit complaint. The problem, as you note, is that doing some
of these steps completely independently doesn't work. But I'll try
splitting out what I can.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 14/21] refs: always handle non-normal refs in files backend
2016-02-12 15:07 ` Michael Haggerty
@ 2016-02-18 2:44 ` David Turner
2016-02-18 12:07 ` Michael Haggerty
0 siblings, 1 reply; 53+ messages in thread
From: David Turner @ 2016-02-18 2:44 UTC (permalink / raw)
To: Michael Haggerty, git
On Fri, 2016-02-12 at 16:07 +0100, Michael Haggerty wrote:
> On 02/05/2016 08:44 PM, David Turner wrote:
> > Always handle non-normal (per-worktree or pseudo) refs in the files
> > backend instead of alternate backends.
> >
> > Sometimes a ref transaction will update both a per-worktree ref and
> > a
> > normal ref. For instance, an ordinary commit might update
> > refs/heads/master and HEAD (or at least HEAD's reflog).
> >
> > Updates to normal refs continue to go through the chosen backend.
> >
> > Updates to non-normal refs are moved to a separate files backend
> > transaction.
> >
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > ---
> > refs.c | 81
> > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
> > 1 file changed, 79 insertions(+), 2 deletions(-)
> >
> > diff --git a/refs.c b/refs.c
> > index 227c018..18ba356 100644
> > --- a/refs.c
> > +++ b/refs.c
> > @@ -9,6 +9,11 @@
> > #include "object.h"
> > #include "tag.h"
> >
> > +static const char split_transaction_fail_warning[] = N_(
> > + "A ref transaction was split across two refs backends.
> > Part of the "
> > + "transaction succeeded, but then the update to the per
> > -worktree refs "
> > + "failed. Your repository may be in an inconsistent
> > state.");
> > +
> > /*
> > * We always have a files backend and it is the default.
> > */
> > @@ -791,6 +796,13 @@ void ref_transaction_free(struct
> > ref_transaction *transaction)
> > free(transaction);
> > }
> >
> > +static void add_update_obj(struct ref_transaction *transaction,
> > + struct ref_update *update)
> > +{
> > + ALLOC_GROW(transaction->updates, transaction->nr + 1,
> > transaction->alloc);
> > + transaction->updates[transaction->nr++] = update;
> > +}
> > +
> > static struct ref_update *add_update(struct ref_transaction
> > *transaction,
> > const char *refname)
> > {
> > @@ -798,8 +810,7 @@ static struct ref_update *add_update(struct
> > ref_transaction *transaction,
> > struct ref_update *update = xcalloc(1, sizeof(*update) +
> > len);
> >
> > memcpy((char *)update->refname, refname, len); /* includes
> > NUL */
> > - ALLOC_GROW(transaction->updates, transaction->nr + 1,
> > transaction->alloc);
> > - transaction->updates[transaction->nr++] = update;
> > + add_update_obj(transaction, update);
> > return update;
> > }
> >
> > @@ -1217,11 +1228,38 @@ static int dereference_symrefs(struct
> > ref_transaction *transaction,
> > return 0;
> > }
> >
> > +/*
> > + * Move all non-normal ref updates into a specially-created
> > + * files-backend transaction
> > + */
> > +static int move_abnormal_ref_updates(struct ref_transaction
> > *transaction,
> > + struct ref_transaction
> > *files_transaction,
> > + struct strbuf *err)
> > +{
> > + int i;
> > +
> > + for (i = 0; i < transaction->nr; i++) {
> > + int last;
> > + struct ref_update *update = transaction
> > ->updates[i];
> > +
> > + if (ref_type(update->refname) == REF_TYPE_NORMAL)
> > + continue;
> > +
> > + last = --transaction->nr;
> > + transaction->updates[i] = transaction
> > ->updates[last];
> > + add_update_obj(files_transaction, update);
> > + }
> > +
> > + return 0;
> > +}
> > +
>
> I think this function is incorrect. The update that was previously at
> transaction->updates[i] never gets checked for abnormality.
Yes it does; that's the "update" variable that we just checked.
> You could
> fix that and also avoid gratuitously changing the order of the
> updates
> like this:
>
> static int move_abnormal_ref_updates(struct ref_transaction
> *transaction,
> struct ref_transaction
> *files_transaction,
> struct strbuf *err)
> {
> int i, normal_nr = 0;
>
> for (i = 0; i < transaction->nr; i++) {
> struct ref_update *update = transaction->updates[i];
>
> if (ref_type(update->refname) == REF_TYPE_NORMAL)
> transaction->updates[normal_nr++] = update;
> else
> add_update_obj(files_transaction, update);
> }
>
> transaction->nr = normal_nr;
> return 0;
> }
Sure, I can make that change.
> Another alternative would be to set
>
> update->flags |= REF_ABNORMAL
>
> for the abnormal references and *leave them* in the original
> transaction
> while also adding them to files_transactions. Then teach non-files
> backends to skip over updates with REF_ABNORMAL.
>
> The reason I thought of this is that long-term I'd like to make it
> possible for some reference updates to fail without aborting the
> transaction. To implement that, we would want a way for
> ref_transaction_commit() to report back to its caller *which* updates
> failed, and an obvious way to do that would be to store the
> reference-specific errors in struct ref_update. If you leave the
> abnormal ref_updates in the main transaction, then my hoped-for
> change
> would be easier.
>
> But that's a separate and hypothetical idea, so you don't have to let
> it
> influence how you implement this patch.
I'm also interested in this idea. Perhaps it would also be nice to
report *why* they fail (e.g. the conflicting ref name). I did a
variant of this with for the journal code, but my way of doing it
turned out to be a bad idea (long story). But I want to stay focused
on the simplest thing possible, for now.
> > int ref_transaction_commit(struct ref_transaction *transaction,
> > struct strbuf *err)
> > {
> > int ret = -1;
> > struct string_list affected_refnames =
> > STRING_LIST_INIT_NODUP;
> > + struct string_list files_affected_refnames =
> > STRING_LIST_INIT_NODUP;
> > + struct ref_transaction *files_transaction = NULL;
> >
> > assert(err);
> >
> > @@ -1237,6 +1275,26 @@ int ref_transaction_commit(struct
> > ref_transaction *transaction,
> > if (ret)
> > goto done;
> >
> > + if (the_refs_backend != &refs_be_files) {
> > + files_transaction = ref_transaction_begin(err);
> > + if (!files_transaction)
> > + goto done;
> > +
> > + ret = move_abnormal_ref_updates(transaction,
> > files_transaction,
> > + err);
> > + if (ret)
> > + goto done;
> > +
> > + /* files backend commit */
> > + if (get_affected_refnames(files_transaction,
> > + &files_affected_r
> > efnames,
> > + err)) {
> > + ret = TRANSACTION_GENERIC_ERROR;
> > + goto done;
> > + }
> > + }
> > +
> > + /* main backend commit */
> > if (get_affected_refnames(transaction, &affected_refnames,
> > err)) {
> > ret = TRANSACTION_GENERIC_ERROR;
> > goto done;
> > @@ -1244,8 +1302,24 @@ int ref_transaction_commit(struct
> > ref_transaction *transaction,
> >
> > ret = the_refs_backend->transaction_commit(transaction,
> >
> > &affected_refnames, err);
> > + if (ret)
> > + goto done;
> > +
> > + if (files_transaction) {
> > + ret =
> > refs_be_files.transaction_commit(files_transaction,
> > +
> > &files_affected_refnames,
> > + err);
> > + if (ret) {
> > + warning(split_transaction_fail_warning);
> > + goto done;
> > + }
> > + }
> > +
> > done:
> > string_list_clear(&affected_refnames, 0);
> > + string_list_clear(&files_affected_refnames, 0);
> > + if (files_transaction)
> > + ref_transaction_free(files_transaction);
> > return ret;
> > }
> >
> > @@ -1285,6 +1359,9 @@ int peel_ref(const char *refname, unsigned
> > char *sha1)
> > int create_symref(const char *ref_target, const char
> > *refs_heads_master,
> > const char *logmsg)
> > {
> > + if (ref_type(ref_target) != REF_TYPE_NORMAL)
> > + return refs_be_files.create_symref(ref_target,
> > refs_heads_master,
> > + logmsg);
> > return the_refs_backend->create_symref(ref_target,
> > refs_heads_master,
> > logmsg);
> > }
> >
>
> Does initial_ref_transaction_commit() need the same treatment?
We only use that for remote refs -- I'm not sure if those can be
symrefs. Wouldn't hurt.
> I think files_rename_ref() will break if one of the references is
> normal
> and one is abnormal. I think it would be OK to prohibit renaming
> abnormal refs entirely (can anybody think of an important use case?),
> but that function should at least do the checks.
The files backend would work fine, but I guess I'll add the check
anyway, since that would be a weird thing to do.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 13/21] refs: resolve symbolic refs first
2016-02-18 0:29 ` David Turner
@ 2016-02-18 11:59 ` Michael Haggerty
0 siblings, 0 replies; 53+ messages in thread
From: Michael Haggerty @ 2016-02-18 11:59 UTC (permalink / raw)
To: David Turner, git
On 02/18/2016 01:29 AM, David Turner wrote:
> On Fri, 201-02-12 at 15:09 +0100, Michael Haggerty wrote:]
>> On 02/05/2016 08:44 PM, David Turner wrote:
>>> Before committing ref updates, split symbolic ref updates into two
>>> parts: an update to the underlying ref, and a log-only update to
>>> the
>>> symbolic ref. This ensures that both references are locked
>>> correctly
>>> while their reflogs are updated.
>>>
>>> It is still possible to confuse git by concurrent updates, since
>>> the
>>> splitting of symbolic refs does not happen under lock. So a
>>> symbolic ref
>>> could be replaced by a plain ref in the middle of this operation,
>>> which
>>> would lead to reflog discontinuities and missed old-ref checks.
>>
>> This patch is doing too much at once for my little brain to follow.
>>
>> My first hangup is the change to setting RESOLVE_REF_NO_RECURSE
>> unconditionally in lock_ref_sha1_basic(). I count five callers of
>> that
>> function and see no justification for why the change is OK in the
>> context of each caller. Here are some thoughts:
>>
>> * The call from files_create_symref() sets REF_NODEREF, so it is
>> unaffected by this change.
>
> Yes.
>
>> * The call from files_transaction_commit() is preceded by a call to
>> dereference_symrefs(), which I assume effectively replaces the need
>> for
>> RESOLVE_REF_NO_RECURSE.
>
> Yes.
>
>> * There are two calls from files_rename_ref(). Why is it OK to do
>> without RESOLVE_REF_NO_RECURSE there?
>>
>> * For the oldrefname call, I suppose the justification is the
>> "(flag &
>> REF_ISSYMREF)" check earlier in the function. (But does this
>> introduce a
>> significant TOCTOU race?)
>
> The refs code as a whole seems likely to have TOCTOU issues. In
> general, anywhere we check/set flag & REF_ISSYMREF without holding a
> lock, we have a potential problem. I haven't generally tried to handle
> these cases, since they're not presently handled.
I agree that we don't do so well here, though I think that most races
would result in reading/writing a ref that was pointed to by the symref
a moment ago, which is usually indistinguishable to the user from their
update having gone through the moment before the symref was updated. So
I don't think your change makes this bit of code significantly worse.
> The central problem with this area of the code is that commit interacts
> so intimately with the locking machinery. I understand some of why
> it's done that way. In particular, your change to ref locking to not
> hold lots of open files was a big win for us at Twitter. But this
> means that it's hard to deal with cross-backend ref updates: you want
> to hold multiple locks, and backends don't have the machinery for it.
>
> We could add backend hooks to specifically lock and unlock refs. Then
> the backend commit code would just be handled a bundle of locked refs
> and would commit them. This might be hairy, but it could fix the
> TOCTOU problems. So, first lock the outer refs, then split out updates
> for any which are symbolic refs, and lock those. Finally, commit all
> updates (split by backend).
As chance would have it, for an internal GitHub project I've implemented
hooks that can be called *during* a ref transaction. The hooks can, for
example, take arbitrary actions between the time that the reflocks are
all acquired and the time that the updates start to be committed. I
didn't submit this code upstream because I didn't think that it would
benefit other users, but many it would be useful for implementing
split-backend reference transaction commits. E.g., the primary reference
transaction could run the secondary backend's commit while holding the
locks for the primary backend references.
Let me think about it.
I don't think this is urgent though. The current code is not
significantly racy in mainstream usage scenarios, right?
> One downside of this is that right now, the backend API is relatively
> close to the front-end, and this would leak what should be an
> implementation detail. But maybe this is necessary to knit multiple
> backends together.
>
> But I'm not sure that this is necessary right now, because I'm not sure
> that I'm actually making TOCTOU issues much worse.
Agreed.
> [...]
> That's a legit complaint. The problem, as you note, is that doing some
> of these steps completely independently doesn't work. But I'll try
> splitting out what I can.
Thanks!
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 14/21] refs: always handle non-normal refs in files backend
2016-02-18 2:44 ` David Turner
@ 2016-02-18 12:07 ` Michael Haggerty
2016-02-18 18:32 ` David Turner
0 siblings, 1 reply; 53+ messages in thread
From: Michael Haggerty @ 2016-02-18 12:07 UTC (permalink / raw)
To: David Turner, git
On 02/18/2016 03:44 AM, David Turner wrote:
> On Fri, 2016-02-12 at 16:07 +0100, Michael Haggerty wrote:
>> On 02/05/2016 08:44 PM, David Turner wrote:
>>> Always handle non-normal (per-worktree or pseudo) refs in the files
>>> backend instead of alternate backends.
>>>
>>> Sometimes a ref transaction will update both a per-worktree ref and
>>> a
>>> normal ref. For instance, an ordinary commit might update
>>> refs/heads/master and HEAD (or at least HEAD's reflog).
>>>
>>> Updates to normal refs continue to go through the chosen backend.
>>>
>>> Updates to non-normal refs are moved to a separate files backend
>>> transaction.
>>>
>>> Signed-off-by: David Turner <dturner@twopensource.com>
>>> ---
>>> refs.c | 81
>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
>>> 1 file changed, 79 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/refs.c b/refs.c
>>> index 227c018..18ba356 100644
>>> --- a/refs.c
>>> +++ b/refs.c
>>> @@ -9,6 +9,11 @@
>>> #include "object.h"
>>> #include "tag.h"
>>>
>>> +static const char split_transaction_fail_warning[] = N_(
>>> + "A ref transaction was split across two refs backends.
>>> Part of the "
>>> + "transaction succeeded, but then the update to the per
>>> -worktree refs "
>>> + "failed. Your repository may be in an inconsistent
>>> state.");
>>> +
>>> /*
>>> * We always have a files backend and it is the default.
>>> */
>>> @@ -791,6 +796,13 @@ void ref_transaction_free(struct
>>> ref_transaction *transaction)
>>> free(transaction);
>>> }
>>>
>>> +static void add_update_obj(struct ref_transaction *transaction,
>>> + struct ref_update *update)
>>> +{
>>> + ALLOC_GROW(transaction->updates, transaction->nr + 1,
>>> transaction->alloc);
>>> + transaction->updates[transaction->nr++] = update;
>>> +}
>>> +
>>> static struct ref_update *add_update(struct ref_transaction
>>> *transaction,
>>> const char *refname)
>>> {
>>> @@ -798,8 +810,7 @@ static struct ref_update *add_update(struct
>>> ref_transaction *transaction,
>>> struct ref_update *update = xcalloc(1, sizeof(*update) +
>>> len);
>>>
>>> memcpy((char *)update->refname, refname, len); /* includes
>>> NUL */
>>> - ALLOC_GROW(transaction->updates, transaction->nr + 1,
>>> transaction->alloc);
>>> - transaction->updates[transaction->nr++] = update;
>>> + add_update_obj(transaction, update);
>>> return update;
>>> }
>>>
>>> @@ -1217,11 +1228,38 @@ static int dereference_symrefs(struct
>>> ref_transaction *transaction,
>>> return 0;
>>> }
>>>
>>> +/*
>>> + * Move all non-normal ref updates into a specially-created
>>> + * files-backend transaction
>>> + */
>>> +static int move_abnormal_ref_updates(struct ref_transaction
>>> *transaction,
>>> + struct ref_transaction
>>> *files_transaction,
>>> + struct strbuf *err)
>>> +{
>>> + int i;
>>> +
>>> + for (i = 0; i < transaction->nr; i++) {
>>> + int last;
>>> + struct ref_update *update = transaction
>>> ->updates[i];
>>> +
>>> + if (ref_type(update->refname) == REF_TYPE_NORMAL)
>>> + continue;
>>> +
>>> + last = --transaction->nr;
>>> + transaction->updates[i] = transaction
>>> ->updates[last];
>>> + add_update_obj(files_transaction, update);
>>> + }
>>> +
>>> + return 0;
>>> +}
>>> +
>>
>> I think this function is incorrect. The update that was previously at
>> transaction->updates[i] never gets checked for abnormality.
>
> Yes it does; that's the "update" variable that we just checked.
Sorry, I meant to say "the update that was previously at
`transaction->updates[transaction->nr - 1]` never gets checked for
abnormality". Because it gets moved to `transaction->updates[i]`, then
`i` is incremented without checking it.
> [...]
>> Another alternative would be to set
>>
>> update->flags |= REF_ABNORMAL
>> [...]
> I'm also interested in this idea. Perhaps it would also be nice to
> report *why* they fail (e.g. the conflicting ref name). I did a
> variant of this with for the journal code, but my way of doing it
> turned out to be a bad idea (long story). But I want to stay focused
> on the simplest thing possible, for now.
Fair enough.
> [...]
>> Does initial_ref_transaction_commit() need the same treatment?
>
> We only use that for remote refs -- I'm not sure if those can be
> symrefs. Wouldn't hurt.
Hmmm, good point. I think the only symrefs that can be set during a
clone are `HEAD` and `refs/remotes/origin/HEAD`. But I guess that no
other references are updated *through* these symrefs, so it's probably
OK. I haven't checked carefully, though.
> [...]
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 15/21] init: allow alternate ref strorage to be set for new repos
2016-02-17 20:47 ` David Turner
@ 2016-02-18 14:12 ` Michael Haggerty
0 siblings, 0 replies; 53+ messages in thread
From: Michael Haggerty @ 2016-02-18 14:12 UTC (permalink / raw)
To: David Turner, git; +Cc: SZEDER Gábor
On 02/17/2016 09:47 PM, David Turner wrote:
> On Fri, 2016-02-12 at 16:26 +0100, Michael Haggerty wrote:
>> [...]
>> Is it worth testing re-initializing with the same --ref-storage?
>> Perhaps
>> not.
>
> Would be nice, but since we cannot guarantee that any alternate backend
> exists, we have no way to test this. We'd have to add an entire "test"
> ref backend just for tests, which seems a bit overboard.
I meant re-initializing a repository that is using the "files" backend
with `--ref-storage=files` to make sure that it is a NOP. But I think
this functionality is unlikely to be broken so it wouldn't be a very
high-value test.
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v4 14/21] refs: always handle non-normal refs in files backend
2016-02-18 12:07 ` Michael Haggerty
@ 2016-02-18 18:32 ` David Turner
0 siblings, 0 replies; 53+ messages in thread
From: David Turner @ 2016-02-18 18:32 UTC (permalink / raw)
To: Michael Haggerty, git
On Thu, 2016-02-18 at 13:07 +0100, Michael Haggerty wrote:
> On 02/18/2016 03:44 AM, David Turner wrote:
> > On Fri, 2016-02-12 at 16:07 +0100, Michael Haggerty wrote:
> > > On 02/05/2016 08:44 PM, David Turner wrote:
> > > > Always handle non-normal (per-worktree or pseudo) refs in the
> > > > files
> > > > backend instead of alternate backends.
> > > >
> > > > Sometimes a ref transaction will update both a per-worktree ref
> > > > and
> > > > a
> > > > normal ref. For instance, an ordinary commit might update
> > > > refs/heads/master and HEAD (or at least HEAD's reflog).
> > > >
> > > > Updates to normal refs continue to go through the chosen
> > > > backend.
> > > >
> > > > Updates to non-normal refs are moved to a separate files
> > > > backend
> > > > transaction.
> > > >
> > > > Signed-off-by: David Turner <dturner@twopensource.com>
> > > > ---
> > > > refs.c | 81
> > > > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > > > +--
> > > > 1 file changed, 79 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/refs.c b/refs.c
> > > > index 227c018..18ba356 100644
> > > > --- a/refs.c
> > > > +++ b/refs.c
> > > > @@ -9,6 +9,11 @@
> > > > #include "object.h"
> > > > #include "tag.h"
> > > >
> > > > +static const char split_transaction_fail_warning[] = N_(
> > > > + "A ref transaction was split across two refs backends.
> > > > Part of the "
> > > > + "transaction succeeded, but then the update to the per
> > > > -worktree refs "
> > > > + "failed. Your repository may be in an inconsistent
> > > > state.");
> > > > +
> > > > /*
> > > > * We always have a files backend and it is the default.
> > > > */
> > > > @@ -791,6 +796,13 @@ void ref_transaction_free(struct
> > > > ref_transaction *transaction)
> > > > free(transaction);
> > > > }
> > > >
> > > > +static void add_update_obj(struct ref_transaction
> > > > *transaction,
> > > > + struct ref_update *update)
> > > > +{
> > > > + ALLOC_GROW(transaction->updates, transaction->nr + 1,
> > > > transaction->alloc);
> > > > + transaction->updates[transaction->nr++] = update;
> > > > +}
> > > > +
> > > > static struct ref_update *add_update(struct ref_transaction
> > > > *transaction,
> > > > const char *refname)
> > > > {
> > > > @@ -798,8 +810,7 @@ static struct ref_update *add_update(struct
> > > > ref_transaction *transaction,
> > > > struct ref_update *update = xcalloc(1, sizeof(*update)
> > > > +
> > > > len);
> > > >
> > > > memcpy((char *)update->refname, refname, len); /*
> > > > includes
> > > > NUL */
> > > > - ALLOC_GROW(transaction->updates, transaction->nr + 1,
> > > > transaction->alloc);
> > > > - transaction->updates[transaction->nr++] = update;
> > > > + add_update_obj(transaction, update);
> > > > return update;
> > > > }
> > > >
> > > > @@ -1217,11 +1228,38 @@ static int dereference_symrefs(struct
> > > > ref_transaction *transaction,
> > > > return 0;
> > > > }
> > > >
> > > > +/*
> > > > + * Move all non-normal ref updates into a specially-created
> > > > + * files-backend transaction
> > > > + */
> > > > +static int move_abnormal_ref_updates(struct ref_transaction
> > > > *transaction,
> > > > + struct ref_transaction
> > > > *files_transaction,
> > > > + struct strbuf *err)
> > > > +{
> > > > + int i;
> > > > +
> > > > + for (i = 0; i < transaction->nr; i++) {
> > > > + int last;
> > > > + struct ref_update *update = transaction
> > > > ->updates[i];
> > > > +
> > > > + if (ref_type(update->refname) ==
> > > > REF_TYPE_NORMAL)
> > > > + continue;
> > > > +
> > > > + last = --transaction->nr;
> > > > + transaction->updates[i] = transaction
> > > > ->updates[last];
> > > > + add_update_obj(files_transaction, update);
> > > > + }
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > >
> > > I think this function is incorrect. The update that was
> > > previously at
> > > transaction->updates[i] never gets checked for abnormality.
> >
> > Yes it does; that's the "update" variable that we just checked.
>
> Sorry, I meant to say "the update that was previously at
> `transaction->updates[transaction->nr - 1]` never gets checked for
> abnormality". Because it gets moved to `transaction->updates[i]`,
> then
> `i` is incremented without checking it.
Oh, right.
^ permalink raw reply [flat|nested] 53+ messages in thread
end of thread, other threads:[~2016-02-18 18:32 UTC | newest]
Thread overview: 53+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-05 19:44 [PATCH v4 00/20] refs backend David Turner
2016-02-05 19:44 ` [PATCH v4 01/21] refs: add a backend method structure with transaction functions David Turner
2016-02-05 19:44 ` [PATCH v4 02/21] refs: add methods for misc ref operations David Turner
2016-02-11 7:45 ` Michael Haggerty
2016-02-12 1:09 ` David Turner
2016-02-05 19:44 ` [PATCH v4 03/21] refs: add methods for the ref iterators David Turner
2016-02-11 8:42 ` Michael Haggerty
2016-02-12 1:08 ` David Turner
2016-02-05 19:44 ` [PATCH v4 04/21] refs: add do_for_each_per_worktree_ref David Turner
2016-02-05 19:44 ` [PATCH v4 05/21] refs: add methods for reflog David Turner
2016-02-05 19:44 ` [PATCH v4 06/21] refs: add method for initial ref transaction commit David Turner
2016-02-05 19:44 ` [PATCH v4 07/21] refs: add method for delete_refs David Turner
2016-02-05 19:44 ` [PATCH v4 08/21] refs: add methods to init refs db David Turner
2016-02-11 8:54 ` Michael Haggerty
2016-02-11 21:15 ` David Turner
2016-02-05 19:44 ` [PATCH v4 09/21] refs: add method to rename refs David Turner
2016-02-11 9:00 ` Michael Haggerty
2016-02-11 21:12 ` David Turner
2016-02-05 19:44 ` [PATCH v4 10/21] refs: make lock generic David Turner
2016-02-05 19:44 ` [PATCH v4 11/21] refs: move duplicate check to common code David Turner
2016-02-05 19:44 ` [PATCH v4 12/21] refs: allow log-only updates David Turner
2016-02-11 10:03 ` Michael Haggerty
2016-02-11 21:23 ` David Turner
2016-02-05 19:44 ` [PATCH v4 13/21] refs: resolve symbolic refs first David Turner
2016-02-12 14:09 ` Michael Haggerty
2016-02-18 0:29 ` David Turner
2016-02-18 11:59 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 14/21] refs: always handle non-normal refs in files backend David Turner
2016-02-12 15:07 ` Michael Haggerty
2016-02-18 2:44 ` David Turner
2016-02-18 12:07 ` Michael Haggerty
2016-02-18 18:32 ` David Turner
2016-02-05 19:44 ` [PATCH v4 15/21] init: allow alternate ref strorage to be set for new repos David Turner
2016-02-12 15:26 ` Michael Haggerty
2016-02-17 20:47 ` David Turner
2016-02-18 14:12 ` Michael Haggerty
2016-02-05 19:44 ` [PATCH v4 16/21] refs: check submodules ref storage config David Turner
2016-02-05 19:44 ` [PATCH v4 17/21] clone: allow ref storage backend to be set for clone David Turner
2016-02-05 19:44 ` [PATCH v4 18/21] svn: learn ref-storage argument David Turner
2016-02-05 19:44 ` [PATCH v4 19/21] refs: add register_ref_storage_backends() David Turner
2016-02-12 15:42 ` Michael Haggerty
2016-02-17 20:32 ` David Turner
2016-02-05 19:44 ` [PATCH v4 20/21] refs: add LMDB refs storage backend David Turner
2016-02-11 8:48 ` Michael Haggerty
2016-02-11 21:21 ` David Turner
2016-02-12 17:01 ` Michael Haggerty
2016-02-13 1:23 ` David Turner
2016-02-14 12:04 ` Duy Nguyen
2016-02-15 9:57 ` Duy Nguyen
2016-02-16 22:01 ` David Turner
2016-02-17 20:32 ` David Turner
2016-02-05 19:44 ` [PATCH v4 21/21] refs: tests for lmdb backend David Turner
2016-02-08 23:37 ` [PATCH v4 00/20] refs backend Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).