From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>
Subject: [PATCH/RFC 0/5] status, commit: separate "# " from the translatable part of output
Date: Fri, 25 Feb 2011 23:07:23 -0600 [thread overview]
Message-ID: <20110226050723.GA27864@elie> (raw)
Hi,
This series makes wt-status and builtin-commit code a little
less explicit about the '#' signs they produce in their output.
The main goal is to make messages like
"\n"
"It looks like you may be committing a MERGE.\n"
"If this is not correct, please remove the file\n"
" %s\n"
"and try again.\n"
""
safe to translate by getting rid of the functionally important initial
# signs; a nice side effect is to make the source code a little easier
# to read and change (for example if we want to use some other kind
of formatting some day for "git status" output).
The first two patches (va_copy, strbuf_vaddf) are stolen from Jeff's
GIT_TRACE_FACET series.
Thanks for your help and patience so far. I hope the series can be
useful.
Jeff King (2):
compat: provide a fallback va_copy definition
strbuf: add strbuf_vaddf
Jonathan Nieder (3):
wt-status: add helpers for printing wt-status lines
commit: refer to commit template as s->fp
commit, status: use status_printf{,_ln,_more} helpers
builtin/commit.c | 58 ++++++++++----------
color.c | 9 +++
color.h | 3 +
compat/msvc.h | 1 -
fsck.c | 14 +----
git-compat-util.h | 4 +
merge-recursive.c | 15 +-----
strbuf.c | 27 +++++----
strbuf.h | 2 +
trace.c | 32 ++---------
wt-status.c | 160 ++++++++++++++++++++++++++++++++++++++--------------
wt-status.h | 7 ++
12 files changed, 195 insertions(+), 137 deletions(-)
next reply other threads:[~2011-02-26 5:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-26 5:07 Jonathan Nieder [this message]
2011-02-26 5:08 ` [PATCH 1/5] compat: provide a fallback va_copy definition Jonathan Nieder
2011-02-26 5:08 ` [PATCH 2/5] strbuf: add strbuf_vaddf Jonathan Nieder
2011-02-26 5:09 ` [PATCH 3/5] wt-status: add helpers for printing wt-status lines Jonathan Nieder
2011-02-26 5:10 ` [PATCH 4/5] commit: refer to commit template as s->fp Jonathan Nieder
2011-02-26 5:11 ` [PATCH 5/5] commit, status: use status_printf{,_ln,_more} helpers Jonathan Nieder
2011-02-27 9:11 ` Junio C Hamano
2011-02-27 9:50 ` Jonathan Nieder
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=20110226050723.GA27864@elie \
--to=jrnieder@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.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.
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).