* [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert
@ 2012-09-14 23:36 vi0oss
2012-09-15 11:04 ` Bert Wesarg
2012-09-17 10:47 ` Pat Thoyts
0 siblings, 2 replies; 5+ messages in thread
From: vi0oss @ 2012-09-14 23:36 UTC (permalink / raw)
To: git; +Cc: vi0oss, patthoyts, bert.wesarg
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
--
1.7.8.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert
2012-09-14 23:36 [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert vi0oss
@ 2012-09-15 11:04 ` Bert Wesarg
2012-09-17 10:47 ` Pat Thoyts
1 sibling, 0 replies; 5+ messages in thread
From: Bert Wesarg @ 2012-09-15 11:04 UTC (permalink / raw)
To: vi0oss; +Cc: git, patthoyts
On Sat, Sep 15, 2012 at 1:36 AM, <vi0oss@gmail.com> wrote:
> 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
>
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert
2012-09-14 23:36 [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert vi0oss
2012-09-15 11:04 ` Bert Wesarg
@ 2012-09-17 10:47 ` Pat Thoyts
1 sibling, 0 replies; 5+ messages in thread
From: Pat Thoyts @ 2012-09-17 10:47 UTC (permalink / raw)
To: vi0oss; +Cc: git, bert.wesarg
vi0oss@gmail.com writes:
>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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert
@ 2012-08-17 3:19 vi0oss
0 siblings, 0 replies; 5+ messages in thread
From: vi0oss @ 2012-08-17 3:19 UTC (permalink / raw)
To: git; +Cc: vi0oss, patthoyts
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>
---
No reply to previous email received,
re-sending with new Cc: as recommented on #git-devel.
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert
@ 2012-08-12 15:53 vi0oss
0 siblings, 0 replies; 5+ messages in thread
From: vi0oss @ 2012-08-12 15:53 UTC (permalink / raw)
To: git; +Cc: vi0oss, bert.wesarg
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>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-17 10:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-14 23:36 [PATCH] git-gui: Fix semi-working shortcuts for unstage and revert vi0oss
2012-09-15 11:04 ` Bert Wesarg
2012-09-17 10:47 ` Pat Thoyts
-- strict thread matches above, loose matches on Subject: below --
2012-08-17 3:19 vi0oss
2012-08-12 15:53 vi0oss
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 NNTP newsgroup(s).