From: Birger Skogeng Pedersen <birger.sp@gmail.com>
To: me@yadavpratyush.com
Cc: git@vger.kernel.org,
Birger Skogeng Pedersen <birger.sp@gmail.com>,
Bert Wesarg <bert.wesarg@googlemail.com>
Subject: [PATCH v3] git-gui: add hotkey to toggle "Amend Last Commit"
Date: Thu, 12 Sep 2019 20:41:00 +0200 [thread overview]
Message-ID: <20190912184100.8212-1-birger.sp@gmail.com> (raw)
In-Reply-To: <20190912162924.phb5o2ppovnxa7nn@yadavpratyush.com>
Selecting whether to do a "New Commit" or "Amend Last Commit" does not have
a hotkey.
With this patch, the user may toggle between the two options with
CTRL/CMD+e.
Signed-off-by: Birger Skogeng Pedersen <birger.sp@gmail.com>
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
git-gui.sh | 41 ++++++++++++++++++++++++++++++++++++-----
1 file changed, 36 insertions(+), 5 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh
index 5bc21b8..ebe267f 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1445,7 +1445,7 @@ proc force_amend {} {
set commit_type $newType
set selected_commit_type amend
- do_select_commit_type
+ ui_select_commit_type
}
proc rescan {after {honor_trustmtime 1}} {
@@ -2640,6 +2640,16 @@ proc show_less_context {} {
}
}
+proc toggle_commit_type {} {
+ global selected_commit_type
+ if {[string match amend* $selected_commit_type]} {
+ set selected_commit_type new
+ } else {
+ set selected_commit_type amend
+ }
+ ui_select_commit_type
+}
+
######################################################################
##
## ui construction
@@ -2824,13 +2834,31 @@ proc commit_btn_caption {} {
}
}
+proc ui_select_commit_type {} {
+ global selected_commit_type
+ global ui_commit_type_commit ui_commit_type_amend
+
+ do_select_commit_type
+ if {$selected_commit_type eq {new}} {
+ .mbar.commit entryconf [mc "New Commit"] \
+ -accelerator {}
+ .mbar.commit entryconf [mc "Amend Last Commit"] \
+ -accelerator $::M1T-E
+ } elseif {$selected_commit_type eq {amend}} {
+ .mbar.commit entryconf [mc "New Commit"] \
+ -accelerator $::M1T-E
+ .mbar.commit entryconf [mc "Amend Last Commit"] \
+ -accelerator {}
+ }
+}
+
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
menu .mbar.commit
if {![is_enabled nocommit]} {
.mbar.commit add radiobutton \
-label [mc "New Commit"] \
- -command do_select_commit_type \
+ -command ui_select_commit_type \
-variable selected_commit_type \
-value new
lappend disable_on_lock \
@@ -2838,7 +2866,8 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
.mbar.commit add radiobutton \
-label [mc "Amend Last Commit"] \
- -command do_select_commit_type \
+ -accelerator $M1T-E \
+ -command ui_select_commit_type \
-variable selected_commit_type \
-value amend
lappend disable_on_lock \
@@ -3315,14 +3344,14 @@ set ui_coml .vpane.lower.commarea.buffer.header.l
if {![is_enabled nocommit]} {
${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
-text [mc "New Commit"] \
- -command do_select_commit_type \
+ -command ui_select_commit_type \
-variable selected_commit_type \
-value new
lappend disable_on_lock \
[list .vpane.lower.commarea.buffer.header.new conf -state]
${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
-text [mc "Amend Last Commit"] \
- -command do_select_commit_type \
+ -command ui_select_commit_type \
-variable selected_commit_type \
-value amend
lappend disable_on_lock \
@@ -3837,6 +3866,8 @@ bind . <$M1B-Key-j> do_revert_selection
bind . <$M1B-Key-J> do_revert_selection
bind . <$M1B-Key-i> do_add_all
bind . <$M1B-Key-I> do_add_all
+bind . <$M1B-Key-e> toggle_commit_type
+bind . <$M1B-Key-E> toggle_commit_type
bind . <$M1B-Key-minus> {show_less_context;break}
bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
bind . <$M1B-Key-equal> {show_more_context;break}
--
2.21.0.windows.1
next prev parent reply other threads:[~2019-09-12 18:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-05 20:09 [PATCH 1/2] git-gui: convert new/amend commit radiobutton to checketton Bert Wesarg
2019-09-05 20:09 ` [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu Bert Wesarg
2019-09-11 20:55 ` Pratyush Yadav
2019-09-12 6:05 ` Birger Skogeng Pedersen
2019-09-12 16:29 ` Pratyush Yadav
2019-09-12 18:41 ` Birger Skogeng Pedersen [this message]
2019-09-13 14:37 ` [PATCH v3] git-gui: add hotkey to toggle "Amend Last Commit" Pratyush Yadav
2019-09-13 21:11 ` [PATCH v4] " Birger Skogeng Pedersen
2019-09-13 21:32 ` Birger Skogeng Pedersen
2019-09-13 22:11 ` Pratyush Yadav
2019-09-14 9:07 ` Birger Skogeng Pedersen
2019-09-14 9:18 ` [PATCH v5] " Birger Skogeng Pedersen
2019-09-14 17:48 ` Pratyush Yadav
2019-09-16 12:23 ` Birger Skogeng Pedersen
2019-09-12 21:34 ` [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu Marc Branchaud
2019-09-12 22:23 ` Philip Oakley
2019-09-13 7:50 ` Birger Skogeng Pedersen
2019-09-13 13:55 ` Marc Branchaud
2019-09-13 17:47 ` Pratyush Yadav
2019-09-05 20:33 ` [PATCH 1/2] git-gui: convert new/amend commit radiobutton to checketton Pratyush Yadav
2019-09-11 20:15 ` Pratyush Yadav
2019-09-12 19:35 ` Bert Wesarg
2019-09-13 17:14 ` Pratyush Yadav
2019-09-12 19:39 ` 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=20190912184100.8212-1-birger.sp@gmail.com \
--to=birger.sp@gmail.com \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.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).