Marco Hinz 8351e5212f
Improve detection of nested repos managed by different VCS
Assume a hg repo below a git repo. `git diff` on a file managed by hg, will
return a successful exit value, but no output.

So, if we got a successful exit value from multiple VCS tools, and none of them
gave any output, keep them all as potential candidates. The next time Sy is run,
only these candidates will be tested again.

If one of them returns a proper diff, set b:sy.updated_by to that VCS and prune
all other candidates.

References #235
2018-04-17 17:35:08 +02:00

191 lines
4.4 KiB
VimL

" vim: et sw=2 sts=2
scriptencoding utf-8
" Init: values {{{1
let s:has_doau_modeline = v:version > 703 || v:version == 703 && has('patch442')
" Function: #start {{{1
function! sy#start() abort
if g:signify_locked
call sy#verbose('Locked.')
return
endif
let sy_path = resolve(expand('%:p'))
if s:skip(sy_path)
call sy#verbose('Skip file: '. sy_path)
if exists('b:sy')
call sy#sign#remove_all_signs(bufnr(''))
unlet! b:sy
endif
return
endif
if !exists('b:sy') || b:sy.path != sy_path
call sy#verbose('Register new file: '. sy_path)
let b:sy = {
\ 'path': sy_path,
\ 'buffer': bufnr(''),
\ 'active': 0,
\ 'detecting': 0,
\ 'vcs': [],
\ 'hunks': [],
\ 'signid': 0x100,
\ 'updated_by': '',
\ 'stats': [-1, -1, -1],
\ 'info': {
\ 'dir': fnamemodify(sy_path, ':p:h'),
\ 'path': sy#util#escape(sy_path),
\ 'file': sy#util#escape(fnamemodify(sy_path, ':t'))
\ }}
if get(g:, 'signify_disable_by_default')
call sy#verbose('Disabled by default.')
return
endif
let b:sy.active = 1
call sy#repo#detect()
elseif has('vim_starting')
call sy#verbose("Don't run Sy more than once during startup.")
return
elseif !b:sy.active
call sy#verbose('Inactive buffer.')
return
elseif empty(b:sy.vcs)
if get(b:sy, 'retry')
let b:sy.retry = 0
call sy#verbose('Redetecting VCS.')
call sy#repo#detect()
else
if get(b:sy, 'detecting')
call sy#verbose('Detection is already in progress.')
else
call sy#verbose('No VCS found. Disabling.')
call sy#disable()
endif
endif
else
for vcs in b:sy.vcs
let job_id = get(b:, 'sy_job_id_'. vcs)
if type(job_id) != type(0) || job_id > 0
call sy#verbose('Update is already in progress.', vcs)
else
call sy#verbose('Updating signs.', vcs)
call sy#repo#get_diff_start(vcs)
endif
endfor
endif
endfunction
" Function: #set_signs {{{1
function! sy#set_signs(sy, vcs, diff) abort
call sy#verbose('set_signs()', a:vcs)
if a:sy.stats == [-1, -1, -1]
let a:sy.stats = [0, 0, 0]
endif
if empty(a:diff)
call sy#verbose('No changes found.', a:vcs)
let a:sy.stats = [0, 0, 0]
call sy#sign#remove_all_signs(a:sy.buffer)
return
endif
if get(g:, 'signify_line_highlight')
call sy#highlight#line_enable()
else
call sy#highlight#line_disable()
endif
call sy#sign#process_diff(a:sy, a:vcs, a:diff)
if exists('#User#Signify')
execute 'doautocmd' (s:has_doau_modeline ? '<nomodeline>' : '') 'User Signify'
endif
endfunction
" Function: #stop {{{1
function! sy#stop(bufnr) abort
let sy = getbufvar(a:bufnr, 'sy')
if empty(sy)
return
endif
call sy#sign#remove_all_signs(a:bufnr)
endfunction
" Function: #enable {{{1
function! sy#enable() abort
if !exists('b:sy')
call sy#start()
return
endif
if !b:sy.active
let b:sy.active = 1
let b:sy.retry = 1
call sy#start()
endif
endfunction
" Function: #disable {{{1
function! sy#disable() abort
if exists('b:sy') && b:sy.active
call sy#stop(b:sy.buffer)
let b:sy.active = 0
let b:sy.stats = [-1, -1, -1]
endif
endfunction
" Function: #toggle {{{1
function! sy#toggle() abort
if !exists('b:sy') || !b:sy.active
call sy#enable()
else
call sy#disable()
endif
endfunction
" Function: #buffer_is_active {{{1
function! sy#buffer_is_active()
return exists('b:sy') && b:sy.active
endfunction
" Function: #verbose {{{1
function! sy#verbose(msg, ...) abort
if &verbose
echomsg printf('[sy%s] %s', (a:0 ? ':'.a:1 : ''), a:msg)
endif
endfunction
" Function: s:skip {{{1
function! s:skip(path)
if &diff || !filereadable(a:path)
return 1
endif
if exists('g:signify_skip_filetype')
if has_key(g:signify_skip_filetype, &filetype)
return 1
elseif has_key(g:signify_skip_filetype, 'help') && (&buftype == 'help')
return 1
endif
endif
if exists('g:signify_skip_filename') && has_key(g:signify_skip_filename, a:path)
return 1
endif
if exists('g:signify_skip_filename_pattern')
for pattern in g:signify_skip_filename_pattern
if a:path =~ pattern
return 1
endif
endfor
endif
return 0
endfunction