From: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
To: Marc Branchaud <marcnarc@xiplink.com>, git@vger.kernel.org
Cc: Chris Packham <judge.packham@gmail.com>,
Alex Riesen <raa.lkml@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCHv2] Tweak help auto-correct phrasing.
Date: Tue, 20 Jun 2017 23:30:10 +0530 [thread overview]
Message-ID: <1497981610.28187.3.camel@gmail.com> (raw)
In-Reply-To: <20161220140226.18456-1-marcnarc@xiplink.com>
On Tue, 2016-12-20 at 09:02 -0500, Marc Branchaud wrote:
> When auto-correct is enabled, an invalid git command prints a warning
> and
> a continuation message, which differs depending on whether or not
> help.autoCorrect is positive or negative.
>
> With help.autoCorrect = 15:
>
> WARNING: You called a Git command named 'lgo', which does not
> exist.
> Continuing under the assumption that you meant 'log'
> in 1.5 seconds automatically...
>
> With help.autoCorrect < 0:
>
> WARNING: You called a Git command named 'lgo', which does not
> exist.
> Continuing under the assumption that you meant 'log'
>
> The continuation message's phrasing is awkward. This commit cleans
> it up.
> As a bonus, we now use full-sentence strings which make translation
> easier.
>
> With help.autoCorrect = 15:
>
> WARNING: You called a Git command named 'lgo', which does not
> exist.
> Continuing in 1.5 seconds, assuming that you meant 'log'.
>
> With help.autoCorrect < 0:
>
> WARNING: You called a Git command named 'lgo', which does not
> exist.
> Continuing under the assumption that you meant 'log'.
>
> Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
> ---
>
> Writing the commit message was more work than the commit! :)
>
> M.
>
> help.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/help.c b/help.c
> index 53e2a67e00..fc56aa2d76 100644
> --- a/help.c
> +++ b/help.c
> @@ -381,12 +381,18 @@ const char *help_unknown_cmd(const char *cmd)
> clean_cmdnames(&main_cmds);
> fprintf_ln(stderr,
> _("WARNING: You called a Git command
> named '%s', "
> - "which does not exist.\n"
> - "Continuing under the assumption that
> you meant '%s'"),
> - cmd, assumed);
> - if (autocorrect > 0) {
> - fprintf_ln(stderr, _("in %0.1f seconds
> automatically..."),
> - (float)autocorrect/10.0);
> + "which does not exist."),
> + cmd);
> + if (autocorrect < 0)
> + fprintf_ln(stderr,
> + _("Continuing under the
> assumption that "
> + "you meant '%s'."),
> + assumed);
> + else {
> + fprintf_ln(stderr,
> + _("Continuing in %0.1f seconds, "
> + "assuming that you meant
> '%s'."),
> + (float)autocorrect/10.0,
> assumed);
> sleep_millisec(autocorrect * 100);
> }
> return assumed;
Excuse me bringing this up after a long time. Was this patch applied?
What's it's status?
--
Regards,
Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
next prev parent reply other threads:[~2017-06-20 18:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-18 12:18 Suggestion for the "Did you mean this?" feature Kaartic Sivaraam
2016-12-18 13:16 ` Stephan Beyer
2016-12-18 13:26 ` Kaartic Sivaraam
2016-12-18 15:16 ` Alexei Lozovsky
2016-12-19 0:48 ` Chris Packham
2016-12-19 17:01 ` [PATCH] Tweak help auto-correct phrasing Marc Branchaud
2016-12-19 22:04 ` Junio C Hamano
2016-12-20 14:02 ` [PATCHv2] " Marc Branchaud
2017-06-20 18:00 ` Kaartic Sivaraam [this message]
2017-06-20 18:04 ` Kaartic Sivaraam
2017-06-20 18:21 ` Marc Branchaud
2017-06-21 13:57 ` [PATCHv2 (resend)] " Marc Branchaud
2017-06-21 22:34 ` Junio C Hamano
2016-12-19 19:24 ` Suggestion for the "Did you mean this?" feature Kaartic Sivaraam
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=1497981610.28187.3.camel@gmail.com \
--to=kaarticsivaraam91196@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=judge.packham@gmail.com \
--cc=marcnarc@xiplink.com \
--cc=raa.lkml@gmail.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.
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).