Skip to contentSkip to conversation

Add hotkey to toggle "Amend Last Commit" radio selector

PATCH Superseded Birger Skogeng Pedersen 3 participants 5 messages Sep 4, 2019 – Sep 5, 2019

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

Hi Pratyush,

So how does this work? Should I email the patch that Bert has created? Or is it okay that it just remains on Github. (Considering the git mail archives)

Birger

#1 lore raw
Quoted 6 lines · Birger Skogeng Pedersen

Hi Pratyush,

So how does this work? Should I email the patch that Bert has created? Or is it okay that it just remains on Github. (Considering the git mail archives)

I think it would be a good idea to send it on the list once before we go ahead with it. This way other people who are interested can take a look. They might not necessarily pay enough attention to the threads to notice the GitHub link. And there is, as you mentioned, the added benefit of having it on the mailing list archives.

Signature · 2 lines
Regards,
Pratyush Yadav
#2 lore raw

PATCH v2 1/1 git-gui: add hotkey to toggle "Amend Last Commit" radio selector

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.

---
 git-gui.sh | 40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)
git-gui.sh +35 -5
index 5bc21b8..47c5db0 100755
@@ -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 \
@@ -3843,6 +3872,7 @@ bind .   <$M1B-Key-equal> {show_more_context;break}
 bind .   <$M1B-Key-plus> {show_more_context;break}
 bind .   <$M1B-Key-KP_Add> {show_more_context;break}
 bind .   <$M1B-Key-Return> do_commit
+bind .   <$M1B-Key-e> toggle_commit_type
 foreach i [list $ui_index $ui_workdir] {
 	bind $i <Button-1>       { toggle_or_diff click %W %x %y; break }
 	bind $i <$M1B-Button-1>  { add_one_to_selection %W %x %y; break }
Signature · 1 line
2.21.0.windows.1
#3 lore raw

Re: [PATCH v2] git-gui: add hotkey to toggle "Amend Last Commit" radio selector

Quoted 27 lines · Birger Skogeng Pedersen

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.

---
 git-gui.sh | 40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)
git-gui.sh +1 -1
index 5bc21b8..47c5db0 100755
@@ -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}} {

git-gui.sh proc show_less_context {} { · line 2645

Quoted 6 lines
git-gui.sh +3 -0
@@ -2640,6 +2640,16 @@ proc show_less_context {} {
        }
 }
 
+proc toggle_commit_type {} {
+       global selected_commit_type
+       if {[string match amend* $selected_commit_type]} {

only $commit_type has multiple incarnations of amend, thus this should have been $commit_type here.

Though I posted new patches which convert it first to b a checkbutton and than addedyour keybinding patch on top of it.

Bert

Quoted 81 lines
git-gui.sh +31 -5
+               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 \
@@ -3843,6 +3872,7 @@ bind .   <$M1B-Key-equal> {show_more_context;break}
 bind .   <$M1B-Key-plus> {show_more_context;break}
 bind .   <$M1B-Key-KP_Add> {show_more_context;break}
 bind .   <$M1B-Key-Return> do_commit
+bind .   <$M1B-Key-e> toggle_commit_type
 foreach i [list $ui_index $ui_workdir] {
        bind $i <Button-1>       { toggle_or_diff click %W %x %y; break }
        bind $i <$M1B-Button-1>  { add_one_to_selection %W %x %y; break }
--

2.21.0.windows.1

#4 lore raw
In reply to Pratyush Yadav
Quoted 9 lines · Pratyush Yadav
Quoted 6 lines · Birger Skogeng Pedersen

Hi Pratyush,

So how does this work? Should I email the patch that Bert has created? Or is it okay that it just remains on Github. (Considering the git mail archives)

Quoted 5 lines

I think it would be a good idea to send it on the list once before we go ahead with it. This way other people who are interested can take a look. They might not necessarily pay enough attention to the threads to notice the GitHub link. And there is, as you mentioned, the added benefit of having it on the mailing list archives.

I'm finally able to send patches around again. Though I find the idea from Johannes appealing to convert this to a check button. Are you with this?

Bert

Quoted 4 lines

--
Regards,
Pratyush Yadav