Re: [RFC PATCH 3/2] vreportf: add prefix to each line
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 11, 2017, 22:11 UTC
- Message-ID
- <xmqqpojtmeld.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20170111140758.yyfsc3r3spqpi6es@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 8 quoted lines
> On Wed, Jan 11, 2017 at 09:01:38AM -0500, Jeff King wrote: > >> [1/2]: Revert "vreportf: avoid intermediate buffer" >> [2/2]: vreport: sanitize ASCII control chars > > We've talked before about repeating the "error:" header for multi-line > messages. The reversion in patch 1 makes this easy to play with, so I > did. I kind of hate it. But here it is, for your viewing pleasure.
Thanks.
Show 28 quoted lines
> > -- >8 -- > Subject: vreportf: add prefix to each line > > Some error and warning messages are multi-line, but we put > the prefix only on the first line. This means that either > the subsequent lines don't have any indication that they're > connected to the original error, or the caller has to make > multiple calls to error() or warning(). And that's not even > possible for die(). > > Instead, let's put the prefix at the start of each line, > just as advise() does. > > Note that this patch doesn't update the tests yet, so it > causes tons of failures. This is just to see what it might > look like. > > It's actually kind of ugly. For instance, a failing test in > t3600 now produces: > > error: the following files have staged content different from both the > error: file and the HEAD: > error: bar.txt > error: foo.txt > error: (use -f to force removal) > > which seems a bit aggressive.
I agree that it is ugly, but one reason I was hoping to do this myself (or have somebody else do it by procrastinating) was that I thought it may help i18n. That is, for an original
error(_("we found an error"))a .po file may translate the string to a multi-line string that has LFs in it and the output would look correct. The translator already can do so by indenting the second and subsequent lines by the same column-width as "error: " (or its translation in their language, if we are going to i18n these headers), but that (1) is extra work for them, and (2) makes it impossible to have the same message appear in different contexts (i.e. "error:" vs "warning:" that have different column-widths).
> It also screws up messages which indent with tabs (the prefix eats > up some of the tabstop, making the indentation smaller).
This is unavoidable and at the same time is a non-issue, isn't it? Messages that indent the second and subsequent lines with tabs are compensating the lack of the multi-line support of vreportf(), which this RFC patch fixes. They may need to be adjusted to the new world order, but that is a good thing. New multi-line messages no longer have to worry about the prefix that is added only to the first line when continuing the message to multiple lines.
> And the result is > a little harder if you need to cut-and-paste the file lines > (if your terminal lets you triple-click to select a whole > line, now you have this "error:" cruft on the front).
This might be an issue, but I personally do not care (as I know how to drive my "screen", namely, use 'c' while cutting) ;-).
> It may be possible to address some of that by using some > other kind of continuation marker (instead of just repeating > the prefix), and expanding initial tabs.
Yes indeed. The "some other kind of continuation marker" could just be a run of spaces that fill the same column as the "error: " or other prefix given to the first line.
Show 42 quoted lines
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> usage.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/usage.c b/usage.c
> index ad6d2910f..8a1f6ff4e 100644
> --- a/usage.c
> +++ b/usage.c
> @@ -8,18 +8,30 @@
>
> static FILE *error_handle;
>
> +static void show_line(FILE *fh, const char *prefix, const char *line, int len)
> +{
> + fprintf(fh, "%s%.*s\n", prefix, len, line);
> +}
> +
> void vreportf(const char *prefix, const char *err, va_list params)
> {
> char msg[4096];
> FILE *fh = error_handle ? error_handle : stderr;
> + const char *base;
> char *p;
>
> vsnprintf(msg, sizeof(msg), err, params);
> +
> + base = msg;
> for (p = msg; *p; p++) {
> - if (iscntrl(*p) && *p != '\t' && *p != '\n')
> + if (*p == '\n') {
> + show_line(fh, prefix, base, p - base);
> + base = p + 1;
> + } else if (iscntrl(*p) && *p != '\t')
> *p = '?';
> }
> - fprintf(fh, "%s%s\n", prefix, msg);
> +
> + show_line(fh, prefix, base, p - base);
> }
>
> static NORETURN void usage_builtin(const char *err, va_list params)