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

Replace s:repo().rev_parse()

Browse Source
This commit is contained in:
Tim Pope
2018-07-28 20:24:15 -04:00
parent 8a0a448f56
commit da95d96ece
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
autoload/fugitive.vim
View File

@@ -141,6 +141,14 @@ function! s:TreeChomp(...) abort
\ join(map(args, 's:shellesc(v:val)'))), '\n$', '') \ join(map(args, 's:shellesc(v:val)'))), '\n$', '')
endfunction endfunction
function! fugitive#RevParse(rev, ...) abort
let hash = system(s:Prepare(a:0 ? a:1 : b:git_dir, 'rev-parse', '--verify', a:rev))[0:-2]
if !v:shell_error && hash =~# '^\x\{40\}$'
return hash
endif
call s:throw('rev-parse '.a:rev.': '.hash)
endfunction
function! fugitive#Config(name, ...) abort function! fugitive#Config(name, ...) abort
let cmd = s:Prepare(a:0 ? a:1 : get(b:, 'git_dir', ''), 'config', '--get', a:name) let cmd = s:Prepare(a:0 ? a:1 : get(b:, 'git_dir', ''), 'config', '--get', a:name)
let out = matchstr(system(cmd), "[^\r\n]*") let out = matchstr(system(cmd), "[^\r\n]*")
@@ -378,11 +386,7 @@ function! s:repo_git_chomp_in_tree(...) dict abort
endfunction endfunction
function! s:repo_rev_parse(rev) dict abort function! s:repo_rev_parse(rev) dict abort
let hash = self.git_chomp('rev-parse','--verify',a:rev) return fugitive#RevParse(a:rev, self.git_dir)
if hash =~ '\<\x\{40\}$'
return matchstr(hash,'\<\x\{40\}$')
endif
call s:throw('rev-parse '.a:rev.': '.hash)
endfunction endfunction
call s:add_methods('repo',['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'])
@@ -2133,7 +2137,7 @@ function! s:Write(force,...) abort
setlocal buftype= setlocal buftype=
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\}') ==# fugitive#RevParse(':0:'.filename)[0:6]
let err = s:TreeChomp('apply', '--cached', '--reverse', expand('%:p')) let err = s:TreeChomp('apply', '--cached', '--reverse', expand('%:p'))
else else
let err = s:TreeChomp('apply', '--cached', expand('%:p')) let err = s:TreeChomp('apply', '--cached', expand('%:p'))
@@ -2465,7 +2469,7 @@ function! s:Diff(vert,keepfocus,...) abort
let file = s:Relative(':0:') let file = s:Relative(':0:')
elseif arg =~# '^:/.' elseif arg =~# '^:/.'
try try
let file = s:repo().rev_parse(arg).s:Relative(':') let file = fugitive#RevParse(arg).s:Relative(':')
catch /^fugitive:/ catch /^fugitive:/
return 'echoerr v:errmsg' return 'echoerr v:errmsg'
endtry endtry
@@ -2989,7 +2993,12 @@ function! s:Browse(bang,line1,count,...) abort
if a:line1 && !a:count && !empty(merge) if a:line1 && !a:count && !empty(merge)
let commit = merge let commit = merge
else else
let commit = s:repo().rev_parse('HEAD') let commit = readfile(b:git_dir . '/HEAD', '', 1)[0]
let i = 0
while commit =~# '^ref: ' && i < 10
let commit = readfile(b:git_dir . '/' . commit[5:-1], '', 1)[0]
let i -= 1
endwhile
endif endif
endif endif
@@ -3163,7 +3172,7 @@ function! s:cfile() abort
let myhash = s:DirRev(@%)[1] let myhash = s:DirRev(@%)[1]
if len(myhash) if len(myhash)
try try
let myhash = s:repo().rev_parse(myhash) let myhash = fugitive#RevParse(myhash)
catch /^fugitive:/ catch /^fugitive:/
let myhash = '' let myhash = ''
endtry endtry
@@ -3212,7 +3221,7 @@ function! s:cfile() abort
elseif getline('.') =~# '^tree \x\{40\}$' elseif getline('.') =~# '^tree \x\{40\}$'
let ref = matchstr(getline('.'),'\x\{40\}') let ref = matchstr(getline('.'),'\x\{40\}')
if len(myhash) && s:repo().rev_parse(myhash.':') ==# ref if len(myhash) && fugitive#RevParse(myhash.':') ==# ref
let ref = myhash.':' let ref = myhash.':'
endif endif
return [ref] return [ref]