From: Phillip Wood <phillip.wood@talktalk.net>
To: "Slavica Đukić" <slawica92@hotmail.com>,
"phillip.wood@dunelm.org.uk" <phillip.wood@dunelm.org.uk>,
"Slavica Djukic via GitGitGadget" <gitgitgadget@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2 5/7] add-interactive.c: implement show-help command
Date: Fri, 18 Jan 2019 14:25:04 +0000 [thread overview]
Message-ID: <f58a3664-db5e-b081-a1e6-8869ce3ed392@talktalk.net> (raw)
In-Reply-To: <VI1PR05MB577331CCE110D2EAE325927CA69C0@VI1PR05MB5773.eurprd05.prod.outlook.com>
Hi Slavica
On 18/01/2019 12:19, Slavica Đukić wrote:
> Hi Phillip,
>
> On 18-Jan-19 12:20 PM, Phillip Wood wrote:
>> Hi Slavica
>>
>> I think this round is looking good I've got a couple of comments about
>> the translation of the help text but everything else looks fine to me
>> now. In future when you're posting a new version it's helpful CC the
>> people who commented on the previous version(s).
>
>
> Thanks for taking your time to review patches again. I'm sorry for
> omitting you
>
> in CC, but I've sent re-roll through GitGitGadget, and I guess I thought
> it would pick it up.
>
> I'll see what happened and keep that in mind.
I'm not sure what GitGitGadget does about CC'ing people but Johannes
will know
>> On 18/01/2019 07:47, Slavica Djukic via GitGitGadget wrote:
>>> From: Slavica Djukic <slawica92@hotmail.com>
>>>
>>> Implement show-help command in add-interactive.c and use it in
>>> builtin add--helper.c.
>>>
>>> Use command name "show-help" instead of "help": add--helper is
>>> builtin, hence add--helper --help would be intercepted by
>>> handle_builtin and re-routed to the help command, without ever
>>> calling cmd_add__helper().
>>>
>>> Signed-off-by: Slavica Djukic <slawica92@hotmail.com>
>>> ---
>>> add-interactive.c | 23 +++++++++++++++++++++++
>>> add-interactive.h | 4 +++-
>>> builtin/add--helper.c | 7 ++++++-
>>> 3 files changed, 32 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/add-interactive.c b/add-interactive.c
>>> index c55d934186..76c3f4c3eb 100644
>>> --- a/add-interactive.c
>>> +++ b/add-interactive.c
>>> @@ -244,3 +244,26 @@ void add_i_print_modified(void)
>>> free(files);
>>> hashmap_free(&s.file_map, 1);
>>> }
>>> +
>>> +void add_i_show_help(void)
>>> +{
>>> + const char *help_color = get_color(COLOR_HELP);
>>> + color_fprintf(stdout, help_color, "%s%s", _("status"),
>>> + N_(" - show paths with changes"));
>>> + printf("\n");
>> There seems to be a bit of confusion with the translation of these
>> messages. "status" does not want to be translated so it shouldn't be in
>> _() - it can just go in the format string as can the indentation and the
>> "\n" (or we could use color_fprintf_ln() to automatically add a newline
>> at the end. N_() is used to mark static strings for translation so the
>> gettext utilities pick up the text to be translated but (because
>> initializes for static variables must be compile-time constants) does
>> not do anything when the program runs - if you have 'const char *s =
>> N_(hello);' you have to do '_(s)' to get the translated version. Here we
>> can just pass the untranslated string directly to gettext so it should
>> be _("show paths with changes"). Putting all that together we get
>>
>> color_fprintf(stdout, help_color, "status - %s\n",
>> _("show paths with changes");
>
>
> I thought _() was for strings that were already translated,
> and N_() for strings that weren't. And I now see that I also tried to
> translate command names as well, just the opposite of what you suggested...
> Thanks for clarifying this.
I hope my explanation made sense, feel free to email if you want to
check anything.
Having thought about it, I don't think we should add "\n" to the format
string as it means the color will be reset after the new line, it should
use color_fprintf_ln() instead which adds a new line after it has reset
the color.
Best Wishes
Phillip
>> Best Wishes
>>
>> Phillip
>>
>>> + color_fprintf(stdout, help_color, "%s%s", _("update"),
>>> + N_(" - add working tree state to the staged set of changes"));
>>> + printf("\n");
>>> + color_fprintf(stdout, help_color, "%s%s", _("revert"),
>>> + N_(" - revert staged set of changes back to the HEAD version"));
>>> + printf("\n");
>>> + color_fprintf(stdout, help_color, "%s%s", _("patch"),
>>> + N_(" - pick hunks and update selectively"));
>>> + printf("\n");
>>> + color_fprintf(stdout, help_color, "%s%s", _("diff"),
>>> + N_(" - view diff between HEAD and index"));
>>> + printf("\n");
>>> + color_fprintf(stdout, help_color, "%s%s", _("add untracked"),
>>> + N_(" - add contents of untracked files to the staged set of changes"));
>>> + printf("\n");
>>> +}
>>> diff --git a/add-interactive.h b/add-interactive.h
>>> index 1f4747553c..46e17c5c71 100644
>>> --- a/add-interactive.h
>>> +++ b/add-interactive.h
>>> @@ -5,4 +5,6 @@ int add_i_config(const char *var, const char *value, void *cbdata);
>>>
>>> void add_i_print_modified(void);
>>>
>>> -#endif
>>> \ No newline at end of file
>>> +void add_i_show_help(void);
>>> +
>>> +#endif
>>> diff --git a/builtin/add--helper.c b/builtin/add--helper.c
>>> index 43545d9af5..a3b3a68b68 100644
>>> --- a/builtin/add--helper.c
>>> +++ b/builtin/add--helper.c
>>> @@ -10,7 +10,8 @@ static const char * const builtin_add_helper_usage[] = {
>>>
>>> enum cmd_mode {
>>> DEFAULT = 0,
>>> - STATUS
>>> + STATUS,
>>> + HELP
>>> };
>>>
>>> int cmd_add__helper(int argc, const char **argv, const char *prefix)
>>> @@ -20,6 +21,8 @@ int cmd_add__helper(int argc, const char **argv, const char *prefix)
>>> struct option options[] = {
>>> OPT_CMDMODE(0, "status", &mode,
>>> N_("print status information with diffstat"), STATUS),
>>> + OPT_CMDMODE(0, "show-help", &mode,
>>> + N_("show help"), HELP),
>>> OPT_END()
>>> };
>>>
>>> @@ -30,6 +33,8 @@ int cmd_add__helper(int argc, const char **argv, const char *prefix)
>>>
>>> if (mode == STATUS)
>>> add_i_print_modified();
>>> + else if (mode == HELP)
>>> + add_i_show_help();
>>> else
>>> usage_with_options(builtin_add_helper_usage,
>>> options);
>>>
next prev parent reply other threads:[~2019-01-18 14:25 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-20 12:34 [PATCH 0/7] Turn git add-i into built-in Johannes Schindelin
2018-12-20 12:09 ` [PATCH 1/7] diff: export diffstat interface Daniel Ferreira via GitGitGadget
2018-12-20 12:09 ` [PATCH 2/7] add--helper: create builtin helper for interactive add Daniel Ferreira via GitGitGadget
2018-12-20 12:09 ` [PATCH 3/7] add-interactive.c: implement status command Daniel Ferreira via GitGitGadget
2018-12-20 12:09 ` [PATCH 4/7] add--interactive.perl: use add--helper --status for status_cmd Daniel Ferreira via GitGitGadget
2018-12-20 12:09 ` [PATCH 5/7] add-interactive.c: implement show-help command Slavica Djukic via GitGitGadget
2019-01-14 11:12 ` Phillip Wood
2018-12-20 12:09 ` [PATCH 6/7] Git.pm: introduce environment variable GIT_TEST_PRETEND_TTY Slavica Djukic via GitGitGadget
2019-01-14 11:13 ` Phillip Wood
2019-01-15 12:45 ` Slavica Djukic
2019-01-15 13:50 ` Johannes Schindelin
2019-01-15 16:09 ` Phillip Wood
2018-12-20 12:09 ` [PATCH 7/7] add--interactive.perl: use add--helper --show-help for help_cmd Slavica Djukic via GitGitGadget
2019-01-14 11:17 ` Phillip Wood
2018-12-20 12:37 ` [PATCH 0/7] Turn git add-i into built-in Johannes Schindelin
2019-01-11 14:09 ` Slavica Djukic
2019-01-18 7:47 ` [PATCH v2 " Slavica Đukić via GitGitGadget
2019-01-18 7:47 ` [PATCH v2 1/7] diff: export diffstat interface Daniel Ferreira via GitGitGadget
2019-01-18 7:47 ` [PATCH v2 2/7] add--helper: create builtin helper for interactive add Daniel Ferreira via GitGitGadget
2019-01-18 7:47 ` [PATCH v2 3/7] add-interactive.c: implement status command Daniel Ferreira via GitGitGadget
2019-01-18 7:47 ` [PATCH v2 4/7] add--interactive.perl: use add--helper --status for status_cmd Daniel Ferreira via GitGitGadget
2019-01-18 7:47 ` [PATCH v2 5/7] add-interactive.c: implement show-help command Slavica Djukic via GitGitGadget
2019-01-18 11:20 ` Phillip Wood
2019-01-18 12:19 ` Slavica Djukic
[not found] ` <VI1PR05MB577331CCE110D2EAE325927CA69C0@VI1PR05MB5773.eurprd05.prod.outlook.com>
2019-01-18 14:25 ` Phillip Wood [this message]
2019-01-18 20:40 ` Johannes Schindelin
2019-01-18 7:47 ` [PATCH v2 6/7] t3701-add-interactive: test add_i_show_help() Slavica Djukic via GitGitGadget
2019-01-18 11:23 ` Phillip Wood
2019-01-18 7:47 ` [PATCH v2 7/7] add--interactive.perl: use add--helper --show-help for help_cmd Slavica Djukic via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 0/7] Turn git add-i into built-in Slavica Đukić via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 1/7] diff: export diffstat interface Daniel Ferreira via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 2/7] add--helper: create builtin helper for interactive add Daniel Ferreira via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 3/7] add-interactive.c: implement status command Daniel Ferreira via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 4/7] add--interactive.perl: use add--helper --status for status_cmd Daniel Ferreira via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 5/7] add-interactive.c: implement show-help command Slavica Djukic via GitGitGadget
2019-01-21 9:13 ` [PATCH v3 6/7] t3701-add-interactive: test add_i_show_help() Slavica Djukic via GitGitGadget
2019-01-25 11:01 ` Phillip Wood
2019-01-25 11:36 ` Slavica Djukic
2019-01-21 9:13 ` [PATCH v3 7/7] add--interactive.perl: use add--helper --show-help for help_cmd Slavica Djukic via GitGitGadget
2019-01-21 9:59 ` Ævar Arnfjörð Bjarmason
2019-01-21 11:59 ` Slavica Djukic
2019-01-25 12:23 ` [PATCH v4 0/7] Turn git add-i into built-in Slavica Đukić via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 1/7] diff: export diffstat interface Daniel Ferreira via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 2/7] add--helper: create builtin helper for interactive add Daniel Ferreira via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 3/7] add-interactive.c: implement status command Daniel Ferreira via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 4/7] add--interactive.perl: use add--helper --status for status_cmd Daniel Ferreira via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 6/7] t3701-add-interactive: test add_i_show_help() Slavica Djukic via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 5/7] add-interactive.c: implement show-help command Slavica Djukic via GitGitGadget
2019-01-25 12:23 ` [PATCH v4 7/7] add--interactive.perl: use add--helper --show-help for help_cmd Slavica Djukic via GitGitGadget
2019-01-25 12:37 ` [PATCH v4 0/7] Turn git add-i into built-in Slavica Djukic
2019-02-01 14:37 ` Phillip Wood
2019-02-20 11:41 ` [PATCH v5 00/10] " Slavica Đukić via GitGitGadget
2019-02-20 11:41 ` [PATCH v5 02/10] add--helper: create builtin helper for interactive add Daniel Ferreira via GitGitGadget
2019-02-21 17:56 ` Junio C Hamano
2019-03-08 20:48 ` Johannes Schindelin
2019-02-20 11:41 ` [PATCH v5 01/10] diff: export diffstat interface Daniel Ferreira via GitGitGadget
2019-02-21 17:53 ` Junio C Hamano
2019-02-22 9:03 ` Slavica Djukic
2019-02-20 11:41 ` [PATCH v5 03/10] add-interactive.c: implement list_modified Slavica Djukic via GitGitGadget
2019-02-21 19:06 ` Junio C Hamano
2019-02-21 20:27 ` Junio C Hamano
2019-02-22 12:18 ` Slavica Djukic
2019-02-22 11:35 ` Slavica Djukic
2019-02-20 11:41 ` [PATCH v5 04/10] add-interactive.c: implement list_and_choose Slavica Djukic via GitGitGadget
2019-02-22 21:46 ` Junio C Hamano
2019-03-01 11:20 ` Slavica Djukic
2019-02-20 11:41 ` [PATCH v5 05/10] add-interactive.c: implement status command Slavica Djukic via GitGitGadget
2019-02-22 22:11 ` Junio C Hamano
2019-03-01 11:08 ` Slavica Djukic
2019-02-20 11:41 ` [PATCH v5 06/10] add--interactive.perl: use add--helper --status for status_cmd Daniel Ferreira via GitGitGadget
2019-02-20 11:41 ` [PATCH v5 07/10] add-interactive.c: add support for list_only option Slavica Djukic via GitGitGadget
2019-02-20 11:41 ` [PATCH v5 08/10] add-interactive.c: implement show-help command Slavica Djukic via GitGitGadget
2019-02-20 11:41 ` [PATCH v5 10/10] add--interactive.perl: use add--helper --show-help for help_cmd Slavica Djukic via GitGitGadget
2019-02-20 11:41 ` [PATCH v5 09/10] t3701-add-interactive: test add_i_show_help() Slavica Djukic via GitGitGadget
2019-02-22 4:53 ` [PATCH v5 00/10] Turn git add-i into built-in Junio C Hamano
2019-03-04 10:49 ` End of Outreachy internship Slavica Djukic
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=f58a3664-db5e-b081-a1e6-8869ce3ed392@talktalk.net \
--to=phillip.wood@talktalk.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=slawica92@hotmail.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).