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

Tease apart bang and non-bang variants of :Gread

Browse Source
This commit is contained in:
Tim Pope
2020-02-22 22:11:48 -05:00
parent 87f998e15f
commit 5a5a95b90a
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
autoload/fugitive.vim
View File

@@ -4453,7 +4453,7 @@ function! fugitive#Open(cmd, bang, mods, arg, args) abort
return mods . a:cmd . pre . ' ' . s:fnameescape(file) return mods . a:cmd . pre . ' ' . s:fnameescape(file)
endfunction endfunction
function! fugitive#ReadCommand(line1, count, range, bang, mods, arg, args) abort function! s:ReadPrepare(line1, count, range, mods) abort
let mods = s:Mods(a:mods) let mods = s:Mods(a:mods)
let after = a:count let after = a:count
if a:count < 0 if a:count < 0
@@ -4464,26 +4464,39 @@ function! fugitive#ReadCommand(line1, count, range, bang, mods, arg, args) abort
else else
let delete = '' let delete = ''
endif endif
if foldlevel(after)
let pre = after . 'foldopen!|'
else
let pre = ''
endif
return [pre . mods . after . 'read', delete . '|diffupdate' . (a:count < 0 ? '|' . line('.') : '')]
endfunction
function! s:ReadExec(line1, count, range, mods, env, args, options) abort
let [read, post] = s:ReadPrepare(a:line1, a:count, a:range, a:mods)
let env = s:BuildEnvPrefix(extend({'COLUMNS': &tw ? &tw : 80}, a:env))
silent execute read . '!' escape(env . s:UserCommand(a:options, ['--no-pager'] + a:args), '!#%')
execute post
call fugitive#ReloadStatus(a:options.dir, 1)
return 'redraw|echo '.string(':!'.s:UserCommand(a:options, a:args))
endfunction
function! fugitive#ReadCommand(line1, count, range, bang, mods, arg, args) abort
if a:bang if a:bang
let dir = s:Dir() let dir = s:Dir()
let args = s:SplitExpand(a:arg, s:Tree(dir)) let args = s:SplitExpand(a:arg, s:Tree(dir))
silent execute mods . after . 'read!' escape(s:UserCommand(dir, ['--no-pager'] + args), '!#%') return s:ReadExec(a:line1, a:count, a:range, a:mods, {}, args, {'dir': dir})
execute delete . 'diffupdate'
call fugitive#ReloadStatus(dir, 1)
return 'redraw|echo '.string(':!'.s:UserCommand(dir, args))
endif endif
let [read, post] = s:ReadPrepare(a:line1, a:count, a:range, a:mods)
try try
let [file, pre] = s:OpenParse(a:args, 0) let [file, pre] = s:OpenParse(a:args, 0)
catch /^fugitive:/ catch /^fugitive:/
return 'echoerr ' . string(v:exception) return 'echoerr ' . string(v:exception)
endtry endtry
if file =~# '^fugitive:' && after is# 0 if file =~# '^fugitive:' && a:count is# 0
return 'exe ' .string(mods . fugitive#FileReadCmd(file, 0, pre)) . '|diffupdate' return 'exe ' .string(s:Mods(a:mods) . fugitive#FileReadCmd(file, 0, pre)) . '|diffupdate'
endif endif
if foldlevel(after) return read . ' ' . pre . ' ' . s:fnameescape(file) . '|' . post
exe after . 'foldopen!'
endif
return mods . after . 'read' . pre . ' ' . s:fnameescape(file) . '|' . delete . 'diffupdate' . (a:count < 0 ? '|' . line('.') : '')
endfunction endfunction
function! fugitive#EditComplete(A, L, P) abort function! fugitive#EditComplete(A, L, P) abort