From: Pratyush Yadav <me@yadavpratyush.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johannes Sixt <j6t@kdbg.org>,
Bert Wesarg <bert.wesarg@googlemail.com>
Subject: Re: [PATCH v2 0/4] git-gui: Add ability to revert selected hunks and lines
Date: Fri, 23 Aug 2019 04:21:43 +0530 [thread overview]
Message-ID: <20190822225143.3blolae3f65z6zqq@localhost.localdomain> (raw)
In-Reply-To: <xmqq4l28ommg.fsf@gitster-ct.c.googlers.com>
On 22/08/19 03:34PM, Junio C Hamano wrote:
> Pratyush Yadav <me@yadavpratyush.com> writes:
>
> > This series adds the ability to revert selected lines and hunks in
> > git-gui. Partially based on the patch by Bert Wesarg [0].
> >
> > The commits can be found in the topic branch 'py/revert-hunks-lines'
> > at https://github.com/prati0100/git-gui/tree/py/revert-hunks-lines
> >
> > Once reviewed, pull the commits from
> > 415ce3f8582769d1d454b3796dc6c9c847cefa87 till
> > 0a1f4ea92b97e673fda40918dae68deead43bb27, or just munge the patches and
> > apply them locally, whichever you prefer.
>
> Let's see how we can work together by you playing the role of
> git-gui maintainer and the others on the list (including me) playing
> the role of reviewer and contributor. So I may keep an eye on the
> discussion on this thread, I may even comment on them myself, but
> you'll be the one waiting for the discussion to settle, adjusting
> the patches in response to reviews, etc. and making the final
> decision when/if the topic is done, at which time you'd be telling
> me to pull from you.
>
> > Pratyush Yadav (4):
> > git-gui: Move revert confirmation dialog creation to separate function
> > git-gui: Add option to disable the revert confirmation prompt
> > git-gui: Add the ability to revert selected lines
> > git-gui: Add the ability to revert selected hunk
>
> "Move" and "Add" after "git-gui:" would better be downcased to be
> more in line with the others in "git shortlog --no-merges"; I also
> think "allow doing X" is shorter and better way to say "add the
> ability to do X".
Will fix. Thanks.
> If I am reading the first patch correctly, we already ask for
> confirmation before reverting local changes, and the steps 3 and 4
> are about allowing partial reversion in addition to the wholesale
> reversion, right?
Yes. The ability to revert whole files already exists. This revert
always asks for confirmation. Steps 3 and 4 allow for partial reverts.
Step 2 allows the user to disable the confirmation dialog for both
whole-file reverts and for partial reverts.
> An earlier objection from j6t sounded like we
> require users to respond to an extra dialog after this series, but
> that does not look like the case. Instead, step 2 adds a new
> feature to allow those to opt-out of the existing dialog (which may
> be reused to squelch the dialog to protect features added in steps 3
> and 4). Am I reading the series correctly?
Yes. The users always responded to an extra dialog for whole file
reverts even before these changes. j6t was running a fork of git-gui
which had the ability for partial reverts, and his fork did not ask for
confirmation for partial reverts. Always asking for confirmation
disrupts his workflow, so I added an option to disable it. It disables
the dialog for partial reverts (which j6t cares about), and also for
whole file reverts, which I added to maintain consistency.
>
> Thanks.
>
> >
> > git-gui.sh | 40 +++++++++++++++++++++++++++++--
> > lib/diff.tcl | 65 ++++++++++++++++++++++++++++++++++++++++++--------
> > lib/index.tcl | 31 ++++++++++++++++--------
> > lib/option.tcl | 1 +
> > 4 files changed, 115 insertions(+), 22 deletions(-)
> >
> > --
> > 2.21.0
--
Regards,
Pratyush Yadav
next prev parent reply other threads:[~2019-08-22 22:51 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 21:41 [PATCH 0/3] git-gui: Add ability to revert selected hunks and lines Pratyush Yadav
2019-08-19 21:41 ` [PATCH 1/3] git-gui: Move revert confirmation dialog creation to separate function Pratyush Yadav
2019-08-19 21:41 ` [PATCH 2/3] git-gui: Add the ability to revert selected lines Pratyush Yadav
2019-08-20 19:21 ` Johannes Sixt
2019-08-20 19:29 ` Pratyush Yadav
2019-08-20 21:19 ` Johannes Sixt
2019-08-21 21:48 ` Pratyush Yadav
2019-08-23 13:01 ` Johannes Schindelin
2019-08-23 16:28 ` Junio C Hamano
2019-08-23 17:03 ` Pratyush Yadav
2019-08-23 19:17 ` Johannes Sixt
2019-08-19 21:41 ` [PATCH 3/3] git-gui: Add the ability to revert selected hunk Pratyush Yadav
2019-08-20 18:47 ` [PATCH 0/3] git-gui: Add ability to revert selected hunks and lines Junio C Hamano
2019-08-20 19:49 ` Pratyush Yadav
2019-08-21 7:06 ` Bert Wesarg
2019-08-21 21:30 ` Pratyush Yadav
2019-08-22 22:01 ` [PATCH v2 0/4] " Pratyush Yadav
2019-08-22 22:01 ` [PATCH v2 1/4] git-gui: Move revert confirmation dialog creation to separate function Pratyush Yadav
2019-08-22 22:01 ` [PATCH v2 2/4] git-gui: Add option to disable the revert confirmation prompt Pratyush Yadav
2019-08-22 22:01 ` [PATCH v2 3/4] git-gui: Add the ability to revert selected lines Pratyush Yadav
2019-08-23 6:29 ` Bert Wesarg
2019-08-23 16:51 ` Pratyush Yadav
2019-08-22 22:01 ` [PATCH v2 4/4] git-gui: Add the ability to revert selected hunk Pratyush Yadav
2019-08-22 22:34 ` [PATCH v2 0/4] git-gui: Add ability to revert selected hunks and lines Junio C Hamano
2019-08-22 22:51 ` Pratyush Yadav [this message]
2019-08-23 6:04 ` Bert Wesarg
2019-08-23 16:04 ` Junio C Hamano
2019-08-23 16:44 ` Pratyush Yadav
[not found] ` <CAKPyHN0QbCDzcG8=zPP4-WHKqMk3R0sJ0BjXDR=zak3OfEa2bg@mail.gmail.com>
2019-08-25 11:57 ` Pratyush Yadav
2019-08-23 23:43 ` David Aguilar
2019-08-24 6:54 ` Bert Wesarg
2019-08-24 6:57 ` Bert Wesarg
2019-08-24 7:26 ` David Aguilar
2019-08-24 8:09 ` Johannes Sixt
2019-08-28 21:57 ` [PATCH v3 " Pratyush Yadav
2019-08-28 21:57 ` [PATCH v3 1/4] git-gui: allow reverting selected lines Pratyush Yadav
2019-08-28 21:57 ` [PATCH v3 2/4] git-gui: allow reverting selected hunk Pratyush Yadav
2019-08-28 21:57 ` [PATCH v3 3/4] git-gui: return early when patch fails to apply Pratyush Yadav
2019-08-28 21:57 ` [PATCH v3 4/4] git-gui: allow undoing last revert Pratyush Yadav
2019-10-21 9:16 ` Bert Wesarg
2019-10-21 19:04 ` Pratyush Yadav
2019-10-22 8:17 ` Bert Wesarg
2019-10-23 18:57 ` Pratyush Yadav
2019-10-21 19:35 ` Johannes Sixt
2019-10-22 7:46 ` Bert Wesarg
2019-10-23 19:00 ` Pratyush Yadav
2019-09-10 19:21 ` [PATCH v3 0/4] git-gui: Add ability to revert selected hunks and lines Pratyush Yadav
2019-09-10 20:26 ` Johannes Sixt
2019-09-12 18:59 ` Bert Wesarg
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=20190822225143.3blolae3f65z6zqq@localhost.localdomain \
--to=me@yadavpratyush.com \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
/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).