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

Decouple running git-status from parsing output

Browse Source
This commit is contained in:
Tim Pope
2023-09-23 19:03:29 -04:00
parent 99db68d9b3
commit f6ec378d1d
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
autoload/fugitive.vim
View File

@@ -956,12 +956,6 @@ function! s:LinesError(...) abort
return [r.exit_status ? [] : r.stdout, r.exit_status] return [r.exit_status ? [] : r.stdout, r.exit_status]
endfunction endfunction
function! s:NullError(cmd) abort
let r = fugitive#Execute(a:cmd)
let list = r.exit_status ? [] : split(tr(join(r.stdout, "\1"), "\1\n", "\n\1"), "\1", 1)[0:-2]
return [list, s:JoinChomp(r.stderr), r.exit_status]
endfunction
function! s:TreeChomp(...) abort function! s:TreeChomp(...) abort
let r = call('fugitive#Execute', a:000) let r = call('fugitive#Execute', a:000)
if !r.exit_status if !r.exit_status
@@ -2672,12 +2666,10 @@ function! fugitive#BufReadStatus(cmdbang) abort
let amatch = s:Slash(expand('%:p')) let amatch = s:Slash(expand('%:p'))
unlet! b:fugitive_reltime b:fugitive_type unlet! b:fugitive_reltime b:fugitive_type
try try
doautocmd BufReadPre
let config = fugitive#Config() let config = fugitive#Config()
let dir = s:Dir() let dir = s:Dir()
let cmd = [dir] let cmd = [dir]
setlocal noreadonly modifiable nomodeline buftype=nowrite
if amatch !~# '^fugitive:' && s:cpath($GIT_INDEX_FILE !=# '' ? resolve(s:GitIndexFileEnv()) : fugitive#Find('.git/index', dir)) !=# s:cpath(amatch) if amatch !~# '^fugitive:' && s:cpath($GIT_INDEX_FILE !=# '' ? resolve(s:GitIndexFileEnv()) : fugitive#Find('.git/index', dir)) !=# s:cpath(amatch)
let cmd += [{'env': {'GIT_INDEX_FILE': FugitiveGitPath(amatch)}}] let cmd += [{'env': {'GIT_INDEX_FILE': FugitiveGitPath(amatch)}}]
endif endif
@@ -2686,21 +2678,29 @@ function! fugitive#BufReadStatus(cmdbang) abort
call add(cmd, '--no-optional-locks') call add(cmd, '--no-optional-locks')
endif endif
let tree = s:Tree(dir)
if !empty(tree)
let status_cmd = cmd + ['status', '-bz']
call add(status_cmd, fugitive#GitVersion(2, 11) ? '--porcelain=v2' : '--porcelain')
let status = fugitive#Execute(status_cmd, function('len'))
endif
doautocmd BufReadPre
setlocal noreadonly modifiable nomodeline buftype=nowrite
let b:fugitive_files = {'Staged': {}, 'Unstaged': {}} let b:fugitive_files = {'Staged': {}, 'Unstaged': {}}
let [staged, unstaged, untracked] = [[], [], []] let [staged, unstaged, untracked] = [[], [], []]
let props = {} let props = {}
let tree = s:Tree() if !exists('status')
if empty(tree)
let branch = FugitiveHead(0, dir) let branch = FugitiveHead(0, dir)
let head = FugitiveHead(11, dir) let head = FugitiveHead(11, dir)
elseif fugitive#GitVersion(2, 11)
let status_cmd = cmd + ['status', '--porcelain=v2', '-bz']
let [output, message, exec_error] = s:NullError(status_cmd)
if exec_error
throw 'fugitive: ' . message
endif
elseif fugitive#Wait(status).exit_status
throw 'fugitive: ' . s:JoinChomp(status.stderr)
elseif status.args[-1] ==# '--porcelain=v2'
let output = split(tr(join(status.stdout, "\1"), "\1\n", "\n\1"), "\1", 1)[0:-2]
let i = 0 let i = 0
while i < len(output) while i < len(output)
let line = output[i] let line = output[i]
@@ -2742,13 +2742,9 @@ function! fugitive#BufReadStatus(cmdbang) abort
else else
let head = FugitiveHead(11, dir) let head = FugitiveHead(11, dir)
endif endif
else " git < 2.11
let status_cmd = cmd + ['status', '--porcelain', '-bz']
let [output, message, exec_error] = s:NullError(status_cmd)
if exec_error
throw 'fugitive: ' . message
endif
else
let output = split(tr(join(status.stdout, "\1"), "\1\n", "\n\1"), "\1", 1)[0:-2]
while get(output, 0, '') =~# '^\l\+:' while get(output, 0, '') =~# '^\l\+:'
call remove(output, 0) call remove(output, 0)
endwhile endwhile