git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: mhagger@alum.mit.edu, Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v5 12/30] replace.c: use the ref transaction functions for updates
Date: Tue, 29 Apr 2014 15:18:57 -0700	[thread overview]
Message-ID: <1398809955-32008-13-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1398809955-32008-1-git-send-email-sahlberg@google.com>

Update replace.c to use ref transactions for updates.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 builtin/replace.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/builtin/replace.c b/builtin/replace.c
index b62420a..b037b29 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -129,7 +129,8 @@ static int replace_object(const char *object_ref, const char *replace_ref,
 	unsigned char object[20], prev[20], repl[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;
 
 	if (get_sha1(object_ref, object))
 		die("Failed to resolve '%s' as a valid ref.", object_ref);
@@ -157,11 +158,12 @@ static int replace_object(const char *object_ref, const char *replace_ref,
 	else if (!force)
 		die("replace ref '%s' already exists", ref);
 
-	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();
+	if (!transaction ||
+	    ref_transaction_update(transaction, ref, repl, prev,
+				   0, !is_null_sha1(prev)) ||
+	    ref_transaction_commit(transaction, NULL, &err))
+		die(_("%s: failed to replace ref: %s"), ref, err.buf);
 
 	return 0;
 }
-- 
1.9.1.532.gf8485a6

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

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-29 22:18 [PATCH v5 00/30] Use ref transactions for all ref updates Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 01/30] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 02/30] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 03/30] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 04/30] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 05/30] update-ref.c: log transaction error from the update_ref Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 06/30] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 07/30] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 08/30] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 09/30] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 10/30] refs.c: ref_transaction_delete to check for error " Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 11/30] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-04-29 22:18 ` Ronnie Sahlberg [this message]
2014-04-29 22:18 ` [PATCH v5 13/30] commit.c: use ref transactions for updates Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 14/30] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 15/30] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 16/30] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 17/30] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 18/30] refs.c: free the transaction before returning when number of updates is 0 Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 19/30] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 20/30] fetch.c: clear errno before calling functions that might set it Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 21/30] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 22/30] fetch.c: use a single ref transaction for all ref updates Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 23/30] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 24/30] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 25/30] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 26/30] refs.c: make write_ref_sha1 static Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 27/30] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 28/30] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 29/30] refs.c: remove the update_ref_lock function Ronnie Sahlberg
2014-04-29 22:19 ` [PATCH v5 30/30] refs.c: remove the update_ref_write function 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=1398809955-32008-13-git-send-email-sahlberg@google.com \
    --to=sahlberg@google.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).