Eliminate use of =...

This commit is contained in:
Tim Pope
2017-05-30 14:10:37 -04:00
parent 7195586b79
commit 7be1f0aef6

View File

@@ -412,10 +412,10 @@ function! s:repo_git_chomp_in_tree(...) dict abort
let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
let dir = getcwd() let dir = getcwd()
try try
execute cd.'`=s:repo().tree()`' execute cd s:fnameescape(s:repo().tree())
return call(s:repo().git_chomp, a:000, s:repo()) return call(s:repo().git_chomp, a:000, s:repo())
finally finally
execute cd.'`=dir`' execute cd s:fnameescape(dir)
endtry endtry
endfunction endfunction
@@ -708,10 +708,10 @@ function! s:ExecuteInTree(cmd) abort
let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
let dir = getcwd() let dir = getcwd()
try try
execute cd.'`=s:repo().tree()`' execute cd s:fnameescape(s:repo().tree())
execute a:cmd execute a:cmd
finally finally
execute cd.'`=dir`' execute cd s:fnameescape(dir)
endtry endtry
endfunction endfunction
@@ -765,8 +765,8 @@ function! s:DirComplete(A,L,P) abort
return matches return matches
endfunction endfunction
call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Gcd :cd<bang> `=s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>)`") call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Gcd :exe 'cd<bang>' s:fnameescape(s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>))")
call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Glcd :lcd<bang> `=s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>)`") call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Glcd :exe 'lcd<bang>' s:fnameescape(s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>))")
" Section: Gstatus " Section: Gstatus
@@ -1073,7 +1073,7 @@ function! s:Commit(args, ...) abort
let errorfile = tempname() let errorfile = tempname()
try try
try try
execute cd.s:fnameescape(repo.tree()) execute cd s:fnameescape(repo.tree())
if s:winshell() if s:winshell()
let command = '' let command = ''
let old_editor = $GIT_EDITOR let old_editor = $GIT_EDITOR
@@ -1091,7 +1091,7 @@ function! s:Commit(args, ...) abort
endif endif
let error = v:shell_error let error = v:shell_error
finally finally
execute cd.'`=dir`' execute cd s:fnameescape(dir)
endtry endtry
if !has('gui_running') if !has('gui_running')
redraw! redraw!
@@ -1304,7 +1304,7 @@ function! s:Grep(cmd,bang,arg) abort
let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
let dir = getcwd() let dir = getcwd()
try try
execute cd.'`=s:repo().tree()`' execute cd s:fnameescape(s:repo().tree())
let &grepprg = s:repo().git_command('--no-pager', 'grep', '-n', '--no-color') let &grepprg = s:repo().git_command('--no-pager', 'grep', '-n', '--no-color')
let &grepformat = '%f:%l:%m,%m %f match%ts,%f' let &grepformat = '%f:%l:%m,%m %f match%ts,%f'
exe a:cmd.'! '.escape(matchstr(a:arg,'\v\C.{-}%($|[''" ]\@=\|)@='),'|') exe a:cmd.'! '.escape(matchstr(a:arg,'\v\C.{-}%($|[''" ]\@=\|)@='),'|')
@@ -1333,7 +1333,7 @@ function! s:Grep(cmd,bang,arg) abort
finally finally
let &grepprg = grepprg let &grepprg = grepprg
let &grepformat = grepformat let &grepformat = grepformat
execute cd.'`=dir`' execute cd s:fnameescape(dir)
endtry endtry
endfunction endfunction
@@ -1364,14 +1364,14 @@ function! s:Log(cmd, line1, line2, ...) abort
let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
let dir = getcwd() let dir = getcwd()
try try
execute cd.'`=s:repo().tree()`' execute cd s:fnameescape(s:repo().tree())
let &grepprg = escape(call(s:repo().git_command,cmd,s:repo()),'%#') let &grepprg = escape(call(s:repo().git_command,cmd,s:repo()),'%#')
let &grepformat = '%Cdiff %.%#,%C--- %.%#,%C+++ %.%#,%Z@@ -%\d%\+\,%\d%\+ +%l\,%\d%\+ @@,%-G-%.%#,%-G+%.%#,%-G %.%#,%A%f::%m,%-G%.%#' let &grepformat = '%Cdiff %.%#,%C--- %.%#,%C+++ %.%#,%Z@@ -%\d%\+\,%\d%\+ +%l\,%\d%\+ @@,%-G-%.%#,%-G+%.%#,%-G %.%#,%A%f::%m,%-G%.%#'
exe a:cmd exe a:cmd
finally finally
let &grepformat = grepformat let &grepformat = grepformat
let &grepprg = grepprg let &grepprg = grepprg
execute cd.'`=dir`' execute cd s:fnameescape(dir)
endtry endtry
endfunction endfunction
@@ -1812,12 +1812,12 @@ function! s:Diff(vert,keepfocus,...) abort
elseif (empty(args) || args[0] == ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().path()) !=# '' elseif (empty(args) || args[0] == ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().path()) !=# ''
let vert = empty(a:vert) ? s:diff_modifier(3) : a:vert let vert = empty(a:vert) ? s:diff_modifier(3) : a:vert
let nr = bufnr('') let nr = bufnr('')
execute 'leftabove '.vert.'split `=fugitive#buffer().repo().translate(s:buffer().expand('':2''))`' execute 'leftabove '.vert.'split' s:fnameescape(fugitive#repo().translate(s:buffer().expand('':2'')))
execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>' execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
let nr2 = bufnr('') let nr2 = bufnr('')
call s:diffthis() call s:diffthis()
wincmd p wincmd p
execute 'rightbelow '.vert.'split `=fugitive#buffer().repo().translate(s:buffer().expand('':3''))`' execute 'rightbelow '.vert.'split' s:fnameescape(fugitive#repo().translate(s:buffer().expand('':3'')))
execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>' execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
let nr3 = bufnr('') let nr3 = bufnr('')
call s:diffthis() call s:diffthis()
@@ -1999,7 +1999,7 @@ function! s:Blame(bang,line1,line2,count,args) abort
let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
if !s:repo().bare() if !s:repo().bare()
let dir = getcwd() let dir = getcwd()
execute cd.'`=s:repo().tree()`' execute cd s:fnameescape(s:repo().tree())
endif endif
if a:count if a:count
execute 'write !'.substitute(basecmd,' blame ',' blame -L '.a:line1.','.a:line2.' ','g') execute 'write !'.substitute(basecmd,' blame ',' blame -L '.a:line1.','.a:line2.' ','g')
@@ -2012,7 +2012,7 @@ function! s:Blame(bang,line1,line2,count,args) abort
silent! execute '%write !'.basecmd.' > '.temp.' 2> '.error silent! execute '%write !'.basecmd.' > '.temp.' 2> '.error
endif endif
if exists('l:dir') if exists('l:dir')
execute cd.'`=dir`' execute cd s:fnameescape(dir)
unlet dir unlet dir
endif endif
if v:shell_error if v:shell_error
@@ -2085,7 +2085,7 @@ function! s:Blame(bang,line1,line2,count,args) abort
endif endif
finally finally
if exists('l:dir') if exists('l:dir')
execute cd.'`=dir`' execute cd s:fnameescape(dir)
endif endif
endtry endtry
return '' return ''
@@ -2551,10 +2551,10 @@ function! s:BufReadIndex() abort
\ 'status') \ 'status')
endif endif
try try
execute cd.'`=s:repo().tree()`' execute cd s:fnameescape(s:repo().tree())
call s:ReplaceCmd(cmd, index) call s:ReplaceCmd(cmd, index)
finally finally
execute cd.'`=dir`' execute cd s:fnameescape(dir)
endtry endtry
set ft=gitcommit set ft=gitcommit
set foldtext=fugitive#foldtext() set foldtext=fugitive#foldtext()