From: Pratyush Yadav <me@yadavpratyush.com>
To: <git@vger.kernel.org>
Cc: Pratyush Yadav <me@yadavpratyush.com>,
Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>,
Bert Wesarg <bert.wesarg@googlemail.com>
Subject: [PATCH v3 0/4] git-gui: Add ability to revert selected hunks and lines
Date: Thu, 29 Aug 2019 03:27:21 +0530 [thread overview]
Message-ID: <20190828215725.13376-1-me@yadavpratyush.com> (raw)
In-Reply-To: <20190819214110.26461-1-me@yadavpratyush.com>
Hi,
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
Changes in v3:
- Drop the confirmation dialog on partial reverts. It is still there for
full file reverts (which was the original behaviour).
- Allow undoing the last revert.
- Update the context menu button layout. In v2, the layout was:
Stage Hunk
Revert Hunk
Stage Lines
Revert Lines
Now it is:
Stage Hunk
Stage Lines
-----------
Revert Hunk
Revert Lines
Undo Last Revert
- Return early when applying a patch fails. This is useful for this
series because in that case we don't save a faulty patch in
last_revert, causing the same error to pop up when reverting the patch
that failed to apply in the first place.
Changes in v2:
- Add an option to disable the revert confirmation prompt as suggested
by Johannes Sixt.
- Base the patches on Pat's git-gui tree instead of git.git.
[0]
https://public-inbox.org/git/a9ba4550a29d7f3c653561e7029f0920bf8eb008.1326116492.git.bert.wesarg@googlemail.com/
Pratyush Yadav (4):
git-gui: allow reverting selected lines
git-gui: allow reverting selected hunk
git-gui: return early when patch fails to apply
git-gui: allow undoing last revert
git-gui.sh | 57 +++++++++++++++++++++++++++++--
lib/diff.tcl | 96 ++++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 135 insertions(+), 18 deletions(-)
--
2.21.0
next prev parent reply other threads:[~2019-08-28 21:57 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 ` Pratyush Yadav [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190828215725.13376-1-me@yadavpratyush.com \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.