From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Jeff King <peff@peff.net>,
git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 12/18] verify_refname_available(): report errors via a "struct strbuf *err"
Date: Mon, 11 May 2015 17:25:14 +0200 [thread overview]
Message-ID: <1431357920-25090-13-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1431357920-25090-1-git-send-email-mhagger@alum.mit.edu>
It shouldn't be spewing errors directly to stderr.
For now, change its callers to spew the errors to stderr.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs.c | 50 ++++++++++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/refs.c b/refs.c
index 703e93d..43e7bdd 100644
--- a/refs.c
+++ b/refs.c
@@ -860,12 +860,12 @@ static int nonmatching_ref_fn(struct ref_entry *entry, void *vdata)
/*
* Return 0 if a reference named refname could be created without
* conflicting with the name of an existing reference in dir.
- * Otherwise, return a negative value. If extras is non-NULL, it is a
- * list of additional refnames with which refname is not allowed to
- * conflict. If skip is non-NULL, ignore potential conflicts with refs
- * in skip (e.g., because they are scheduled for deletion in the same
- * operation). Behavior is undefined if the same name is listed in
- * both extras and skip.
+ * Otherwise, return a negative value and write an explanation to err.
+ * If extras is non-NULL, it is a list of additional refnames with
+ * which refname is not allowed to conflict. If skip is non-NULL,
+ * ignore potential conflicts with refs in skip (e.g., because they
+ * are scheduled for deletion in the same operation). Behavior is
+ * undefined if the same name is listed in both extras and skip.
*
* Two reference names conflict if one of them exactly matches the
* leading components of the other; e.g., "refs/foo/bar" conflicts
@@ -877,7 +877,8 @@ static int nonmatching_ref_fn(struct ref_entry *entry, void *vdata)
static int verify_refname_available(const char *refname,
const struct string_list *extras,
const struct string_list *skip,
- struct ref_dir *dir)
+ struct ref_dir *dir,
+ struct strbuf *err)
{
const char *slash;
int pos;
@@ -889,6 +890,8 @@ static int verify_refname_available(const char *refname,
* refname is "refs/foo/bar".
*/
+ assert(err);
+
strbuf_grow(&dirname, strlen(refname) + 1);
for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) {
/* Expand dirname to the new prefix, not including the trailing slash: */
@@ -908,16 +911,16 @@ static int verify_refname_available(const char *refname,
* a proper prefix of refname; e.g.,
* "refs/foo", and is not in skip.
*/
- error("'%s' exists; cannot create '%s'",
- dirname.buf, refname);
+ strbuf_addf(err, "'%s' exists; cannot create '%s'",
+ dirname.buf, refname);
goto cleanup;
}
}
if (extras && string_list_has_string(extras, dirname.buf) &&
(!skip || !string_list_has_string(skip, dirname.buf))) {
- error("cannot process '%s' and '%s' at the same time",
- refname, dirname.buf);
+ strbuf_addf(err, "cannot process '%s' and '%s' at the same time",
+ refname, dirname.buf);
goto cleanup;
}
@@ -976,8 +979,8 @@ static int verify_refname_available(const char *refname,
dir = get_ref_dir(dir->entries[pos]);
sort_ref_dir(dir);
if (do_for_each_entry_in_dir(dir, 0, nonmatching_ref_fn, &data)) {
- error("'%s' exists; cannot create '%s'",
- data.conflicting_refname, refname);
+ strbuf_addf(err, "'%s' exists; cannot create '%s'",
+ data.conflicting_refname, refname);
goto cleanup;
}
}
@@ -1000,8 +1003,8 @@ static int verify_refname_available(const char *refname,
break;
if (!skip || !string_list_has_string(skip, extra_refname)) {
- error("cannot process '%s' and '%s' at the same time",
- refname, extra_refname);
+ strbuf_addf(err, "cannot process '%s' and '%s' at the same time",
+ refname, extra_refname);
goto cleanup;
}
}
@@ -2340,6 +2343,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
int resolve_flags = 0;
int attempts_remaining = 3;
+ struct strbuf err = STRBUF_INIT;
lock = xcalloc(1, sizeof(struct ref_lock));
lock->lock_fd = -1;
@@ -2384,7 +2388,9 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
* our refname.
*/
if (is_null_sha1(lock->old_sha1) &&
- verify_refname_available(refname, extras, skip, get_packed_refs(&ref_cache))) {
+ verify_refname_available(refname, extras, skip,
+ get_packed_refs(&ref_cache), &err)) {
+ error("%s", err.buf);
last_errno = ENOTDIR;
goto error_return;
}
@@ -2425,10 +2431,8 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
*/
goto retry;
else {
- struct strbuf err = STRBUF_INIT;
unable_to_lock_message(ref_file, errno, &err);
error("%s", err.buf);
- strbuf_release(&err);
goto error_return;
}
}
@@ -2436,6 +2440,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
error_return:
unlock_ref(lock);
+ strbuf_release(&err);
errno = last_errno;
return NULL;
}
@@ -2822,14 +2827,19 @@ static int rename_tmp_log(const char *newrefname)
static int rename_ref_available(const char *oldname, const char *newname)
{
struct string_list skip = STRING_LIST_INIT_NODUP;
+ struct strbuf err = STRBUF_INIT;
int ret;
string_list_insert(&skip, oldname);
ret = !verify_refname_available(newname, NULL, &skip,
- get_packed_refs(&ref_cache))
+ get_packed_refs(&ref_cache), &err)
&& !verify_refname_available(newname, NULL, &skip,
- get_loose_refs(&ref_cache));
+ get_loose_refs(&ref_cache), &err);
+ if (!ret)
+ error("%s", err.buf);
+
string_list_clear(&skip, 0);
+ strbuf_release(&err);
return ret;
}
--
2.1.4
next prev parent reply other threads:[~2015-05-11 15:26 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 15:25 [PATCH v2 00/18] Improve handling of D/F conflicts Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 01/18] t1404: new tests of ref D/F conflicts within transactions Michael Haggerty
2015-05-11 18:52 ` Junio C Hamano
2015-05-12 8:45 ` Michael Haggerty
2015-05-11 19:37 ` Junio C Hamano
2015-05-12 8:32 ` Michael Haggerty
2015-05-12 15:45 ` Junio C Hamano
2015-05-13 20:19 ` Michael Haggerty
2015-05-14 17:00 ` Junio C Hamano
2015-05-22 22:47 ` Michael Haggerty
2015-05-23 0:52 ` Junio C Hamano
2015-05-11 15:25 ` [PATCH v2 02/18] is_refname_available(): revamp the comments Michael Haggerty
2015-05-12 21:04 ` Junio C Hamano
2015-05-11 15:25 ` [PATCH v2 03/18] is_refname_available(): avoid shadowing "dir" variable Michael Haggerty
2015-05-12 21:06 ` Junio C Hamano
2015-05-11 15:25 ` [PATCH v2 04/18] is_refname_available(): convert local variable "dirname" to strbuf Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 05/18] entry_matches(): inline function Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 06/18] report_refname_conflict(): " Michael Haggerty
2015-05-12 21:21 ` Junio C Hamano
2015-05-11 15:25 ` [PATCH v2 07/18] struct nonmatching_ref_data: store a refname instead of a ref_entry Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 08/18] is_refname_available(): use dirname in first loop Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 09/18] ref_transaction_commit(): use a string_list for detecting duplicates Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 10/18] refs: check for D/F conflicts among refs created in a transaction Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 11/18] verify_refname_available(): rename function Michael Haggerty
2015-05-11 15:25 ` Michael Haggerty [this message]
2015-05-11 15:25 ` [PATCH v2 13/18] lock_ref_sha1_basic(): report errors via a "struct strbuf *err" Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 14/18] lock_ref_sha1_basic(): improve diagnostics for ref D/F conflicts Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 15/18] rename_ref(): integrate lock_ref_sha1_basic() errors into ours Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 16/18] ref_transaction_commit(): provide better error messages Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 17/18] ref_transaction_commit(): delete extra "the" from error message Michael Haggerty
2015-05-11 15:25 ` [PATCH v2 18/18] reflog_expire(): integrate lock_ref_sha1_basic() errors into ours Michael Haggerty
2015-05-11 17:56 ` [PATCH v2 00/18] Improve handling of D/F conflicts Junio C Hamano
2015-05-11 18:10 ` Stefan Beller
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431357920-25090-13-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--cc=sunshine@sunshineco.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).