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

[PATCH v10 06/44] refs.c: add an err argument to delete_ref_loose

From
Ronnie Sahlberg <sahlberg@google.com>
Date
May 16, 2014, 17:36 UTC
Message-ID
<1400261852-31303-7-git-send-email-sahlberg@google.com>
In-Reply-To
<1400261852-31303-1-git-send-email-sahlberg@google.com>

Add an err argument to delete_loose_ref so that we can pass a descriptive error string back to the caller. Pass the err argument from transaction commit to this function so that transaction users will have a nice error string if the transaction failed due to delete_loose_ref.

Add a new function unlink_or_err that we can call from delete_ref_loose. This function is similar to unlink_or_warn except that we can pass it an err argument. If err is non-NULL the function will populate err instead of printing a warning().

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/refs.c b/refs.c
index 57ec72a..bc444c7 100644
--- a/refs.c
+++ b/refs.c
@@ -2491,17 +2491,43 @@ static int repack_without_ref(const char *refname)
 	return repack_without_refs(&refname, 1, NULL);
 }
 
-static int delete_ref_loose(struct ref_lock *lock, int flag)
+static int add_err_if_unremovable(const char *op, const char *file,
+				  struct strbuf *e, int rc)
+{
+	int err = errno;
+	if (rc < 0 && err != ENOENT) {
+		strbuf_addf(e, "unable to %s %s: %s",
+			    op, file, strerror(errno));
+		errno = err;
+	}
+	return rc;
+}
+
+static int unlink_or_err(const char *file, struct strbuf *err)
+{
+	if (err)
+		return add_err_if_unremovable("unlink", file, err,
+					      unlink(file));
+	else
+		return unlink_or_warn(file);
+}
+
+static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
 {
 	if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) {
 		/* loose */
-		int err, i = strlen(lock->lk->filename) - 5; /* .lock */
+		int res, i = strlen(lock->lk->filename) - 5; /* .lock */
 
 		lock->lk->filename[i] = 0;
-		err = unlink_or_warn(lock->lk->filename);
+		res = unlink_or_err(lock->lk->filename, err);
 		lock->lk->filename[i] = '.';
-		if (err && errno != ENOENT)
+		if (res && errno != ENOENT) {
+			if (err)
+				strbuf_addf(err,
+					    "failed to delete loose ref '%s'",
+					    lock->lk->filename);
 			return 1;
+		}
 	}
 	return 0;
 }
@@ -2514,7 +2540,7 @@ int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
 	lock = lock_ref_sha1_basic(refname, sha1, delopt, &flag);
 	if (!lock)
 		return 1;
-	ret |= delete_ref_loose(lock, flag);
+	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
@@ -3494,7 +3520,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 
 		if (update->lock) {
 			delnames[delnum++] = update->lock->ref_name;
-			ret |= delete_ref_loose(update->lock, update->type);
+			ret |= delete_ref_loose(update->lock, update->type,
+						err);
 		}
 	}
 

-- 
2.0.0.rc3.510.g20c254b
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 9 of 65 in “Use ref transactions for all ref updates”
  1. 00/44 Use ref transactions for all ref updatesRonnie Sahlberg, May 16, 2014
  2. 01/44 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, May 16, 2014
  3. 02/44 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, May 16, 2014
  4. 03/44 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, May 16, 2014
  5. 04/44 refs.c: add an err argument to repack_without_refsRonnie Sahlberg, May 16, 2014
  6. Michael HaggertyMay 17, 2014
  7. Ronnie SahlbergMay 27, 2014
  8. 05/44 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, May 16, 2014
  9. 06/44 refs.c: add an err argument to delete_ref_looseRonnie Sahlberg, May 16, 2014
  10. 07/44 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, May 16, 2014
  11. 08/44 update-ref.c: log transaction error from the update_refRonnie Sahlberg, May 16, 2014
  12. 09/44 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, May 16, 2014
  13. 10/44 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, May 16, 2014
  14. 11/44 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, May 16, 2014
  15. 12/44 refs.c: ref_transaction_delete to check for error and return statusRonnie Sahlberg, May 16, 2014
  16. 13/44 tag.c: use ref transactions when doing updatesRonnie Sahlberg, May 16, 2014
  17. Michael HaggertyMay 17, 2014
  18. Ronnie SahlbergMay 19, 2014
  19. Ronnie SahlbergMay 19, 2014
  20. 14/44 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, May 16, 2014
  21. Michael HaggertyMay 17, 2014
  22. Ronnie SahlbergMay 19, 2014
  23. 15/44 commit.c: use ref transactions for updatesRonnie Sahlberg, May 16, 2014
  24. 16/44 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, May 16, 2014
  25. 17/44 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, May 16, 2014
  26. 18/44 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, May 16, 2014
  27. Michael HaggertyMay 17, 2014
  28. Ronnie SahlbergMay 19, 2014
  29. 19/44 refs.c: change update_ref to use a transactionRonnie Sahlberg, May 16, 2014
  30. 20/44 refs.c: free the transaction before returning when number of updates is 0Ronnie Sahlberg, May 16, 2014
  31. 21/44 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, May 16, 2014
  32. 22/44 fetch.c: clear errno before calling functions that might set itRonnie Sahlberg, May 16, 2014
  33. Michael HaggertyMay 17, 2014
  34. Ronnie SahlbergMay 27, 2014
  35. 23/44 fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg, May 16, 2014
  36. 24/44 fetch.c: use a single ref transaction for all ref updatesRonnie Sahlberg, May 16, 2014
  37. Michael HaggertyMay 17, 2014
  38. Michael HaggertyMay 17, 2014
  39. 25/44 receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg, May 16, 2014
  40. Michael HaggertyMay 17, 2014
  41. Ronnie SahlbergMay 19, 2014
  42. Michael HaggertyMay 23, 2014
  43. Ronnie SahlbergMay 23, 2014
  44. Michael HaggertyMay 23, 2014
  45. Ronnie SahlbergMay 27, 2014
  46. 26/44 fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg, May 16, 2014
  47. 27/44 walker.c: use ref transaction for ref updatesRonnie Sahlberg, May 16, 2014
  48. 28/44 refs.c: make write_ref_sha1 staticRonnie Sahlberg, May 16, 2014
  49. 29/44 refs.c: make lock_ref_sha1 staticRonnie Sahlberg, May 16, 2014
  50. 30/44 refs.c: add transaction.status and track OPEN/CLOSED/ERRORRonnie Sahlberg, May 16, 2014
  51. 31/44 refs.c: remove the update_ref_lock functionRonnie Sahlberg, May 16, 2014
  52. 32/44 refs.c: remove the update_ref_write functionRonnie Sahlberg, May 16, 2014
  53. 33/44 refs.c: remove lock_ref_sha1Ronnie Sahlberg, May 16, 2014
  54. 34/44 refs.c: make prune_ref use a transaction to delete the refRonnie Sahlberg, May 16, 2014
  55. 35/44 refs.c: make delete_ref use a transactionRonnie Sahlberg, May 16, 2014
  56. 36/44 refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg, May 16, 2014
  57. 37/44 refs.c: pass NULL as *flags to read_ref_fullRonnie Sahlberg, May 16, 2014
  58. 38/44 refs.c: pack all refs before we start to rename a refRonnie Sahlberg, May 16, 2014
  59. 39/44 refs.c: move the check for valid refname to lock_ref_sha1_basicRonnie Sahlberg, May 16, 2014
  60. 40/44 refs.c: call lock_ref_sha1_basic directly from commitRonnie Sahlberg, May 16, 2014
  61. 41/44 refs.c: add a new flag for transaction delete for refs we know are packed onlyRonnie Sahlberg, May 16, 2014
  62. 42/44 refs.c: pass a skip list to name_conflict_fnRonnie Sahlberg, May 16, 2014
  63. 43/44 refs.c: make rename_ref use a transactionRonnie Sahlberg, May 16, 2014
  64. 44/44 refs.c: remove forward declaration of write_ref_sha1Ronnie Sahlberg, May 16, 2014
  65. Jonathan NiederMay 16, 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.