From: Phillip Wood <phillip.wood123@gmail.com>
To: "Rubén Justo" <rjusto@gmail.com>,
phillip.wood@dunelm.org.uk, "Git List" <git@vger.kernel.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 1/2] add-patch: introduce 'p' in interactive-patch
Date: Wed, 27 Mar 2024 10:55:26 +0000 [thread overview]
Message-ID: <65f41d5a-b645-4123-a214-0e785c64cdb4@gmail.com> (raw)
In-Reply-To: <e54ebc35-6946-4e63-a54f-fd73df0e89bc@gmail.com>
Hi Rubén
On 26/03/2024 18:40, Rubén Justo wrote:
> On Tue, Mar 26, 2024 at 02:38:02PM +0000, Phillip Wood wrote:
>
>>> Let's introduce a new option to allow the user to explicitly request
>>> the printing.
>>
>> I wonder if we want to hide this option unless we've skipped rendering the
>> hunk in the same way that we hide other options that are not relevant to the
>> hunk being displayed.
>
> You've got me scratching my head. Do you see any cases where we
> shouldn't offer the new option?
If we've printed the hunk followed by the prompt then there is no point
in offering 'p' because it does not do anything useful for the user. It
is only useful offer to show the hunk again when we've printed an error
message that separates the prompt from the hunk. I don't think we should
make 'p' an error, but it seems like clutter to put it in the prompt
when it does not offer anything useful to the user.
>> I also wonder if 'r' for "re-display" would better
>> convey the intent of this keybinding.
>
> I'm more inclined towards the 'p' because the verb is 'print'. Does
> this reasoning make sense to you?
I'm not sure I follow as "re-display" or for that matter "reprint" are
also verbs. The reason I suggested "re-display" is that it I think the
name is a more accurate description because we're printing the same hunk
again.
>>
>>> diff --git a/add-patch.c b/add-patch.c
>>> index 68f525b35c..444fd75b2a 100644
>>> --- a/add-patch.c
>>> +++ b/add-patch.c
>>> @@ -1388,6 +1388,7 @@ N_("j - leave this hunk undecided, see next undecided hunk\n"
>>> "/ - search for a hunk matching the given regex\n"
>>> "s - split the current hunk into smaller hunks\n"
>>> "e - manually edit the current hunk\n"
>>> + "p - print again the current hunk\n"
>>
>> I think "print the hunk again" is clearer
>
> The word 'current' is in my proposal because IMHO it adds value making
> explicit what we're offering. Maybe "print the current hunk again"?
> What do you think?
I've no objecting to "current"
Best Wishes
Phillip
next prev parent reply other threads:[~2024-03-27 10:55 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 20:59 [PATCH 0/2] improve interactive-patch Rubén Justo
2024-03-25 21:05 ` [PATCH 1/2] add-patch: introduce 'p' in interactive-patch Rubén Justo
2024-03-25 21:38 ` Junio C Hamano
2024-03-25 23:15 ` Rubén Justo
2024-03-25 23:42 ` Junio C Hamano
2024-03-25 21:07 ` [PATCH 2/2] add-patch: do not print hunks repeatedly Rubén Justo
2024-03-25 21:34 ` Junio C Hamano
2024-03-26 0:15 ` [PATCH v2 0/2] improve interactive-patch Rubén Justo
2024-03-26 0:17 ` [PATCH v2 1/2] add-patch: introduce 'p' in interactive-patch Rubén Justo
2024-03-26 14:38 ` Phillip Wood
2024-03-26 18:40 ` Rubén Justo
2024-03-27 10:55 ` Phillip Wood [this message]
2024-03-26 0:17 ` [PATCH v2 2/2] add-patch: do not print hunks repeatedly Rubén Justo
2024-03-26 14:39 ` Phillip Wood
2024-03-26 18:46 ` Rubén Justo
2024-03-27 11:06 ` Phillip Wood
2024-03-28 0:39 ` Rubén Justo
2024-03-26 14:37 ` [PATCH v2 0/2] improve interactive-patch Phillip Wood
2024-03-26 15:31 ` Junio C Hamano
2024-03-26 18:48 ` Rubén Justo
2024-03-26 19:13 ` Junio C Hamano
2024-03-26 20:26 ` Rubén Justo
2024-03-29 19:26 ` Rubén Justo
2024-03-29 19:48 ` Dragan Simic
2024-03-30 13:49 ` Rubén Justo
2024-03-30 17:06 ` Junio C Hamano
2024-03-27 11:14 ` Phillip Wood
2024-03-27 15:43 ` Junio C Hamano
2024-03-27 16:14 ` Phillip Wood
2024-03-28 1:03 ` Rubén Justo
2024-03-26 18:46 ` Rubén Justo
2024-03-28 1:10 ` [PATCH v3 " Rubén Justo
2024-03-28 1:12 ` [PATCH v3 1/2] add-patch: introduce 'p' in interactive-patch Rubén Justo
2024-03-28 14:45 ` Junio C Hamano
2024-03-28 1:12 ` [PATCH v3 2/2] add-patch: do not print hunks repeatedly Rubén Justo
2024-03-28 14:46 ` Junio C Hamano
2024-03-29 3:49 ` Rubén Justo
2024-03-29 3:56 ` [PATCH v4 0/2] improve interactive-patch Rubén Justo
2024-03-29 3:58 ` [PATCH v4 1/2] add-patch: introduce 'p' in interactive-patch Rubén Justo
2024-03-29 3:58 ` [PATCH v4 2/2] add-patch: do not print hunks repeatedly Rubén Justo
2024-03-29 10:41 ` phillip.wood123
2024-03-29 11:37 ` Rubén Justo
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=65f41d5a-b645-4123-a214-0e785c64cdb4@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=rjusto@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.
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).