aboutsummaryrefslogtreecommitdiff
path: root/autoload
diff options
context:
space:
mode:
authorCody Hiar <cody.hiar@investopedia.com>2016-11-04 11:18:11 -0600
committerCody Hiar <cody.hiar@investopedia.com>2016-11-04 11:18:41 -0600
commitde270a071995f7544b87201542c2399653a9b154 (patch)
tree4a8450a15efca3fe925b59b22679404231c52780 /autoload
parent3473f61bf30294296a10d1c51a86b363d5d5624b (diff)
Updating Plug
Diffstat (limited to 'autoload')
-rw-r--r--autoload/plug.vim1137
1 files changed, 766 insertions, 371 deletions
diff --git a/autoload/plug.vim b/autoload/plug.vim
index 6e14d0e..7945e8d 100644
--- a/autoload/plug.vim
+++ b/autoload/plug.vim
@@ -11,9 +11,13 @@
" 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'
"
@@ -21,14 +25,17 @@
" 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' }
"
" " Plugin outside ~/.vim/plugged with post-update hook
-" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
+" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
"
" " Unmanaged plugin (manually installed and updated)
" Plug '~/my-prototype-plugin'
@@ -37,10 +44,24 @@
" call plug#end()
"
" Then reload .vimrc and :PlugInstall to install plugins.
-" Visit https://github.com/junegunn/vim-plug for more information.
"
+" Plug options:
+"
+"| 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) 2015 Junegunn Choi
+"
+" Copyright (c) 2016 Junegunn Choi
"
" MIT License
"
@@ -77,6 +98,7 @@ let s:plug_buf = get(s:, 'plug_buf', -1)
let s:mac_gui = has('gui_macvim') && has('gui_running')
let s:is_win = has('win32') || has('win64')
let s:nvim = has('nvim') && exists('*jobwait') && !s:is_win
+let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
let s:me = resolve(expand('<sfile>:p'))
let s:base_spec = { 'branch': 'master', 'frozen': 0 }
let s:TYPE = {
@@ -110,17 +132,17 @@ function! plug#begin(...)
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>' == '!', [<f-args>])
- command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update('<bang>' == '!', [<f-args>])
- command! -nargs=0 -bar -bang PlugClean call s:clean('<bang>' == '!')
+ 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>])
+ command! -nargs=0 -bar -bang PlugClean call s:clean(<bang>0)
command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif
command! -nargs=0 -bar PlugStatus call s:status()
command! -nargs=0 -bar PlugDiff call s:diff()
- command! -nargs=? -bar PlugSnapshot call s:snapshot(<f-args>)
+ command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(<bang>0, <f-args>)
endfunction
function! s:to_a(v)
@@ -131,18 +153,43 @@ 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, ...)
+ call inputsave()
+ echohl WarningMsg
+ let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) '))
+ echohl None
+ call inputrestore()
+ echo "\r"
+ 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()
if !exists('g:plugs')
return s:err('Call plug#begin() first')
@@ -156,8 +203,13 @@ function! plug#end()
endif
let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
- filetype off
+ if exists('g:did_load_filetypes')
+ filetype off
+ endif
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
@@ -172,11 +224,14 @@ function! plug#end()
call s:assoc(lod.map, cmd, name)
endif
call add(s:triggers[name].map, cmd)
- elseif cmd =~ '^[A-Z]'
+ elseif cmd =~# '^[A-Z]'
if exists(':'.cmd) != 2
call s:assoc(lod.cmd, cmd, name)
endif
call add(s:triggers[name].cmd, cmd)
+ else
+ call s:err('Invalid `on` option: '.cmd.
+ \ '. Should start with an uppercase letter or `<Plug>`.')
endif
endfor
endif
@@ -184,7 +239,9 @@ function! plug#end()
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)
@@ -202,8 +259,8 @@ function! plug#end()
for [mode, map_prefix, key_prefix] in
\ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
execute printf(
- \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, "%s")<CR>',
- \ mode, map, map_prefix, string(map), string(names), key_prefix)
+ \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
+ \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
endfor
endfor
@@ -217,9 +274,11 @@ function! plug#end()
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
@@ -227,9 +286,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
@@ -248,8 +311,9 @@ function! s:version_requirement(val, min)
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'))[2], '\.'), 'str2nr(v:val)')
+ endif
return s:version_requirement(s:git_version, a:000)
endfunction
@@ -294,9 +358,14 @@ endif
function! s:err(msg)
echohl ErrorMsg
- echom a:msg
+ echom '[vim-plug] '.a:msg
+ echohl None
+endfunction
+
+function! s:warn(cmd, msg)
+ echohl WarningMsg
+ execute a:cmd 'a:msg'
echohl None
- return 0
endfunction
function! s:esc(path)
@@ -332,7 +401,7 @@ function! s:reorg_rtp()
let s:middle = get(s:, 'middle', &rtp)
let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])')
- let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), 'isdirectory(v:val)')
+ let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)')
let rtp = join(map(rtps, 'escape(v:val, ",")'), ',')
\ . ','.s:middle.','
\ . join(map(afters, 'escape(v:val, ",")'), ',')
@@ -345,6 +414,23 @@ function! s:reorg_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')
@@ -360,9 +446,7 @@ function! plug#load(...)
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
@@ -380,7 +464,7 @@ function! s:remove_triggers(name)
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
@@ -392,30 +476,33 @@ function! s:lod(names, types)
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'])
+ 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)
+function! s:lod_map(map, names, with_prefix, 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)
@@ -424,19 +511,31 @@ function! s:lod_map(map, names, prefix)
endif
let extra .= nr2char(c)
endwhile
- call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
+
+ if a:with_prefix
+ let prefix = v:count ? v:count : ''
+ let prefix .= '"'.v:register.a:prefix
+ if mode(1) == 'no'
+ if v:operator == 'c'
+ let prefix = "\<esc>" . prefix
+ endif
+ let prefix .= v:operator
+ endif
+ call feedkeys(prefix, 'n')
+ endif
+ call feedkeys(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
@@ -477,8 +576,7 @@ function! s:infer_properties(name, repo)
let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git')
let uri = printf(fmt, repo)
endif
- let dir = s:dirpath( fnamemodify(join([g:plug_home, a:name], '/'), ':p') )
- return { 'dir': dir, 'uri': uri }
+ return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri }
endif
endfunction
@@ -515,16 +613,23 @@ function! s:syntax()
syn match plugStar /^*/
syn match plugMessage /\(^- \)\@<=.*/
syn match plugName /\(^- \)\@<=[^ ]*:/
+ 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
- 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
hi def link plug2 Repeat
+ hi def link plugH2 Type
hi def link plugX Exception
hi def link plugBracket Structure
hi def link plugNumber Number
@@ -539,8 +644,11 @@ function! s:syntax()
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
hi def link plugNotLoaded Comment
endfunction
@@ -599,32 +707,54 @@ function! s:switch_out(...)
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 _
+ if b:plug_preview == 1
+ pc
+ endif
+ enew
else
call s:new_window()
- nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>echo<bar>q<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()
- endif
- silent! unmap <buffer> <cr>
- silent! unmap <buffer> L
- silent! unmap <buffer> o
- silent! unmap <buffer> X
- setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile nowrap cursorline modifiable
+ endif
+
+ 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
+ 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 nolist noswapfile nowrap cursorline modifiable
setf vim-plug
- call s:syntax()
+ if exists('g:syntax_on')
+ call s:syntax()
+ endif
endfunction
function! s:assign_name()
@@ -639,6 +769,38 @@ function! s:assign_name()
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)
@@ -646,45 +808,70 @@ function! s:do(pull, force, todo)
endif
let installed = has_key(s:update.new, name)
let updated = installed ? 0 :
- \ (a:pull && !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
- let result = v:shell_error ? ('Exit status: '.v:shell_error) : 'Done!'
- unlet g:_plug_do
- endtry
+ if spec.do[0] == ':'
+ call s:load_plugin(spec)
+ try
+ execute spec.do[1:]
+ catch
+ let error = v:exception
+ endtry
+ if !s:plug_window_exists()
+ cd -
+ throw 'Warning: vim-plug was terminated by the post-update hook of '.name
+ endif
+ else
+ let error = s:bang(spec.do)
+ endif
elseif type == s:TYPE.funcref
try
let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged')
call spec.do({ 'name': name, 'status': status, 'force': a:force })
- let result = 'Done!'
catch
- let result = 'Error: ' . v:exception
+ let error = v:exception
endtry
else
- let result = 'Error: Invalid type!'
+ 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
- call setline(4, getline(4) . result)
cd -
endif
endfor
endfunction
+function! s:hash_match(a, b)
+ return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0
+endfunction
+
+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)
let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen'))
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()
@@ -699,12 +886,14 @@ function! s:finish(pull)
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
@@ -717,20 +906,28 @@ 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]*$') ?
- \ remove(args, -1) : get(g:, 'plug_threads', s:is_win ? 1 : 16)
+ \ remove(args, -1) : get(g:, 'plug_threads', 16)
let managed = filter(copy(g:plugs), 's:is_managed(v:key)')
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)
@@ -752,14 +949,12 @@ function! s:update_impl(pull, force, args) abort
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:is_win && !has('win32unix')
- \ && (!s:nvim || has('vim_starting'))
- let ruby = has('ruby') && !s:nvim && (v:version >= 703 || v:version == 702 && has('patch374'))
+ let use_job = s:nvim || s:vim8
+ let python = (has('python') || has('python3')) && !use_job
+ let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && s:check_ruby()
let s:update = {
\ 'start': reltime(),
@@ -769,12 +964,12 @@ function! s:update_impl(pull, force, args) abort
\ 'pull': a:pull,
\ 'force': a:force,
\ 'new': {},
- \ 'threads': (python || ruby || s:nvim) ? min([len(todo), threads]) : 1,
+ \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1,
\ 'bar': '',
\ 'fin': 0
\ }
- call s:prepare()
+ call s:prepare(1)
call append(0, ['', ''])
normal! 2G
silent! redraw
@@ -783,9 +978,9 @@ function! s:update_impl(pull, force, args) abort
\ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : ''
" Python version requirement (>= 2.7)
- if python && !has('python3') && !ruby && !s:nvim && s:update.threads > 1
+ if python && !has('python3') && !ruby && !use_job && 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])
@@ -824,15 +1019,76 @@ function! s:update_impl(pull, force, args) abort
endtry
else
call s:update_vim()
+ while use_job && has('vim_starting')
+ sleep 100m
+ if s:update.fin
+ break
+ endif
+ endwhile
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: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 _
+ try
+ 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")'))
+ catch
+ call s:warn('echom', v:exception)
+ call s:warn('echo', '')
+ return
+ endtry
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')
@@ -840,12 +1096,16 @@ function! s:update_finish()
endfunction
function! s:job_abort()
- if !s:nvim || !exists('s:jobs')
+ if (!s:nvim && !s:vim8) || !exists('s:jobs')
return
endif
for [name, j] in items(s:jobs)
- silent! call jobstop(j.jobid)
+ if s:nvim
+ silent! call jobstop(j.jobid)
+ elseif s:vim8
+ silent! call job_stop(j.jobid)
+ endif
if j.new
call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
endif
@@ -853,53 +1113,88 @@ function! s:job_abort()
let s:jobs = {}
endfunction
-" When a:event == 'stdout', data = list of strings
-" When a:event == 'exit', data = returncode
-function! s:job_handler(job_id, data, event) abort
+function! s:last_non_empty_line(lines)
+ let len = len(a:lines)
+ for idx in range(len)
+ let line = a:lines[len-idx-1]
+ if !empty(line)
+ return line
+ endif
+ endfor
+ return ''
+endfunction
+
+function! s:job_out_cb(self, data) abort
+ let self = a:self
+ let data = remove(self.lines, -1) . a:data
+ let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]')
+ call extend(self.lines, lines)
+ " To reduce the number of buffer updates
+ let self.tick = get(self, 'tick', -1) + 1
+ if !self.running || self.tick % len(s:jobs) == 0
+ let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-')
+ let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines)
+ call s:log(bullet, self.name, result)
+ endif
+endfunction
+
+function! s:job_exit_cb(self, data) abort
+ let a:self.running = 0
+ let a:self.error = a:data != 0
+ call s:reap(a:self.name)
+ call s:tick()
+endfunction
+
+function! s:job_cb(fn, job, ch, data)
if !s:plug_window_exists() " plug window closed
return s:job_abort()
endif
+ call call(a:fn, [a:job, a:data])
+endfunction
- if a:event == 'stdout'
- let self.result .= substitute(s:to_s(a:data), '[\r\n]', '', 'g') . "\n"
- " To reduce the number of buffer updates
- let self.tick = get(self, 'tick', -1) + 1
- if self.tick % len(s:jobs) == 0
- call s:log(self.new ? '+' : '*', self.name, self.result)
- endif
- elseif a:event == 'exit'
- let self.running = 0
- if a:data != 0
- let self.error = 1
- endif
- call s:reap(self.name)
- call s:tick()
- endif
+function! s:nvim_cb(job_id, data, event) abort
+ return a:event == 'stdout' ?
+ \ s:job_cb('s:job_out_cb', self, 0, join(a:data, "\n")) :
+ \ s:job_cb('s:job_exit_cb', self, 0, a:data)
endfunction
function! s:spawn(name, cmd, opts)
- let job = { 'name': a:name, 'running': 1, 'error': 0, 'result': '',
- \ 'new': get(a:opts, 'new', 0),
- \ 'on_stdout': function('s:job_handler'),
- \ 'on_exit' : function('s:job_handler'),
- \ }
+ let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
+ \ 'new': get(a:opts, 'new', 0) }
let s:jobs[a:name] = job
+ let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'],
+ \ has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd)
if s:nvim
- let argv = [ 'sh', '-c',
- \ (has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd) ]
+ call extend(job, {
+ \ 'on_stdout': function('s:nvim_cb'),
+ \ 'on_exit': function('s:nvim_cb'),
+ \ })
let jid = jobstart(argv, job)
if jid > 0
let job.jobid = jid
else
let job.running = 0
let job.error = 1
- let job.result = jid < 0 ? 'sh is not executable' :
- \ 'Invalid arguments (or job table is full)'
+ let job.lines = [jid < 0 ? argv[0].' is not executable' :
+ \ 'Invalid arguments (or job table is full)']
+ endif
+ elseif s:vim8
+ let jid = job_start(argv, {
+ \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]),
+ \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]),
+ \ 'out_mode': 'raw'
+ \})
+ if job_status(jid) == 'run'
+ let job.jobid = jid
+ else
+ let job.running = 0
+ let job.error = 1
+ let job.lines = ['Failed to start job']
endif
else
let params = has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd]
- let job.result = call('s:system', params)
+ let job.lines = s:lines(call('s:system', params))
let job.error = v:shell_error != 0
let job.running = 0
endif
@@ -914,7 +1209,9 @@ function! s:reap(name)
endif
let s:update.bar .= job.error ? 'x' : '='
- call s:log(job.error ? 'x' : '-', a:name, job.result)
+ let bullet = job.error ? 'x' : '-'
+ let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines)
+ call s:log(bullet, a:name, empty(result) ? 'OK' : result)
call s:bar()
call remove(s:jobs, a:name)
@@ -931,26 +1228,33 @@ function! s:bar()
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
+ for j in range(i + 1, line('$'))
+ if getline(j) !~ '^ '
+ return [i, j - 1]
+ endif
+ endfor
+ return [i, i]
endif
endfor
- return 0
+ return [0, 0]
endfunction
function! s:log(bullet, name, lines)
if s:switch_in()
- let pos = s:logpos(a:name)
- if pos > 0
- execute pos 'd _'
- if pos > winheight('.')
- let pos = 4
+ let [b, e] = s:logpos(a:name)
+ if b > 0
+ silent execute printf('%d,%d d _', b, e)
+ if b > winheight('.')
+ let b = 4
endif
else
- let pos = 4
+ let b = 4
endif
- call append(pos - 1, s:format_message(a:bullet, a:name, a:lines))
+ " FIXME For some reason, nomodifiable is set after :d in vim8
+ setlocal modifiable
+ call append(b - 1, s:format_message(a:bullet, a:name, a:lines))
call s:switch_out()
endif
endfunction
@@ -964,12 +1268,12 @@ endfunction
function! s:tick()
let pull = s:update.pull
- let prog = s:progress_opt(s:nvim)
+ let prog = s:progress_opt(s:nvim || s:vim8)
while 1 " Without TCO, Vim stack is bound to explode
if empty(s:update.todo)
if empty(s:jobs) && !s:update.fin
- let s:update.fin = 1
call s:update_finish()
+ let s:update.fin = 1
endif
return
endif
@@ -982,30 +1286,24 @@ while 1 " Without TCO, Vim stack is bound to explode
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 [valid, msg] = s:git_valid(spec, 0)
- if valid
+ 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 }
+ let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 }
endif
else
- let s:jobs[name] = { 'running': 0, 'result': msg, 'error': 1 }
+ let s:jobs[name] = { 'running': 0, 'lines': s:lines(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
@@ -1019,9 +1317,8 @@ endwhile
endfunction
function! s:update_python()
-let py_exe = has('python3') ? 'python3' : 'python'
+let py_exe = has('python') ? 'python' : 'python3'
execute py_exe "<< EOF"
-""" Due to use of signals this function is POSIX only. """
import datetime
import functools
import os
@@ -1048,33 +1345,29 @@ G_CLONE_OPT = vim.eval('s:clone_opt')
G_PROGRESS = vim.eval('s:progress_opt(1)')
G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads'))
G_STOP = thr.Event()
-G_THREADS = {}
+G_IS_WIN = vim.eval('s:is_win') == '1'
-class BaseExc(Exception):
+class PlugError(Exception):
def __init__(self, msg):
- self._msg = msg
- @property
- def msg(self):
- return self._msg
-class CmdTimedOut(BaseExc):
+ self.msg = msg
+class CmdTimedOut(PlugError):
pass
-class CmdFailed(BaseExc):
+class CmdFailed(PlugError):
pass
-class InvalidURI(BaseExc):
+class InvalidURI(PlugError):
pass
class Action(object):
INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-']
class Buffer(object):
- def __init__(self, lock, num_plugs, is_pull, is_win):
+ def __init__(self, lock, num_plugs, is_pull):
self.bar = ''
self.event = 'Updating' if is_pull else 'Installing'
- self.is_win = is_win
self.lock = lock
self.maxy = int(vim.eval('winheight(".")'))
self.num_plugs = num_plugs
- def _where(self, name):
+ def __where(self, name):
""" Find first line with name in current buffer. Return line num. """
found, lnum = False, 0
matcher = re.compile('^[-+x*] {0}:'.format(name))
@@ -1097,14 +1390,12 @@ class Buffer(object):
with self.lock:
vim.command('normal! 2G')
- if not self.is_win:
- vim.command('redraw')
+ vim.command('redraw')
def write(self, action, name, lines):
first, rest = lines[0], lines[1:]
msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)]
- padded_rest = [' ' + line for line in rest]
- msg.extend(padded_rest)
+ msg.extend([' ' + line for line in rest])
try:
if action == Action.ERROR:
@@ -1114,7 +1405,7 @@ class Buffer(object):
self.bar += '='
curbuf = vim.current.buffer
- lnum = self._where(name)
+ lnum = self.__where(name)
if lnum != -1: # Found matching line num
del curbuf[lnum]
if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]):
@@ -1128,62 +1419,84 @@ class Buffer(object):
pass
class Command(object):
- def __init__(self, cmd, cmd_dir=None, timeout=60, ntries=3, cb=None, clean=None):
+ CD = 'cd /d' if G_IS_WIN else 'cd'
+
+ def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None):
self.cmd = cmd
- self.cmd_dir = cmd_dir
+ if cmd_dir:
+ self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd)
self.timeout = timeout
- self.ntries = ntries
self.callback = cb if cb else (lambda msg: None)
- self.clean = clean
+ self.clean = clean if clean else (lambda: None)
+ self.proc = None
- def attempt_cmd(self):
- """ Tries to run the command, returns result if no exceptions. """
- attempt = 0
- finished = False
- limit = self.timeout
+ @property
+ def alive(self):
+ """ Returns true only if command still running. """
+ return self.proc and self.proc.poll() is None
+
+ def execute(self, ntries=3):
+ """ Execute the command with ntries if CmdTimedOut.
+ Returns the output of the command if no Exception.
+ """
+ attempt, finished, limit = 0, False, self.timeout
while not finished:
try:
attempt += 1
- result = self.timeout_cmd()
+ result = self.try_command()
finished = True
+ return result
except CmdTimedOut:
- if attempt != self.ntries:
- for count in range(3, 0, -1):
- if G_STOP.is_set():
- raise KeyboardInterrupt
- msg = 'Timeout. Will retry in {0} second{1} ...'.format(
- count, 's' if count != 1 else '')
- self.callback([msg])
- time.sleep(1)
+ if attempt != ntries:
+ self.notify_retry()
self.timeout += limit
- self.callback(['Retrying ...'])
else:
raise
- return result
-
- def timeout_cmd(self):
+ def notify_retry(self):
+ """ Retry required for command, notify user. """
+ for count in range(3, 0, -1):
+ if G_STOP.is_set():
+ raise KeyboardInterrupt
+ msg = 'Timeout. Will retry in {0} second{1} ...'.format(
+ count, 's' if count != 1 else '')
+ self.callback([msg])
+ time.sleep(1)
+ self.callback(['Retrying ...'])
+
+ def try_command(self):
""" Execute a cmd & poll for callback. Returns list of output.
- Raises CmdFailed -> return code for Popen isn't 0
- Raises CmdTimedOut -> command exceeded timeout without new output
+ Raises CmdFailed -> return code for Popen isn't 0
+ Raises CmdTimedOut -> command exceeded timeout without new output
"""
- proc = None
first_line = True
+
try:
- tfile = tempfile.NamedTemporaryFile(mode='w+b', delete=False)
- proc = subprocess.Popen(self.cmd, cwd=self.cmd_dir, stdout=tfile,
- stderr=subprocess.STDOUT, shell=True, preexec_fn=os.setsid)
- while proc.poll() is None:
- # Yield this thread
- time.sleep(0.2)
+ tfile = tempfile.NamedTemporaryFile(mode='w+b')
+ preexec_fn = not G_IS_WIN and os.setsid or None
+ self.proc = subprocess.Popen(self.cmd, stdout=tfile,
+ stderr=subprocess.STDOUT,
+ stdin=subprocess.PIPE, shell=True,
+ preexec_fn=preexec_fn)
+ thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,))
+ thrd.start()
+
+ thread_not_started = True
+ while thread_not_started:
+ try:
+ thrd.join(0.1)
+ thread_not_started = False
+ except RuntimeError:
+ pass
+ while self.alive:
if G_STOP.is_set():
raise KeyboardInterrupt
if first_line or random.random() < G_LOG_PROB:
first_line = False
- line = nonblock_read(tfile.name)
+ line = '' if G_IS_WIN else nonblock_read(tfile.name)
if line:
self.callback([line])
@@ -1191,23 +1504,27 @@ class Command(object):
if time_diff > self.timeout:
raise CmdTimedOut(['Timeout!'])
+ thrd.join(0.5)
+
tfile.seek(0)
result = [line.decode('utf-8', 'replace').rstrip() for line in tfile]
- if proc.returncode != 0:
- msg = ['']
- msg.extend(result)
- raise CmdFailed(msg)
+ if self.proc.returncode != 0:
+ raise CmdFailed([''] + result)
+
+ return result
except:
- if proc and proc.poll() is None:
- os.killpg(proc.pid, signal.SIGTERM)
- if self.clean:
- self.clean()
+ self.terminate()
raise
- finally:
- os.remove(tfile.name)
- return result
+ def terminate(self):
+ """ Terminate process and cleanup. """
+ if self.alive:
+ if G_IS_WIN:
+ os.kill(self.proc.pid, signal.SIGINT)
+ else:
+ os.killpg(self.proc.pid, signal.SIGTERM)
+ self.clean()
class Plugin(object):
def __init__(self, name, args, buf_q, lock):
@@ -1215,10 +1532,7 @@ class Plugin(object):
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:
@@ -1228,7 +1542,7 @@ class Plugin(object):
self.install()
with self.lock:
thread_vim_command("let s:update.new['{0}'] = 1".format(self.name))
- except (CmdTimedOut, CmdFailed, InvalidURI) as exc:
+ except PlugError as exc:
self.write(Action.ERROR, self.name, exc.msg)
except KeyboardInterrupt:
G_STOP.set()
@@ -1241,6 +1555,8 @@ class Plugin(object):
def install(self):
target = self.args['dir']
+ if target[-1] == '\\':
+ target = target[0:-1]
def clean(target):
def _clean():
@@ -1252,17 +1568,26 @@ class Plugin(object):
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(
- '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], self.checkout, esc(target))
- com = Command(cmd, None, G_TIMEOUT, G_RETRIES, callback, clean(target))
- result = com.attempt_cmd()
+ cmd = 'git clone {0} {1} {2} {3} 2>&1'.format(
+ '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'],
+ 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 -f .git/config remote.origin.url'
+ command = Command(cmd, self.args['dir'], G_TIMEOUT,)
+ result = command.execute(G_RETRIES)
+ return result[-1]
+
def update(self):
- match = re.compile(r'git::?@')
- actual_uri = re.sub(match, '', self.repo_uri())
- expect_uri = re.sub(match, '', self.args['uri'])
- if actual_uri != expect_uri:
+ actual_uri = self.repo_uri()
+ expect_uri = self.args['uri']
+ regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$')
+ ma = regex.match(actual_uri)
+ mb = regex.match(expect_uri)
+ if ma is None or mb is None or ma.groups() != mb.groups():
msg = ['',
'Invalid URI: {0}'.format(actual_uri),
'Expected {0}'.format(expect_uri),
@@ -1273,23 +1598,13 @@ class Plugin(object):
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)
- com = Command(cmd, self.args['dir'], G_TIMEOUT, G_RETRIES, callback)
- result = com.attempt_cmd()
+ 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:])
else:
self.write(Action.DONE, self.name, ['Already installed'])
- def repo_uri(self):
- cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url'
- command = Command(cmd, self.args['dir'], G_TIMEOUT, G_RETRIES)
- result = command.attempt_cmd()
- return result[-1]
-
def write(self, action, name, msg):
self.buf_q.put((action, name, msg))
@@ -1311,10 +1626,6 @@ class PlugThread(thr.Thread):
work_q.task_done()
except queue.Empty:
pass
- finally:
- global G_THREADS
- with lock:
- del G_THREADS[thr.current_thread().name]
class RefreshThread(thr.Thread):
def __init__(self, lock):
@@ -1326,7 +1637,7 @@ class RefreshThread(thr.Thread):
while self.running:
with self.lock:
thread_vim_command('noautocmd normal! a')
- time.sleep(0.2)
+ time.sleep(0.33)
def stop(self):
self.running = False
@@ -1360,28 +1671,26 @@ def main():
nthreads = int(vim.eval('s:update.threads'))
plugs = vim.eval('s:update.todo')
mac_gui = vim.eval('s:mac_gui') == '1'
- is_win = vim.eval('s:is_win') == '1'
lock = thr.Lock()
- buf = Buffer(lock, len(plugs), G_PULL, is_win)
+ buf = Buffer(lock, len(plugs), G_PULL)
buf_q, work_q = queue.Queue(), queue.Queue()
for work in plugs.items():
work_q.put(work)
- global G_THREADS
+ start_cnt = thr.active_count()
for num in range(nthreads):
tname = 'PlugT-{0:02}'.format(num)
thread = PlugThread(tname, (buf_q, work_q, lock))
thread.start()
- G_THREADS[tname] = thread
if mac_gui:
rthread = RefreshThread(lock)
rthread.start()
- while not buf_q.empty() or len(G_THREADS) != 0:
+ 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
@@ -1421,16 +1730,25 @@ function! s:update_ruby()
def killall pid
pids = [pid]
- unless `which pgrep 2> /dev/null`.empty?
- children = pids
- until children.empty?
- children = children.map { |pid|
- `pgrep -P #{pid}`.lines.map { |l| l.chomp }
- }.flatten
- pids += children
+ if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM
+ pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil }
+ else
+ unless `which pgrep 2> /dev/null`.empty?
+ children = pids
+ until children.empty?
+ children = children.map { |pid|
+ `pgrep -P #{pid}`.lines.map { |l| l.chomp }
+ }.flatten
+ pids += children
+ end
end
+ pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil }
end
- pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil }
+ end
+
+ def compare_git_uri a, b
+ regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$}
+ regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1)
end
require 'thread'
@@ -1456,7 +1774,7 @@ function! s:update_ruby()
$curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})"
$curbuf[2] = '[' + bar.ljust(tot) + ']'
VIM::command('normal! 2G')
- VIM::command('redraw') unless iswin
+ VIM::command('redraw')
}
where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } }
log = proc { |name, result, type|
@@ -1471,7 +1789,7 @@ function! s:update_ruby()
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
@@ -1534,9 +1852,8 @@ function! s:update_ruby()
main = Thread.current
threads = []
watcher = Thread.new {
- while VIM::evaluate('getchar(1)')
- sleep 0.1
- end
+ require 'io/console' # >= Ruby 1.9
+ nil until IO.console.getch == 3.chr
mtx.synchronize do
running = false
threads.each { |t| t.raise Interrupt }
@@ -1561,15 +1878,12 @@ function! s:update_ruby()
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
- dir = iswin ? dir : esc(dir)
- ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url", nil, nil, nil
+ chdir = "#{cd} #{iswin ? dir : esc(dir)}"
+ 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/
@@ -1577,7 +1891,7 @@ function! s:update_ruby()
else
[false, [data.chomp, "PlugClean required."].join($/)]
end
- elsif current_uri.sub(/git::?@/, '') != uri.sub(/git::?@/, '')
+ elsif !compare_git_uri(current_uri, uri)
[false, ["Invalid URI: #{current_uri}",
"Expected: #{uri}",
"PlugClean required."].join($/)]
@@ -1585,7 +1899,7 @@ function! s:update_ruby()
if pull
log.call name, 'Updating ...', :update
fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : ''
- bt.call "#{cd} #{dir} && 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
@@ -1593,7 +1907,7 @@ function! s:update_ruby()
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
@@ -1615,7 +1929,7 @@ function! s:shellesc(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)
@@ -1623,9 +1937,15 @@ function! s:progress_bar(line, bar, total)
endfunction
function! s:compare_git_uri(a, b)
- let a = substitute(a:a, 'git:\{1,2}@', '', '')
- let b = substitute(a:b, 'git:\{1,2}@', '', '')
- return a ==# b
+ " See `git help clone'
+ " https:// [user@] github.com[:port] / junegunn/vim-plug [.git]
+ " [git@] github.com[:port] : junegunn/vim-plug [.git]
+ " file:// / junegunn/vim-plug [/]
+ " / junegunn/vim-plug [/]
+ let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$'
+ let ma = matchlist(a:a, pat)
+ let mb = matchlist(a:b, pat)
+ return ma[1:2] ==# mb[1:2]
endfunction
function! s:format_message(bullet, name, message)
@@ -1643,10 +1963,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
@@ -1659,42 +1976,53 @@ function! s:system_chomp(...)
return v:shell_error ? '' : substitute(ret, '\n$', '', '')
endfunction
-function! s:git_valid(spec, check_branch)
- let ret = 1
- let msg = 'OK'
+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 msg = join([remote, 'PlugClean required.'], "\n")
- let ret = 0
+ let err = join([remote, 'PlugClean required.'], "\n")
elseif !s:compare_git_uri(remote, a:spec.uri)
- let msg = join(['Invalid URI: '.remote,
+ let err = join(['Invalid URI: '.remote,
\ 'Expected: '.a:spec.uri,
\ 'PlugClean required.'], "\n")
- let ret = 0
+ elseif a:check_branch && has_key(a:spec, 'commit')
+ let result = s:lines(s:system('git rev-parse HEAD 2>&1', a:spec.dir))
+ let sha = result[-1]
+ if v:shell_error
+ let err = join(add(result, 'PlugClean required.'), "\n")
+ elseif !s:hash_match(sha, a:spec.commit)
+ let err = join([printf('Invalid HEAD (expected: %s, actual: %s)',
+ \ a:spec.commit[:6], sha[:6]),
+ \ 'PlugUpdate required.'], "\n")
+ endif
elseif a:check_branch
let branch = result[0]
" Check tag
if has_key(a:spec, 'tag')
let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir)
if a:spec.tag !=# tag
- let msg = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.',
+ let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.',
\ (empty(tag) ? 'N/A' : tag), a:spec.tag)
- let ret = 0
endif
" Check branch
elseif a:spec.branch !=# branch
- let msg = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.',
+ let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.',
\ branch, a:spec.branch)
- let ret = 0
+ 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 msg = 'Not found'
- let ret = 0
+ let err = 'Not found'
endif
- return [ret, msg]
+ return [err, err =~# 'PlugClean']
endfunction
function! s:rm_rf(dir)
@@ -1705,15 +2033,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) || s:git_valid(spec, 0)[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)
@@ -1737,28 +2073,60 @@ function! s:clean(force)
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
- call inputsave()
- let yes = a:force || (input('Proceed? (y/N) ') =~? '^y')
- call inputrestore()
- if yes
- 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()
@@ -1805,7 +2173,8 @@ function! s:status()
for [name, spec] in items(g:plugs)
if has_key(spec, 'uri')
if isdirectory(spec.dir)
- let [valid, msg] = s:git_valid(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.']
endif
@@ -1868,7 +2237,6 @@ function! s:is_preview_window_open()
wincmd p
return 1
endif
- return 0
endfunction
function! s:find_name(lnum)
@@ -1890,7 +2258,7 @@ function! s:preview_commit()
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
@@ -1900,11 +2268,15 @@ function! s:preview_commit()
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
@@ -1914,41 +2286,72 @@ function! s:section(flags)
call search('\(^[x-] \)\@<=[^:]\+:', a:flags)
endfunction
+function! s:format_git_log(line)
+ 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%s (%s)', indent, graph, sha, tag, subject, date)
+endfunction
+
+function! s:append_ul(lnum, text)
+ call append(a:lnum, ['', a:text, repeat('-', len(a:text))])
+endfunction
+
function! s:diff()
call s:prepare()
- call append(0, 'Collecting updated changes ...')
- normal! gg
- redraw
-
- let cnt = 0
- for [k, v] in items(g:plugs)
- if !isdirectory(v.dir) || !s:is_managed(k)
+ call append(0, ['Collecting changes ...', ''])
+ let cnts = [0, 0]
+ 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
-
- let diff = s:system_chomp('git log --pretty=format:"%h %s (%cr)" "HEAD...HEAD@{1}"', v.dir)
- if !empty(diff)
- call append(1, '')
- call append(2, '- '.k.':')
- call append(3, map(s:lines(diff), '" ". v:val'))
- let cnt += 1
- normal! gg
+ call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
+ for [k, v] in plugs
+ 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)
+ 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)')))
+ let cnts[origin] += 1
+ endif
+ let bar .= '='
+ call s:progress_bar(2, bar, len(total))
+ normal! 2G
redraw
+ endfor
+ if !cnts[origin]
+ call append(5, ['', 'N/A'])
endif
endfor
+ call setline(1, printf('%d plugin(s) updated.', cnts[0])
+ \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
- call setline(1, cnt == 0 ? 'No updates.' : 'Last update:')
- nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
- nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr>
- nnoremap <silent> <buffer> X :call <SID>revert()<cr>
- normal! gg
- setlocal nomodifiable
- if cnt > 0
+ if cnts[0] || cnts[1]
+ nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
+ nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr>
+ endif
+ if cnts[0]
+ nnoremap <silent> <buffer> X :call <SID>revert()<cr>
echo "Press 'X' on each block to revert the update"
endif
+ normal! gg
+ setlocal nomodifiable
endfunction
function! s:revert()
+ if search('^Pending updates', 'bnW')
+ return
+ endif
+
let name = s:find_name(line('.'))
if empty(name) || !has_key(g:plugs, name) ||
\ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y'
@@ -1959,45 +2362,38 @@ function! s:revert()
setlocal modifiable
normal! "_dap
setlocal nomodifiable
- echo 'Reverted.'
+ echo 'Reverted'
endfunction
-function! s:snapshot(...) abort
- let home = get(s:, 'plug_home_org', g:plug_home)
- let [type, var, header] = s:is_win ?
- \ ['dosbatch', '%PLUG_HOME%',
- \ ['@echo off', ':: Generated by vim-plug', ':: '.strftime("%c"), '',
- \ ':: Make sure to PlugUpdate first', '', 'set PLUG_HOME='.home]] :
- \ ['sh', '$PLUG_HOME',
- \ ['#!/bin/sh', '# Generated by vim-plug', '# '.strftime("%c"), '',
- \ 'vim +PlugUpdate +qa', '', 'PLUG_HOME='.s:esc(home)]]
-
+function! s:snapshot(force, ...) abort
call s:prepare()
- execute 'setf' type
- call append(0, header)
- call append('$', '')
+ setf vim
+ call append(0, ['" Generated by vim-plug',
+ \ '" '.strftime("%c"),
+ \ '" :source this file in vim to restore the snapshot',
+ \ '" or execute: vim -S snapshot.vim',
+ \ '', '', 'PlugUpdate!'])
1
- redraw
-
- let dirs = sort(map(values(filter(copy(g:plugs),
- \'has_key(v:val, "uri") && isdirectory(v:val.dir)')), 'v:val.dir'))
- let anchor = line('$') - 1
- for dir in reverse(dirs)
- let sha = s:system_chomp('git rev-parse --short HEAD', dir)
+ let anchor = line('$') - 3
+ let names = sort(keys(filter(copy(g:plugs),
+ \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)')))
+ for name in reverse(names)
+ let sha = s:system_chomp('git rev-parse --short HEAD', g:plugs[name].dir)
if !empty(sha)
- call append(anchor, printf('cd %s && git reset --hard %s',
- \ substitute(dir, '^\V'.escape(g:plug_home, '\'), var, ''), sha))
+ call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha))
redraw
endif
endfor
if a:0 > 0
let fn = expand(a:1)
- let fne = s:esc(fn)
+ if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?'))
+ return
+ endif
call writefile(getline(1, '$'), fn)
- if !s:is_win | call s:system('chmod +x ' . fne) | endif
- echo 'Saved to '.a:1
- silent execute 'e' fne
+ echo 'Saved as '.a:1
+ silent execute 'e' s:esc(fn)
+ setf vim
endif
endfunction
@@ -2016,4 +2412,3 @@ endif
let &cpo = s:cpo_save
unlet s:cpo_save
-