Remove all references to do_register

This commit is contained in:
Marco Hinz 2017-04-18 17:13:17 +02:00
parent 92ed727f3a
commit 64b2170a1f
No known key found for this signature in database
GPG Key ID: 1C980A1B657B4A4F
2 changed files with 41 additions and 44 deletions

View File

@ -47,7 +47,7 @@ function! sy#start() abort
return
endif
let b:sy.active = 1
call sy#repo#detect(1)
call sy#repo#detect()
elseif has('vim_starting')
call sy#verbose("Don't run Sy more than once during startup.")
return
@ -58,7 +58,7 @@ function! sy#start() abort
if get(b:sy, 'retry')
let b:sy.retry = 0
call sy#verbose('Redetecting VCS.')
call sy#repo#detect(1)
call sy#repo#detect()
else
if get(b:sy, 'detecting')
call sy#verbose('Detection is already in progress.')
@ -75,20 +75,18 @@ function! sy#start() abort
call sy#verbose('Update is already in progress.', vcs)
else
call sy#verbose('Updating signs.', vcs)
call sy#repo#get_diff_start(vcs, 0)
call sy#repo#get_diff_start(vcs)
endif
endfor
endif
endfunction
" Function: #set_signs {{{1
function! sy#set_signs(sy, vcs, diff, do_register) abort
function! sy#set_signs(sy, vcs, diff) abort
call sy#verbose('set_signs()', a:vcs)
if a:do_register
if a:sy.stats == [-1, -1, -1]
let a:sy.stats = [0, 0, 0]
endif
if a:sy.stats == [-1, -1, -1]
let a:sy.stats = [0, 0, 0]
endif
if empty(a:diff)

View File

@ -3,10 +3,10 @@
scriptencoding utf-8
" Function: #detect {{{1
function! sy#repo#detect(do_register) abort
function! sy#repo#detect() abort
for vcs in s:vcs_list
let b:sy.detecting += 1
call sy#repo#get_diff_start(vcs, a:do_register)
call sy#repo#get_diff_start(vcs)
endfor
endfunction
@ -23,7 +23,7 @@ endfunction
" Function: s:callback_nvim_exit {{{1
function! s:callback_nvim_exit(_job_id, exitval, _event) dict abort
call s:job_exit(self.bufnr, self.vcs, a:exitval, self.stdoutbuf, self.do_register)
call s:job_exit(self.bufnr, self.vcs, a:exitval, self.stdoutbuf)
endfunction
" Function: s:callback_vim_stdout {{{1
@ -41,11 +41,11 @@ function! s:callback_vim_close(channel) dict abort
endif
sleep 10m
endwhile
call s:job_exit(self.bufnr, self.vcs, exitval, self.stdoutbuf, self.do_register)
call s:job_exit(self.bufnr, self.vcs, exitval, self.stdoutbuf)
endfunction
" Function: s:job_exit {{{1
function! s:job_exit(bufnr, vcs, exitval, diff, do_register) abort
function! s:job_exit(bufnr, vcs, exitval, diff) abort
call sy#verbose('job_exit()', a:vcs)
let sy = getbufvar(a:bufnr, 'sy')
if empty(sy)
@ -57,12 +57,12 @@ function! s:job_exit(bufnr, vcs, exitval, diff, do_register) abort
elseif empty(sy.vcs) && sy.active
let sy.detecting -= 1
endif
call sy#repo#get_diff_{a:vcs}(sy, a:exitval, a:diff, a:do_register)
call sy#repo#get_diff_{a:vcs}(sy, a:exitval, a:diff)
call setbufvar(a:bufnr, 'sy_job_id_'.a:vcs, 0)
endfunction
" Function: sy#get_diff_start {{{1
function! sy#repo#get_diff_start(vcs, do_register) abort
function! sy#repo#get_diff_start(vcs) abort
call sy#verbose('get_diff_start()', a:vcs)
let job_id = get(b:, 'sy_job_id_'.a:vcs)
@ -72,7 +72,7 @@ function! sy#repo#get_diff_start(vcs, do_register) abort
silent! call jobstop(job_id)
endif
let [cmd, options] = s:initialize_job(a:vcs, a:do_register)
let [cmd, options] = s:initialize_job(a:vcs)
let [cwd, chdir] = sy#util#chdir()
call sy#verbose(printf('CMD: %s | CWD: %s', string(cmd), b:sy_info.dir), a:vcs)
@ -88,7 +88,7 @@ function! sy#repo#get_diff_start(vcs, do_register) abort
silent! call job_stop(job_id)
endif
let [cmd, options] = s:initialize_job(a:vcs, a:do_register)
let [cmd, options] = s:initialize_job(a:vcs)
let [cwd, chdir] = sy#util#chdir()
try
@ -107,67 +107,67 @@ function! sy#repo#get_diff_start(vcs, do_register) abort
" Older Vim
else
let diff = split(s:run(a:vcs), '\n')
call sy#repo#get_diff_{a:vcs}(b:sy, v:shell_error, diff, a:do_register)
call sy#repo#get_diff_{a:vcs}(b:sy, v:shell_error, diff)
endif
endfunction
" Function: s:get_diff_end {{{1
function! s:get_diff_end(sy, found_diff, vcs, diff, do_register) abort
function! s:get_diff_end(sy, found_diff, vcs, diff) abort
call sy#verbose('get_diff_end()', a:vcs)
if a:found_diff
if index(a:sy.vcs, a:vcs) == -1
let a:sy.vcs += [a:vcs]
endif
call sy#set_signs(a:sy, a:vcs, a:diff, a:do_register)
call sy#set_signs(a:sy, a:vcs, a:diff)
else
call sy#verbose('No valid diff found. Disabling this VCS.', a:vcs)
endif
endfunction
" Function: #get_diff_git {{{1
function! sy#repo#get_diff_git(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_git(sy, exitval, diff) abort
call sy#verbose('get_diff_git()', 'git')
let [found_diff, diff] = a:exitval ? [0, []] : [1, a:diff]
call s:get_diff_end(a:sy, found_diff, 'git', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'git', diff)
endfunction
" Function: #get_diff_hg {{{1
function! sy#repo#get_diff_hg(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_hg(sy, exitval, diff) abort
call sy#verbose('get_diff_hg()', 'hg')
let [found_diff, diff] = a:exitval ? [0, []] : [1, a:diff]
call s:get_diff_end(a:sy, found_diff, 'hg', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'hg', diff)
endfunction
" Function: #get_diff_svn {{{1
function! sy#repo#get_diff_svn(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_svn(sy, exitval, diff) abort
call sy#verbose('get_diff_svn()', 'svn')
let [found_diff, diff] = a:exitval ? [0, []] : [1, a:diff]
call s:get_diff_end(a:sy, found_diff, 'svn', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'svn', diff)
endfunction
" Function: #get_diff_bzr {{{1
function! sy#repo#get_diff_bzr(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_bzr(sy, exitval, diff) abort
call sy#verbose('get_diff_bzr()', 'bzr')
let [found_diff, diff] = (a:exitval =~ '[012]') ? [1, a:diff] : [0, []]
call s:get_diff_end(a:sy, found_diff, 'bzr', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'bzr', diff)
endfunction
" Function: #get_diff_darcs {{{1
function! sy#repo#get_diff_darcs(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_darcs(sy, exitval, diff) abort
call sy#verbose('get_diff_darcs()', 'darcs')
let [found_diff, diff] = a:exitval ? [0, []] : [1, a:diff]
call s:get_diff_end(a:sy, found_diff, 'darcs', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'darcs', diff)
endfunction
" Function: #get_diff_fossil {{{1
function! sy#repo#get_diff_fossil(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_fossil(sy, exitval, diff) abort
call sy#verbose('get_diff_fossil()', 'fossil')
let [found_diff, diff] = a:exitval ? [0, []] : [1, a:diff]
call s:get_diff_end(a:sy, found_diff, 'fossil', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'fossil', diff)
endfunction
" Function: #get_diff_cvs {{{1
function! sy#repo#get_diff_cvs(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_cvs(sy, exitval, diff) abort
call sy#verbose('get_diff_cvs()', 'cvs')
let [found_diff, diff] = [0, []]
if a:exitval == 1
@ -178,35 +178,35 @@ function! sy#repo#get_diff_cvs(sy, exitval, diff, do_register) abort
endif
endfor
endif
call s:get_diff_end(a:sy, found_diff, 'cvs', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'cvs', diff)
endfunction
" Function: #get_diff_rcs {{{1
function! sy#repo#get_diff_rcs(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_rcs(sy, exitval, diff) abort
call sy#verbose('get_diff_rcs()', 'rcs')
let [found_diff, diff] = a:exitval ? [0, []] : [1, a:diff]
call s:get_diff_end(a:sy, found_diff, 'rcs', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'rcs', diff)
endfunction
" Function: #get_diff_accurev {{{1
function! sy#repo#get_diff_accurev(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_accurev(sy, exitval, diff) abort
call sy#verbose('get_diff_accurev()', 'accurev')
let [found_diff, diff] = (a:exitval >= 2) ? [0, []] : [1, a:diff]
call s:get_diff_end(a:sy, found_diff, 'accurev', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'accurev', diff)
endfunction
" Function: #get_diff_perforce {{{1
function! sy#repo#get_diff_perforce(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_perforce(sy, exitval, diff) abort
call sy#verbose('get_diff_perforce()', 'perforce')
let [found_diff, diff] = a:exitval ? [0, []] : [1, a:diff]
call s:get_diff_end(a:sy, found_diff, 'perforce', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'perforce', diff)
endfunction
" Function: #get_diff_tfs {{{1
function! sy#repo#get_diff_tfs(sy, exitval, diff, do_register) abort
function! sy#repo#get_diff_tfs(sy, exitval, diff) abort
call sy#verbose('get_diff_tfs()', 'tfs')
let [found_diff, diff] = a:exitval ? [0, []] : [1, s:strip_context(a:diff)]
call s:get_diff_end(a:sy, found_diff, 'tfs', diff, a:do_register)
call s:get_diff_end(a:sy, found_diff, 'tfs', diff)
endfunction
" Function: #get_stats {{{1
@ -245,7 +245,7 @@ function! sy#repo#debug_detection()
endfunction
" Function: s:initialize_job {{{1
function! s:initialize_job(vcs, do_register) abort
function! s:initialize_job(vcs) abort
let vcs_cmd = s:expand_cmd(a:vcs)
if has('win32')
if has('nvim')
@ -259,7 +259,6 @@ function! s:initialize_job(vcs, do_register) abort
let options = {
\ 'stdoutbuf': [],
\ 'vcs': a:vcs,
\ 'do_register': a:do_register,
\ 'bufnr': bufnr('%'),
\ }
return [cmd, options]