From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Matt Kraai <kraai@ftbfs.org>, git@vger.kernel.org
Subject: Re: [PATCH 3/3] wt-status: use "format" function attribute for status_printf
Date: Wed, 10 Jul 2013 02:11:15 -0400 [thread overview]
Message-ID: <20130710061115.GA11741@sigill.intra.peff.net> (raw)
In-Reply-To: <7vehb7t0zs.fsf@alter.siamese.dyndns.org>
On Tue, Jul 09, 2013 at 10:52:55PM -0700, Junio C Hamano wrote:
> > The patch to do it is below, but I actually think an explicit blank-line
> > function like:
> >
> > status_print_empty_line(s, color);
> >
> > would be more obvious to a reader.
>
> I noticed that all but one can be dealt with with
>
> perl -p -i -e 's/status_printf_ln\((.*), ""\);/status_printf($1, "\\n");/'
>
> That is,
>
> - status_printf_ln(s, GIT_COLOR_NORMAL, "");
> + status_printf(s, GIT_COLOR_NORMAL, "\n");
>
> which does not look _too_ bad.
Is that correct, though? The reason we have *_printf_ln in the
first place is that we want to do:
${color}content${reset}\n
to make sure that the newline does not happen inside the colorization.
At least that is why I added color_printf_ln long ago.
It would probably improve the code quite a bit if we could simply feed
multi-line strings to status_printf, and have it stick the colorization
in the correct spot of each line. And hmm...it kind of looks like
status_vprintf already does that. Now I'm puzzled why many of these do
not simply include the newline along with the string being printed.
> There is one instance that needs this, though.
>
> - status_printf(s, color(WT_STATUS_HEADER, s), "");
> + status_printf(s, color(WT_STATUS_HEADER, s), "%s", "");
Hmm, yeah. It cannot be combined with the lines following it, either,
because they are using different colorization.
If you want to keep refactoring this, I don't mind, but I kind of feel
like we are going down a rabbit hole for very little gain.
-Peff
next prev parent reply other threads:[~2013-07-10 6:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-09 5:18 [PATCH] remote-http: use argv-array Junio C Hamano
2013-07-09 6:05 ` Bert Wesarg
2013-07-09 6:38 ` Jeff King
2013-07-09 22:27 ` Matt Kraai
2013-07-10 0:16 ` Jeff King
2013-07-10 0:18 ` [PATCH 1/3] add missing "format" function attributes Jeff King
2013-07-10 0:19 ` [PATCH 2/3] use "sentinel" function attribute for variadic lists Jeff King
2013-07-10 0:23 ` [PATCH 3/3] wt-status: use "format" function attribute for status_printf Jeff King
2013-07-10 5:26 ` Junio C Hamano
2013-07-10 5:28 ` Jeff King
2013-07-10 5:35 ` Junio C Hamano
2013-07-10 5:40 ` Jeff King
2013-07-10 5:52 ` Junio C Hamano
2013-07-10 6:11 ` Jeff King [this message]
2013-07-10 6:17 ` Junio C Hamano
2013-07-12 16:10 ` Junio C Hamano
2013-07-12 20:44 ` Jeff King
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=20130710061115.GA11741@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kraai@ftbfs.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.
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).