From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Pratyush Yadav <me@yadavpratyush.com>,
Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v3 4/4] git-gui: allow undoing last revert
Date: Tue, 22 Oct 2019 09:46:40 +0200 [thread overview]
Message-ID: <CAKPyHN1V+gDdL=9eGvHmC7sv_bJPwv9kCvDu2f8sL_kPhAzRAg@mail.gmail.com> (raw)
In-Reply-To: <5b62b4a7-67ad-9e5f-d4a1-9dce7bcfcb6b@kdbg.org>
On Mon, Oct 21, 2019 at 9:35 PM Johannes Sixt <j6t@kdbg.org> wrote:
>
> Am 21.10.19 um 11:16 schrieb Bert Wesarg:
> > Dear Pratyush,
> >
> > I just noticed that the 'Revert Last Hunk' menu entry is enabled in
> > the stage-list. But I think it should be disabled, like the 'Revert
> > Hunk' and 'Revert Line' menu entry.
> >
> > Can you confirm this?
>
> Technically, it need not be disabled because the hunk being reverted
> does not depend on the contents of any of diffs that can be shown.
>
> The entry should be disabled if reverting the stored hunk fails. But to
> know that, it would have to be tried: the file could have been edited
> since the hunk was generated so that the reversal of the hunk fails.
But the "Undo" changes the worktree not the stage, sure it indirectly
also changes the view of the staged content, but that is only a
secondary effect. As I only can revert in the worktree list, I think
we should be consistent and also only allow to undo the revert in the
worktree list.
And I think it is independent of 'does the undo apply at all' question.
Bert
>
> Not sure what to do, though.
>
> -- Hannes
next prev parent reply other threads:[~2019-10-22 7:46 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
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 [this message]
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='CAKPyHN1V+gDdL=9eGvHmC7sv_bJPwv9kCvDu2f8sL_kPhAzRAg@mail.gmail.com' \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=me@yadavpratyush.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).