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

Eliminate filereadable() guards by catching readfile() error

Browse Source
This commit is contained in:
Tim Pope
2022-01-11 18:06:11 -05:00
parent 944dc602c6
commit 189e3c406e
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugin/fugitive.vim
View File

@@ -309,6 +309,14 @@ function! FugitiveIsGitDir(...) abort
\ getftype(path.'commondir') ==# 'file') \ getftype(path.'commondir') ==# 'file')
endfunction endfunction
function! s:ReadFile(path, line_count) abort
try
return readfile(a:path, 'b', a:line_count)
catch
return []
endtry
endfunction
let s:worktree_for_dir = {} let s:worktree_for_dir = {}
let s:dir_for_worktree = {} let s:dir_for_worktree = {}
function! s:Tree(path) abort function! s:Tree(path) abort
@@ -320,9 +328,8 @@ function! s:Tree(path) abort
endif endif
if !has_key(s:worktree_for_dir, dir) if !has_key(s:worktree_for_dir, dir)
let s:worktree_for_dir[dir] = '' let s:worktree_for_dir[dir] = ''
let config_file = dir . '/config' let config = s:ReadFile(dir . '/config', 10)
if filereadable(config_file) if len(config)
let config = readfile(config_file,'',10)
let wt_config = filter(copy(config),'v:val =~# "^\\s*worktree *="') let wt_config = filter(copy(config),'v:val =~# "^\\s*worktree *="')
if len(wt_config) == 1 if len(wt_config) == 1
let worktree = FugitiveVimPath(matchstr(wt_config[0], '= *\zs.*')) let worktree = FugitiveVimPath(matchstr(wt_config[0], '= *\zs.*'))
@@ -332,8 +339,8 @@ function! s:Tree(path) abort
let s:worktree_for_dir[dir] = 0 let s:worktree_for_dir[dir] = 0
endif endif
endif endif
elseif filereadable(dir . '/gitdir') else
let worktree = fnamemodify(FugitiveVimPath(readfile(dir . '/gitdir')[0]), ':h') let worktree = fnamemodify(FugitiveVimPath(get(s:ReadFile(dir . '/gitdir', 1), '0', '')), ':h')
if worktree ==# '.' if worktree ==# '.'
unlet! worktree unlet! worktree
endif endif
@@ -409,10 +416,10 @@ function! FugitiveExtractGitDir(path) abort
return dir return dir
elseif type ==# 'link' && FugitiveIsGitDir(dir) elseif type ==# 'link' && FugitiveIsGitDir(dir)
return resolve(dir) return resolve(dir)
elseif type !=# '' && filereadable(dir) elseif type !=# ''
let line = get(readfile(dir, '', 1), 0, '') let line = get(s:ReadFile(dir, 1), 0, '')
let file_dir = s:Slash(FugitiveVimPath(matchstr(line, '^gitdir: \zs.*'))) let file_dir = s:Slash(FugitiveVimPath(matchstr(line, '^gitdir: \zs.*')))
if file_dir !~# '^/\|^\a:' && FugitiveIsGitDir(root . '/' . file_dir) if file_dir !~# '^/\|^\a:\|^$' && FugitiveIsGitDir(root . '/' . file_dir)
return simplify(root . '/' . file_dir) return simplify(root . '/' . file_dir)
elseif len(file_dir) && FugitiveIsGitDir(file_dir) elseif len(file_dir) && FugitiveIsGitDir(file_dir)
return file_dir return file_dir