From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v3 11/20] refs: move duplicate check to common code
Date: Thu, 14 Jan 2016 11:26:08 -0500 [thread overview]
Message-ID: <1452788777-24954-12-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1452788777-24954-1-git-send-email-dturner@twopensource.com>
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 deeb7cf..d9cdacf 100644
--- a/refs.c
+++ b/refs.c
@@ -1105,6 +1105,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)
{
@@ -1114,7 +1144,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)
@@ -1266,5 +1318,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 9ae06a6..6dc9257 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3136,24 +3136,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;
@@ -3161,26 +3145,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
@@ -3199,7 +3163,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);
@@ -3311,7 +3275,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;
}
@@ -3324,27 +3287,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
@@ -3357,7 +3311,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++) {
@@ -3367,7 +3321,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;
@@ -3398,7 +3352,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 7390247..0dbb13d 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
next prev parent reply other threads:[~2016-01-14 16:27 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-14 16:25 [PATCH v3 00/20] refs backend rebase on pu David Turner
2016-01-14 16:25 ` [PATCH v3 01/20] refs: add a backend method structure with transaction functions David Turner
2016-01-14 16:25 ` [PATCH v3 02/20] refs: add methods for misc ref operations David Turner
2016-01-14 16:26 ` [PATCH v3 03/20] refs: add methods for the ref iterators David Turner
2016-01-14 16:26 ` [PATCH v3 04/20] refs: add do_for_each_per_worktree_ref David Turner
2016-01-14 16:26 ` [PATCH v3 05/20] refs: add methods for reflog David Turner
2016-01-14 16:26 ` [PATCH v3 06/20] refs: add method for initial ref transaction commit David Turner
2016-01-14 16:26 ` [PATCH v3 07/20] refs: add method for delete_refs David Turner
2016-01-14 16:26 ` [PATCH v3 08/20] refs: add methods to init refs db David Turner
2016-01-14 16:26 ` [PATCH v3 09/20] refs: add method to rename refs David Turner
2016-01-14 16:26 ` [PATCH v3 10/20] refs: make lock generic David Turner
2016-01-14 16:26 ` David Turner [this message]
2016-01-14 16:26 ` [PATCH v3 12/20] refs: allow log-only updates David Turner
2016-01-14 16:26 ` [PATCH v3 13/20] refs: resolve symbolic refs first David Turner
2016-02-04 7:37 ` Jeff King
2016-02-04 19:24 ` David Turner
2016-01-14 16:26 ` [PATCH v3 14/20] refs: always handle non-normal refs in files backend David Turner
2016-01-14 16:26 ` [PATCH v3 15/20] init: allow alternate backends to be set for new repos David Turner
2016-01-15 11:33 ` SZEDER Gábor
2016-01-15 12:51 ` Thomas Gummerer
2016-01-19 19:12 ` David Turner
2016-02-04 9:48 ` Duy Nguyen
2016-02-04 20:05 ` David Turner
2016-01-14 16:26 ` [PATCH v3 16/20] refs: check submodules ref storage config David Turner
2016-01-14 16:26 ` [PATCH v3 17/20] refs: allow ref backend to be set for clone David Turner
2016-01-15 11:32 ` SZEDER Gábor
2016-01-19 17:06 ` David Turner
2016-01-21 9:08 ` SZEDER Gábor
2016-01-14 16:26 ` [PATCH v3 18/20] svn: learn ref-storage argument David Turner
2016-01-15 11:34 ` SZEDER Gábor
2016-01-14 16:26 ` [PATCH v3 19/20] refs: add LMDB refs backend David Turner
2016-01-15 13:33 ` Thomas Gummerer
2016-01-19 18:55 ` David Turner
2016-02-04 9:58 ` Duy Nguyen
2016-02-04 19:33 ` David Turner
2016-01-14 16:26 ` [PATCH v3 20/20] refs: tests for lmdb backend David Turner
2016-02-02 20:08 ` [PATCH v3 00/20] refs backend rebase on pu David Turner
2016-02-02 22:13 ` Junio C Hamano
2016-02-04 0:09 ` Junio C Hamano
2016-02-04 1:12 ` David Turner
2016-02-04 1:54 ` Ramsay Jones
2016-02-04 2:58 ` Jeff King
2016-02-04 22:44 ` David Turner
2016-02-04 10:09 ` Duy Nguyen
2016-02-04 21:39 ` David Turner
2016-02-04 11:42 ` Duy Nguyen
2016-02-04 20:25 ` David Turner
2016-02-04 20:39 ` Ramsay Jones
2016-02-04 21:23 ` David Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452788777-24954-12-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).