Author: Kyle Fuller <kyle@fuller.li> 2016-08-24 21:31:01 +0100 +0100
Committer: Kyle Fuller <kyle@fuller.li> 2016-09-13 23:54:39 +0100 +0100
Commit: b70cc496e2ccb0e6dd364c756155cd8ebfca51a3
Parent: 1a88b393f1822128977134f4715db0c757dabbb1
[vim] Upgrade vim plug
diff --git a/.vim/autoload/plug.vim b/.vim/autoload/plug.vim
index 2a06dc7742babc4ce6f81aefff1c6fde178bb048..d6f7afcb84f102b033d54e25035a4b8f5ec18fb7 100644
--- a/.vim/autoload/plug.vim
+++ b/.vim/autoload/plug.vim
@@ -11,8 +11,12 @@ "
" call plug#begin('~/.vim/plugged')
"
" " Make sure you use single quotes
-" Plug 'junegunn/seoul256.vim'
+"
+" " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align
" Plug 'junegunn/vim-easy-align'
+"
+" " Any valid git URL is allowed
+" Plug 'https://github.com/junegunn/vim-github-dashboard.git'
"
" " Group dependencies, vim-snippets depends on ultisnips
" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
@@ -20,13 +24,13 @@ "
" " On-demand loading
" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
" Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
-"
-" " Using git URL
-" Plug 'https://github.com/junegunn/vim-github-dashboard.git'
"
" " Using a non-master branch
" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
"
+" " Using a tagged release; wildcard allowed (requires git 1.9.2 or above)
+" Plug 'fatih/vim-go', { 'tag': '*' }
+"
" " Plugin options
" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
"
@@ -40,10 +44,24 @@ " " Add plugins to &runtimepath
" call plug#end()
"
" Then reload .vimrc and :PlugInstall to install plugins.
-" Visit https://github.com/junegunn/vim-plug for more information.
"
+" Plug options:
"
-" Copyright (c) 2015 Junegunn Choi
+"| Option | Description |
+"| ----------------------- | ------------------------------------------------ |
+"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use |
+"| `rtp` | Subdirectory that contains Vim plugin |
+"| `dir` | Custom directory for the plugin |
+"| `as` | Use different name for the plugin |
+"| `do` | Post-update hook (string or funcref) |
+"| `on` | On-demand loading: Commands or `<Plug>`-mappings |
+"| `for` | On-demand loading: File types |
+"| `frozen` | Do not update unless explicitly specified |
+"
+" More information: https://github.com/junegunn/vim-plug
+"
+"
+" Copyright (c) 2016 Junegunn Choi
"
" MIT License
"
@@ -113,9 +131,9 @@ return 1
endfunction
function! s:define_commands()
- command! -nargs=+ -bar Plug call s:add(<args>)
+ command! -nargs=+ -bar Plug call plug#(<args>)
if !executable('git')
- return s:err('`git` executable not found. vim-plug requires git.')
+ return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.')
endif
command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(<bang>0, [<f-args>])
command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(<bang>0, [<f-args>])
@@ -134,26 +152,41 @@ function! s:to_s(v)
return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n"
endfunction
+function! s:glob(from, pattern)
+ return s:lines(globpath(a:from, a:pattern))
+endfunction
+
function! s:source(from, ...)
+ let found = 0
for pattern in a:000
- for vim in s:lines(globpath(a:from, pattern))
+ for vim in s:glob(a:from, pattern)
execute 'source' s:esc(vim)
+ let found = 1
endfor
endfor
+ return found
endfunction
function! s:assoc(dict, key, val)
let a:dict[a:key] = add(get(a:dict, a:key, []), a:val)
endfunction
-function! s:ask(message)
+function! s:ask(message, ...)
call inputsave()
echohl WarningMsg
- let proceed = input(a:message.' (y/N) ') =~? '^y'
+ let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) '))
echohl None
call inputrestore()
echo "\r"
- return proceed
+ return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0
+endfunction
+
+function! s:ask_no_interrupt(...)
+ try
+ return call('s:ask', a:000)
+ catch
+ return 0
+ endtry
endfunction
function! plug#end()
@@ -171,6 +204,9 @@ let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
filetype off
for name in g:plugs_order
+ if !has_key(g:plugs, name)
+ continue
+ endif
let plug = g:plugs[name]
if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for')
let s:loaded[name] = 1
@@ -200,7 +236,9 @@
if has_key(plug, 'for')
let types = s:to_a(plug.for)
if !empty(types)
+ augroup filetypedetect
call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim')
+ augroup END
endif
for type in types
call s:assoc(lod.ft, type, name)
@@ -233,9 +271,11 @@
call s:reorg_rtp()
filetype plugin indent on
if has('vim_starting')
- syntax enable
+ if has('syntax') && !exists('g:syntax_on')
+ syntax enable
+ end
else
- call s:reload()
+ call s:reload_plugins()
endif
endfunction
@@ -243,9 +283,13 @@ function! s:loaded_names()
return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)')
endfunction
-function! s:reload()
+function! s:load_plugin(spec)
+ call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim')
+endfunction
+
+function! s:reload_plugins()
for name in s:loaded_names()
- call s:source(s:rtp(g:plugs[name]), 'plugin/**/*.vim', 'after/plugin/**/*.vim')
+ call s:load_plugin(g:plugs[name])
endfor
endfunction
@@ -264,8 +308,9 @@ return 1
endfunction
function! s:git_version_requirement(...)
- let s:git_version = get(s:, 'git_version',
- \ map(split(split(s:system('git --version'))[-1], '\.'), 'str2nr(v:val)'))
+ if !exists('s:git_version')
+ let s:git_version = map(split(split(s:system('git --version'))[-1], '\.'), 'str2nr(v:val)')
+ endif
return s:version_requirement(s:git_version, a:000)
endfunction
@@ -312,7 +357,12 @@ function! s:err(msg)
echohl ErrorMsg
echom '[vim-plug] '.a:msg
echohl None
- return 0
+endfunction
+
+function! s:warn(cmd, msg)
+ echohl WarningMsg
+ execute a:cmd 'a:msg'
+ echohl None
endfunction
function! s:esc(path)
@@ -361,6 +411,23 @@ execute 'set rtp+='.s:last_rtp
endif
endfunction
+function! s:doautocmd(...)
+ if exists('#'.join(a:000, '#'))
+ execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '<nomodeline>' : '') join(a:000)
+ endif
+endfunction
+
+function! s:dobufread(names)
+ for name in a:names
+ let path = s:rtp(g:plugs[name]).'/**'
+ for dir in ['ftdetect', 'ftplugin']
+ if len(finddir(dir, path))
+ return s:doautocmd('BufRead')
+ endif
+ endfor
+ endfor
+endfunction
+
function! plug#load(...)
if a:0 == 0
return s:err('Argument missing: plugin name(s) required')
@@ -376,9 +443,7 @@ end
for name in a:000
call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
endfor
- if exists('#BufRead')
- doautocmd BufRead
- endif
+ call s:dobufread(a:000)
return 1
endfunction
@@ -396,7 +461,7 @@ endfor
call remove(s:triggers, a:name)
endfunction
-function! s:lod(names, types)
+function! s:lod(names, types, ...)
for name in a:names
call s:remove_triggers(name)
let s:loaded[name] = 1
@@ -408,30 +473,33 @@ let rtp = s:rtp(g:plugs[name])
for dir in a:types
call s:source(rtp, dir.'/**/*.vim')
endfor
- if exists('#User#'.name)
- execute 'doautocmd User' name
+ if a:0
+ if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2))
+ execute 'runtime' a:1
+ endif
+ call s:source(rtp, a:2)
endif
+ call s:doautocmd('User', name)
endfor
endfunction
function! s:lod_ft(pat, names)
- call s:lod(a:names, ['plugin', 'after/plugin', 'syntax', 'after/syntax'])
+ let syn = 'syntax/'.a:pat.'.vim'
+ call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn)
execute 'autocmd! PlugLOD FileType' a:pat
- if exists('#filetypeplugin#FileType')
- doautocmd filetypeplugin FileType
- endif
- if exists('#filetypeindent#FileType')
- doautocmd filetypeindent FileType
- endif
+ call s:doautocmd('filetypeplugin', 'FileType')
+ call s:doautocmd('filetypeindent', 'FileType')
endfunction
function! s:lod_cmd(cmd, bang, l1, l2, args, names)
call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
+ call s:dobufread(a:names)
execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
endfunction
function! s:lod_map(map, names, prefix)
call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
+ call s:dobufread(a:names)
let extra = ''
while 1
let c = getchar(0)
@@ -440,19 +508,26 @@ break
endif
let extra .= nr2char(c)
endwhile
+ if v:count
+ call feedkeys(v:count, 'n')
+ endif
+ call feedkeys('"'.v:register, 'n')
+ if mode(1) == 'no'
+ call feedkeys(v:operator)
+ endif
call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
endfunction
-function! s:add(repo, ...)
+function! plug#(repo, ...)
if a:0 > 1
return s:err('Invalid number of arguments (1..2)')
endif
try
let repo = s:trim(a:repo)
- let name = fnamemodify(repo, ':t:s?\.git$??')
- let spec = extend(s:infer_properties(name, repo),
- \ a:0 == 1 ? s:parse_options(a:1) : s:base_spec)
+ let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec
+ let name = get(opts, 'as', fnamemodify(repo, ':t:s?\.git$??'))
+ let spec = extend(s:infer_properties(name, repo), opts)
if !has_key(g:plugs, name)
call add(g:plugs_order, name)
endif
@@ -531,15 +606,18 @@ syn match plugPlus /^+/
syn match plugStar /^*/
syn match plugMessage /\(^- \)\@<=.*/
syn match plugName /\(^- \)\@<=[^ ]*:/
- syn match plugSha /\%(: \)\@<=[0-9a-z]\{4,}$/
+ syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/
syn match plugTag /(tag: [^)]\+)/
syn match plugInstall /\(^+ \)\@<=[^:]*/
syn match plugUpdate /\(^* \)\@<=[^:]*/
- syn match plugCommit /^ [0-9a-z]\{7} .*/ contains=plugRelDate,plugSha,plugTag
- syn match plugSha /\(^ \)\@<=[0-9a-z]\{7}/ contained
+ syn match plugCommit /^ \X*[0-9a-f]\{7} .*/ contains=plugRelDate,plugEdge,plugTag
+ syn match plugEdge /^ \X\+$/
+ syn match plugEdge /^ \X*/ contained nextgroup=plugSha
+ syn match plugSha /[0-9a-f]\{7}/ contained
syn match plugRelDate /([^)]*)$/ contained
syn match plugNotLoaded /(not loaded)$/
syn match plugError /^x.*/
+ syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/
syn match plugH2 /^.*:\n-\+$/
syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean
hi def link plug1 Title
@@ -559,7 +637,9 @@ hi def link plugInstall Function
hi def link plugUpdate Type
hi def link plugError Error
+ hi def link plugDeleted Ignore
hi def link plugRelDate Comment
+ hi def link plugEdge PreProc
hi def link plugSha Identifier
hi def link plugTag Constant
@@ -620,32 +700,50 @@ call winrestview(s:pos[2])
endif
endfunction
-function! s:prepare()
+function! s:finish_bindings()
+ nnoremap <silent> <buffer> R :call <SID>retry()<cr>
+ nnoremap <silent> <buffer> D :PlugDiff<cr>
+ nnoremap <silent> <buffer> S :PlugStatus<cr>
+ nnoremap <silent> <buffer> U :call <SID>status_update()<cr>
+ xnoremap <silent> <buffer> U :call <SID>status_update()<cr>
+ nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr>
+ nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr>
+endfunction
+
+function! s:prepare(...)
+ if empty(getcwd())
+ throw 'Invalid current working directory. Cannot proceed.'
+ endif
+
+ for evar in ['$GIT_DIR', '$GIT_WORK_TREE']
+ if exists(evar)
+ throw evar.' detected. Cannot proceed.'
+ endif
+ endfor
+
call s:job_abort()
if s:switch_in()
- silent %d _
- else
- call s:new_window()
- nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>bd<cr>
- nnoremap <silent> <buffer> R :silent! call <SID>retry()<cr>
- nnoremap <silent> <buffer> D :PlugDiff<cr>
- nnoremap <silent> <buffer> S :PlugStatus<cr>
- nnoremap <silent> <buffer> U :call <SID>status_update()<cr>
- xnoremap <silent> <buffer> U :call <SID>status_update()<cr>
- nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr>
- nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr>
- let b:plug_preview = -1
- let s:plug_tab = tabpagenr()
- let s:plug_buf = winbufnr(0)
- call s:assign_name()
+ normal q
+ endif
+
+ call s:new_window()
+ nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>bd<cr>
+ if a:0 == 0
+ call s:finish_bindings()
endif
- silent! unmap <buffer> <cr>
- silent! unmap <buffer> L
- silent! unmap <buffer> o
- silent! unmap <buffer> X
+ let b:plug_preview = -1
+ let s:plug_tab = tabpagenr()
+ let s:plug_buf = winbufnr(0)
+ call s:assign_name()
+
+ for k in ['<cr>', 'L', 'o', 'X', 'd', 'dd']
+ execute 'silent! unmap <buffer>' k
+ endfor
setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile nowrap cursorline modifiable
setf vim-plug
- call s:syntax()
+ if exists('g:syntax_on')
+ call s:syntax()
+ endif
endfunction
function! s:assign_name()
@@ -660,6 +758,38 @@ endwhile
silent! execute 'f' fnameescape(name)
endfunction
+function! s:chsh(swap)
+ let prev = [&shell, &shellredir]
+ if !s:is_win && a:swap
+ set shell=sh shellredir=>%s\ 2>&1
+ endif
+ return prev
+endfunction
+
+function! s:bang(cmd, ...)
+ try
+ let [sh, shrd] = s:chsh(a:0)
+ " FIXME: Escaping is incomplete. We could use shellescape with eval,
+ " but it won't work on Windows.
+ let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
+ let g:_plug_bang = '!'.escape(cmd, '#!%')
+ execute "normal! :execute g:_plug_bang\<cr>\<cr>"
+ finally
+ unlet g:_plug_bang
+ let [&shell, &shellredir] = [sh, shrd]
+ endtry
+ return v:shell_error ? 'Exit status: ' . v:shell_error : ''
+endfunction
+
+function! s:regress_bar()
+ let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '')
+ call s:progress_bar(2, bar, len(bar))
+endfunction
+
+function! s:is_updated(dir)
+ return !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', a:dir))
+endfunction
+
function! s:do(pull, force, todo)
for [name, spec] in items(a:todo)
if !isdirectory(spec.dir)
@@ -667,24 +797,19 @@ continue
endif
let installed = has_key(s:update.new, name)
let updated = installed ? 0 :
- \ (a:pull && index(s:update.errors, name) < 0 && !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', spec.dir)))
+ \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir))
if a:force || installed || updated
execute 'cd' s:esc(spec.dir)
call append(3, '- Post-update hook for '. name .' ... ')
let error = ''
let type = type(spec.do)
if type == s:TYPE.string
- try
- " FIXME: Escaping is incomplete. We could use shellescape with eval,
- " but it won't work on Windows.
- let g:_plug_do = '!'.escape(spec.do, '#!%')
- execute "normal! :execute g:_plug_do\<cr>\<cr>"
- finally
- if v:shell_error
- let error = 'Exit status: ' . v:shell_error
- endif
- unlet g:_plug_do
- endtry
+ if spec.do[0] == ':'
+ call s:load_plugin(spec)
+ execute spec.do[1:]
+ else
+ let error = s:bang(spec.do)
+ endif
elseif type == s:TYPE.funcref
try
let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged')
@@ -695,8 +820,13 @@ endtry
else
let error = 'Invalid hook type'
endif
+ call s:switch_in()
call setline(4, empty(error) ? (getline(4) . 'OK')
\ : ('x' . getline(4)[1:] . error))
+ if !empty(error)
+ call add(s:update.errors, name)
+ call s:regress_bar()
+ endif
cd -
endif
endfor
@@ -706,32 +836,14 @@ function! s:hash_match(a, b)
return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0
endfunction
-function! s:checkout(plugs)
- for [name, spec] in items(a:plugs)
- let sha = spec.commit
- call append(3, '- Checking out '.sha[:6].' of '.name.' ... ')
- redraw
-
- let error = []
- let output = s:lines(s:system('git rev-parse HEAD', spec.dir))
- if v:shell_error
- let error = output
- elseif !s:hash_match(sha, output[0])
- let output = s:lines(s:system(
- \ 'git fetch --depth 999999 && git checkout '.sha, spec.dir))
- if v:shell_error
- let error = output
- endif
- endif
- if empty(error)
- call setline(4, getline(4) . 'OK')
- else
- call setline(4, 'x'.getline(4)[1:] . 'Error')
- for line in reverse(error)
- call append(4, ' '.line)
- endfor
- endif
- endfor
+function! s:checkout(spec)
+ let sha = a:spec.commit
+ let output = s:system('git rev-parse HEAD', a:spec.dir)
+ if !v:shell_error && !s:hash_match(sha, s:lines(output)[0])
+ let output = s:system(
+ \ 'git fetch --depth 999999 && git checkout '.s:esc(sha), a:spec.dir)
+ endif
+ return output
endfunction
function! s:finish(pull)
@@ -740,7 +852,7 @@ if new_frozen
let s = new_frozen > 1 ? 's' : ''
call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s))
endif
- call append(3, '- Finishing ... ')
+ call append(3, '- Finishing ... ') | 4
redraw
call plug#helptags()
call plug#end()
@@ -755,12 +867,14 @@ \ "v:val =~ '^- ' && stridx(v:val, 'Already up-to-date') < 0"))
call add(msgs, "Press 'D' to see the updated changes.")
endif
echo join(msgs, ' ')
+ call s:finish_bindings()
endfunction
function! s:retry()
if empty(s:update.errors)
return
endif
+ echo
call s:update_impl(s:update.pull, s:update.force,
\ extend(copy(s:update.errors), [s:update.threads]))
endfunction
@@ -773,6 +887,17 @@ function! s:names(...)
return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)'))
endfunction
+function! s:check_ruby()
+ silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'")
+ if !exists('g:plug_ruby')
+ redraw!
+ return s:warn('echom', 'Warning: Ruby interface is broken')
+ endif
+ let ruby_version = split(g:plug_ruby, '\.')
+ unlet g:plug_ruby
+ return s:version_requirement(ruby_version, [1, 8, 7])
+endfunction
+
function! s:update_impl(pull, force, args) abort
let args = copy(a:args)
let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ?
@@ -783,10 +908,7 @@ let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') :
\ filter(managed, 'index(args, v:key) >= 0')
if empty(todo)
- echohl WarningMsg
- echo 'No plugin to '. (a:pull ? 'update' : 'install') . '.'
- echohl None
- return
+ return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install'))
endif
if !s:is_win && s:git_version_requirement(2, 3)
@@ -808,13 +930,11 @@ endtry
endif
if has('nvim') && !exists('*jobwait') && threads > 1
- echohl WarningMsg
- echomsg 'vim-plug: update Neovim for parallel installer'
- echohl None
+ call s:warn('echom', '[vim-plug] Update Neovim for parallel installer')
endif
let python = (has('python') || has('python3')) && (!s:nvim || has('vim_starting'))
- let ruby = has('ruby') && !s:nvim && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running'))
+ let ruby = has('ruby') && !s:nvim && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && s:check_ruby()
let s:update = {
\ 'start': reltime(),
@@ -829,7 +949,7 @@ \ 'bar': '',
\ 'fin': 0
\ }
- call s:prepare()
+ call s:prepare(1)
call append(0, ['', ''])
normal! 2G
silent! redraw
@@ -840,7 +960,7 @@
" Python version requirement (>= 2.7)
if python && !has('python3') && !ruby && !s:nvim && s:update.threads > 1
redir => pyv
- silent python import platform; print(platform.python_version())
+ silent python import platform; print platform.python_version()
redir END
let python = s:version_requirement(
\ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6])
@@ -882,13 +1002,61 @@ call s:update_vim()
endif
endfunction
+function! s:log4(name, msg)
+ call setline(4, printf('- %s (%s)', a:msg, a:name))
+ redraw
+endfunction
+
function! s:update_finish()
if exists('s:git_terminal_prompt')
let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt
endif
if s:switch_in()
- call s:checkout(filter(copy(s:update.all), 'has_key(v:val, "commit")'))
- call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'has_key(v:val, "do")'))
+ call append(3, '- Updating ...') | 4
+ for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))'))
+ let pos = s:logpos(name)
+ if !pos
+ continue
+ endif
+ if has_key(spec, 'commit')
+ call s:log4(name, 'Checking out '.spec.commit)
+ let out = s:checkout(spec)
+ elseif has_key(spec, 'tag')
+ let tag = spec.tag
+ if tag =~ '\*'
+ let tags = s:lines(s:system('git tag --list '.string(tag).' --sort -version:refname 2>&1', spec.dir))
+ if !v:shell_error && !empty(tags)
+ let tag = tags[0]
+ call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag))
+ call append(3, '')
+ endif
+ endif
+ call s:log4(name, 'Checking out '.tag)
+ let out = s:system('git checkout -q '.s:esc(tag).' 2>&1', spec.dir)
+ else
+ let branch = s:esc(get(spec, 'branch', 'master'))
+ call s:log4(name, 'Merging origin/'.branch)
+ let out = s:system('git checkout -q '.branch.' 2>&1'
+ \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only origin/'.branch.' 2>&1')), spec.dir)
+ endif
+ if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
+ \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
+ call s:log4(name, 'Updating submodules. This may take a while.')
+ let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir)
+ endif
+ let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
+ if v:shell_error
+ call add(s:update.errors, name)
+ call s:regress_bar()
+ silent execute pos 'd _'
+ call append(4, msg) | 4
+ elseif !empty(out)
+ call setline(pos, msg[0])
+ endif
+ redraw
+ endfor
+ silent 4 d _
+ call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")'))
call s:finish(s:update.pull)
call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.')
call s:switch_out('normal! gg')
@@ -976,7 +1144,7 @@ let s:update.new[a:name] = 1
endif
let s:update.bar .= job.error ? 'x' : '='
- call s:log(job.error ? 'x' : '-', a:name, job.result)
+ call s:log(job.error ? 'x' : '-', a:name, empty(job.result) ? 'OK' : job.result)
call s:bar()
call remove(s:jobs, a:name)
@@ -993,19 +1161,18 @@ endif
endfunction
function! s:logpos(name)
- for i in range(1, line('$'))
+ for i in range(4, line('$'))
if getline(i) =~# '^[-+x*] '.a:name.':'
return i
endif
endfor
- return 0
endfunction
function! s:log(bullet, name, lines)
if s:switch_in()
let pos = s:logpos(a:name)
if pos > 0
- execute pos 'd _'
+ silent execute pos 'd _'
if pos > winheight('.')
let pos = 4
endif
@@ -1044,17 +1211,12 @@ call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
redraw
let has_tag = has_key(spec, 'tag')
- let checkout = s:shellesc(has_tag ? spec.tag : spec.branch)
- let merge = s:shellesc(has_tag ? spec.tag : 'origin/'.spec.branch)
-
if !new
- let error = s:git_validate(spec, 0)
+ let [error, _] = s:git_validate(spec, 0)
if empty(error)
if pull
let fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : ''
- call s:spawn(name,
- \ printf('(git fetch %s %s 2>&1 && git checkout -q %s 2>&1 && git merge --ff-only %s 2>&1 && git submodule update --init --recursive 2>&1)',
- \ fetch_opt, prog, checkout, merge), { 'dir': spec.dir })
+ call s:spawn(name, printf('git fetch %s %s 2>&1', fetch_opt, prog), { 'dir': spec.dir })
else
let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 }
endif
@@ -1063,11 +1225,10 @@ let s:jobs[name] = { 'running': 0, 'result': error, 'error': 1 }
endif
else
call s:spawn(name,
- \ printf('git clone %s %s --recursive %s -b %s %s 2>&1',
+ \ printf('git clone %s %s %s %s 2>&1',
\ has_tag ? '' : s:clone_opt,
\ prog,
\ s:shellesc(spec.uri),
- \ checkout,
\ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
endif
@@ -1296,10 +1457,7 @@ self.name = name
self.args = args
self.buf_q = buf_q
self.lock = lock
- tag = args.get('tag', 0)
- self.checkout = esc(tag if tag else args['branch'])
- self.merge = esc(tag if tag else 'origin/' + args['branch'])
- self.tag = tag
+ self.tag = args.get('tag', 0)
def manage(self):
try:
@@ -1335,15 +1493,15 @@ return _clean
self.write(Action.INSTALL, self.name, ['Installing ...'])
callback = functools.partial(self.write, Action.INSTALL, self.name)
- cmd = 'git clone {0} {1} --recursive {2} -b {3} {4} 2>&1'.format(
+ cmd = 'git clone {0} {1} {2} {3} 2>&1'.format(
'' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'],
- self.checkout, esc(target))
+ esc(target))
com = Command(cmd, None, G_TIMEOUT, callback, clean(target))
result = com.execute(G_RETRIES)
self.write(Action.DONE, self.name, result[-1:])
def repo_uri(self):
- cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url'
+ cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url'
command = Command(cmd, self.args['dir'], G_TIMEOUT,)
result = command.execute(G_RETRIES)
return result[-1]
@@ -1363,11 +1521,7 @@ if G_PULL:
self.write(Action.UPDATE, self.name, ['Updating ...'])
callback = functools.partial(self.write, Action.UPDATE, self.name)
fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else ''
- cmds = ['git fetch {0} {1}'.format(fetch_opt, G_PROGRESS),
- 'git checkout -q {0}'.format(self.checkout),
- 'git merge --ff-only {0}'.format(self.merge),
- 'git submodule update --init --recursive']
- cmd = ' 2>&1 && '.join(cmds)
+ cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS)
com = Command(cmd, self.args['dir'], G_TIMEOUT, callback)
result = com.execute(G_RETRIES)
self.write(Action.DONE, self.name, result[-1:])
@@ -1459,7 +1613,7 @@
while not buf_q.empty() or thr.active_count() != start_cnt:
try:
action, name, msg = buf_q.get(True, 0.25)
- buf.write(action, name, msg)
+ buf.write(action, name, ['OK'] if not msg else msg)
buf_q.task_done()
except queue.Empty:
pass
@@ -1553,7 +1707,7 @@ 'x'
end
result =
if type || type.nil?
- ["#{b} #{name}: #{result.lines.to_a.last}"]
+ ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"]
elsif result =~ /^Interrupted|^Timeout/
["#{b} #{name}: #{result}"]
else
@@ -1643,15 +1797,12 @@ mtx.synchronize do
threads << Thread.new {
while pair = take1.call
name = pair.first
- dir, uri, branch, tag = pair.last.values_at *%w[dir uri branch tag]
- checkout = esc(tag ? tag : branch)
- merge = esc(tag ? tag : "origin/#{branch}")
- subm = "git submodule update --init --recursive 2>&1"
+ dir, uri, tag = pair.last.values_at *%w[dir uri tag]
exists = File.directory? dir
ok, result =
if exists
chdir = "#{cd} #{iswin ? dir : esc(dir)}"
- ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url", nil, nil, nil
+ ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil
current_uri = data.lines.to_a.last
if !ret
if data =~ /^Interrupted|^Timeout/
@@ -1667,7 +1818,7 @@ else
if pull
log.call name, 'Updating ...', :update
fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : ''
- bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1 && git checkout -q #{checkout} 2>&1 && git merge --ff-only #{merge} 2>&1 && #{subm}", name, :update, nil
+ bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil
else
[true, skip]
end
@@ -1675,7 +1826,7 @@ end
else
d = esc dir.sub(%r{[\\/]+$}, '')
log.call name, 'Installing ...', :install
- bt.call "git clone #{clone_opt unless tag} #{progress} --recursive #{uri} -b #{checkout} #{d} 2>&1", name, :install, proc {
+ bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc {
FileUtils.rm_rf dir
}
end
@@ -1697,7 +1848,7 @@ return '"'.escape(a:arg, '"').'"'
endfunction
function! s:glob_dir(path)
- return map(filter(s:lines(globpath(a:path, '**')), 'isdirectory(v:val)'), 's:dirpath(v:val)')
+ return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)')
endfunction
function! s:progress_bar(line, bar, total)
@@ -1725,10 +1876,7 @@ endfunction
function! s:system(cmd, ...)
try
- let [sh, shrd] = [&shell, &shellredir]
- if !s:is_win
- set shell=sh shellredir=>%s\ 2>&1
- endif
+ let [sh, shrd] = s:chsh(1)
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
return system(s:is_win ? '('.cmd.')' : cmd)
finally
@@ -1744,7 +1892,7 @@
function! s:git_validate(spec, check_branch)
let err = ''
if isdirectory(a:spec.dir)
- let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url', a:spec.dir))
+ let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url', a:spec.dir))
let remote = result[-1]
if v:shell_error
let err = join([remote, 'PlugClean required.'], "\n")
@@ -1776,11 +1924,18 @@ elseif a:spec.branch !=# branch
let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.',
\ branch, a:spec.branch)
endif
+ if empty(err)
+ let commits = len(s:lines(s:system(printf('git rev-list origin/%s..HEAD', a:spec.branch), a:spec.dir)))
+ if !v:shell_error && commits
+ let err = join([printf('Diverged from origin/%s by %d commit(s).', a:spec.branch, commits),
+ \ 'Reinstall after PlugClean.'], "\n")
+ endif
+ endif
endif
else
let err = 'Not found'
endif
- return err
+ return [err, err =~# 'PlugClean']
endfunction
function! s:rm_rf(dir)
@@ -1791,15 +1946,23 @@ endfunction
function! s:clean(force)
call s:prepare()
- call append(0, 'Searching for unused plugins in '.g:plug_home)
+ call append(0, 'Searching for invalid plugins in '.g:plug_home)
call append(1, '')
" List of valid directories
let dirs = []
+ let errs = {}
let [cnt, total] = [0, len(g:plugs)]
for [name, spec] in items(g:plugs)
- if !s:is_managed(name) || empty(s:git_validate(spec, 0))
+ if !s:is_managed(name)
call add(dirs, spec.dir)
+ else
+ let [err, clean] = s:git_validate(spec, 1)
+ if clean
+ let errs[spec.dir] = s:lines(err)[0]
+ else
+ call add(dirs, spec.dir)
+ endif
endif
let cnt += 1
call s:progress_bar(2, repeat('=', cnt), total)
@@ -1823,25 +1986,60 @@ let f = remove(found, 0)
if !has_key(allowed, f) && isdirectory(f)
call add(todo, f)
call append(line('$'), '- ' . f)
+ if has_key(errs, f)
+ call append(line('$'), ' ' . errs[f])
+ endif
let found = filter(found, 'stridx(v:val, f) != 0')
end
endwhile
- normal! G
+ 4
redraw
if empty(todo)
call append(line('$'), 'Already clean.')
else
- if a:force || s:ask('Proceed?')
- for dir in todo
- call s:rm_rf(dir)
- endfor
- call append(line('$'), 'Removed.')
+ let s:clean_count = 0
+ call append(3, ['Directories to delete:', ''])
+ redraw!
+ if a:force || s:ask_no_interrupt('Delete all directories?')
+ call s:delete([6, line('$')], 1)
else
- call append(line('$'), 'Cancelled.')
+ call setline(4, 'Cancelled.')
+ nnoremap <silent> <buffer> d :set opfunc=<sid>delete_op<cr>g@
+ nmap <silent> <buffer> dd d_
+ xnoremap <silent> <buffer> d :<c-u>call <sid>delete_op(visualmode(), 1)<cr>
+ echo 'Delete the lines (d{motion}) to delete the corresponding directories'
endif
endif
- normal! G
+ 4
+ setlocal nomodifiable
+endfunction
+
+function! s:delete_op(type, ...)
+ call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0)
+endfunction
+
+function! s:delete(range, force)
+ let [l1, l2] = a:range
+ let force = a:force
+ while l1 <= l2
+ let line = getline(l1)
+ if line =~ '^- ' && isdirectory(line[2:])
+ execute l1
+ redraw!
+ let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1)
+ let force = force || answer > 1
+ if answer
+ call s:rm_rf(line[2:])
+ setlocal modifiable
+ call setline(l1, '~'.line[1:])
+ let s:clean_count += 1
+ call setline(4, printf('Removed %d directories.', s:clean_count))
+ setlocal nomodifiable
+ endif
+ endif
+ let l1 += 1
+ endwhile
endfunction
function! s:upgrade()
@@ -1888,7 +2086,7 @@ let [cnt, total] = [0, len(g:plugs)]
for [name, spec] in items(g:plugs)
if has_key(spec, 'uri')
if isdirectory(spec.dir)
- let err = s:git_validate(spec, 1)
+ let [err, _] = s:git_validate(spec, 1)
let [valid, msg] = [empty(err), empty(err) ? 'OK' : err]
else
let [valid, msg] = [0, 'Not found. Try PlugInstall.']
@@ -1952,7 +2150,6 @@ if &previewwindow
wincmd p
return 1
endif
- return 0
endfunction
function! s:find_name(lnum)
@@ -1974,7 +2171,7 @@ if b:plug_preview < 0
let b:plug_preview = !s:is_preview_window_open()
endif
- let sha = matchstr(getline('.'), '\(^ \)\@<=[0-9a-z]\{7}')
+ let sha = matchstr(getline('.'), '^ \X*\zs[0-9a-f]\{7}')
if empty(sha)
return
endif
@@ -1984,11 +2181,15 @@ if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir)
return
endif
- execute 'pedit' sha
- wincmd P
- setlocal filetype=git buftype=nofile nobuflisted modifiable
- execute 'silent read !cd' s:shellesc(g:plugs[name].dir) '&& git show --pretty=medium' sha
- normal! gg"_dd
+ if exists('g:plug_pwindow') && !s:is_preview_window_open()
+ execute g:plug_pwindow
+ execute 'e' sha
+ else
+ execute 'pedit' sha
+ wincmd P
+ endif
+ setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
+ execute 'silent %!cd' s:shellesc(g:plugs[name].dir) '&& git show --no-color --pretty=medium' sha
setlocal nomodifiable
nnoremap <silent> <buffer> q :q<cr>
wincmd p
@@ -1999,10 +2200,15 @@ call search('\(^[x-] \)\@<=[^:]\+:', a:flags)
endfunction
function! s:format_git_log(line)
- let [sha, refs, subject, date] = split(a:line, nr2char(1))
+ let indent = ' '
+ let tokens = split(a:line, nr2char(1))
+ if len(tokens) != 5
+ return indent.substitute(a:line, '\s*$', '', '')
+ endif
+ let [graph, sha, refs, subject, date] = tokens
let tag = matchstr(refs, 'tag: [^,)]\+')
let tag = empty(tag) ? ' ' : ' ('.tag.') '
- return printf(' %s%s%s (%s)', sha, tag, subject, date)
+ return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date)
endfunction
function! s:append_ul(lnum, text)
@@ -2017,10 +2223,14 @@ let bar = ''
let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)')
call s:progress_bar(2, bar, len(total))
for origin in [1, 0]
+ let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))'))))
+ if empty(plugs)
+ continue
+ endif
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
- for [k, v] in reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))'))))
+ for [k, v] in plugs
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
- let diff = s:system_chomp('git log --pretty=format:"%h%x01%d%x01%s%x01%cr" '.s:shellesc(range), v.dir)
+ 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)
if !empty(diff)
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)')))
@@ -2065,7 +2275,7 @@ call s:system('git reset --hard HEAD@{1} && git checkout '.s:esc(g:plugs[name].branch), g:plugs[name].dir)
setlocal modifiable
normal! "_dap
setlocal nomodifiable
- echo 'Reverted.'
+ echo 'Reverted'
endfunction
function! s:snapshot(force, ...) abort
@@ -2115,4 +2325,3 @@ endif
let &cpo = s:cpo_save
unlet s:cpo_save
-