From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: mhagger@alum.mit.edu, Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v2 10/13] fast-import.c: change update_branch to use ref transactions
Date: Mon, 21 Apr 2014 15:53:28 -0700 [thread overview]
Message-ID: <1398120811-20284-11-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1398120811-20284-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 | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index fb4738d..466dfe3 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1678,36 +1678,43 @@ 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];
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);
+ transaction = ref_transaction_begin();
+ if (!transaction)
+ return error("Unable to begin transaction for %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);
+ ref_transaction_rollback(transaction);
return error("Branch %s is missing commits.", b->name);
}
if (!in_merge_bases(old_cmit, new_cmit)) {
- unlock_ref(lock);
+ ref_transaction_rollback(transaction);
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);
+ if (ref_transaction_update(transaction, b->name, b->sha1, old_sha1,
+ 0, 1)) {
+ ref_transaction_rollback(transaction);
+ return error("Unable to update transaction for %s", b->name);
+ }
+ if (ref_transaction_commit(transaction, msg,
+ UPDATE_REFS_QUIET_ON_ERR))
+ return error("Unable to commit transaction for %s", b->name);
+
return 0;
}
--
1.9.1.515.g3b87021
next prev parent reply other threads:[~2014-04-21 22:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 22:53 [PATCH v2 00/13] Use ref transactions from most callers Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 01/13] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 02/13] refs.c: use a single exit path from transaction commit and handle onerr Ronnie Sahlberg
2014-04-22 19:11 ` Junio C Hamano
2014-04-22 22:46 ` Ronnie Sahlberg
2014-04-22 19:14 ` Junio C Hamano
2014-04-21 22:53 ` [PATCH v2 03/13] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 04/13] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 05/13] refs.c: ref_transaction_delete to check for error " Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 06/13] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 07/13] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 08/13] commit.c: use ref transactions " Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 09/13] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-04-21 22:53 ` Ronnie Sahlberg [this message]
2014-04-21 22:53 ` [PATCH v2 11/13] branch.c: use ref transaction " Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 12/13] walker.c: use ref transaction for " Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 13/13] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-04-22 19:34 ` [PATCH v2 00/13] Use ref transactions from most callers Junio C Hamano
2014-04-22 22:43 ` 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=1398120811-20284-11-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).