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

Rename #Prepare to #ShellCommand

Browse Source 
Shell commands are on their way out.  Let's start reclaiming this verb.
This commit is contained in:
Tim Pope
2021-08-10 00:35:17 -04:00
parent 371a5062d3
commit d1970112f4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
autoload/fugitive.vim
View File

@@ -525,11 +525,15 @@ function! s:BuildShell(dir, env, git, args) abort
return pre . join(map(a:git + cmd, 's:shellesc(v:val)'))
endfunction
function! fugitive#Prepare(...) abort
function! fugitive#ShellCommand(...) abort
let [dir, env, git, flags, args] = call('fugitive#PrepareDirEnvGitFlagsArgs', a:000)
return s:BuildShell(dir, env, git, flags + args)
endfunction
function! fugitive#Prepare(...) abort
return call('fugitive#ShellCommand', a:000)
endfunction
function! s:SystemError(cmd, ...) abort
let cmd = type(a:cmd) == type([]) ? s:shellesc(a:cmd) : a:cmd
try
@@ -626,7 +630,7 @@ function! s:EchoExec(...) abort
if s:RunJobs()
return 'Git ' . s:fnameescape(a:000)
else
echo substitute(s:SystemError(call('fugitive#Prepare', a:000))[0], "\n$", '', '')
echo substitute(s:SystemError(call('fugitive#ShellCommand', a:000))[0], "\n$", '', '')
call fugitive#ReloadStatus(-1, 1)
return 'checktime'
endif
@@ -1078,17 +1082,13 @@ endfunction
call s:add_methods('repo',['dir','tree','bare','find','translate','head'])
function! s:repo_prepare(...) dict abort
return call('fugitive#Prepare', [self.git_dir] + a:000)
endfunction
function! s:repo_git_command(...) dict abort
let git = s:GitShellCmd() . ' --git-dir='.s:shellesc(self.git_dir)
return git.join(map(copy(a:000),'" ".s:shellesc(v:val)'),'')
endfunction
function! s:repo_git_chomp(...) dict abort
return s:sub(system(FugitivePrepare(a:000, self.git_dir)), '\n$', '')
return s:sub(system(fugitive#ShellCommand(a:000, self.git_dir)), '\n$', '')
endfunction
function! s:repo_git_chomp_in_tree(...) dict abort
@@ -1099,7 +1099,7 @@ function! s:repo_rev_parse(rev) dict abort
return fugitive#RevParse(a:rev, self.git_dir)
endfunction
call s:add_methods('repo',['prepare','git_command','git_chomp','git_chomp_in_tree','rev_parse'])
call s:add_methods('repo',['git_command','git_chomp','git_chomp_in_tree','rev_parse'])
function! s:repo_superglob(base) dict abort
return map(fugitive#CompleteObject(a:base, self.git_dir), 'substitute(v:val, ''\\\(.\)'', ''\1'', "g")')
@@ -2408,9 +2408,9 @@ function! fugitive#FileReadCmd(...) abort
return 'noautocmd ' . line . 'read ' . s:fnameescape(amatch)
endif
if rev !~# ':' && s:ChompDefault('', [dir, 'cat-file', '-t', rev]) =~# '^\%(commit\|tag\)$'
let cmd = fugitive#Prepare(dir, 'log', '--pretty=format:%B', '-1', rev, '--')
let cmd = fugitive#ShellCommand([dir, 'log', '--pretty=format:%B', '-1', rev, '--'])
else
let cmd = fugitive#Prepare(dir, 'cat-file', '-p', rev)
let cmd = fugitive#ShellCommand([dir, 'cat-file', '-p', rev, '--'])
endif
return line . 'read !' . escape(cmd, '!#%')
endfunction

2
plugin/fugitive.vim
View File

@@ -134,7 +134,7 @@ endfunction
" it will be used as the Git dir. If it's a buffer number, the Git dir for
" that buffer will be used. The default is the current buffer.
function! FugitivePrepare(...) abort
return call('fugitive#Prepare', a:000)
return call('fugitive#ShellCommand', a:000)
endfunction
" FugitiveConfig() get returns an opaque structure that can be passed to other