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 v4 17/27] refs.c: change update_ref to use a transaction
Date: Mon, 28 Apr 2014 15:54:32 -0700	[thread overview]
Message-ID: <1398725682-30782-18-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1398725682-30782-1-git-send-email-sahlberg@google.com>

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

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/refs.c b/refs.c
index 0a4e28e..563f336 100644
--- a/refs.c
+++ b/refs.c
@@ -3396,11 +3396,28 @@ 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();
+	if ((!t ||
+	    ref_transaction_update(t, refname, sha1, oldval, flags,
+				   !!oldval)) ||
+	    (ref_transaction_commit(t, action, &err) && !(t = NULL))) {
+		const char *str = "update_ref failed for ref '%s': %s";
+
+		ref_transaction_rollback(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)
-- 
1.9.1.528.g98b8868.dirty

  parent reply	other threads:[~2014-04-28 22:55 UTC|newest]

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