From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v21 05/19] refs.c: add a strbuf argument to ref_transaction_commit for error logging
Date: Mon, 14 Jul 2014 13:58:47 -0700 [thread overview]
Message-ID: <1405371541-32121-6-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1405371541-32121-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.
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
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 1fd7a89..22617af 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);
ref_transaction_free(transaction);
return ret;
diff --git a/refs.c b/refs.c
index 1d6dece..db05602 100644
--- a/refs.c
+++ b/refs.c
@@ -3444,7 +3444,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;
@@ -3473,6 +3474,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 8c7f9c4..09d3564 100644
--- a/refs.h
+++ b/refs.h
@@ -269,9 +269,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.
+ * If err is non-NULL we will add an error string to it to explain why
+ * the transaction failed. The string does not end in newline.
*/
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);
/*
* Free an existing transaction and all associated data.
--
2.0.1.546.gf603308
next prev parent reply other threads:[~2014-07-14 20:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-14 20:58 [PATCH v21 00/19] Use ref transactions Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 01/19] refs.c: remove ref_transaction_rollback Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 02/19] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 03/19] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 04/19] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-07-14 20:58 ` Ronnie Sahlberg [this message]
2014-07-14 20:58 ` [PATCH v21 06/19] lockfile.c: add a new public function unable_to_lock_message Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 07/19] lockfile.c: make lock_file return a meaningful errno on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 08/19] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 09/19] refs.c: make sure log_ref_setup returns a meaningful errno Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 10/19] refs.c: verify_lock should set errno to something meaningful Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 11/19] refs.c: make remove_empty_directories always set errno to something sane Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 12/19] refs.c: commit_packed_refs to return a meaningful errno on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 13/19] refs.c: make resolve_ref_unsafe set errno to something meaningful on error Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 14/19] refs.c: log_ref_write should try to return meaningful errno Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 15/19] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 16/19] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-07-14 20:58 ` [PATCH v21 17/19] update-ref: use err argument to get error from ref_transaction_commit Ronnie Sahlberg
2014-07-14 20:59 ` [PATCH v21 18/19] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-07-14 20:59 ` [PATCH v21 19/19] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405371541-32121-6-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).