threads / patch / 31536

patchgit-gui: Fix semi-working shortcuts for unstage and revert

Subject: [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert

## tl;dr

3 messages between Sep 14, 2012 and Sep 17, 2012. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

vi0oss@gmail.com· Sep 14, 2012, 23:36 UTC · lore
From: Vitaly _Vi Shukela <vi0oss@gmail.com>

Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave more like Ctrl+T for adding.

They were working only when one area was focused (diff or commit message), now they should work everywhere.

Signed-off-by: Vitaly _Vi Shukela <vi0oss@gmail.com>
---
Sending the patch the third time (haven't got any replies to previous two attempts).
 git-gui/git-gui.sh |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
Show changes to git-gui/git-gui.sh +4 −0
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index ba4e5c1..6618016 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -3710,6 +3710,8 @@ bind $ui_diff <$M1B-Key-v> {break}
 bind $ui_diff <$M1B-Key-V> {break}
 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
+bind $ui_diff <$M1B-Key-j> {do_revert_selection;break}
+bind $ui_diff <$M1B-Key-J> {do_revert_selection;break}
 bind $ui_diff <Key-Up>     {catch {%W yview scroll -1 units};break}
 bind $ui_diff <Key-Down>   {catch {%W yview scroll  1 units};break}
 bind $ui_diff <Key-Left>   {catch {%W xview scroll -1 units};break}
@@ -3742,6 +3744,8 @@ bind .   <$M1B-Key-s> do_signoff
 bind .   <$M1B-Key-S> do_signoff
 bind .   <$M1B-Key-t> do_add_selection
 bind .   <$M1B-Key-T> do_add_selection
+bind .   <$M1B-Key-u> do_unstage_selection
+bind .   <$M1B-Key-U> do_unstage_selection
 bind .   <$M1B-Key-j> do_revert_selection
 bind .   <$M1B-Key-J> do_revert_selection
 bind .   <$M1B-Key-i> do_add_all

-- 
1.7.8.5
Bert Wesarg· Sep 15, 2012, 11:04 UTC · re: vi0oss@gmail.com · lore

Re: [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert

On Sat, Sep 15, 2012 at 1:36 AM,  <vi0oss@gmail.com> wrote:
Show 11 quoted lines
> From: Vitaly _Vi Shukela <vi0oss@gmail.com>
>
> Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave
> more like Ctrl+T for adding.
>
> They were working only when one area was focused (diff or commit message),
> now they should work everywhere.
>
> Signed-off-by: Vitaly _Vi Shukela <vi0oss@gmail.com>
> ---
> Sending the patch the third time (haven't got any replies to previous two attempts).
For what its worth:
Acked-by: Bert Wesarg <bert.wesarg@googlemail.com>
But unless Pat reacts this is useless.
Bert
Show 29 quoted lines
>
>  git-gui/git-gui.sh |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index ba4e5c1..6618016 100755
> --- a/git-gui/git-gui.sh
> +++ b/git-gui/git-gui.sh
> @@ -3710,6 +3710,8 @@ bind $ui_diff <$M1B-Key-v> {break}
>  bind $ui_diff <$M1B-Key-V> {break}
>  bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
>  bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
> +bind $ui_diff <$M1B-Key-j> {do_revert_selection;break}
> +bind $ui_diff <$M1B-Key-J> {do_revert_selection;break}
>  bind $ui_diff <Key-Up>     {catch {%W yview scroll -1 units};break}
>  bind $ui_diff <Key-Down>   {catch {%W yview scroll  1 units};break}
>  bind $ui_diff <Key-Left>   {catch {%W xview scroll -1 units};break}
> @@ -3742,6 +3744,8 @@ bind .   <$M1B-Key-s> do_signoff
>  bind .   <$M1B-Key-S> do_signoff
>  bind .   <$M1B-Key-t> do_add_selection
>  bind .   <$M1B-Key-T> do_add_selection
> +bind .   <$M1B-Key-u> do_unstage_selection
> +bind .   <$M1B-Key-U> do_unstage_selection
>  bind .   <$M1B-Key-j> do_revert_selection
>  bind .   <$M1B-Key-J> do_revert_selection
>  bind .   <$M1B-Key-i> do_add_all
> --
> 1.7.8.5
>
Pat Thoyts· Sep 17, 2012, 10:47 UTC · re: vi0oss@gmail.com · lore

Re: [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert

vi0oss@gmail.com writes:
Show 37 quoted lines
>From: Vitaly _Vi Shukela <vi0oss@gmail.com>
>
>Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave
>more like Ctrl+T for adding.
>
>They were working only when one area was focused (diff or commit message),
>now they should work everywhere.
>
>Signed-off-by: Vitaly _Vi Shukela <vi0oss@gmail.com>
>---
>Sending the patch the third time (haven't got any replies to previous two attempts).
>
> git-gui/git-gui.sh |    4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
>diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
>index ba4e5c1..6618016 100755
>--- a/git-gui/git-gui.sh
>+++ b/git-gui/git-gui.sh
>@@ -3710,6 +3710,8 @@ bind $ui_diff <$M1B-Key-v> {break}
> bind $ui_diff <$M1B-Key-V> {break}
> bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
> bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
>+bind $ui_diff <$M1B-Key-j> {do_revert_selection;break}
>+bind $ui_diff <$M1B-Key-J> {do_revert_selection;break}
> bind $ui_diff <Key-Up>     {catch {%W yview scroll -1 units};break}
> bind $ui_diff <Key-Down>   {catch {%W yview scroll  1 units};break}
> bind $ui_diff <Key-Left>   {catch {%W xview scroll -1 units};break}
>@@ -3742,6 +3744,8 @@ bind .   <$M1B-Key-s> do_signoff
> bind .   <$M1B-Key-S> do_signoff
> bind .   <$M1B-Key-t> do_add_selection
> bind .   <$M1B-Key-T> do_add_selection
>+bind .   <$M1B-Key-u> do_unstage_selection
>+bind .   <$M1B-Key-U> do_unstage_selection
> bind .   <$M1B-Key-j> do_revert_selection
> bind .   <$M1B-Key-J> do_revert_selection
> bind .   <$M1B-Key-i> do_add_all
Looks good to me. Applied.
Thank you. 
-- 
Pat Thoyts                            http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD

← back to recent threads