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

Rename fugitive#buffer().name() to spec()

Browse Source 
In rails.vim, path() and name() have the opposite (and dare I say more
intuitive) semantic of that found in fugitive.vim.  An outright switch
would be a little violent, so for now, rename name() to spec() (as in
"file spec").
This commit is contained in:
Tim Pope
2010-08-03 15:23:25 -04:00
parent ea89d6ec12
commit a8bd148683
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
plugin/fugitive.vim
View File

@@ -354,7 +354,7 @@ endfunction
function! s:buffer_type(...) dict abort function! s:buffer_type(...) dict abort
if self.getvar('fugitive_type') != '' if self.getvar('fugitive_type') != ''
let type = self.getvar('fugitive_type') let type = self.getvar('fugitive_type')
elseif fnamemodify(self.name(),':p') =~# '.\git/refs/\|\.git/\w*HEAD$' elseif fnamemodify(self.spec(),':p') =~# '.\git/refs/\|\.git/\w*HEAD$'
let type = 'head' let type = 'head'
elseif self.getline(1) =~ '^tree \x\{40\}$' && self.getline(2) == '' elseif self.getline(1) =~ '^tree \x\{40\}$' && self.getline(2) == ''
let type = 'tree' let type = 'tree'
@@ -362,11 +362,11 @@ function! s:buffer_type(...) dict abort
let type = 'tree' let type = 'tree'
elseif self.getline(1) =~ '^\d\{6\} \x\{40\}\> \d\t' elseif self.getline(1) =~ '^\d\{6\} \x\{40\}\> \d\t'
let type = 'index' let type = 'index'
elseif isdirectory(self.name()) elseif isdirectory(self.spec())
let type = 'directory' let type = 'directory'
elseif self.name() == '' elseif self.spec() == ''
let type = 'null' let type = 'null'
elseif filereadable(self.name()) elseif filereadable(self.spec())
let type = 'file' let type = 'file'
else else
let type = '' let type = ''
@@ -378,42 +378,46 @@ function! s:buffer_type(...) dict abort
endif endif
endfunction endfunction
function! s:buffer_name() dict abort function! s:buffer_spec() dict abort
let bufname = bufname(self['#']) let bufname = bufname(self['#'])
return s:shellslash(bufname == '' ? '' : fnamemodify(bufname,':p')) return s:shellslash(bufname == '' ? '' : fnamemodify(bufname,':p'))
endfunction endfunction
function! s:buffer_name() dict abort
return self.spec()
endfunction
function! s:buffer_commit() dict abort function! s:buffer_commit() dict abort
return matchstr(self.name(),'^fugitive://.\{-\}//\zs\w*') return matchstr(self.spec(),'^fugitive://.\{-\}//\zs\w*')
endfunction endfunction
function! s:buffer_path(...) dict abort function! s:buffer_path(...) dict abort
let rev = matchstr(self.name(),'^fugitive://.\{-\}//\zs.*') let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*')
if rev != '' if rev != ''
let rev = s:sub(rev,'\w*','') let rev = s:sub(rev,'\w*','')
else else
let rev = self.name()[strlen(self.repo().tree()) : -1] let rev = self.spec()[strlen(self.repo().tree()) : -1]
endif endif
return s:sub(rev,'^/',a:0 ? a:1 : '') return s:sub(rev,'^/',a:0 ? a:1 : '')
endfunction endfunction
function! s:buffer_rev() dict abort function! s:buffer_rev() dict abort
let rev = matchstr(self.name(),'^fugitive://.\{-\}//\zs.*') let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*')
if rev =~ '^\x/' if rev =~ '^\x/'
return ':'.rev[0].':'.rev[2:-1] return ':'.rev[0].':'.rev[2:-1]
elseif rev =~ '.' elseif rev =~ '.'
return s:sub(rev,'/',':') return s:sub(rev,'/',':')
elseif self.name() =~ '\.git/index$' elseif self.spec() =~ '\.git/index$'
return ':' return ':'
elseif self.name() =~ '\.git/refs/\|\.git/.*HEAD$' elseif self.spec() =~ '\.git/refs/\|\.git/.*HEAD$'
return self.name()[strlen(self.repo().dir())+1 : -1] return self.spec()[strlen(self.repo().dir())+1 : -1]
else else
return self.path() return self.path()
endif endif
endfunction endfunction
function! s:buffer_sha1() dict abort function! s:buffer_sha1() dict abort
if self.name() =~ '^fugitive://' || self.name() =~ '\.git/refs/\|\.git/.*HEAD$' if self.spec() =~ '^fugitive://' || self.spec() =~ '\.git/refs/\|\.git/.*HEAD$'
return self.repo().rev_parse(self.rev()) return self.repo().rev_parse(self.rev())
else else
return '' return ''
@@ -446,7 +450,7 @@ function! s:buffer_containing_commit() dict abort
endif endif
endfunction endfunction
call s:add_methods('buffer',['getvar','setvar','getline','repo','type','name','commit','path','rev','sha1','expand','containing_commit']) call s:add_methods('buffer',['getvar','setvar','getline','repo','type','spec','name','commit','path','rev','sha1','expand','containing_commit'])
" }}}1 " }}}1
" Git {{{1 " Git {{{1