From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: mhagger@alum.mit.edu, Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v5 15/30] fast-import.c: change update_branch to use ref transactions
Date: Tue, 29 Apr 2014 15:19:00 -0700 [thread overview]
Message-ID: <1398809955-32008-16-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1398809955-32008-1-git-send-email-sahlberg@google.com>
Change update_branch() to use ref transactions for updates.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
fast-import.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index fb4738d..35de36a 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1678,36 +1678,41 @@ found_entry:
static int update_branch(struct branch *b)
{
static const char *msg = "fast-import";
- struct ref_lock *lock;
+ struct ref_transaction *transaction;
unsigned char old_sha1[20];
+ struct strbuf err = STRBUF_INIT;
if (is_null_sha1(b->sha1))
return 0;
if (read_ref(b->name, old_sha1))
hashclr(old_sha1);
- lock = lock_any_ref_for_update(b->name, old_sha1, 0, NULL);
- if (!lock)
- return error("Unable to lock %s", b->name);
if (!force_update && !is_null_sha1(old_sha1)) {
struct commit *old_cmit, *new_cmit;
old_cmit = lookup_commit_reference_gently(old_sha1, 0);
new_cmit = lookup_commit_reference_gently(b->sha1, 0);
if (!old_cmit || !new_cmit) {
- unlock_ref(lock);
return error("Branch %s is missing commits.", b->name);
}
if (!in_merge_bases(old_cmit, new_cmit)) {
- unlock_ref(lock);
warning("Not updating %s"
" (new tip %s does not contain %s)",
b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
return -1;
}
}
- if (write_ref_sha1(lock, b->sha1, msg) < 0)
- return error("Unable to update %s", b->name);
+ transaction = ref_transaction_begin();
+ if ((!transaction ||
+ ref_transaction_update(transaction, b->name, b->sha1, old_sha1,
+ 0, 1)) ||
+ (ref_transaction_commit(transaction, msg, &err) &&
+ !(transaction = NULL))) {
+ ref_transaction_rollback(transaction);
+ error("Unable to update branch %s: %s", b->name, err.buf);
+ strbuf_release(&err);
+ return -1;
+ }
return 0;
}
--
1.9.1.532.gf8485a6
next prev 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 ` [PATCH v5 12/30] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-04-29 22:18 ` [PATCH v5 13/30] commit.c: use ref transactions " 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 ` Ronnie Sahlberg [this message]
2014-04-29 22:19 ` [PATCH v5 16/30] branch.c: use ref transaction " 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-16-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).