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

[PATCH v13 32/41] refs.c: make delete_ref use a transaction

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Jun 3, 2014, 21:37 UTC
Message-ID
<1401831479-3388-33-git-send-email-sahlberg@google.com>
In-Reply-To
<1401831479-3388-1-git-send-email-sahlberg@google.com>

Change delete_ref to use a ref transaction for the deletion. At the same time since we no longer have any callers of repack_without_ref we can now delete this function.

Change delete_ref to return 0 on success and 1 on failure instead of the previous 0 on success either 1 or -1 on failure.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)
diff --git a/refs.c b/refs.c
index e19041a..4cdbc26 100644
--- a/refs.c
+++ b/refs.c
@@ -2513,11 +2513,6 @@ static int repack_without_refs(const char **refnames, int n, struct strbuf *err)
 	return ret;
 }
 
-static int repack_without_ref(const char *refname)
-{
-	return repack_without_refs(&refname, 1, NULL);
-}
-
 static int add_err_if_unremovable(const char *op, const char *file,
 				  struct strbuf *e, int rc)
 {
@@ -2557,24 +2552,21 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
 
 int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
 {
-	struct ref_lock *lock;
-	int ret = 0, flag = 0;
+	struct ref_transaction *transaction;
+	struct strbuf err = STRBUF_INIT;
 
-	lock = lock_ref_sha1_basic(refname, sha1, delopt, &flag);
-	if (!lock)
+	transaction = ref_transaction_begin(&err);
+	if (!transaction ||
+	    ref_transaction_delete(transaction, refname, sha1, delopt,
+				   sha1 && !is_null_sha1(sha1), &err) ||
+	    ref_transaction_commit(transaction, NULL, &err)) {
+		error("%s", err.buf);
+		ref_transaction_free(transaction);
+		strbuf_release(&err);
 		return 1;
-	ret |= delete_ref_loose(lock, flag, NULL);
-
-	/* removing the loose one could have resurrected an earlier
-	 * packed one.  Also, if it was not loose we need to repack
-	 * without it.
-	 */
-	ret |= repack_without_ref(lock->ref_name);
-
-	unlink_or_warn(git_path("logs/%s", lock->ref_name));
-	clear_loose_ref_cache(&ref_cache);
-	unlock_ref(lock);
-	return ret;
+	}
+	ref_transaction_free(transaction);
+	return 0;
 }
 
 /*

-- 
2.0.0.567.g64a7adf
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 33 of 43 in “Use ref transactions”
  1. 00/41 Use ref transactionsRonnie Sahlberg, Jun 3, 2014
  2. 01/41 refs.c: remove ref_transaction_rollbackRonnie Sahlberg, Jun 3, 2014
  3. 02/41 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, Jun 3, 2014
  4. 03/41 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, Jun 3, 2014
  5. 04/41 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, Jun 3, 2014
  6. 05/41 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, Jun 3, 2014
  7. 06/41 refs.c: add an err argument to repack_without_refsRonnie Sahlberg, Jun 3, 2014
  8. 07/41 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, Jun 3, 2014
  9. 08/41 refs.c: add an err argument to delete_ref_looseRonnie Sahlberg, Jun 3, 2014
  10. 09/41 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, Jun 3, 2014
  11. 10/41 update-ref: use err argument to get error from ref_transaction_commitRonnie Sahlberg, Jun 3, 2014
  12. 11/41 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, Jun 3, 2014
  13. 12/41 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, Jun 3, 2014
  14. 13/41 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, Jun 3, 2014
  15. 14/41 refs.c: update ref_transaction_delete to check for error and return statusRonnie Sahlberg, Jun 3, 2014
  16. 15/41 refs.c: make ref_transaction_begin take an err argumentRonnie Sahlberg, Jun 3, 2014
  17. 16/41 refs.c: add transaction.status and track OPEN/CLOSED/ERRORRonnie Sahlberg, Jun 3, 2014
  18. 17/41 tag.c: use ref transactions when doing updatesRonnie Sahlberg, Jun 3, 2014
  19. 18/41 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, Jun 3, 2014
  20. 19/41 commit.c: use ref transactions for updatesRonnie Sahlberg, Jun 3, 2014
  21. 20/41 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, Jun 3, 2014
  22. 21/41 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, Jun 3, 2014
  23. 22/41 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, Jun 3, 2014
  24. 23/41 refs.c: change update_ref to use a transactionRonnie Sahlberg, Jun 3, 2014
  25. 24/41 receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg, Jun 3, 2014
  26. 25/41 fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg, Jun 3, 2014
  27. 26/41 walker.c: use ref transaction for ref updatesRonnie Sahlberg, Jun 3, 2014
  28. 27/41 refs.c: make lock_ref_sha1 staticRonnie Sahlberg, Jun 3, 2014
  29. 28/41 refs.c: remove the update_ref_lock functionRonnie Sahlberg, Jun 3, 2014
  30. 29/41 refs.c: remove the update_ref_write functionRonnie Sahlberg, Jun 3, 2014
  31. 30/41 refs.c: remove lock_ref_sha1Ronnie Sahlberg, Jun 3, 2014
  32. 31/41 refs.c: make prune_ref use a transaction to delete the refRonnie Sahlberg, Jun 3, 2014
  33. 32/41 refs.c: make delete_ref use a transactionRonnie Sahlberg, Jun 3, 2014
  34. 33/41 refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg, Jun 3, 2014
  35. 34/41 refs.c: pass NULL as *flags to read_ref_fullRonnie Sahlberg, Jun 3, 2014
  36. 35/41 refs.c: pack all refs before we start to rename a refRonnie Sahlberg, Jun 3, 2014
  37. 36/41 refs.c: move the check for valid refname to lock_ref_sha1_basicRonnie Sahlberg, Jun 3, 2014
  38. 37/41 refs.c: call lock_ref_sha1_basic directly from commitRonnie Sahlberg, Jun 3, 2014
  39. 38/41 refs.c: pass a skip list to name_conflict_fnRonnie Sahlberg, Jun 3, 2014
  40. 39/41 refs.c: propagate any errno==ENOTDIR from _commit back to the callersRonnie Sahlberg, Jun 3, 2014
  41. 40/41 fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg, Jun 3, 2014
  42. 41/41 refs.c: make write_ref_sha1 staticRonnie Sahlberg, Jun 3, 2014
  43. Jonathan NiederJun 3, 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.