From: "René Scharfe" <l.s.r@web.de>
To: Junio C Hamano <gitster@pobox.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Patrick Fong <patrickf3139@gmail.com>, git@vger.kernel.org
Subject: Re: [Bug report] git status doesn't escape paths of untracked files
Date: Tue, 8 Sep 2020 23:06:50 +0200 [thread overview]
Message-ID: <3a72c5f2-35cc-a865-d5f2-02706c48d8ec@web.de> (raw)
In-Reply-To: <xmqq4ko8yxp9.fsf@gitster.c.googlers.com>
Am 08.09.20 um 19:39 schrieb Junio C Hamano:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> I agree with your "the special case handling needs to be taught to
>> the wt_shortstatus_other()"; a refactored helper function called
>> by both places would help.
>
> I came up with this.
>
> - I very much like the fact that I got rid of the "directly print
> dq and then feed the remainder of (un)quoted path plus trailing
> dq to the normal printing logic" from print_cquoted(), even
> though strbuf_insertstr() a single byte to the beginning of the
> buffer feels a bit wasteful.
I don't particularly like how this print* function takes a printf
format, but doesn't interpret its remaining arguments like printf does.
> - I think the short status output for unmerged paths deserve the
> same quoting treatment, so an extra helper function pays off even
> better than our plan to fix "untracked/ignored".
>
> - I am undecided if I like that the helper formats and also prints;
> I was hoping I can come up with a pure formatting helper that
> does not do I/O but it seems to be hard to arrange for the
> current callers.
How about something like this then?
diff --git a/wt-status.c b/wt-status.c
index ff43932402..e0711aff04 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1829,19 +1829,19 @@ static void wt_longstatus_print(struct wt_status *s)
wt_longstatus_print_stash_summary(s);
}
-static void print_cquoted(const char *fmt, const char *path, const char *prefix)
+static const char *cquote(const char *in, const char *prefix, struct strbuf *out)
{
- struct strbuf onebuf = STRBUF_INIT;
- const char *one;
-
- one = quote_path(path, prefix, &onebuf);
- if (*one != '"' && strchr(one, ' ')) {
- strbuf_insertstr(&onebuf, 0, "\"");
- strbuf_addch(&onebuf, '"');
- one = onebuf.buf;
- }
- printf(fmt, one);
- strbuf_release(&onebuf);
+ struct strbuf sb = STRBUF_INIT;
+ const char *rel = relative_path(in, prefix, &sb);
+ int need_quotes = *rel != '"' && strchr(rel, ' ');
+ strbuf_reset(out);
+ if (need_quotes)
+ strbuf_addch(out, '"');
+ quote_c_style(rel, out, NULL, 0);
+ if (need_quotes)
+ strbuf_addch(out, '"');
+ strbuf_release(&sb);
+ return out->buf;
}
static void wt_shortstatus_unmerged(struct string_list_item *it,
@@ -1849,6 +1849,7 @@ static void wt_shortstatus_unmerged(struct string_list_item *it,
{
struct wt_status_change_data *d = it->util;
const char *how = "??";
+ struct strbuf sb = STRBUF_INIT;
switch (d->stagemask) {
case 1: how = "DD"; break; /* both deleted */
@@ -1863,13 +1864,15 @@ static void wt_shortstatus_unmerged(struct string_list_item *it,
if (s->null_termination)
fprintf(stdout, " %s%c", it->string, 0);
else
- print_cquoted(" %s\n", it->string, s->prefix);
+ printf(" %s\n", cquote(it->string, s->prefix, &sb));
+ strbuf_release(&sb);
}
static void wt_shortstatus_status(struct string_list_item *it,
struct wt_status *s)
{
struct wt_status_change_data *d = it->util;
+ struct strbuf sb = STRBUF_INIT;
if (d->index_status)
color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
@@ -1886,20 +1889,24 @@ static void wt_shortstatus_status(struct string_list_item *it,
fprintf(stdout, "%s%c", d->rename_source, 0);
} else {
if (d->rename_source)
- print_cquoted("%s -> ", d->rename_source, s->prefix);
- print_cquoted("%s\n", it->string, s->prefix);
+ printf("%s -> ", cquote(d->rename_source, s->prefix, &sb));
+ printf("%s\n", cquote(it->string, s->prefix, &sb));
}
+ strbuf_release(&sb);
}
static void wt_shortstatus_other(struct string_list_item *it,
struct wt_status *s, const char *sign)
{
+ struct strbuf sb = STRBUF_INIT;
+
if (s->null_termination) {
fprintf(stdout, "%s %s%c", sign, it->string, 0);
} else {
color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
- print_cquoted(" %s\n", it->string, s->prefix);
+ printf(" %s\n", cquote(it->string, s->prefix, &sb));
}
+ strbuf_release(&sb);
}
static void wt_shortstatus_print_tracking(struct wt_status *s)
next prev parent reply other threads:[~2020-09-08 21:07 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 0:28 [Bug report] git status doesn't escape paths of untracked files Patrick Fong
2020-09-08 1:13 ` Junio C Hamano
2020-09-08 1:17 ` brian m. carlson
2020-09-08 1:30 ` Junio C Hamano
2020-09-08 4:41 ` Junio C Hamano
2020-09-08 17:39 ` Junio C Hamano
2020-09-08 19:01 ` Martin Ågren
2020-09-08 21:06 ` René Scharfe [this message]
2020-09-09 22:22 ` Junio C Hamano
2020-09-10 14:23 ` René Scharfe
2020-09-10 15:28 ` Junio C Hamano
2020-09-08 1:30 ` [PATCH] wt-status: quote paths identically whether tracked or untracked brian m. carlson
2020-09-08 20:52 ` [PATCH 0/6] quote_path() clean-ups Junio C Hamano
2020-09-08 20:52 ` [PATCH 1/6] quote_path: rename quote_path_relative() to quote_path() Junio C Hamano
2020-09-08 20:52 ` [PATCH 2/6] quote_path: give flags parameter " Junio C Hamano
2020-09-10 12:21 ` Jeff King
2020-09-10 15:04 ` Junio C Hamano
2020-09-10 15:17 ` Junio C Hamano
2020-09-10 20:26 ` Jeff King
2020-09-08 20:52 ` [PATCH 3/6] quote_path: optionally allow quoting a path with SP in it Junio C Hamano
2020-09-10 12:35 ` Jeff King
2020-09-08 20:52 ` [PATCH 4/6] wt-status: consistently quote paths in "status --short" output Junio C Hamano
2020-09-08 20:52 ` [PATCH 5/6] quote: rename misnamed sq_lookup[] to cq_lookup[] Junio C Hamano
2020-09-08 20:52 ` [PATCH 6/6] quote: turn 'nodq' parameter into a set of flags Junio C Hamano
2020-09-10 12:38 ` Jeff King
2020-09-08 22:56 ` [PATCH 0/6] quote_path() clean-ups Chris Torek
2020-09-10 12:39 ` Jeff King
2020-09-10 17:01 ` [PATCH v2 0/7] " Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 1/7] quote_path: rename quote_path_relative() to quote_path() Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 2/7] quote_path: give flags parameter " Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 3/7] quote_path: optionally allow quoting a path with SP in it Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 4/7] quote_path: code clarification Junio C Hamano
2020-09-10 18:08 ` Jeff King
2020-09-10 18:40 ` Junio C Hamano
2020-09-10 19:29 ` Jeff King
2020-09-10 17:01 ` [PATCH v2 5/7] wt-status: consistently quote paths in "status --short" output Junio C Hamano
2020-09-10 18:13 ` Jeff King
2020-09-10 18:38 ` Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 6/7] quote: rename misnamed sq_lookup[] to cq_lookup[] Junio C Hamano
2020-09-10 17:01 ` [PATCH v2 7/7] quote: turn 'nodq' parameter into a set of flags Junio C Hamano
2020-09-10 23:03 ` [PATCH v2 0/7] quote_path() clean-ups brian m. carlson
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=3a72c5f2-35cc-a865-d5f2-02706c48d8ec@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=patrickf3139@gmail.com \
--cc=sandals@crustytoothpaste.net \
/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).