git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v5 12/30] replace.c: use the ref transaction functions for updates

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Apr 29, 2014, 22:18 UTC
Message-ID
<1398809955-32008-13-git-send-email-sahlberg@google.com>
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
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 13 of 31 in “Use ref transactions for all ref updates”
  1. 00/30 Use ref transactions for all ref updatesRonnie Sahlberg, Apr 29, 2014
  2. 01/30 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, Apr 29, 2014
  3. 02/30 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, Apr 29, 2014
  4. 03/30 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, Apr 29, 2014
  5. 04/30 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, Apr 29, 2014
  6. 05/30 update-ref.c: log transaction error from the update_refRonnie Sahlberg, Apr 29, 2014
  7. 06/30 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, Apr 29, 2014
  8. 07/30 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, Apr 29, 2014
  9. 08/30 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, Apr 29, 2014
  10. 09/30 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, Apr 29, 2014
  11. 10/30 refs.c: ref_transaction_delete to check for error and return statusRonnie Sahlberg, Apr 29, 2014
  12. 11/30 tag.c: use ref transactions when doing updatesRonnie Sahlberg, Apr 29, 2014
  13. 12/30 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, Apr 29, 2014
  14. 13/30 commit.c: use ref transactions for updatesRonnie Sahlberg, Apr 29, 2014
  15. 14/30 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, Apr 29, 2014
  16. 15/30 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, Apr 29, 2014
  17. 16/30 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, Apr 29, 2014
  18. 17/30 refs.c: change update_ref to use a transactionRonnie Sahlberg, Apr 29, 2014
  19. 18/30 refs.c: free the transaction before returning when number of updates is 0Ronnie Sahlberg, Apr 29, 2014
  20. 19/30 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, Apr 29, 2014
  21. 20/30 fetch.c: clear errno before calling functions that might set itRonnie Sahlberg, Apr 29, 2014
  22. 21/30 fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg, Apr 29, 2014
  23. 22/30 fetch.c: use a single ref transaction for all ref updatesRonnie Sahlberg, Apr 29, 2014
  24. 23/30 receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg, Apr 29, 2014
  25. 24/30 fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg, Apr 29, 2014
  26. 25/30 walker.c: use ref transaction for ref updatesRonnie Sahlberg, Apr 29, 2014
  27. 26/30 refs.c: make write_ref_sha1 staticRonnie Sahlberg, Apr 29, 2014
  28. 27/30 refs.c: make lock_ref_sha1 staticRonnie Sahlberg, Apr 29, 2014
  29. 28/30 refs.c: add transaction.status and track OPEN/CLOSED/ERRORRonnie Sahlberg, Apr 29, 2014
  30. 29/30 refs.c: remove the update_ref_lock functionRonnie Sahlberg, Apr 29, 2014
  31. 30/30 refs.c: remove the update_ref_write functionRonnie Sahlberg, Apr 29, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.