xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix another case where git tests were hanging

Browse Source
This commit is contained in:
Maxime Coste 2024-05-12 14:18:17 +10:00
parent 7be22f1ec2
commit 0e92b3fdef
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rc/tools/git.kak
View File

@ -224,7 +224,7 @@ define-command -params 1.. \
execute-keys <a-l><semicolon><a-?>^commit<ret><a-semicolon> execute-keys <a-l><semicolon><a-?>^commit<ret><a-semicolon>
} catch %{ } catch %{
# Missing commit line, assume it is an uncommitted change. # Missing commit line, assume it is an uncommitted change.
execute-keys <a-l><semicolon><a-?>\A<ret><a-semicolon> execute-keys <a-l><semicolon>Gg<a-semicolon>
} }
require-module diff require-module diff
try %{ try %{

2
test/run
View File

@ -193,7 +193,7 @@ ui_out() {
-until) -until)
shift shift
while read -r event <&4; do while read -r event <&4; do
[ "$event" == "$1" ] && break [ "$event" = "$1" ] && break
done done
;; ;;
-until-grep) -until-grep)

4
test/tools/git/blame-in-diff/script
View File

@ -1,9 +1,9 @@
ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }' ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
# We've jumped to the new version of line 2. Move to the old version so we # We've jumped to the new version of line 2. Move to the old version so we
# can annotate the old file. # can annotate the old file.
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "k:git blame<ret>" ] }' ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "k:git blame<ret>" ] }'
ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }' while ui_out -until-grep '"draw_status"' | grep '\[fifo\]'; do :; done > /dev/null
# We should have jumped to the old version of line 2, assert on kak_selection. # We should have jumped to the old version of line 2, assert on kak_selection.
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "x" ] }' ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "x" ] }'