m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-11 12:53:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Account for ch_status() == 'fail'

Browse Source 
References: https://github.com/tpope/vim-fugitive/issues/1815
This commit is contained in:
Tim Pope
2022-07-27 07:14:33 -04:00
parent 9a13fc87c4
commit 6955915af5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
autoload/fugitive.vim
View File

@@ -342,13 +342,13 @@ function! fugitive#Wait(job_or_jobs, ...) abort
else else
let sleep = has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m' let sleep = has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m'
for job in jobs for job in jobs
if ch_status(job) !=# 'closed' if ch_status(job) ==# 'open'
call ch_close_in(job) call ch_close_in(job)
endif endif
endfor endfor
let i = 0 let i = 0
for job in jobs for job in jobs
while ch_status(job) !=# 'closed' || job_status(job) ==# 'run' while ch_status(job) !~# '^closed$\|^fail$' || job_status(job) ==# 'run'
if i == timeout_ms if i == timeout_ms
break break
endif endif
@@ -873,7 +873,7 @@ function! s:SystemList(cmd) abort
let job = job_start(a:cmd, jopts) let job = job_start(a:cmd, jopts)
call ch_close_in(job) call ch_close_in(job)
let sleep = has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m' let sleep = has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m'
while ch_status(job) !=# 'closed' || job_status(job) ==# 'run' while ch_status(job) !~# '^closed$\|^fail$' || job_status(job) ==# 'run'
exe sleep exe sleep
endwhile endwhile
return [lines, exit[0]] return [lines, exit[0]]
@@ -988,7 +988,7 @@ function! s:StdoutToFile(out, cmd, ...) abort
call ch_sendraw(job, a:1) call ch_sendraw(job, a:1)
endif endif
call ch_close_in(job) call ch_close_in(job)
while ch_status(job) !=# 'closed' || job_status(job) ==# 'run' while ch_status(job) !~# '^closed$\|^fail$' || job_status(job) ==# 'run'
exe has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m' exe has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m'
endwhile endwhile
return [join(readfile(err, 'b'), "\n"), exit[0]] return [join(readfile(err, 'b'), "\n"), exit[0]]
@@ -3493,7 +3493,7 @@ function! s:RunTick(job) abort
if type(a:job) == v:t_number if type(a:job) == v:t_number
return jobwait([a:job], 1)[0] == -1 return jobwait([a:job], 1)[0] == -1
elseif type(a:job) == 8 elseif type(a:job) == 8
let running = ch_status(a:job) !~# '^closed$\|^failed$' || job_status(a:job) ==# 'run' let running = ch_status(a:job) !~# '^closed$\|^fail$' || job_status(a:job) ==# 'run'
sleep 1m sleep 1m
return running return running
endif endif