From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Birger Skogeng Pedersen <birger.sp@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
David Aguilar <davvid@gmail.com>, David <bouncingcats@gmail.com>
Subject: Re: [PATCH] Add hotkey to toggle "Amend Last Commit" radio selector
Date: Tue, 3 Sep 2019 10:52:58 +0200 [thread overview]
Message-ID: <CAKPyHN0tFzRDYFkjwTDi6MvN3DmzDRNH6V0Y5Ay1U6K2T-H6sA@mail.gmail.com> (raw)
In-Reply-To: <20190902195618.3820-1-birger.sp@gmail.com>
Birger,
On Mon, Sep 2, 2019 at 9:56 PM Birger Skogeng Pedersen
<birger.sp@gmail.com> wrote:
>
> 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.
David A. (in Cc from git-cola) suggested, that we try to re-use
existing key bindings in Git GUIs. Here is Git-Cola hotkeys:
http://git-cola.github.io/share/doc/git-cola/hotkeys.html
and this indicates, that it already uses CTRL+m for "amend". Though
I'm unsure if this is a toggle like in git-gui or a one-shot. David
A., can you please clarify?
>
> Signed-off-by: Birger Skogeng Pedersen <birger.sp@gmail.com>
> ---
> git-gui.sh | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/git-gui.sh b/git-gui.sh
> index 5bc21b8..14be1e0 100755
> --- a/git-gui.sh
> +++ b/git-gui.sh
> @@ -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
> + }
> + do_select_commit_type
> +}
> +
> ######################################################################
> ##
> ## ui construction
> @@ -3843,6 +3853,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
The commit type has also a two toggle menu entries (under "Commit")
they should now also indicate the key binding.
disable
Though how to express a toggle keybinding in the menu? I don't know if
you can assign the same keybinding to the same menu entry. Maybe we
need to add/remove the keybinding depending on the current mode.
Bert
> 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
>
next prev parent reply other threads:[~2019-09-03 8:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-31 10:51 feature request, git-gui: add hotkey to toggle amend/new Birger Skogeng Pedersen
2019-09-02 16:25 ` Birger Skogeng Pedersen
2019-09-02 18:07 ` Bert Wesarg
2019-09-02 19:49 ` Birger Skogeng Pedersen
2019-09-02 19:56 ` [PATCH] Add hotkey to toggle "Amend Last Commit" radio selector Birger Skogeng Pedersen
2019-09-03 8:52 ` Bert Wesarg [this message]
2019-09-03 10:25 ` Bert Wesarg
2019-09-03 16:20 ` Bert Wesarg
2019-09-02 20:12 ` feature request, git-gui: add hotkey to toggle amend/new Bert Wesarg
2019-09-02 20:15 ` Bert Wesarg
2019-09-03 5:37 ` Birger Skogeng Pedersen
2019-09-03 12:45 ` Pratyush Yadav
2019-09-03 14:06 ` Birger Skogeng Pedersen
2019-09-03 17:34 ` Pratyush Yadav
2019-09-03 15:35 ` David
2019-09-03 17:27 ` Pratyush Yadav
2019-09-04 6:24 ` Johannes Sixt
2019-09-04 17:46 ` Pratyush Yadav
2019-09-04 17:54 ` Birger Skogeng Pedersen
2019-09-04 18:52 ` Johannes Sixt
2019-09-04 19:03 ` Bert Wesarg
2019-09-10 8:54 ` David Aguilar
2019-09-11 10:27 ` Birger Skogeng Pedersen
2019-09-11 18:34 ` Pratyush Yadav
2019-09-11 18:47 ` Pratyush Yadav
2019-09-03 1:01 ` David
2019-09-03 8:44 ` Bert Wesarg
-- strict thread matches above, loose matches on Subject: below --
2019-09-04 5:58 [PATCH] Add hotkey to toggle "Amend Last Commit" radio selector Birger Skogeng Pedersen
2019-09-04 17:36 ` Pratyush Yadav
2019-09-04 18:55 ` 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=CAKPyHN0tFzRDYFkjwTDi6MvN3DmzDRNH6V0Y5Ay1U6K2T-H6sA@mail.gmail.com \
--to=bert.wesarg@googlemail.com \
--cc=birger.sp@gmail.com \
--cc=bouncingcats@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.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).