Github/vim-plug
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove l: and use s:trim

Browse Source
This commit is contained in:
Yasuhiro Matsumoto 2020-09-01 13:19:55 +09:00
parent 0e9ac7fd20
commit ffb26b1aaa
No known key found for this signature in database
GPG Key ID: 622DE34DC490584B
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
plug.vim
View File

@ -121,19 +121,19 @@ function! s:isabsolute(dir) abort
endfunction endfunction
function! s:get_gitdir(dir) abort function! s:get_gitdir(dir) abort
let l:gitdir = a:dir . '/.git' let gitdir = a:dir . '/.git'
if isdirectory(l:gitdir) if isdirectory(gitdir)
return l:gitdir return gitdir
endif endif
try try
let l:line = readfile(l:gitdir)[0] let line = readfile(gitdir)[0]
if l:line =~# '^gitdir: ' if line =~# '^gitdir: '
let l:gitdir = l:line[8:] let gitdir = line[8:]
if !s:isabsolute(l:gitdir) if !s:isabsolute(gitdir)
let l:gitdir = a:dir . '/' . l:gitdir let gitdir = a:dir . '/' . gitdir
endif endif
if isdirectory(l:gitdir) if isdirectory(gitdir)
return l:gitdir return gitdir
endif endif
endif endif
catch catch
@ -150,14 +150,14 @@ function! s:git_get_remote_origin_url(dir) abort
let lines = readfile(gitdir . '/config') let lines = readfile(gitdir . '/config')
let [n, ll, url] = [0, len(lines), ''] let [n, ll, url] = [0, len(lines), '']
while n < ll while n < ll
let line = trim(lines[n]) let line = s:trim(lines[n])
if stridx(line, '[remote "origin"]') != 0 if stridx(line, '[remote "origin"]') != 0
let n += 1 let n += 1
continue continue
endif endif
let n += 1 let n += 1
while n < ll while n < ll
let line = trim(lines[n]) let line = s:trim(lines[n])
if line ==# '[' if line ==# '['
break break
endif endif
@ -176,20 +176,20 @@ function! s:git_get_remote_origin_url(dir) abort
endfunction endfunction
function! s:git_get_revision(dir) abort function! s:git_get_revision(dir) abort
let l:gitdir = s:get_gitdir(a:dir) let gitdir = s:get_gitdir(a:dir)
if l:gitdir ==# '' if gitdir ==# ''
return '' return ''
endif endif
try try
let l:line = readfile(l:gitdir . '/HEAD')[0] let line = readfile(gitdir . '/HEAD')[0]
if l:line =~# '^ref: ' if line =~# '^ref: '
let l:ref = l:line[5:] let ref = line[5:]
if filereadable(l:gitdir . '/' . l:ref) if filereadable(gitdir . '/' . ref)
return readfile(l:gitdir . '/' . l:ref)[0] return readfile(gitdir . '/' . ref)[0]
endif endif
for l:line in readfile(l:gitdir . '/packed-refs') for line in readfile(gitdir . '/packed-refs')
if l:line =~# ' ' . l:ref if line =~# ' ' . ref
return substitute(l:line, '^\([0-9a-f]*\) ', '\1', '') return substitute(line, '^\([0-9a-f]*\) ', '\1', '')
endif endif
endfor endfor
endif endif
@ -199,14 +199,14 @@ function! s:git_get_revision(dir) abort
endfunction endfunction
function! s:git_get_branch(dir) abort function! s:git_get_branch(dir) abort
let l:gitdir = s:get_gitdir(a:dir) let gitdir = s:get_gitdir(a:dir)
if l:gitdir ==# '' if gitdir ==# ''
return '' return ''
endif endif
try try
let l:line = readfile(l:gitdir . '/HEAD')[0] let line = readfile(gitdir . '/HEAD')[0]
if l:line =~# '^ref: refs/heads/' if line =~# '^ref: refs/heads/'
return l:line[16:] return line[16:]
endif endif
return '' return ''
catch catch