Re: [GSoC PATCH v6] add -p: show user's hunk decision when selecting hunks
- From
Samuel Abraham <abrahamadekunle50@gmail.com>
- Date
- Jan 7, 2026, 08:49 UTC
- Message-ID
- <CADYq+fYRbdMOo-bZ9bQ0uVpthNKrxKB-fDama5xN-kukprS01w@mail.gmail.com>
- In-Reply-To
- <CADYq+fZDyJWzuJ_DZUc0-uEXJnJc-3mjg=xecaRZ+XqOF1zd1w@mail.gmail.com>
On Tue, Jan 6, 2026 at 11:19 PM Samuel Abraham <abrahamadekunle50@gmail.com> wrote:
Show 58 quoted lines
> > On Tue, Jan 6, 2026 at 11:02 PM Samuel Abraham > <abrahamadekunle50@gmail.com> wrote: > > > > On Tue, Jan 6, 2026 at 5:10 PM Phillip Wood <phillip.wood123@gmail.com> wrote: > > > > > > Hi Abraham > > > > Hello Phillip, > > > > > > > > On 06/01/2026 12:01, Abraham Samuel Adekunle wrote: > > > > When a user is interactively deciding which hunks to use or skip for > > > > staging, unstaging, stashing etc, there is no way to know the > > > > decision previously chosen for a hunk when navigating through the > > > > previous and next hunks using K/J respectively. > > > > > > > > Improve the UI to explicitly show if a user has previously decided to > > > > use a hunk (by pressing 'y') or skip the hunk (by pressing 'n'). > > > > This will improve clarity and aid the navigation process for the > > > > user. > > > > > > I like the idea of telling the user if the hunk is currently selected > > > but say "(previous decision: use)" makes the prompt rather long (some of > > > the prompts in the tests below are 80 characters long). I wonder if we > > > can find a more compact notation. "(currently selected)" is a bit > > > shorter and takes us under 80 characters but is still longer than I'd > > > like - maybe someone reading this will have a better suggestion. > > > > Thank you for the review > > So I previously used selected/deselected. But Junio was not okay with those > > choice of words because they did not clearly tell If the user selected > > to skip or > > or selected to use the hunk. > > > > But how about > > > > Stage this mode change (you chose: use) [y,n,q,a,d%s,?]? > > Stage this mode change (you chose: skip) [y,n,q,a,d%s,?]? > > Stage this deletion (you chose: use) [y,n,q,a,d%sm,?]? > > > > or > > Stage this mode change (choice: use) [y,n,q,a,d%s,?]? > > Stage this mode change (choice: skip)[y,n,q,a,d%s,?]? > > Stage this deletion (choice: skip)" [y,n,q,a,d%sm,?]? > > > > or > > Stage this mode change (use: yes) [y,n,q,a,d%s,?]? > > Stage this mode change (use: no) [y,n,q,a,d%s,?]? > > Stage this deletion (use: no) [y,n,q,a,d%sm,?]? > > > > Also "(you chose yes)" i think is an option also. > Stage this mode change (you chose yes) [y,n,q,a,d%s,?]? > Stage this mode change (you chose no) [y,n,q,a,d%s,?]? > Stage this deletion (you chose no) [y,n,q,a,d%sm,?]? > > Abraham.
I also think "(was: y)" or "(was: n)" is considerably shorter Stage this mode change (was: y) [y,n,q,a,d%s,?]? Stage this mode change (was: n) [y,n,q,a,d%s,?]? Stage this deletion (was: y) [y,n,q,a,d%sm,?]?