Re: [PATCH] add-patch: response to invalid option
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 16, 2024, 10:26 UTC
- Message-ID
- <xmqq5xwhhacm.fsf@gitster.g>
- In-Reply-To
- <4e2bc660-ee33-4641-aca5-783d0cefcd23@gmail.com>
Rubén Justo <rjusto@gmail.com> writes:
> When the user introduces an invalid option, we respond with the whole > help text.
The verb "introduces" in the first sentence looked weird to me.
add -p: require two steps to get help after mistyping an option
During a "git add -p" session, if the user chooses an option
that is not offered, the help text for the entire available
choices is given.or something, perhaps.
> Instead of displaying the long help description, display a short error > message indicating the incorrectly introduced option with a note on how > to get the help text.
When you wanted to 'q'uit but touched the 'w' key that sits next to it by mistake, you do not need to be told about what any of the options would do; you may want to be told "the option to quit is 'q', not 'w'", though ;-).
On the other hand, if you are truly lost and do not know what each of the listed choices mean, you'd type '?' anyway because that is one of the offered choices. So the only change needed here is to make sure that '?' is the only thing that gives the help message, and all other unrecognised option 'x' are made to say "we do not know 'x'".
That flow of thought makes sort-of sense, if the choices that are offered are too numerous (say, around a dozen or more), but with the current command set, I am not sure if this change is an improvement (note: I did not say "I do not think that"---I simply am not sure).
If we implemented the UI this way 20 years ago in the first version, perhaps we would have had happily been using it since, but given that the way we implemented the UI 20 years ago has been used happily by our users without much complaint, either way must be just fine.
Is it worth changing it at this point? Does it improve the end-user experience in any noticeable way? I do not think I can answer these two questions with confident "yes".
Show 50 quoted lines
> Signed-off-by: Rubén Justo <rjusto@gmail.com>
> ---
> add-patch.c | 5 ++++-
> t/t3701-add-interactive.sh | 10 ++++++++++
> 2 files changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/add-patch.c b/add-patch.c
> index a06dd18985..c77902fec5 100644
> --- a/add-patch.c
> +++ b/add-patch.c
> @@ -1667,7 +1667,7 @@ static int patch_update_file(struct add_p_state *s,
> }
> } else if (s->answer.buf[0] == 'p') {
> rendered_hunk_index = -1;
> - } else {
> + } else if (s->answer.buf[0] == '?') {
> const char *p = _(help_patch_remainder), *eol = p;
>
> color_fprintf(stdout, s->s.help_color, "%s",
> @@ -1691,6 +1691,9 @@ static int patch_update_file(struct add_p_state *s,
> color_fprintf_ln(stdout, s->s.help_color,
> "%.*s", (int)(eol - p), p);
> }
> + } else {
> + err(s, _("Unknown option '%s' (use '?' for help)"),
> + s->answer.buf);
> }
> }
>
> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
> index bc55255b0a..b38fd5388a 100755
> --- a/t/t3701-add-interactive.sh
> +++ b/t/t3701-add-interactive.sh
> @@ -61,6 +61,16 @@ test_expect_success 'setup (initial)' '
> echo more >>file &&
> echo lines >>file
> '
> +
> +test_expect_success 'invalid option' '
> + cat >expect <<-EOF &&
> + Unknown option ${SQ}W${SQ} (use ${SQ}?${SQ} for help)
> + EOF
> + test_write_lines W |
> + git -c core.filemode=true add -p 2>actual &&
> + test_cmp expect actual
> +'
> +
> test_expect_success 'status works (initial)' '
> git add -i </dev/null >output &&
> grep "+1/-0 *+2/-0 file" output