lloeki/vimfiles
1
0
Fork 0
mirror of https://github.com/lloeki/vimfiles.git synced 2025-12-06 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update plug

Browse source
This commit is contained in:
Loic Nageleisen 2018-03-14 15:03:18 +01:00
parent 3e7c7867e6
commit a7f0c06566
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
autoload/plug.vim
View file

@ -605,7 +605,7 @@ function! plug#helptags()
return s:err('plug#begin was not called') return s:err('plug#begin was not called')
endif endif
for spec in values(g:plugs) for spec in values(g:plugs)
let docd = join([spec.dir, 'doc'], '/') let docd = join([s:rtp(spec), 'doc'], '/')
if isdirectory(docd) if isdirectory(docd)
silent! execute 'helptags' s:esc(docd) silent! execute 'helptags' s:esc(docd)
endif endif
@ -908,7 +908,7 @@ function! s:finish(pull)
call add(msgs, "Press 'R' to retry.") call add(msgs, "Press 'R' to retry.")
endif endif
if a:pull && len(s:update.new) < len(filter(getline(5, '$'), if a:pull && len(s:update.new) < len(filter(getline(5, '$'),
\ "v:val =~ '^- ' && stridx(v:val, 'Already up-to-date') < 0")) \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'"))
call add(msgs, "Press 'D' to see the updated changes.") call add(msgs, "Press 'D' to see the updated changes.")
endif endif
echo join(msgs, ' ') echo join(msgs, ' ')
@ -2246,15 +2246,16 @@ function! s:status()
let unloaded = 0 let unloaded = 0
let [cnt, total] = [0, len(g:plugs)] let [cnt, total] = [0, len(g:plugs)]
for [name, spec] in items(g:plugs) for [name, spec] in items(g:plugs)
let is_dir = isdirectory(spec.dir)
if has_key(spec, 'uri') if has_key(spec, 'uri')
if isdirectory(spec.dir) if is_dir
let [err, _] = s:git_validate(spec, 1) let [err, _] = s:git_validate(spec, 1)
let [valid, msg] = [empty(err), empty(err) ? 'OK' : err] let [valid, msg] = [empty(err), empty(err) ? 'OK' : err]
else else
let [valid, msg] = [0, 'Not found. Try PlugInstall.'] let [valid, msg] = [0, 'Not found. Try PlugInstall.']
endif endif
else else
if isdirectory(spec.dir) if is_dir
let [valid, msg] = [1, 'OK'] let [valid, msg] = [1, 'OK']
else else
let [valid, msg] = [0, 'Not found.'] let [valid, msg] = [0, 'Not found.']
@ -2263,7 +2264,7 @@ function! s:status()
let cnt += 1 let cnt += 1
let ecnt += !valid let ecnt += !valid
" `s:loaded` entry can be missing if PlugUpgraded " `s:loaded` entry can be missing if PlugUpgraded
if valid && get(s:loaded, name, -1) == 0 if is_dir && get(s:loaded, name, -1) == 0
let unloaded = 1 let unloaded = 1
let msg .= ' (not loaded)' let msg .= ' (not loaded)'
endif endif
@ -2406,7 +2407,7 @@ function! s:diff()
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
for [k, v] in plugs for [k, v] in plugs
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..' let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
let diff = s:system_chomp('git log --graph --color=never --pretty=format:"%x01%h%x01%d%x01%s%x01%cr" '.s:shellesc(range), v.dir) let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir)
if !empty(diff) if !empty(diff)
let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))