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

[PATCH v4 03/27] refs.c: add a strbuf argument to ref_transaction_commit for error logging

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Apr 28, 2014, 22:54 UTC
Message-ID
<1398725682-30782-4-git-send-email-sahlberg@google.com>
In-Reply-To
<1398725682-30782-1-git-send-email-sahlberg@google.com>

Add a strbuf argument to _commit so that we can pass an error string back to the caller. So that we can do error logging from the caller instead of from _commit.

Longer term plan is to first convert all callers to use onerr==QUIET_ON_ERR and craft any log messages from the callers themselves and finally remove the onerr argument completely.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 builtin/update-ref.c | 2 +-
 refs.c               | 6 +++++-
 refs.h               | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 405267f..aaa06aa 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -367,7 +367,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 		if (end_null)
 			line_termination = '\0';
 		update_refs_stdin();
-		ret = ref_transaction_commit(transaction, msg,
+		ret = ref_transaction_commit(transaction, msg, NULL,
 					     UPDATE_REFS_DIE_ON_ERR);
 		return ret;
 	}
diff --git a/refs.c b/refs.c
index 2d83ef6..64e8feb 100644
--- a/refs.c
+++ b/refs.c
@@ -3414,7 +3414,8 @@ static int ref_update_reject_duplicates(struct ref_update **updates, int n,
 }
 
 int ref_transaction_commit(struct ref_transaction *transaction,
-			   const char *msg, enum action_on_err onerr)
+			   const char *msg, struct strbuf *err,
+			   enum action_on_err onerr)
 {
 	int ret = 0, delnum = 0, i;
 	const char **delnames;
@@ -3443,6 +3444,9 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 					       update->flags,
 					       &update->type, onerr);
 		if (!update->lock) {
+			if (err)
+				strbuf_addf(err ,"Cannot lock the ref '%s'.",
+					    update->refname);
 			ret = 1;
 			goto cleanup;
 		}
diff --git a/refs.h b/refs.h
index 892c5b6..ff87e14 100644
--- a/refs.h
+++ b/refs.h
@@ -268,9 +268,12 @@ void ref_transaction_delete(struct ref_transaction *transaction,
  * Commit all of the changes that have been queued in transaction, as
  * atomically as possible.  Return a nonzero value if there is a
  * problem.  The ref_transaction is freed by this function.
+ * If err is non-NULL we will add an error string to it to explain why
+ * the transaction failed.
  */
 int ref_transaction_commit(struct ref_transaction *transaction,
-			   const char *msg, enum action_on_err onerr);
+			   const char *msg, struct strbuf *err,
+			   enum action_on_err onerr);
 
 /** Lock a ref and then write its file */
 int update_ref(const char *action, const char *refname,

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