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

Encapsulate fugitive#repo().git_chomp_in_tree()

Browse Source
This commit is contained in:
Tim Pope
2018-07-22 13:56:21 -04:00
parent a8626a4ca4
commit 978ca4a5ce
1 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
autoload/fugitive.vim
View File

@@ -116,6 +116,15 @@ function! fugitive#Prepare(...) abort
return g:fugitive_git_executable . ' ' . join(map(args, 's:shellesc(v:val)'), ' ') return g:fugitive_git_executable . ' ' . join(map(args, 's:shellesc(v:val)'), ' ')
endfunction endfunction
function! s:TreeChomp(...) abort
let args = ['--git-dir=' . b:git_dir] + a:000
let tree = FugitiveTreeForGitDir(b:git_dir)
if !empty(tree)
call insert(args, '--work-tree=' . tree)
endif
return s:sub(s:System(call('fugitive#Prepare', args)),'\n$','')
endfunction
let s:git_versions = {} let s:git_versions = {}
function! fugitive#GitVersion(...) abort function! fugitive#GitVersion(...) abort
if !has_key(s:git_versions, g:fugitive_git_executable) if !has_key(s:git_versions, g:fugitive_git_executable)
@@ -396,8 +405,8 @@ 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:fnameescape(s:repo().tree()) execute cd s:fnameescape(self.tree())
return call(s:repo().git_chomp, a:000, s:repo()) return call(self.git_chomp, a:000, self)
finally finally
execute cd s:fnameescape(dir) execute cd s:fnameescape(dir)
endtry endtry
@@ -418,11 +427,11 @@ function! s:repo_superglob(base) dict abort
let results = [] let results = []
if a:base !~# '^/' if a:base !~# '^/'
let heads = ["HEAD","ORIG_HEAD","FETCH_HEAD","MERGE_HEAD"] let heads = ["HEAD","ORIG_HEAD","FETCH_HEAD","MERGE_HEAD"]
let heads += sort(split(s:repo().git_chomp("rev-parse","--symbolic","--branches","--tags","--remotes"),"\n")) let heads += sort(split(self.git_chomp("rev-parse","--symbolic","--branches","--tags","--remotes"),"\n"))
" Add any stashes. " Add any stashes.
if filereadable(s:repo().dir('refs/stash')) if filereadable(self.dir('refs/stash'))
let heads += ["stash"] let heads += ["stash"]
let heads += sort(split(s:repo().git_chomp("stash","list","--pretty=format:%gd"),"\n")) let heads += sort(split(self.git_chomp("stash","list","--pretty=format:%gd"),"\n"))
endif endif
call filter(heads,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base') call filter(heads,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base')
let results += heads let results += heads
@@ -1025,17 +1034,16 @@ function! s:StageUndo() abort
if empty(filename) if empty(filename)
return '' return ''
endif endif
let repo = s:repo() let hash = s:TreeChomp('hash-object', '-w', filename)
let hash = repo.git_chomp('hash-object', '-w', filename)
if !empty(hash) if !empty(hash)
if section ==# 'untracked' if section ==# 'untracked'
call repo.git_chomp_in_tree('clean', '-f', '--', filename) call s:TreeChomp('clean', '-f', '--', filename)
elseif section ==# 'unmerged' elseif section ==# 'unmerged'
call repo.git_chomp_in_tree('rm', '--', filename) call s:TreeChomp('rm', '--', filename)
elseif section ==# 'unstaged' elseif section ==# 'unstaged'
call repo.git_chomp_in_tree('checkout', '--', filename) call s:TreeChomp('checkout', '--', filename)
else else
call repo.git_chomp_in_tree('checkout', 'HEAD', '--', filename) call s:TreeChomp('checkout', 'HEAD', '--', filename)
endif endif
call s:StageReloadSeek(filename, line('.'), line('.')) call s:StageReloadSeek(filename, line('.'), line('.'))
let @" = hash let @" = hash
@@ -1069,8 +1077,7 @@ function! s:StageDiffEdit() abort
if section ==# 'staged' if section ==# 'staged'
return 'Git! diff --no-ext-diff --cached '.s:shellesc(arg) return 'Git! diff --no-ext-diff --cached '.s:shellesc(arg)
elseif section ==# 'untracked' elseif section ==# 'untracked'
let repo = s:repo() call s:TreeChomp('add','--intent-to-add',arg)
call repo.git_chomp_in_tree('add','--intent-to-add',arg)
if arg ==# '.' if arg ==# '.'
silent! edit! silent! edit!
1 1
@@ -1094,10 +1101,9 @@ function! s:StageToggle(lnum1,lnum2) abort
let output = '' let output = ''
for lnum in range(a:lnum1,a:lnum2) for lnum in range(a:lnum1,a:lnum2)
let [filename, section] = s:stage_info(lnum) let [filename, section] = s:stage_info(lnum)
let repo = s:repo()
if getline('.') =~# ':$' if getline('.') =~# ':$'
if section ==# 'staged' if section ==# 'staged'
call repo.git_chomp_in_tree('reset','-q') call s:TreeChomp('reset','-q')
silent! edit! silent! edit!
1 1
if !search('^.*:\n.\= .*"git add .*\n#\n\|^\%(. \)\=Untracked files:$','W') if !search('^.*:\n.\= .*"git add .*\n#\n\|^\%(. \)\=Untracked files:$','W')
@@ -1105,7 +1111,7 @@ function! s:StageToggle(lnum1,lnum2) abort
endif endif
return '' return ''
elseif section ==# 'unstaged' elseif section ==# 'unstaged'
call repo.git_chomp_in_tree('add','-u') call s:TreeChomp('add','-u')
silent! edit! silent! edit!
1 1
if !search('^.*:\n\.\= .*"git add .*\n#\n\|^\%( \)=Untracked files:$','W') if !search('^.*:\n\.\= .*"git add .*\n#\n\|^\%( \)=Untracked files:$','W')
@@ -1113,7 +1119,7 @@ function! s:StageToggle(lnum1,lnum2) abort
endif endif
return '' return ''
else else
call repo.git_chomp_in_tree('add','.') call s:TreeChomp('add','.')
silent! edit! silent! edit!
1 1
call search(':$','W') call search(':$','W')
@@ -1142,7 +1148,7 @@ function! s:StageToggle(lnum1,lnum2) abort
if !exists('first_filename') if !exists('first_filename')
let first_filename = filename let first_filename = filename
endif endif
let output .= call(repo.git_chomp_in_tree,cmd,s:repo())."\n" let output .= call('s:TreeChomp', cmd)."\n"
endfor endfor
if exists('first_filename') if exists('first_filename')
call s:StageReloadSeek(first_filename,a:lnum1,a:lnum2) call s:StageReloadSeek(first_filename,a:lnum1,a:lnum2)
@@ -1330,18 +1336,18 @@ call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gpull " .
\ "execute s:Merge('pull --progress', <bang>0, <q-args>)") \ "execute s:Merge('pull --progress', <bang>0, <q-args>)")
function! s:RevisionComplete(A, L, P) abort function! s:RevisionComplete(A, L, P) abort
return s:repo().git_chomp('rev-parse', '--symbolic', '--branches', '--tags', '--remotes') return s:TreeChomp('rev-parse', '--symbolic', '--branches', '--tags', '--remotes')
\ . "\nHEAD\nFETCH_HEAD\nORIG_HEAD" \ . "\nHEAD\nFETCH_HEAD\nORIG_HEAD"
endfunction endfunction
function! s:RemoteComplete(A, L, P) abort function! s:RemoteComplete(A, L, P) abort
let remote = matchstr(a:L, ' \zs\S\+\ze ') let remote = matchstr(a:L, ' \zs\S\+\ze ')
if !empty(remote) if !empty(remote)
let matches = split(s:repo().git_chomp('ls-remote', remote), "\n") let matches = split(s:TreeChomp('ls-remote', remote), "\n")
call filter(matches, 'v:val =~# "\t" && v:val !~# "{"') call filter(matches, 'v:val =~# "\t" && v:val !~# "{"')
call map(matches, 's:sub(v:val, "^.*\t%(refs/%(heads/|tags/)=)=", "")') call map(matches, 's:sub(v:val, "^.*\t%(refs/%(heads/|tags/)=)=", "")')
else else
let matches = split(s:repo().git_chomp('remote'), "\n") let matches = split(s:TreeChomp('remote'), "\n")
endif endif
return join(matches, "\n") return join(matches, "\n")
endfunction endfunction
@@ -1396,7 +1402,7 @@ function! s:Merge(cmd, bang, args) abort
\ . 'U%\t%f' \ . 'U%\t%f'
if a:cmd =~# '^merge' && empty(a:args) && if a:cmd =~# '^merge' && empty(a:args) &&
\ (had_merge_msg || isdirectory(s:repo().dir('rebase-apply')) || \ (had_merge_msg || isdirectory(s:repo().dir('rebase-apply')) ||
\ !empty(s:repo().git_chomp('diff-files', '--diff-filter=U'))) \ !empty(s:TreeChomp('diff-files', '--diff-filter=U')))
let &l:makeprg = g:fugitive_git_executable.' diff-files --name-status --diff-filter=U' let &l:makeprg = g:fugitive_git_executable.' diff-files --name-status --diff-filter=U'
else else
let &l:makeprg = s:sub(s:git_command() . ' ' . a:cmd . let &l:makeprg = s:sub(s:git_command() . ' ' . a:cmd .
@@ -1677,9 +1683,9 @@ function! s:Write(force,...) abort
silent write silent write
setlocal buftype=nowrite setlocal buftype=nowrite
if matchstr(getline(2),'index [[:xdigit:]]\+\.\.\zs[[:xdigit:]]\{7\}') ==# s:repo().rev_parse(':0:'.filename)[0:6] if matchstr(getline(2),'index [[:xdigit:]]\+\.\.\zs[[:xdigit:]]\{7\}') ==# s:repo().rev_parse(':0:'.filename)[0:6]
let err = s:repo().git_chomp('apply','--cached','--reverse',s:buffer().spec()) let err = s:TreeChomp('apply','--cached','--reverse',s:buffer().spec())
else else
let err = s:repo().git_chomp('apply','--cached',s:buffer().spec()) let err = s:TreeChomp('apply','--cached',s:buffer().spec())
endif endif
if err !=# '' if err !=# ''
let v:errmsg = split(err,"\n")[0] let v:errmsg = split(err,"\n")[0]
@@ -1700,7 +1706,7 @@ function! s:Write(force,...) abort
return 'write'.(a:force ? '! ' : ' ').s:fnameescape(s:Generate(s:buffer().expand(path))) return 'write'.(a:force ? '! ' : ' ').s:fnameescape(s:Generate(s:buffer().expand(path)))
endif endif
let always_permitted = (s:buffer().relative() ==# path && s:buffer().commit() =~# '^0\=$') let always_permitted = (s:buffer().relative() ==# path && s:buffer().commit() =~# '^0\=$')
if !always_permitted && !a:force && s:repo().git_chomp_in_tree('diff','--name-status','HEAD','--',path) . s:repo().git_chomp_in_tree('ls-files','--others','--',path) !=# '' if !always_permitted && !a:force && (len(s:TreeChomp('diff','--name-status','HEAD','--',path)) || len(s:TreeChomp('ls-files','--others','--',path)))
let v:errmsg = 'fugitive: file has uncommitted changes (use ! to override)' let v:errmsg = 'fugitive: file has uncommitted changes (use ! to override)'
return 'echoerr v:errmsg' return 'echoerr v:errmsg'
endif endif
@@ -1748,9 +1754,9 @@ function! s:Write(force,...) abort
endif endif
if a:force if a:force
let error = s:repo().git_chomp_in_tree('add', '--force', '--', path) let error = s:TreeChomp('add', '--force', '--', path)
else else
let error = s:repo().git_chomp_in_tree('add', '--', path) let error = s:TreeChomp('add', '--', path)
endif endif
if v:shell_error if v:shell_error
let v:errmsg = 'fugitive: '.error let v:errmsg = 'fugitive: '.error
@@ -1959,14 +1965,14 @@ function! s:CompareAge(mine, theirs) abort
elseif mine ==# theirs elseif mine ==# theirs
return 0 return 0
endif endif
let base = s:repo().git_chomp('merge-base', mine, theirs) let base = s:TreeChomp('merge-base', mine, theirs)
if base ==# mine if base ==# mine
return -1 return -1
elseif base ==# theirs elseif base ==# theirs
return 1 return 1
endif endif
let my_time = +s:repo().git_chomp('log','--max-count=1','--pretty=format:%at',a:mine) let my_time = +s:TreeChomp('log','--max-count=1','--pretty=format:%at',a:mine)
let their_time = +s:repo().git_chomp('log','--max-count=1','--pretty=format:%at',a:theirs) let their_time = +s:TreeChomp('log','--max-count=1','--pretty=format:%at',a:theirs)
return my_time < their_time ? -1 : my_time != their_time return my_time < their_time ? -1 : my_time != their_time
endfunction endfunction
@@ -1979,7 +1985,7 @@ function! s:Diff(vert,keepfocus,...) abort
let vert = empty(a:vert) ? s:diff_modifier(2) : a:vert let vert = empty(a:vert) ? s:diff_modifier(2) : a:vert
if exists(':DiffGitCached') if exists(':DiffGitCached')
return 'DiffGitCached' return 'DiffGitCached'
elseif (empty(args) || args[0] ==# ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().relative()) !=# '' elseif (empty(args) || args[0] ==# ':') && s:DirCommitFile(@%)[1] =~# '^[0-1]\=$' && !empty(s:TreeChomp('ls-files', '--unmerged', '--', s:buffer().relative()))
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' s:fnameescape(s:Generate(s:buffer().relative(':2:'))) execute 'leftabove '.vert.'split' s:fnameescape(s:Generate(s:buffer().relative(':2:')))
@@ -2013,7 +2019,7 @@ function! s:Diff(vert,keepfocus,...) abort
else else
let file = s:buffer().expand(arg) let file = s:buffer().expand(arg)
endif endif
if file !~# ':' && file !~# '^/' && s:repo().git_chomp('cat-file','-t',file) =~# '^\%(tag\|commit\)$' if file !~# ':' && file !~# '^/' && s:TreeChomp('cat-file','-t',file) =~# '^\%(tag\|commit\)$'
let file = file.s:buffer().relative(':') let file = file.s:buffer().relative(':')
endif endif
else else
@@ -2063,7 +2069,7 @@ function! s:Move(force, rename, destination) abort
if isdirectory(s:buffer().spec()) if isdirectory(s:buffer().spec())
setlocal noswapfile setlocal noswapfile
endif endif
let message = call(s:repo().git_chomp_in_tree,['mv']+(a:force ? ['-f'] : [])+['--', s:buffer().relative(), destination], s:repo()) let message = call('s:TreeChomp', ['mv'] + (a:force ? ['-f'] : []) + ['--', s:buffer().relative(), destination])
if v:shell_error if v:shell_error
let v:errmsg = 'fugitive: '.message let v:errmsg = 'fugitive: '.message
return 'echoerr v:errmsg' return 'echoerr v:errmsg'
@@ -2115,7 +2121,7 @@ function! s:Remove(after, force) abort
if a:force if a:force
let cmd += ['--force'] let cmd += ['--force']
endif endif
let message = call(s:repo().git_chomp_in_tree,cmd+['--',s:buffer().relative()],s:repo()) let message = call('s:TreeChomp', cmd+['--',s:buffer().relative()])
if v:shell_error if v:shell_error
let v:errmsg = 'fugitive: '.s:sub(message,'error:.*\zs\n\(.*-f.*',' (add ! to force)') let v:errmsg = 'fugitive: '.s:sub(message,'error:.*\zs\n\(.*-f.*',' (add ! to force)')
return 'echoerr '.string(v:errmsg) return 'echoerr '.string(v:errmsg)
@@ -2454,7 +2460,7 @@ function! s:Browse(bang,line1,count,...) abort
let commit = '' let commit = ''
endif endif
if commit =~ '..' if commit =~ '..'
let type = s:repo().git_chomp('cat-file','-t',commit.s:sub(path,'^/',':')) let type = s:TreeChomp('cat-file','-t',commit.s:sub(path,'^/',':'))
let branch = matchstr(expanded, '^[^:]*') let branch = matchstr(expanded, '^[^:]*')
else else
let type = 'blob' let type = 'blob'
@@ -2615,9 +2621,9 @@ function! s:instaweb_url(opts) abort
if a:opts.remote !=# '.' if a:opts.remote !=# '.'
return '' return ''
endif endif
let output = a:opts.repo.git_chomp('instaweb','-b','unknown') let output = system(get(g:, 'fugitive_executable', 'git') . ' --git-dir=' . shellescape(a:opts.dir) . ' instaweb -b unknown')
if output =~# 'http://' if output =~# 'http://'
let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:opts.repo.dir(),':t') let root = matchstr(output,"http://[^\n]*").'/?p='.fnamemodify(a:opts.dir, ':t')
else else
return '' return ''
endif endif