git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v14 18/40] replace.c: use the ref transaction functions for updates
Date: Fri,  6 Jun 2014 15:28:56 -0700	[thread overview]
Message-ID: <1402093758-3162-19-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1402093758-3162-1-git-send-email-sahlberg@google.com>

Update replace.c to use ref transactions for updates.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 builtin/replace.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/builtin/replace.c b/builtin/replace.c
index 4b3705d..cf92e5d 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -154,7 +154,8 @@ static int replace_object_sha1(const char *object_ref,
 	unsigned char prev[20];
 	enum object_type obj_type, repl_type;
 	char ref[PATH_MAX];
-	struct ref_lock *lock;
+	struct ref_transaction *transaction;
+	struct strbuf err = STRBUF_INIT;
 
 	obj_type = sha1_object_info(object, NULL);
 	repl_type = sha1_object_info(repl, NULL);
@@ -167,12 +168,14 @@ static int replace_object_sha1(const char *object_ref,
 
 	check_ref_valid(object, prev, ref, sizeof(ref), force);
 
-	lock = lock_any_ref_for_update(ref, prev, 0, NULL);
-	if (!lock)
-		die("%s: cannot lock the ref", ref);
-	if (write_ref_sha1(lock, repl, NULL) < 0)
-		die("%s: cannot update the ref", ref);
+	transaction = ref_transaction_begin(&err);
+	if (!transaction ||
+	    ref_transaction_update(transaction, ref, repl, prev,
+				   0, !is_null_sha1(prev), &err) ||
+	    ref_transaction_commit(transaction, NULL, &err))
+		die("%s", err.buf);
 
+	ref_transaction_free(transaction);
 	return 0;
 }
 
-- 
2.0.0.582.ge25c160

  parent reply	other threads:[~2014-06-06 22:29 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-06 22:28 [PATCH v14 00/40] Use ref transactions Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 01/40] refs.c: remove ref_transaction_rollback Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 02/40] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 03/40] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 04/40] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 05/40] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 06/40] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-06-10 20:10   ` Jonathan Nieder
2014-06-10 21:46     ` Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 07/40] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 08/40] refs.c: add an err argument to delete_ref_loose Ronnie Sahlberg
2014-06-10 22:49   ` Jonathan Nieder
2014-06-11 18:21     ` Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 09/40] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 10/40] update-ref: use err argument to get error from ref_transaction_commit Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 11/40] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 12/40] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 13/40] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 14/40] refs.c: update ref_transaction_delete to check for error " Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 15/40] refs.c: make ref_transaction_begin take an err argument Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 16/40] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-06-10 22:53   ` Jonathan Nieder
2014-06-06 22:28 ` [PATCH v14 17/40] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-06-06 22:28 ` Ronnie Sahlberg [this message]
2014-06-06 22:28 ` [PATCH v14 19/40] commit.c: use ref transactions for updates Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 20/40] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 21/40] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 22/40] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 23/40] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 24/40] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-06-10 23:18   ` Jonathan Nieder
2014-06-11 18:44     ` Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 25/40] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-06-10 23:22   ` Jonathan Nieder
2014-06-06 22:29 ` [PATCH v14 26/40] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-06-10 23:23   ` Jonathan Nieder
2014-06-06 22:29 ` [PATCH v14 27/40] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 28/40] refs.c: remove the update_ref_lock function Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 29/40] refs.c: remove the update_ref_write function Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 30/40] refs.c: remove lock_ref_sha1 Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 31/40] refs.c: make prune_ref use a transaction to delete the ref Ronnie Sahlberg
2014-06-10 23:37   ` Jonathan Nieder
2014-06-06 22:29 ` [PATCH v14 32/40] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 33/40] refs.c: pass the ref log message to _create/delete/update instead of _commit Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 34/40] refs.c: pass NULL as *flags to read_ref_full Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 35/40] refs.c: move the check for valid refname to lock_ref_sha1_basic Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 36/40] refs.c: call lock_ref_sha1_basic directly from commit Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 37/40] refs.c: pass a skip list to name_conflict_fn Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 38/40] refs.c: propagate any errno==ENOTDIR from _commit back to the callers Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 39/40] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 40/40] refs.c: make write_ref_sha1 static Ronnie Sahlberg

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=1402093758-3162-19-git-send-email-sahlberg@google.com \
    --to=sahlberg@google.com \
    --cc=git@vger.kernel.org \
    /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).