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 11/20] refs.c: change update_ref to use a transaction
Date: Tue, 15 Jul 2014 16:34:09 -0700	[thread overview]
Message-ID: <1405467258-24102-12-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1405467258-24102-1-git-send-email-sahlberg@google.com>

Change the update_ref helper function to use a ref transaction internally.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/refs.c b/refs.c
index d015285..ff4e799 100644
--- a/refs.c
+++ b/refs.c
@@ -3523,11 +3523,31 @@ int update_ref(const char *action, const char *refname,
 	       const unsigned char *sha1, const unsigned char *oldval,
 	       int flags, enum action_on_err onerr)
 {
-	struct ref_lock *lock;
-	lock = update_ref_lock(refname, oldval, flags, NULL, onerr);
-	if (!lock)
+	struct ref_transaction *t;
+	struct strbuf err = STRBUF_INIT;
+
+	t = ref_transaction_begin(&err);
+	if (!t ||
+	    ref_transaction_update(t, refname, sha1, oldval, flags,
+				   !!oldval, &err) ||
+	    ref_transaction_commit(t, action, &err)) {
+		const char *str = "update_ref failed for ref '%s': %s";
+
+		ref_transaction_free(t);
+		switch (onerr) {
+		case UPDATE_REFS_MSG_ON_ERR:
+			error(str, refname, err.buf);
+			break;
+		case UPDATE_REFS_DIE_ON_ERR:
+			die(str, refname, err.buf);
+			break;
+		case UPDATE_REFS_QUIET_ON_ERR:
+			break;
+		}
+		strbuf_release(&err);
 		return 1;
-	return update_ref_write(action, refname, sha1, lock, NULL, onerr);
+	}
+	return 0;
 }
 
 static int ref_update_compare(const void *r1, const void *r2)
-- 
2.0.1.442.g7fe6834.dirty

  parent reply	other threads:[~2014-07-15 23:35 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-15 23:33 [PATCH 00/20] ref transactions part 2 Ronnie Sahlberg
2014-07-15 23:33 ` [PATCH 01/20] refs.c: change ref_transaction_create to do error checking and return status Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 02/20] refs.c: update ref_transaction_delete to check for error " Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 03/20] refs.c: make ref_transaction_begin take an err argument Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 04/20] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 05/20] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 06/20] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 07/20] commit.c: use ref transactions " Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 08/20] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 09/20] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 10/20] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-07-15 23:34 ` Ronnie Sahlberg [this message]
2014-07-15 23:34 ` [PATCH 12/20] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 13/20] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 14/20] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 15/20] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 16/20] refs.c: remove the update_ref_lock function Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 17/20] refs.c: remove the update_ref_write function Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 18/20] refs.c: remove lock_ref_sha1 Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 19/20] refs.c: make prune_ref use a transaction to delete the ref Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 20/20] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-07-15 23:37 ` [PATCH 00/20] ref transactions part 2 Ronnie Sahlberg
2014-07-16 22:16   ` Junio C Hamano
2014-07-16 22:52     ` Ronnie Sahlberg
  -- strict thread matches above, loose matches on Subject: below --
2014-07-30 17:10 Transaction patch series overview Ronnie Sahlberg
2014-07-31 21:41 ` Ronnie Sahlberg
2014-08-08 16:50   ` Ronnie Sahlberg
2014-08-19 19:54     ` Ronnie Sahlberg
2014-08-20 23:17       ` Jonathan Nieder
2014-08-26  0:03         ` Jonathan Nieder
2014-08-26 21:01           ` Junio C Hamano
2014-08-26 22:14             ` Jonathan Nieder
2014-08-27  0:28               ` [PATCH 0/20] rs/ref-transaction-1 (Re: Transaction patch series overview) Jonathan Nieder
2014-08-27  0:33                 ` [PATCH 11/20] refs.c: change update_ref to use a transaction Jonathan Nieder

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=1405467258-24102-12-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).