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

[PATCH v18 39/48] refs.c: make prune_ref use a transaction to delete the ref

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Jun 17, 2014, 15:53 UTC
Message-ID
<1403020442-31049-40-git-send-email-sahlberg@google.com>
In-Reply-To
<1403020442-31049-1-git-send-email-sahlberg@google.com>

Change prune_ref to delete the ref using a ref transaction. To do this we also need to add a new flag REF_ISPRUNING that will tell the transaction that we do not want to delete this ref from the packed refs. This flag is private to refs.c and not exposed to external callers.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 29 +++++++++++++++++++++--------
 refs.h | 14 ++++++++++++--
 2 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/refs.c b/refs.c
index e8118de..e753711 100644
--- a/refs.c
+++ b/refs.c
@@ -25,6 +25,11 @@ static unsigned char refname_disposition[256] = {
 };
 
 /*
+ * Used as a flag to ref_transaction_delete when a loose ref is being
+ * pruned.
+ */
+#define REF_ISPRUNING	0x0100
+/*
  * Try to read one refname component from the front of refname.
  * Return the length of the component found, or -1 if the component is
  * not legal.  It is legal if it is something reasonable to have under
@@ -2380,17 +2385,24 @@ static void try_remove_empty_parents(char *name)
 /* make sure nobody touched the ref, and unlink */
 static void prune_ref(struct ref_to_prune *r)
 {
-	struct ref_lock *lock;
+	struct ref_transaction *transaction;
+	struct strbuf err = STRBUF_INIT;
 
 	if (check_refname_format(r->name + 5, 0))
 		return;
 
-	lock = lock_ref_sha1_basic(r->name, r->sha1, 0, NULL);
-	if (lock) {
-		unlink_or_warn(git_path("%s", r->name));
-		unlock_ref(lock);
-		try_remove_empty_parents(r->name);
-	}
+	transaction = ref_transaction_begin(&err);
+	if (!transaction ||
+	    ref_transaction_delete(transaction, r->name, r->sha1,
+				   REF_ISPRUNING, 1, &err) ||
+	    ref_transaction_commit(transaction, NULL, &err)) {
+		ref_transaction_free(transaction);
+		error("%s", err.buf);
+		strbuf_release(&err);
+		return;
+ 	}
+	ref_transaction_free(transaction);
+	try_remove_empty_parents(r->name);
 }
 
 static void prune_refs(struct ref_to_prune *r)
@@ -3619,9 +3631,10 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 		struct ref_update *update = updates[i];
 
 		if (update->lock) {
-			delnames[delnum++] = update->lock->ref_name;
 			ret |= delete_ref_loose(update->lock, update->type,
 						err);
+			if (!(update->flags & REF_ISPRUNING))
+				delnames[delnum++] = update->lock->ref_name;
 		}
 	}
 
diff --git a/refs.h b/refs.h
index 4ac4a7d..3b321c2 100644
--- a/refs.h
+++ b/refs.h
@@ -177,9 +177,19 @@ extern int ref_exists(const char *);
  */
 extern int peel_ref(const char *refname, unsigned char *sha1);
 
-/** Locks any ref (for 'HEAD' type refs). */
+/*
+ * Flags controlling lock_any_ref_for_update(), ref_transaction_update(),
+ * ref_transaction_create(), etc.
+ * REF_NODEREF: act on the ref directly, instead of dereferencing
+ *              symbolic references.
+ *
+ * Flags >= 0x100 are reserved for internal use.
+ */
 #define REF_NODEREF	0x01
-/* errno is set to something meaningful on failure */
+/*
+ * Locks any ref (for 'HEAD' type refs) and sets errno to something
+ * meaningful on failure.
+ */
 extern struct ref_lock *lock_any_ref_for_update(const char *refname,
 						const unsigned char *old_sha1,
 						int flags, int *type_p);

-- 
2.0.0.438.gec92e5c
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 52 of 61 in “Use ref transactions”
  1. 00/48 Use ref transactionsRonnie Sahlberg, Jun 17, 2014
  2. 01/48 refs.c: remove ref_transaction_rollbackRonnie Sahlberg, Jun 17, 2014
  3. 02/48 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, Jun 17, 2014
  4. 03/48 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, Jun 17, 2014
  5. 04/48 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, Jun 17, 2014
  6. 05/48 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, Jun 17, 2014
  7. 06/48 lockfile.c: add a new public function unable_to_lock_messageRonnie Sahlberg, Jun 17, 2014
  8. 07/48 lockfile.c: make lock_file return a meaningful errno on failureiRonnie Sahlberg, Jun 17, 2014
  9. Michael HaggertyJun 18, 2014
  10. Michael HaggertyJun 18, 2014
  11. 08/48 refs.c: add an err argument to repack_without_refsRonnie Sahlberg, Jun 17, 2014
  12. 09/48 refs.c: make sure log_ref_setup returns a meaningful errnoRonnie Sahlberg, Jun 17, 2014
  13. 10/48 refs.c: verify_lock should set errno to something meaningfulRonnie Sahlberg, Jun 17, 2014
  14. Michael HaggertyJun 18, 2014
  15. Ronnie SahlbergJun 18, 2014
  16. 11/48 refs.c: make remove_empty_directories alwasy set errno to something saneRonnie Sahlberg, Jun 17, 2014
  17. Michael HaggertyJun 18, 2014
  18. Ronnie SahlbergJun 18, 2014
  19. 12/48 refs.c: commit_packed_refs to return a meaningful errno on failureRonnie Sahlberg, Jun 17, 2014
  20. 13/48 refs.c: make resolve_ref_unsafe set errno to something meaningful on errorRonnie Sahlberg, Jun 17, 2014
  21. 14/48 refs.c: log_ref_write should try to return meaningful errnoRonnie Sahlberg, Jun 17, 2014
  22. Michael HaggertyJun 18, 2014
  23. Ronnie SahlbergJun 18, 2014
  24. 15/48 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, Jun 17, 2014
  25. 16/48 refs.c: add an err argument to delete_ref_looseRonnie Sahlberg, Jun 17, 2014
  26. Michael HaggertyJun 18, 2014
  27. Ronnie SahlbergJun 18, 2014
  28. Michael HaggertyJun 18, 2014
  29. Ronnie SahlbergJun 19, 2014
  30. 17/48 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, Jun 17, 2014
  31. 18/48 update-ref: use err argument to get error from ref_transaction_commitRonnie Sahlberg, Jun 17, 2014
  32. 19/48 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, Jun 17, 2014
  33. 20/48 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, Jun 17, 2014
  34. 21/48 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, Jun 17, 2014
  35. 22/48 refs.c: update ref_transaction_delete to check for error and return statusRonnie Sahlberg, Jun 17, 2014
  36. 23/48 refs.c: make ref_transaction_begin take an err argumentRonnie Sahlberg, Jun 17, 2014
  37. 24/48 refs.c: add transaction.status and track OPEN/CLOSED/ERRORRonnie Sahlberg, Jun 17, 2014
  38. 25/48 tag.c: use ref transactions when doing updatesRonnie Sahlberg, Jun 17, 2014
  39. 26/48 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, Jun 17, 2014
  40. 27/48 commit.c: use ref transactions for updatesRonnie Sahlberg, Jun 17, 2014
  41. 28/48 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, Jun 17, 2014
  42. 29/48 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, Jun 17, 2014
  43. 30/48 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, Jun 17, 2014
  44. 31/48 refs.c: change update_ref to use a transactionRonnie Sahlberg, Jun 17, 2014
  45. 32/48 receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg, Jun 17, 2014
  46. 33/48 fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg, Jun 17, 2014
  47. 34/48 walker.c: use ref transaction for ref updatesRonnie Sahlberg, Jun 17, 2014
  48. 35/48 refs.c: make lock_ref_sha1 staticRonnie Sahlberg, Jun 17, 2014
  49. 36/48 refs.c: remove the update_ref_lock functionRonnie Sahlberg, Jun 17, 2014
  50. 37/48 refs.c: remove the update_ref_write functionRonnie Sahlberg, Jun 17, 2014
  51. 38/48 refs.c: remove lock_ref_sha1Ronnie Sahlberg, Jun 17, 2014
  52. 39/48 refs.c: make prune_ref use a transaction to delete the refRonnie Sahlberg, Jun 17, 2014
  53. 40/48 refs.c: make delete_ref use a transactionRonnie Sahlberg, Jun 17, 2014
  54. 41/48 refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg, Jun 17, 2014
  55. 42/48 refs.c: pass NULL as *flags to read_ref_fullRonnie Sahlberg, Jun 17, 2014
  56. 43/48 refs.c: move the check for valid refname to lock_ref_sha1_basicRonnie Sahlberg, Jun 17, 2014
  57. 44/48 refs.c: call lock_ref_sha1_basic directly from commitRonnie Sahlberg, Jun 17, 2014
  58. 45/48 refs.c: pass a skip list to name_conflict_fnRonnie Sahlberg, Jun 17, 2014
  59. 46/48 refs.c: propagate any errno==ENOTDIR from _commit back to the callersRonnie Sahlberg, Jun 17, 2014
  60. 47/48 fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg, Jun 17, 2014
  61. 48/48 refs.c: make write_ref_sha1 staticRonnie Sahlberg, Jun 17, 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.