On Mon, Mar 25, 2024 at 02:38:30PM -0700, Junio C Hamano wrote:
> Rubén Justo <rjusto@xxxxxxxxx> writes:
>
> > Shortly we're going make interactive-patch stop printing automatically
> > the hunk under certain circumstances.
> >
> > Let's introduce a new option to allow the user to explicitly request
> > the printing.
>
> That is good, but ...
>
> > Signed-off-by: Rubén Justo <rjusto@xxxxxxxxx>
> > ---
> > add-patch.c | 4 ++++
> > t/t3701-add-interactive.sh | 22 +++++++++++-----------
> > 2 files changed, 15 insertions(+), 11 deletions(-)
> >
> > diff --git a/add-patch.c b/add-patch.c
> > index 68f525b35c..52be1ddb15 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"
> > "? - print help\n");
> >
> > static int patch_update_file(struct add_p_state *s,
> > @@ -1480,6 +1481,7 @@ static int patch_update_file(struct add_p_state *s,
> > permitted |= ALLOW_EDIT;
> > strbuf_addstr(&s->buf, ",e");
> > }
> > + strbuf_addstr(&s->buf, ",p");
> > }
> > if (file_diff->deleted)
> > prompt_mode_type = PROMPT_DELETION;
> > @@ -1658,6 +1660,8 @@ static int patch_update_file(struct add_p_state *s,
> > hunk->use = USE_HUNK;
> > goto soft_increment;
> > }
> > + } else if (s->answer.buf[0] == 'p') {
> > + /* nothing to do */
>
> This is not good. If we are taking a new input, why doesn't the
> code already respond to it? "Showing it again" should be a separate
> feature even if some other codepaths still do show when [2/2] would
> prevent them to show, no?
Doing nothing here produces, in the current implementation, the intended
printing. Maybe the message needs to state so?
> Also, in addition to the changes to the patch to unbreak it, we'd
> need to update the git-add(1) manual page, especially its section on
> the interactive mode. I think a single-line addition should suffice,
> but it has to be there, added by the same patch as the one that
> starts accepting 'p' and acting on that input.
Oh, of course. I think this is the line needed:
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 14a371fff3..90b47927b2 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -348,6 +348,7 @@ patch::
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
e - manually edit the current hunk
+ p - print again the current hunk
? - print help
+
After deciding the fate for all hunks, if there is any hunk
