aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2015-07-10 19:45:41 +0200
committerDuncaen <mail@duncano.de>2015-07-10 19:46:05 +0200
commitc903d7d76cffb1d16f71091be0f4f0ed09cc0b4e (patch)
tree67662a984b4c3147e39bb51c9e47be4de4d26409
parent1093d172be6d4673fd93d5b7195bebedff4d2ce1 (diff)
downloaddotfiles-c903d7d76cffb1d16f71091be0f4f0ed09cc0b4e.tar.gz
work changes
-rwxr-xr-xbin/venv90
-rwxr-xr-xmksh.d/00-go.sh7
-rwxr-xr-xmksh.d/00-xbps.sh2
-rw-r--r--mkshrc5
-rw-r--r--profile2
l---------service.x/vbox-win-workstation1
-rwxr-xr-xsv/statusbar/run2
-rwxr-xr-xsv/vbox-win-workstation/control/t3
-rw-r--r--sv/vbox-win-workstation/down0
-rwxr-xr-xsv/vbox-win-workstation/run3
-rwxr-xr-xsv/x/xinit12
-rw-r--r--vim/autoload/plug.vim410
-rw-r--r--vim/autoload/plug.vim.old2020
13 files changed, 2272 insertions, 285 deletions
diff --git a/bin/venv b/bin/venv
index a4ed46d..f047580 100755
--- a/bin/venv
+++ b/bin/venv
@@ -1,80 +1,30 @@
#!/bin/mksh
-readonly PROGNAME=$(basename $0)
-
-venv_list() {
- ls -1 "$VENV_PATH"
-}
-
-venv_create() {
- if [[ ! -d "$VENV_PATH/$1" ]]; then
- mkdir -pv "$VENV_PATH/$1"
- fi
- "${VENV_CMD}" "$VENV_PATH/$1"
-}
-
-venv_delete() {
- if [[ -d $VENV_PATH/$1 ]]; then
- rm -rfv $VENV_PATH/$1
- fi
-}
-
-venv_run() {
- [ -n "$1" ] || usage
-
- name="$1"
- cmd="$2"
-
- if [[ -z "$cmd" ]]; then
- shift 1
- else
- shift 2
- fi
-
- if [[ ! -d "$VENV_PATH/$name" ]]; then
- echo "venv: $name not found"
- exit 1
- fi
-
- # virtualenv magic
- unset PYTHONHOME
- export VIRTUAL_ENV="$VENV_PATH/$name"
- export PATH="$VIRTUAL_ENV/bin:$PATH"
-
- # run command with args or mksh
- "${cmd:-mksh}" "${@}"
-
- exit 0
-}
-
-usage() {
+function usage {
cat <<EOF
- Usage: $PROGNAME <command> [<args>]
-
- Commands:
- l, list
- c, create <name>
- d, delete <name>
- r, run <name> [<cmd> [<args>...]]
+ Usage: $(basename $0) <path> [<cmd> <args>]
EOF
exit
}
-: ${CONFIG_FILE:=~/.venv/config}
-: ${VENV_PATH:=~/.venv}
-: ${VENV_CMD:=virtualenv-2.7}
-
-if [ -r "${CONFIG_FILE}" ]; then
- . "$CONFIG_FILE"
+[ -n "$1" ] ||
+[ -d "$1" ] || echo "venv: $1 not found" & exit 1
+
+if [ -n "$1" || ! -d "$1" ]; then
+ echo "venv: <path> [<cmd> [<arg>...]]" & exit 1
fi
-command="$1"
-[ -z "$command" ] || shift 1
+# virtualenv magic
+unset PYTHONHOME
+export VIRTUAL_ENV="$1"
+export PATH="$1/bin:$PATH"
+
+shift 1
-case "$command" in
- l*) venv_list ;;
- c*) venv_create "$1" ;;
- d*) venv_delete "$1" ;;
- r*) venv_run "${@}" ;;
- *) usage ;;
-esac
+echo "$#"
+
+if [ "$#" -gt "1" ]; then
+ "${@}"
+else
+ /bin/mksh
+fi
diff --git a/mksh.d/00-go.sh b/mksh.d/00-go.sh
index 836d665..cb261af 100755
--- a/mksh.d/00-go.sh
+++ b/mksh.d/00-go.sh
@@ -1,3 +1,4 @@
-export GOPATH=~/go
-export GOBIN=$GOPATH/bin
-export PATH="$PATH:$GOBIN"
+GOPATH="$HOME/go"
+GOBIN="$GOPATH/bin"
+PATH="$PATH:$GOBIN"
+export GOPATH GOBIN PATH
diff --git a/mksh.d/00-xbps.sh b/mksh.d/00-xbps.sh
index 6d6d231..4c191c6 100755
--- a/mksh.d/00-xbps.sh
+++ b/mksh.d/00-xbps.sh
@@ -1,4 +1,4 @@
-if [ -d /etc/xbps.d ]; then
+if [ -x /usr/bin/xbps-install ]; then
export XBPS_DISTDIR=/srv/void-packages
alias xi='sudo xbps-install'
alias xr='sudo xbps-remove'
diff --git a/mkshrc b/mkshrc
index 7b41fe5..98880e0 100644
--- a/mkshrc
+++ b/mkshrc
@@ -390,7 +390,8 @@ function setenv {
HISTFILE=$HOME/.mksh_history
HISTSIZE=1000
SHELL=$MKSH
-export HISTFILE HISTSIZE SHELL
+PATH="$HOME/bin:$PATH"
+export HISTFILE HISTSIZE SHELL PATH
# fix del key
printf '\033[?1h\033=' >/dev/tty
@@ -398,7 +399,7 @@ printf '\033[?1h\033=' >/dev/tty
if [ -d ~/.mksh.d ]; then
for f in ~/.mksh.d/*.sh; do
- [ -x "$f" ] && source "$f"
+ [ -x "$f" ] && . "$f"
done
fi
diff --git a/profile b/profile
index ea9aaa3..62d003e 100644
--- a/profile
+++ b/profile
@@ -2,7 +2,7 @@
. /etc/profile
# Keychain
-[ -r /usr/bin/keychain ] && eval `keychain --eval --agents ssh id_rsa`
+[ -r /usr/bin/keychain -a "$(tty)" = "/dev/tty1" ] && eval `keychain --eval --agents ssh id_rsa`
#
export DISPLAY=:0
diff --git a/service.x/vbox-win-workstation b/service.x/vbox-win-workstation
new file mode 120000
index 0000000..6781f3c
--- /dev/null
+++ b/service.x/vbox-win-workstation
@@ -0,0 +1 @@
+/home/duncan/sv/vbox-win-workstation \ No newline at end of file
diff --git a/sv/statusbar/run b/sv/statusbar/run
index 8668019..d622975 100755
--- a/sv/statusbar/run
+++ b/sv/statusbar/run
@@ -1,3 +1,3 @@
#!/bin/mksh
-exec ~/repos/go-dwmstatus/go-dwmstatus
+exec go-dwmstatus
diff --git a/sv/vbox-win-workstation/control/t b/sv/vbox-win-workstation/control/t
new file mode 100755
index 0000000..11f6f83
--- /dev/null
+++ b/sv/vbox-win-workstation/control/t
@@ -0,0 +1,3 @@
+#!/bin/mksh
+
+VBoxManage controlvm "Windows 8.1" savestate
diff --git a/sv/vbox-win-workstation/down b/sv/vbox-win-workstation/down
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/sv/vbox-win-workstation/down
diff --git a/sv/vbox-win-workstation/run b/sv/vbox-win-workstation/run
new file mode 100755
index 0000000..9edc37f
--- /dev/null
+++ b/sv/vbox-win-workstation/run
@@ -0,0 +1,3 @@
+#!/bin/mksh
+
+exec VBoxSDL --startvm "Windows 8.1"
diff --git a/sv/x/xinit b/sv/x/xinit
index 2c767c7..30439a5 100755
--- a/sv/x/xinit
+++ b/sv/x/xinit
@@ -7,7 +7,17 @@ xset +fp ~/.fonts/
xset +fp /usr/share/fonts/misc/
xset fp rehash
xset -b
-xrandr --dpi 96
+
+case "$HOSTNAME" in
+ tux)
+ xrandr --dpi 96
+ ;;
+ mir02)
+ xrandr --dpi 91
+ xrandr --output DP1 --left-of DP2
+ ;;
+esac
+
setxkbmap de
echo "starting ~/service.x"
diff --git a/vim/autoload/plug.vim b/vim/autoload/plug.vim
index 8886b2a..cabeb4f 100644
--- a/vim/autoload/plug.vim
+++ b/vim/autoload/plug.vim
@@ -3,8 +3,7 @@
"
" Download plug.vim and put it in ~/.vim/autoload
"
-" mkdir -p ~/.vim/autoload
-" curl -fLo ~/.vim/autoload/plug.vim \
+" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
"
" Edit your .vimrc
@@ -15,6 +14,9 @@
" Plug 'junegunn/seoul256.vim'
" Plug 'junegunn/vim-easy-align'
"
+" " Group dependencies, vim-snippets depends on ultisnips
+" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
+"
" " On-demand loading
" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
" Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
@@ -23,7 +25,7 @@
" Plug 'https://github.com/junegunn/vim-github-dashboard.git'
"
" " Plugin options
-" Plug 'nsf/gocode', { 'tag': 'go.weekly.2012-03-13', 'rtp': 'vim' }
+" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
"
" " Plugin outside ~/.vim/plugged with post-update hook
" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
@@ -37,7 +39,7 @@
" Visit https://github.com/junegunn/vim-plug for more information.
"
"
-" Copyright (c) 2014 Junegunn Choi
+" Copyright (c) 2015 Junegunn Choi
"
" MIT License
"
@@ -68,14 +70,12 @@ let g:loaded_plug = 1
let s:cpo_save = &cpo
set cpo&vim
-let s:plug_src = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
let s:plug_tab = get(s:, 'plug_tab', -1)
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:py2 = has('python') && !s:is_win
-let s:ruby = has('ruby') && (v:version >= 703 || v:version == 702 && has('patch374'))
-let s:nvim = has('nvim') && !s:is_win
+let s:nvim = has('nvim') && exists('*jobwait') && !s:is_win
let s:me = resolve(expand('<sfile>:p'))
let s:base_spec = { 'branch': 'master', 'frozen': 0 }
let s:TYPE = {
@@ -166,7 +166,7 @@ function! plug#end()
if has_key(plug, 'on')
let s:triggers[name] = { 'map': [], 'cmd': [] }
for cmd in s:to_a(plug.on)
- if cmd =~ '^<Plug>.\+'
+ if cmd =~? '^<Plug>.\+'
if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i'))
call s:assoc(lod.map, cmd, name)
endif
@@ -271,7 +271,7 @@ if s:is_win
endfunction
function! s:is_local_plug(repo)
- return a:repo =~? '^[a-z]:'
+ return a:repo =~? '^[a-z]:\|^[%~]'
endfunction
else
function! s:rtp(spec)
@@ -359,7 +359,9 @@ function! plug#load(...)
for name in a:000
call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
endfor
- doautocmd BufRead
+ if exists('#BufRead')
+ doautocmd BufRead
+ endif
return 1
endfunction
@@ -389,14 +391,21 @@ 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
+ endif
endfor
endfunction
function! s:lod_ft(pat, names)
call s:lod(a:names, ['plugin', 'after/plugin'])
execute 'autocmd! PlugLOD FileType' a:pat
- doautocmd filetypeplugin FileType
- doautocmd filetypeindent FileType
+ if exists('#filetypeplugin#FileType')
+ doautocmd filetypeplugin FileType
+ endif
+ if exists('#filetypeindent#FileType')
+ doautocmd filetypeindent FileType
+ endif
endfunction
function! s:lod_cmd(cmd, bang, l1, l2, args, names)
@@ -431,7 +440,7 @@ function! s:add(repo, ...)
call add(g:plugs_order, name)
endif
let g:plugs[name] = spec
- let s:loaded[name] = 0
+ let s:loaded[name] = get(s:loaded, name, 0)
catch
return s:err(v:exception)
endtry
@@ -710,7 +719,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', 16)
+ \ remove(args, -1) : get(g:, 'plug_threads', s:is_win ? 1 : 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)') :
@@ -741,6 +750,16 @@ function! s:update_impl(pull, force, args) abort
endtry
endif
+ if has('nvim') && !exists('*jobwait') && threads > 1
+ echohl WarningMsg
+ echomsg 'vim-plug: update Neovim for parallel installer'
+ echohl None
+ 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 s:update = {
\ 'start': reltime(),
\ 'all': todo,
@@ -749,7 +768,7 @@ function! s:update_impl(pull, force, args) abort
\ 'pull': a:pull,
\ 'force': a:force,
\ 'new': {},
- \ 'threads': (s:py2 || s:ruby || s:nvim) ? min([len(todo), threads]) : 1,
+ \ 'threads': (python || ruby || s:nvim) ? min([len(todo), threads]) : 1,
\ 'bar': '',
\ 'fin': 0
\ }
@@ -757,22 +776,27 @@ function! s:update_impl(pull, force, args) abort
call s:prepare()
call append(0, ['', ''])
normal! 2G
+ silent! redraw
+
+ let s:clone_opt = get(g:, 'plug_shallow', 1) ?
+ \ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : ''
" Python version requirement (>= 2.7)
- if s:py2 && !s:ruby && !s:nvim && s:update.threads > 1
+ if python && !has('python3') && !ruby && !s:nvim && s:update.threads > 1
redir => pyv
silent python import platform; print(platform.python_version())
redir END
- let s:py2 = s:version_requirement(
- \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 7])
+ let python = s:version_requirement(
+ \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6])
endif
- if (s:py2 || s:ruby) && !s:nvim && s:update.threads > 1
+
+ if (python || ruby) && s:update.threads > 1
try
let imd = &imd
if s:mac_gui
set noimd
endif
- if s:ruby
+ if ruby
call s:update_ruby()
else
call s:update_python()
@@ -818,9 +842,7 @@ function! s:job_abort()
if !s:nvim || !exists('s:jobs')
return
endif
- augroup PlugJobControl
- autocmd!
- augroup END
+
for [name, j] in items(s:jobs)
silent! call jobstop(j.jobid)
if j.new
@@ -830,52 +852,48 @@ function! s:job_abort()
let s:jobs = {}
endfunction
-function! s:job_handler(name) abort
+" When a:event == 'stdout', data = list of strings
+" When a:event == 'exit', data = returncode
+function! s:job_handler(job_id, data, event) abort
if !s:plug_window_exists() " plug window closed
return s:job_abort()
endif
- if !has_key(s:jobs, a:name)
- return
- endif
- let job = s:jobs[a:name]
-
- if v:job_data[1] == 'exit'
- let job.running = 0
- if s:lastline(job.result) ==# 'Error'
- let job.error = 1
- let job.result = substitute(job.result, "Error[\r\n]$", '', '')
- endif
- call s:reap(a:name)
- call s:tick()
- else
- let job.result .= s:to_s(v:job_data[2])
+ 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 job.tick = get(job, 'tick', -1) + 1
- if job.tick % len(s:jobs) == 0
- call s:log(job.new ? '+' : '*', a:name, job.result)
+ 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
endfunction
function! s:spawn(name, cmd, opts)
- let job = { 'running': 1, 'new': get(a:opts, 'new', 0),
- \ 'error': 0, 'result': '' }
+ 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 s:jobs[a:name] = job
if s:nvim
- let x = jobstart(a:name, 'sh', ['-c',
- \ (has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd)
- \ . ' || echo Error'])
- if x > 0
- let job.jobid = x
- augroup PlugJobControl
- execute 'autocmd JobActivity' a:name printf('call s:job_handler(%s)', string(a:name))
- augroup END
+ let argv = [ 'sh', '-c',
+ \ (has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd) ]
+ let jid = jobstart(argv, job)
+ if jid > 0
+ let job.jobid = jid
else
let job.running = 0
let job.error = 1
- let job.result = x < 0 ? 'sh is not executable' :
+ let job.result = jid < 0 ? 'sh is not executable' :
\ 'Invalid arguments (or job table is full)'
endif
else
@@ -887,10 +905,6 @@ function! s:spawn(name, cmd, opts)
endfunction
function! s:reap(name)
- if s:nvim
- silent! execute 'autocmd! PlugJobControl JobActivity' a:name
- endif
-
let job = s:jobs[a:name]
if job.error
call add(s:update.errors, a:name)
@@ -966,16 +980,18 @@ while 1 " Without TCO, Vim stack is bound to explode
call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
redraw
- let checkout = s:shellesc(has_key(spec, 'tag') ? spec.tag : spec.branch)
- let merge = s:shellesc(has_key(spec, 'tag') ? spec.tag : 'origin/'.spec.branch)
+ 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
if pull
+ let fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : ''
call s:spawn(name,
- \ printf('(git fetch %s 2>&1 && git checkout -q %s 2>&1 && git merge --ff-only %s 2>&1 && git submodule update --init --recursive 2>&1)',
- \ prog, checkout, merge), { 'dir': spec.dir })
+ \ 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 })
else
let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 }
endif
@@ -984,7 +1000,8 @@ while 1 " Without TCO, Vim stack is bound to explode
endif
else
call s:spawn(name,
- \ printf('git clone %s --recursive %s -b %s %s 2>&1',
+ \ printf('git clone %s %s --recursive %s -b %s %s 2>&1',
+ \ has_tag ? '' : s:clone_opt,
\ prog,
\ s:shellesc(spec.uri),
\ checkout,
@@ -1001,12 +1018,16 @@ endwhile
endfunction
function! s:update_python()
-python << EOF
+let py_exe = has('python3') ? 'python3' : 'python'
+execute py_exe "<< EOF"
""" Due to use of signals this function is POSIX only. """
import datetime
import functools
import os
-import Queue
+try:
+ import queue
+except ImportError:
+ import Queue as queue
import random
import re
import shutil
@@ -1018,48 +1039,36 @@ import time
import traceback
import vim
+G_NVIM = vim.eval("has('nvim')") == '1'
G_PULL = vim.eval('s:update.pull') == '1'
G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1
G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)'))
+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()
-
-class CmdTimedOut(Exception):
+G_THREADS = {}
+
+class BaseExc(Exception):
+ def __init__(self, msg):
+ self._msg = msg
+ @property
+ def msg(self):
+ return self._msg
+class CmdTimedOut(BaseExc):
pass
-class CmdFailed(Exception):
+class CmdFailed(BaseExc):
pass
-class InvalidURI(Exception):
+class InvalidURI(BaseExc):
pass
class Action(object):
INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-']
-class GLog(object):
- ON = None
- LOGDIR = None
- @classmethod
- def write(cls, msg):
- if cls.ON is None:
- cls.ON = int(vim.eval('get(g:, "plug_log_on", 0)'))
- cls.LOGDIR = os.path.expanduser(vim.eval('get(g:, "plug_logs", "~/plug_logs")'))
- if cls.ON:
- if not os.path.exists(cls.LOGDIR):
- os.makedirs(cls.LOGDIR)
- cls._write(msg)
- @classmethod
- def _write(cls, msg):
- name = thr.current_thread().name
- fname = cls.LOGDIR + os.path.sep + name
- with open(fname, 'ab') as flog:
- ltime = datetime.datetime.now().strftime("%H:%M:%S.%f")
- msg = '[{},{}] {}{}'.format(name, ltime, msg, '\n')
- flog.write(msg)
-
class Buffer(object):
- def __init__(self, lock, num_plugs):
+ def __init__(self, lock, num_plugs, is_pull, is_win):
self.bar = ''
- self.event = 'Updating' if vim.eval('s:update.pull') == '1' else 'Installing'
- self.is_win = vim.eval('s:is_win') == '1'
+ 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
@@ -1067,7 +1076,7 @@ class Buffer(object):
def _where(self, name):
""" Find first line with name in current buffer. Return line num. """
found, lnum = False, 0
- matcher = re.compile('^[-+x*] {}:'.format(name))
+ matcher = re.compile('^[-+x*] {0}:'.format(name))
for line in vim.current.buffer:
if matcher.search(line) is not None:
found = True
@@ -1080,29 +1089,26 @@ class Buffer(object):
def header(self):
curbuf = vim.current.buffer
- curbuf[0] = self.event + ' plugins ({}/{})'.format(len(self.bar), self.num_plugs)
+ curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs)
num_spaces = self.num_plugs - len(self.bar)
- curbuf[1] = '[{}{}]'.format(self.bar, num_spaces * ' ')
+ curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ')
- vim.command('normal! 2G')
- if not self.is_win:
- vim.command('redraw')
-
- def write(self, *args, **kwargs):
with self.lock:
- self._write(*args, **kwargs)
+ vim.command('normal! 2G')
+ if not self.is_win:
+ vim.command('redraw')
- def _write(self, action, name, lines):
+ def write(self, action, name, lines):
first, rest = lines[0], lines[1:]
- msg = ['{} {}{}{}'.format(action, name, ': ' if first else '', first)]
+ msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)]
padded_rest = [' ' + line for line in rest]
msg.extend(padded_rest)
try:
if action == Action.ERROR:
self.bar += 'x'
- vim.command("call add(s:update.errors, '{}')".format(name))
+ vim.command("call add(s:update.errors, '{0}')".format(name))
elif action == Action.DONE:
self.bar += '='
@@ -1110,7 +1116,7 @@ class Buffer(object):
lnum = self._where(name)
if lnum != -1: # Found matching line num
del curbuf[lnum]
- if lnum > self.maxy and action in {Action.INSTALL, Action.UPDATE}:
+ if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]):
lnum = 3
else:
lnum = 3
@@ -1118,7 +1124,7 @@ class Buffer(object):
self.header()
except vim.error:
- GLog.write('Buffer Update FAILED.')
+ pass
class Command(object):
def __init__(self, cmd, cmd_dir=None, timeout=60, ntries=3, cb=None, clean=None):
@@ -1145,7 +1151,7 @@ class Command(object):
for count in range(3, 0, -1):
if G_STOP.is_set():
raise KeyboardInterrupt
- msg = 'Timeout. Will retry in {} second{} ...'.format(
+ msg = 'Timeout. Will retry in {0} second{1} ...'.format(
count, 's' if count != 1 else '')
self.callback([msg])
time.sleep(1)
@@ -1164,7 +1170,7 @@ class Command(object):
proc = None
first_line = True
try:
- tfile = tempfile.NamedTemporaryFile()
+ 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:
@@ -1185,7 +1191,7 @@ class Command(object):
raise CmdTimedOut(['Timeout!'])
tfile.seek(0)
- result = [line.rstrip() for line in tfile]
+ result = [line.decode().rstrip() for line in tfile]
if proc.returncode != 0:
msg = ['']
@@ -1197,18 +1203,21 @@ class Command(object):
if self.clean:
self.clean()
raise
+ finally:
+ os.remove(tfile.name)
return result
class Plugin(object):
- def __init__(self, name, args, buf, lock):
+ def __init__(self, name, args, buf_q, lock):
self.name = name
self.args = args
- self.buf = buf
+ 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
def manage(self):
try:
@@ -1217,15 +1226,15 @@ class Plugin(object):
else:
self.install()
with self.lock:
- vim.command("let s:update.new['{}'] = 1".format(self.name))
+ thread_vim_command("let s:update.new['{0}'] = 1".format(self.name))
except (CmdTimedOut, CmdFailed, InvalidURI) as exc:
- self.write(Action.ERROR, self.name, exc.message)
+ self.write(Action.ERROR, self.name, exc.msg)
except KeyboardInterrupt:
G_STOP.set()
self.write(Action.ERROR, self.name, ['Interrupted!'])
except:
# Any exception except those above print stack trace
- msg = 'Trace:\n{}'.format(traceback.format_exc().rstrip())
+ msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip())
self.write(Action.ERROR, self.name, msg.split('\n'))
raise
@@ -1241,9 +1250,9 @@ class Plugin(object):
return _clean
self.write(Action.INSTALL, self.name, ['Installing ...'])
- callback = functools.partial(self.buf.write, Action.INSTALL, self.name)
- cmd = 'git clone {} --recursive {} -b {} {} 2>&1'.format(
- G_PROGRESS, self.args['uri'], self.checkout, esc(target))
+ 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()
self.write(Action.DONE, self.name, result[-1:])
@@ -1254,23 +1263,22 @@ class Plugin(object):
expect_uri = re.sub(match, '', self.args['uri'])
if actual_uri != expect_uri:
msg = ['',
- 'Invalid URI: {}'.format(actual_uri),
- 'Expected {}'.format(expect_uri),
+ 'Invalid URI: {0}'.format(actual_uri),
+ 'Expected {0}'.format(expect_uri),
'PlugClean required.']
raise InvalidURI(msg)
if G_PULL:
self.write(Action.UPDATE, self.name, ['Updating ...'])
- callback = functools.partial(self.buf.write, Action.UPDATE, self.name)
- cmds = ['git fetch {}'.format(G_PROGRESS),
- 'git checkout -q {}'.format(self.checkout),
- 'git merge --ff-only {}'.format(self.merge),
+ 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)
- GLog.write(cmd)
com = Command(cmd, self.args['dir'], G_TIMEOUT, G_RETRIES, callback)
result = com.attempt_cmd()
- GLog.write(result)
self.write(Action.DONE, self.name, result[-1:])
else:
self.write(Action.DONE, self.name, ['Already installed'])
@@ -1282,8 +1290,7 @@ class Plugin(object):
return result[-1]
def write(self, action, name, msg):
- GLog.write('{} {}: {}'.format(action, name, '\n'.join(msg)))
- self.buf.write(action, name, msg)
+ self.buf_q.put((action, name, msg))
class PlugThread(thr.Thread):
def __init__(self, tname, args):
@@ -1293,17 +1300,20 @@ class PlugThread(thr.Thread):
def run(self):
thr.current_thread().name = self.tname
- work_q, lock, buf = self.args
+ buf_q, work_q, lock = self.args
try:
while not G_STOP.is_set():
name, args = work_q.get_nowait()
- GLog.write('{}: Dir {}'.format(name, args['dir']))
- plug = Plugin(name, args, buf, lock)
+ plug = Plugin(name, args, buf_q, lock)
plug.manage()
work_q.task_done()
- except Queue.Empty:
- GLog.write('Queue now empty.')
+ 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):
@@ -1314,19 +1324,26 @@ class RefreshThread(thr.Thread):
def run(self):
while self.running:
with self.lock:
- vim.command('noautocmd normal! a')
+ thread_vim_command('noautocmd normal! a')
time.sleep(0.2)
def stop(self):
self.running = False
+if G_NVIM:
+ def thread_vim_command(cmd):
+ vim.session.threadsafe_call(lambda: vim.command(cmd))
+else:
+ def thread_vim_command(cmd):
+ vim.command(cmd)
+
def esc(name):
return '"' + name.replace('"', '\"') + '"'
def nonblock_read(fname):
""" Read a file with nonblock flag. Return the last line. """
fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK)
- buf = os.read(fread, 100000)
+ buf = os.read(fread, 100000).decode()
os.close(fread)
line = buf.rstrip('\r\n')
@@ -1339,42 +1356,40 @@ def nonblock_read(fname):
def main():
thr.current_thread().name = 'main'
- GLog.write('')
- if GLog.ON and os.path.exists(GLog.LOGDIR):
- shutil.rmtree(GLog.LOGDIR)
-
- threads = []
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'
- GLog.write('Plugs: {}'.format(plugs))
- GLog.write('PULL: {}, WIN: {}, MAC: {}'.format(G_PULL, is_win, mac_gui))
- GLog.write('Num Threads: {}'.format(nthreads))
lock = thr.Lock()
- buf = Buffer(lock, len(plugs))
- work_q = Queue.Queue()
+ buf = Buffer(lock, len(plugs), G_PULL, is_win)
+ buf_q, work_q = queue.Queue(), queue.Queue()
for work in plugs.items():
work_q.put(work)
- GLog.write('Starting Threads')
+ global G_THREADS
for num in range(nthreads):
tname = 'PlugT-{0:02}'.format(num)
- thread = PlugThread(tname, (work_q, lock, buf))
+ thread = PlugThread(tname, (buf_q, work_q, lock))
thread.start()
- threads.append(thread)
+ G_THREADS[tname] = thread
if mac_gui:
rthread = RefreshThread(lock)
rthread.start()
- GLog.write('Joining Live Threads')
- for thread in threads:
- thread.join()
+ while not buf_q.empty() or len(G_THREADS) != 0:
+ try:
+ action, name, msg = buf_q.get(True, 0.25)
+ buf.write(action, name, msg)
+ buf_q.task_done()
+ except queue.Empty:
+ pass
+ except KeyboardInterrupt:
+ G_STOP.set()
+
if mac_gui:
rthread.stop()
rthread.join()
- GLog.write('Cleanly Exited Main')
main()
EOF
@@ -1538,6 +1553,7 @@ function! s:update_ruby()
end
} if VIM::evaluate('s:mac_gui') == 1
+ clone_opt = VIM::evaluate('s:clone_opt')
progress = VIM::evaluate('s:progress_opt(1)')
nthr.times do
mtx.synchronize do
@@ -1567,7 +1583,8 @@ function! s:update_ruby()
else
if pull
log.call name, 'Updating ...', :update
- bt.call "#{cd} #{dir} && git fetch #{progress} 2>&1 && git checkout -q #{checkout} 2>&1 && git merge --ff-only #{merge} 2>&1 && #{subm}", name, :update, nil
+ 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
else
[true, skip]
end
@@ -1575,7 +1592,7 @@ function! s:update_ruby()
else
d = esc dir.sub(%r{[\\/]+$}, '')
log.call name, 'Installing ...', :install
- bt.call "git clone #{progress} --recursive #{uri} -b #{checkout} #{d} 2>&1", name, :install, proc {
+ bt.call "git clone #{clone_opt unless tag} #{progress} --recursive #{uri} -b #{checkout} #{d} 2>&1", name, :install, proc {
FileUtils.rm_rf dir
}
end
@@ -1625,14 +1642,14 @@ endfunction
function! s:system(cmd, ...)
try
- let sh = &shell
+ let [sh, shrd] = [&shell, &shellredir]
if !s:is_win
- set shell=sh
+ set shell=sh shellredir=>%s\ 2>&1
endif
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
return system(s:is_win ? '('.cmd.')' : cmd)
finally
- let &shell = sh
+ let [&shell, &shellredir] = [sh, shrd]
endtry
endfunction
@@ -1679,6 +1696,12 @@ function! s:git_valid(spec, check_branch)
return [ret, msg]
endfunction
+function! s:rm_rf(dir)
+ if isdirectory(a:dir)
+ call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir))
+ endif
+endfunction
+
function! s:clean(force)
call s:prepare()
call append(0, 'Searching for unused plugins in '.g:plug_home)
@@ -1727,9 +1750,7 @@ function! s:clean(force)
call inputrestore()
if yes
for dir in todo
- if isdirectory(dir)
- call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(dir))
- endif
+ call s:rm_rf(dir)
endfor
call append(line('$'), 'Removed.')
else
@@ -1740,55 +1761,30 @@ function! s:clean(force)
endfunction
function! s:upgrade()
- let new = s:me . '.new'
- echo 'Downloading '. s:plug_src
+ echo 'Downloading the latest version of vim-plug'
redraw
+ let tmp = tempname()
+ let new = tmp . '/plug.vim'
+
try
- if executable('curl')
- let output = s:system(printf('curl -fLo %s %s', s:shellesc(new), s:plug_src))
- if v:shell_error
- throw get(s:lines(output), -1, v:shell_error)
- endif
- elseif s:ruby
- call s:upgrade_using_ruby(new)
- elseif s:py2
- call s:upgrade_using_python(new)
+ let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp))
+ if v:shell_error
+ return s:err('Error upgrading vim-plug: '. out)
+ endif
+
+ if readfile(s:me) ==# readfile(new)
+ echo 'vim-plug is already up-to-date'
+ return 0
else
- return s:err('Missing: curl executable, ruby support or python support')
+ call rename(s:me, s:me . '.old')
+ call rename(new, s:me)
+ unlet g:loaded_plug
+ echo 'vim-plug has been upgraded'
+ return 1
endif
- catch
- return s:err('Error upgrading vim-plug: '. v:exception)
+ finally
+ silent! call s:rm_rf(tmp)
endtry
-
- if readfile(s:me) ==# readfile(new)
- echo 'vim-plug is already up-to-date'
- silent! call delete(new)
- return 0
- else
- call rename(s:me, s:me . '.old')
- call rename(new, s:me)
- unlet g:loaded_plug
- echo 'vim-plug has been upgraded'
- return 1
- endif
-endfunction
-
-function! s:upgrade_using_ruby(new)
- ruby << EOF
- require 'open-uri'
- File.open(VIM::evaluate('a:new'), 'w') do |f|
- f << open(VIM::evaluate('s:plug_src')).read
- end
-EOF
-endfunction
-
-function! s:upgrade_using_python(new)
-python << EOF
-import urllib
-import vim
-psrc, dest = vim.eval('s:plug_src'), vim.eval('a:new')
-urllib.urlretrieve(psrc, dest)
-EOF
endfunction
function! s:upgrade_specs()
@@ -1905,9 +1901,11 @@ function! s:preview_commit()
execute 'pedit' sha
wincmd P
- setlocal filetype=git buftype=nofile nobuflisted
- execute 'silent read !cd' s:shellesc(g:plugs[name].dir) '&& git show' sha
+ 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
+ setlocal nomodifiable
+ nnoremap <silent> <buffer> q :q<cr>
wincmd p
endfunction
diff --git a/vim/autoload/plug.vim.old b/vim/autoload/plug.vim.old
new file mode 100644
index 0000000..8886b2a
--- /dev/null
+++ b/vim/autoload/plug.vim.old
@@ -0,0 +1,2020 @@
+" vim-plug: Vim plugin manager
+" ============================
+"
+" Download plug.vim and put it in ~/.vim/autoload
+"
+" mkdir -p ~/.vim/autoload
+" curl -fLo ~/.vim/autoload/plug.vim \
+" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+"
+" Edit your .vimrc
+"
+" call plug#begin('~/.vim/plugged')
+"
+" " Make sure you use single quotes
+" Plug 'junegunn/seoul256.vim'
+" Plug 'junegunn/vim-easy-align'
+"
+" " 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'
+"
+" " Plugin options
+" Plug 'nsf/gocode', { 'tag': 'go.weekly.2012-03-13', 'rtp': 'vim' }
+"
+" " Plugin outside ~/.vim/plugged with post-update hook
+" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
+"
+" " Unmanaged plugin (manually installed and updated)
+" Plug '~/my-prototype-plugin'
+"
+" call plug#end()
+"
+" Then reload .vimrc and :PlugInstall to install plugins.
+" Visit https://github.com/junegunn/vim-plug for more information.
+"
+"
+" Copyright (c) 2014 Junegunn Choi
+"
+" MIT License
+"
+" Permission is hereby granted, free of charge, to any person obtaining
+" a copy of this software and associated documentation files (the
+" "Software"), to deal in the Software without restriction, including
+" without limitation the rights to use, copy, modify, merge, publish,
+" distribute, sublicense, and/or sell copies of the Software, and to
+" permit persons to whom the Software is furnished to do so, subject to
+" the following conditions:
+"
+" The above copyright notice and this permission notice shall be
+" included in all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+if exists('g:loaded_plug')
+ finish
+endif
+let g:loaded_plug = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let s:plug_src = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+let s:plug_tab = get(s:, 'plug_tab', -1)
+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:py2 = has('python') && !s:is_win
+let s:ruby = has('ruby') && (v:version >= 703 || v:version == 702 && has('patch374'))
+let s:nvim = has('nvim') && !s:is_win
+let s:me = resolve(expand('<sfile>:p'))
+let s:base_spec = { 'branch': 'master', 'frozen': 0 }
+let s:TYPE = {
+\ 'string': type(''),
+\ 'list': type([]),
+\ 'dict': type({}),
+\ 'funcref': type(function('call'))
+\ }
+let s:loaded = get(s:, 'loaded', {})
+let s:triggers = get(s:, 'triggers', {})
+
+function! plug#begin(...)
+ if a:0 > 0
+ let s:plug_home_org = a:1
+ let home = s:path(fnamemodify(expand(a:1), ':p'))
+ elseif exists('g:plug_home')
+ let home = s:path(g:plug_home)
+ elseif !empty(&rtp)
+ let home = s:path(split(&rtp, ',')[0]) . '/plugged'
+ else
+ return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.')
+ endif
+
+ let g:plug_home = home
+ let g:plugs = {}
+ let g:plugs_order = []
+ let s:triggers = {}
+
+ call s:define_commands()
+ return 1
+endfunction
+
+function! s:define_commands()
+ command! -nargs=+ -bar Plug call s:add(<args>)
+ if !executable('git')
+ return s:err('`git` executable not found. vim-plug requires git.')
+ 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=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>)
+endfunction
+
+function! s:to_a(v)
+ return type(a:v) == s:TYPE.list ? a:v : [a:v]
+endfunction
+
+function! s:to_s(v)
+ return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n"
+endfunction
+
+function! s:source(from, ...)
+ for pattern in a:000
+ for vim in s:lines(globpath(a:from, pattern))
+ execute 'source' s:esc(vim)
+ endfor
+ endfor
+endfunction
+
+function! s:assoc(dict, key, val)
+ let a:dict[a:key] = add(get(a:dict, a:key, []), a:val)
+endfunction
+
+function! plug#end()
+ if !exists('g:plugs')
+ return s:err('Call plug#begin() first')
+ endif
+
+ if exists('#PlugLOD')
+ augroup PlugLOD
+ autocmd!
+ augroup END
+ augroup! PlugLOD
+ endif
+ let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
+
+ filetype off
+ for name in g:plugs_order
+ let plug = g:plugs[name]
+ if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for')
+ let s:loaded[name] = 1
+ continue
+ endif
+
+ if has_key(plug, 'on')
+ let s:triggers[name] = { 'map': [], 'cmd': [] }
+ for cmd in s:to_a(plug.on)
+ if cmd =~ '^<Plug>.\+'
+ if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i'))
+ call s:assoc(lod.map, cmd, name)
+ endif
+ call add(s:triggers[name].map, cmd)
+ elseif cmd =~ '^[A-Z]'
+ if exists(':'.cmd) != 2
+ call s:assoc(lod.cmd, cmd, name)
+ endif
+ call add(s:triggers[name].cmd, cmd)
+ endif
+ endfor
+ endif
+
+ if has_key(plug, 'for')
+ let types = s:to_a(plug.for)
+ if !empty(types)
+ call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim')
+ endif
+ for type in types
+ call s:assoc(lod.ft, type, name)
+ endfor
+ endif
+ endfor
+
+ for [cmd, names] in items(lod.cmd)
+ execute printf(
+ \ 'command! -nargs=* -range -bang %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)',
+ \ cmd, string(cmd), string(names))
+ endfor
+
+ for [map, names] in items(lod.map)
+ 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)
+ endfor
+ endfor
+
+ for [ft, names] in items(lod.ft)
+ augroup PlugLOD
+ execute printf('autocmd FileType %s call <SID>lod_ft(%s, %s)',
+ \ ft, string(ft), string(names))
+ augroup END
+ endfor
+
+ call s:reorg_rtp()
+ filetype plugin indent on
+ if has('vim_starting')
+ syntax enable
+ else
+ call s:reload()
+ endif
+endfunction
+
+function! s:loaded_names()
+ return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)')
+endfunction
+
+function! s:reload()
+ for name in s:loaded_names()
+ call s:source(s:rtp(g:plugs[name]), 'plugin/**/*.vim', 'after/plugin/**/*.vim')
+ endfor
+endfunction
+
+function! s:trim(str)
+ return substitute(a:str, '[\/]\+$', '', '')
+endfunction
+
+function! s:version_requirement(val, min)
+ for idx in range(0, len(a:min) - 1)
+ let v = get(a:val, idx, 0)
+ if v < a:min[idx] | return 0
+ elseif v > a:min[idx] | return 1
+ endif
+ endfor
+ 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)'))
+ return s:version_requirement(s:git_version, a:000)
+endfunction
+
+function! s:progress_opt(base)
+ return a:base && !s:is_win &&
+ \ s:git_version_requirement(1, 7, 1) ? '--progress' : ''
+endfunction
+
+if s:is_win
+ function! s:rtp(spec)
+ return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
+ endfunction
+
+ function! s:path(path)
+ return s:trim(substitute(a:path, '/', '\', 'g'))
+ endfunction
+
+ function! s:dirpath(path)
+ return s:path(a:path) . '\'
+ endfunction
+
+ function! s:is_local_plug(repo)
+ return a:repo =~? '^[a-z]:'
+ endfunction
+else
+ function! s:rtp(spec)
+ return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
+ endfunction
+
+ function! s:path(path)
+ return s:trim(a:path)
+ endfunction
+
+ function! s:dirpath(path)
+ return substitute(a:path, '[/\\]*$', '/', '')
+ endfunction
+
+ function! s:is_local_plug(repo)
+ return a:repo[0] =~ '[/$~]'
+ endfunction
+endif
+
+function! s:err(msg)
+ echohl ErrorMsg
+ echom a:msg
+ echohl None
+ return 0
+endfunction
+
+function! s:esc(path)
+ return escape(a:path, ' ')
+endfunction
+
+function! s:escrtp(path)
+ return escape(a:path, ' ,')
+endfunction
+
+function! s:remove_rtp()
+ for name in s:loaded_names()
+ let rtp = s:rtp(g:plugs[name])
+ execute 'set rtp-='.s:escrtp(rtp)
+ let after = globpath(rtp, 'after')
+ if isdirectory(after)
+ execute 'set rtp-='.s:escrtp(after)
+ endif
+ endfor
+endfunction
+
+function! s:reorg_rtp()
+ if !empty(s:first_rtp)
+ execute 'set rtp-='.s:first_rtp
+ execute 'set rtp-='.s:last_rtp
+ endif
+
+ " &rtp is modified from outside
+ if exists('s:prtp') && s:prtp !=# &rtp
+ call s:remove_rtp()
+ unlet! s:middle
+ endif
+
+ 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 rtp = join(map(rtps, 'escape(v:val, ",")'), ',')
+ \ . ','.s:middle.','
+ \ . join(map(afters, 'escape(v:val, ",")'), ',')
+ let &rtp = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g')
+ let s:prtp = &rtp
+
+ if !empty(s:first_rtp)
+ execute 'set rtp^='.s:first_rtp
+ execute 'set rtp+='.s:last_rtp
+ endif
+endfunction
+
+function! plug#load(...)
+ if a:0 == 0
+ return s:err('Argument missing: plugin name(s) required')
+ endif
+ if !exists('g:plugs')
+ return s:err('plug#begin was not called')
+ endif
+ let unknowns = filter(copy(a:000), '!has_key(g:plugs, v:val)')
+ if !empty(unknowns)
+ let s = len(unknowns) > 1 ? 's' : ''
+ return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', ')))
+ end
+ for name in a:000
+ call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
+ endfor
+ doautocmd BufRead
+ return 1
+endfunction
+
+function! s:remove_triggers(name)
+ if !has_key(s:triggers, a:name)
+ return
+ endif
+ for cmd in s:triggers[a:name].cmd
+ execute 'silent! delc' cmd
+ endfor
+ for map in s:triggers[a:name].map
+ execute 'silent! unmap' map
+ execute 'silent! iunmap' map
+ endfor
+ call remove(s:triggers, a:name)
+endfunction
+
+function! s:lod(names, types)
+ for name in a:names
+ call s:remove_triggers(name)
+ let s:loaded[name] = 1
+ endfor
+ call s:reorg_rtp()
+
+ for name in a:names
+ let rtp = s:rtp(g:plugs[name])
+ for dir in a:types
+ call s:source(rtp, dir.'/**/*.vim')
+ endfor
+ endfor
+endfunction
+
+function! s:lod_ft(pat, names)
+ call s:lod(a:names, ['plugin', 'after/plugin'])
+ execute 'autocmd! PlugLOD FileType' a:pat
+ doautocmd filetypeplugin FileType
+ 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'])
+ 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'])
+ let extra = ''
+ while 1
+ let c = getchar(0)
+ if c == 0
+ break
+ endif
+ let extra .= nr2char(c)
+ endwhile
+ call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
+endfunction
+
+function! s:add(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)
+ if !has_key(g:plugs, name)
+ call add(g:plugs_order, name)
+ endif
+ let g:plugs[name] = spec
+ let s:loaded[name] = 0
+ catch
+ return s:err(v:exception)
+ endtry
+endfunction
+
+function! s:parse_options(arg)
+ let opts = copy(s:base_spec)
+ let type = type(a:arg)
+ if type == s:TYPE.string
+ let opts.tag = a:arg
+ elseif type == s:TYPE.dict
+ call extend(opts, a:arg)
+ if has_key(opts, 'dir')
+ let opts.dir = s:dirpath(expand(opts.dir))
+ endif
+ else
+ throw 'Invalid argument type (expected: string or dictionary)'
+ endif
+ return opts
+endfunction
+
+function! s:infer_properties(name, repo)
+ let repo = a:repo
+ if s:is_local_plug(repo)
+ return { 'dir': s:dirpath(expand(repo)) }
+ else
+ if repo =~ ':'
+ let uri = repo
+ else
+ if repo !~ '/'
+ let repo = 'vim-scripts/'. repo
+ endif
+ 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 }
+ endif
+endfunction
+
+function! s:install(force, names)
+ call s:update_impl(0, a:force, a:names)
+endfunction
+
+function! s:update(force, names)
+ call s:update_impl(1, a:force, a:names)
+endfunction
+
+function! plug#helptags()
+ if !exists('g:plugs')
+ return s:err('plug#begin was not called')
+ endif
+ for spec in values(g:plugs)
+ let docd = join([spec.dir, 'doc'], '/')
+ if isdirectory(docd)
+ silent! execute 'helptags' s:esc(docd)
+ endif
+ endfor
+ return 1
+endfunction
+
+function! s:syntax()
+ syntax clear
+ syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber
+ syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX
+ syn match plugNumber /[0-9]\+[0-9.]*/ contained
+ syn match plugBracket /[[\]]/ contained
+ syn match plugX /x/ contained
+ syn match plugDash /^-/
+ syn match plugPlus /^+/
+ syn match plugStar /^*/
+ syn match plugMessage /\(^- \)\@<=.*/
+ syn match plugName /\(^- \)\@<=[^ ]*:/
+ 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 plugRelDate /([^)]*)$/ contained
+ syn match plugNotLoaded /(not loaded)$/
+ syn match plugError /^x.*/
+ syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean
+ hi def link plug1 Title
+ hi def link plug2 Repeat
+ hi def link plugX Exception
+ hi def link plugBracket Structure
+ hi def link plugNumber Number
+
+ hi def link plugDash Special
+ hi def link plugPlus Constant
+ hi def link plugStar Boolean
+
+ hi def link plugMessage Function
+ hi def link plugName Label
+ hi def link plugInstall Function
+ hi def link plugUpdate Type
+
+ hi def link plugError Error
+ hi def link plugRelDate Comment
+ hi def link plugSha Identifier
+
+ hi def link plugNotLoaded Comment
+endfunction
+
+function! s:lpad(str, len)
+ return a:str . repeat(' ', a:len - len(a:str))
+endfunction
+
+function! s:lines(msg)
+ return split(a:msg, "[\r\n]")
+endfunction
+
+function! s:lastline(msg)
+ return get(s:lines(a:msg), -1, '')
+endfunction
+
+function! s:new_window()
+ execute get(g:, 'plug_window', 'vertical topleft new')
+endfunction
+
+function! s:plug_window_exists()
+ let buflist = tabpagebuflist(s:plug_tab)
+ return !empty(buflist) && index(buflist, s:plug_buf) >= 0
+endfunction
+
+function! s:switch_in()
+ if !s:plug_window_exists()
+ return 0
+ endif
+
+ if winbufnr(0) != s:plug_buf
+ let s:pos = [tabpagenr(), winnr(), winsaveview()]
+ execute 'normal!' s:plug_tab.'gt'
+ let winnr = bufwinnr(s:plug_buf)
+ execute winnr.'wincmd w'
+ call add(s:pos, winsaveview())
+ else
+ let s:pos = [winsaveview()]
+ endif
+
+ setlocal modifiable
+ return 1
+endfunction
+
+function! s:switch_out(...)
+ call winrestview(s:pos[-1])
+ setlocal nomodifiable
+ if a:0 > 0
+ execute a:1
+ endif
+
+ if len(s:pos) > 1
+ execute 'normal!' s:pos[0].'gt'
+ execute s:pos[1] 'wincmd w'
+ call winrestview(s:pos[2])
+ endif
+endfunction
+
+function! s:prepare()
+ 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>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
+ setf vim-plug
+ call s:syntax()
+endfunction
+
+function! s:assign_name()
+ " Assign buffer name
+ let prefix = '[Plugins]'
+ let name = prefix
+ let idx = 2
+ while bufexists(name)
+ let name = printf('%s (%s)', prefix, idx)
+ let idx = idx + 1
+ endwhile
+ silent! execute 'f' fnameescape(name)
+endfunction
+
+function! s:do(pull, force, todo)
+ for [name, spec] in items(a:todo)
+ if !isdirectory(spec.dir)
+ continue
+ 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)))
+ if a:force || installed || updated
+ execute 'cd' s:esc(spec.dir)
+ call append(3, '- Post-update hook for '. name .' ... ')
+ 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
+ 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
+ endtry
+ else
+ let result = 'Error: Invalid type!'
+ endif
+ call setline(4, getline(4) . result)
+ cd -
+ endif
+ endfor
+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 ... ')
+ redraw
+ call plug#helptags()
+ call plug#end()
+ call setline(4, getline(4) . 'Done!')
+ redraw
+ let msgs = []
+ if !empty(s:update.errors)
+ call add(msgs, "Press 'R' to retry.")
+ endif
+ if a:pull && len(s:update.new) < len(filter(getline(5, '$'),
+ \ "v:val =~ '^- ' && stridx(v:val, 'Already up-to-date') < 0"))
+ call add(msgs, "Press 'D' to see the updated changes.")
+ endif
+ echo join(msgs, ' ')
+endfunction
+
+function! s:retry()
+ if empty(s:update.errors)
+ return
+ endif
+ call s:update_impl(s:update.pull, s:update.force,
+ \ extend(copy(s:update.errors), [s:update.threads]))
+endfunction
+
+function! s:is_managed(name)
+ return has_key(g:plugs[a:name], 'uri')
+endfunction
+
+function! s:names(...)
+ return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)'))
+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', 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
+ endif
+
+ if !s:is_win && s:git_version_requirement(2, 3)
+ let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : ''
+ let $GIT_TERMINAL_PROMPT = 0
+ for plug in values(todo)
+ let plug.uri = substitute(plug.uri,
+ \ '^https://git::@github\.com', 'https://github.com', '')
+ endfor
+ endif
+
+ if !isdirectory(g:plug_home)
+ try
+ call mkdir(g:plug_home, 'p')
+ catch
+ return s:err(printf('Invalid plug directory: %s. '.
+ \ 'Try to call plug#begin with a valid directory', g:plug_home))
+ endtry
+ endif
+
+ let s:update = {
+ \ 'start': reltime(),
+ \ 'all': todo,
+ \ 'todo': copy(todo),
+ \ 'errors': [],
+ \ 'pull': a:pull,
+ \ 'force': a:force,
+ \ 'new': {},
+ \ 'threads': (s:py2 || s:ruby || s:nvim) ? min([len(todo), threads]) : 1,
+ \ 'bar': '',
+ \ 'fin': 0
+ \ }
+
+ call s:prepare()
+ call append(0, ['', ''])
+ normal! 2G
+
+ " Python version requirement (>= 2.7)
+ if s:py2 && !s:ruby && !s:nvim && s:update.threads > 1
+ redir => pyv
+ silent python import platform; print(platform.python_version())
+ redir END
+ let s:py2 = s:version_requirement(
+ \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 7])
+ endif
+ if (s:py2 || s:ruby) && !s:nvim && s:update.threads > 1
+ try
+ let imd = &imd
+ if s:mac_gui
+ set noimd
+ endif
+ if s:ruby
+ call s:update_ruby()
+ else
+ call s:update_python()
+ endif
+ catch
+ let lines = getline(4, '$')
+ let printed = {}
+ silent! 4,$d _
+ for line in lines
+ let name = s:extract_name(line, '.', '')
+ if empty(name) || !has_key(printed, name)
+ call append('$', line)
+ if !empty(name)
+ let printed[name] = 1
+ if line[0] == 'x' && index(s:update.errors, name) < 0
+ call add(s:update.errors, name)
+ end
+ endif
+ endif
+ endfor
+ finally
+ let &imd = imd
+ call s:update_finish()
+ endtry
+ else
+ call s:update_vim()
+ endif
+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 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')
+ endif
+endfunction
+
+function! s:job_abort()
+ if !s:nvim || !exists('s:jobs')
+ return
+ endif
+ augroup PlugJobControl
+ autocmd!
+ augroup END
+ for [name, j] in items(s:jobs)
+ silent! call jobstop(j.jobid)
+ if j.new
+ call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
+ endif
+ endfor
+ let s:jobs = {}
+endfunction
+
+function! s:job_handler(name) abort
+ if !s:plug_window_exists() " plug window closed
+ return s:job_abort()
+ endif
+
+ if !has_key(s:jobs, a:name)
+ return
+ endif
+ let job = s:jobs[a:name]
+
+ if v:job_data[1] == 'exit'
+ let job.running = 0
+ if s:lastline(job.result) ==# 'Error'
+ let job.error = 1
+ let job.result = substitute(job.result, "Error[\r\n]$", '', '')
+ endif
+ call s:reap(a:name)
+ call s:tick()
+ else
+ let job.result .= s:to_s(v:job_data[2])
+ " To reduce the number of buffer updates
+ let job.tick = get(job, 'tick', -1) + 1
+ if job.tick % len(s:jobs) == 0
+ call s:log(job.new ? '+' : '*', a:name, job.result)
+ endif
+ endif
+endfunction
+
+function! s:spawn(name, cmd, opts)
+ let job = { 'running': 1, 'new': get(a:opts, 'new', 0),
+ \ 'error': 0, 'result': '' }
+ let s:jobs[a:name] = job
+
+ if s:nvim
+ let x = jobstart(a:name, 'sh', ['-c',
+ \ (has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd)
+ \ . ' || echo Error'])
+ if x > 0
+ let job.jobid = x
+ augroup PlugJobControl
+ execute 'autocmd JobActivity' a:name printf('call s:job_handler(%s)', string(a:name))
+ augroup END
+ else
+ let job.running = 0
+ let job.error = 1
+ let job.result = x < 0 ? 'sh is not executable' :
+ \ 'Invalid arguments (or job table is full)'
+ 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.error = v:shell_error != 0
+ let job.running = 0
+ endif
+endfunction
+
+function! s:reap(name)
+ if s:nvim
+ silent! execute 'autocmd! PlugJobControl JobActivity' a:name
+ endif
+
+ let job = s:jobs[a:name]
+ if job.error
+ call add(s:update.errors, a:name)
+ elseif get(job, 'new', 0)
+ 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:bar()
+
+ call remove(s:jobs, a:name)
+endfunction
+
+function! s:bar()
+ if s:switch_in()
+ let total = len(s:update.all)
+ call setline(1, (s:update.pull ? 'Updating' : 'Installing').
+ \ ' plugins ('.len(s:update.bar).'/'.total.')')
+ call s:progress_bar(2, s:update.bar, total)
+ call s:switch_out()
+ endif
+endfunction
+
+function! s:logpos(name)
+ for i in range(1, 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 _'
+ if pos > winheight('.')
+ let pos = 4
+ endif
+ else
+ let pos = 4
+ endif
+ call append(pos - 1, s:format_message(a:bullet, a:name, a:lines))
+ call s:switch_out()
+ endif
+endfunction
+
+function! s:update_vim()
+ let s:jobs = {}
+
+ call s:bar()
+ call s:tick()
+endfunction
+
+function! s:tick()
+ let pull = s:update.pull
+ let prog = s:progress_opt(s:nvim)
+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()
+ endif
+ return
+ endif
+
+ let name = keys(s:update.todo)[0]
+ let spec = remove(s:update.todo, name)
+ let new = !isdirectory(spec.dir)
+
+ call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
+ redraw
+
+ let checkout = s:shellesc(has_key(spec, 'tag') ? spec.tag : spec.branch)
+ let merge = s:shellesc(has_key(spec, 'tag') ? spec.tag : 'origin/'.spec.branch)
+
+ if !new
+ let [valid, msg] = s:git_valid(spec, 0)
+ if valid
+ if pull
+ call s:spawn(name,
+ \ printf('(git fetch %s 2>&1 && git checkout -q %s 2>&1 && git merge --ff-only %s 2>&1 && git submodule update --init --recursive 2>&1)',
+ \ prog, checkout, merge), { 'dir': spec.dir })
+ else
+ let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 }
+ endif
+ else
+ let s:jobs[name] = { 'running': 0, 'result': msg, 'error': 1 }
+ endif
+ else
+ call s:spawn(name,
+ \ printf('git clone %s --recursive %s -b %s %s 2>&1',
+ \ prog,
+ \ s:shellesc(spec.uri),
+ \ checkout,
+ \ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
+ endif
+
+ if !s:jobs[name].running
+ call s:reap(name)
+ endif
+ if len(s:jobs) >= s:update.threads
+ break
+ endif
+endwhile
+endfunction
+
+function! s:update_python()
+python << EOF
+""" Due to use of signals this function is POSIX only. """
+import datetime
+import functools
+import os
+import Queue
+import random
+import re
+import shutil
+import signal
+import subprocess
+import tempfile
+import threading as thr
+import time
+import traceback
+import vim
+
+G_PULL = vim.eval('s:update.pull') == '1'
+G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1
+G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)'))
+G_PROGRESS = vim.eval('s:progress_opt(1)')
+G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads'))
+G_STOP = thr.Event()
+
+class CmdTimedOut(Exception):
+ pass
+class CmdFailed(Exception):
+ pass
+class InvalidURI(Exception):
+ pass
+class Action(object):
+ INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-']
+
+class GLog(object):
+ ON = None
+ LOGDIR = None
+ @classmethod
+ def write(cls, msg):
+ if cls.ON is None:
+ cls.ON = int(vim.eval('get(g:, "plug_log_on", 0)'))
+ cls.LOGDIR = os.path.expanduser(vim.eval('get(g:, "plug_logs", "~/plug_logs")'))
+ if cls.ON:
+ if not os.path.exists(cls.LOGDIR):
+ os.makedirs(cls.LOGDIR)
+ cls._write(msg)
+ @classmethod
+ def _write(cls, msg):
+ name = thr.current_thread().name
+ fname = cls.LOGDIR + os.path.sep + name
+ with open(fname, 'ab') as flog:
+ ltime = datetime.datetime.now().strftime("%H:%M:%S.%f")
+ msg = '[{},{}] {}{}'.format(name, ltime, msg, '\n')
+ flog.write(msg)
+
+class Buffer(object):
+ def __init__(self, lock, num_plugs):
+ self.bar = ''
+ self.event = 'Updating' if vim.eval('s:update.pull') == '1' else 'Installing'
+ self.is_win = vim.eval('s:is_win') == '1'
+ self.lock = lock
+ self.maxy = int(vim.eval('winheight(".")'))
+ self.num_plugs = num_plugs
+
+ def _where(self, name):
+ """ Find first line with name in current buffer. Return line num. """
+ found, lnum = False, 0
+ matcher = re.compile('^[-+x*] {}:'.format(name))
+ for line in vim.current.buffer:
+ if matcher.search(line) is not None:
+ found = True
+ break
+ lnum += 1
+
+ if not found:
+ lnum = -1
+ return lnum
+
+ def header(self):
+ curbuf = vim.current.buffer
+ curbuf[0] = self.event + ' plugins ({}/{})'.format(len(self.bar), self.num_plugs)
+
+ num_spaces = self.num_plugs - len(self.bar)
+ curbuf[1] = '[{}{}]'.format(self.bar, num_spaces * ' ')
+
+ vim.command('normal! 2G')
+ if not self.is_win:
+ vim.command('redraw')
+
+ def write(self, *args, **kwargs):
+ with self.lock:
+ self._write(*args, **kwargs)
+
+ def _write(self, action, name, lines):
+ first, rest = lines[0], lines[1:]
+ msg = ['{} {}{}{}'.format(action, name, ': ' if first else '', first)]
+ padded_rest = [' ' + line for line in rest]
+ msg.extend(padded_rest)
+
+ try:
+ if action == Action.ERROR:
+ self.bar += 'x'
+ vim.command("call add(s:update.errors, '{}')".format(name))
+ elif action == Action.DONE:
+ self.bar += '='
+
+ curbuf = vim.current.buffer
+ lnum = self._where(name)
+ if lnum != -1: # Found matching line num
+ del curbuf[lnum]
+ if lnum > self.maxy and action in {Action.INSTALL, Action.UPDATE}:
+ lnum = 3
+ else:
+ lnum = 3
+ curbuf.append(msg, lnum)
+
+ self.header()
+ except vim.error:
+ GLog.write('Buffer Update FAILED.')
+
+class Command(object):
+ def __init__(self, cmd, cmd_dir=None, timeout=60, ntries=3, cb=None, clean=None):
+ self.cmd = cmd
+ self.cmd_dir = cmd_dir
+ self.timeout = timeout
+ self.ntries = ntries
+ self.callback = cb if cb else (lambda msg: None)
+ self.clean = clean
+
+ def attempt_cmd(self):
+ """ Tries to run the command, returns result if no exceptions. """
+ attempt = 0
+ finished = False
+ limit = self.timeout
+
+ while not finished:
+ try:
+ attempt += 1
+ result = self.timeout_cmd()
+ finished = True
+ 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 {} second{} ...'.format(
+ count, 's' if count != 1 else '')
+ self.callback([msg])
+ time.sleep(1)
+ self.timeout += limit
+ self.callback(['Retrying ...'])
+ else:
+ raise
+
+ return result
+
+ def timeout_cmd(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
+ """
+ proc = None
+ first_line = True
+ try:
+ tfile = tempfile.NamedTemporaryFile()
+ 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)
+
+ if G_STOP.is_set():
+ raise KeyboardInterrupt
+
+ if first_line or random.random() < G_LOG_PROB:
+ first_line = False
+ line = nonblock_read(tfile.name)
+ if line:
+ self.callback([line])
+
+ time_diff = time.time() - os.path.getmtime(tfile.name)
+ if time_diff > self.timeout:
+ raise CmdTimedOut(['Timeout!'])
+
+ tfile.seek(0)
+ result = [line.rstrip() for line in tfile]
+
+ if proc.returncode != 0:
+ msg = ['']
+ msg.extend(result)
+ raise CmdFailed(msg)
+ except:
+ if proc and proc.poll() is None:
+ os.killpg(proc.pid, signal.SIGTERM)
+ if self.clean:
+ self.clean()
+ raise
+
+ return result
+
+class Plugin(object):
+ def __init__(self, name, args, buf, lock):
+ self.name = name
+ self.args = args
+ self.buf = buf
+ 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'])
+
+ def manage(self):
+ try:
+ if os.path.exists(self.args['dir']):
+ self.update()
+ else:
+ self.install()
+ with self.lock:
+ vim.command("let s:update.new['{}'] = 1".format(self.name))
+ except (CmdTimedOut, CmdFailed, InvalidURI) as exc:
+ self.write(Action.ERROR, self.name, exc.message)
+ except KeyboardInterrupt:
+ G_STOP.set()
+ self.write(Action.ERROR, self.name, ['Interrupted!'])
+ except:
+ # Any exception except those above print stack trace
+ msg = 'Trace:\n{}'.format(traceback.format_exc().rstrip())
+ self.write(Action.ERROR, self.name, msg.split('\n'))
+ raise
+
+ def install(self):
+ target = self.args['dir']
+
+ def clean(target):
+ def _clean():
+ try:
+ shutil.rmtree(target)
+ except OSError:
+ pass
+ return _clean
+
+ self.write(Action.INSTALL, self.name, ['Installing ...'])
+ callback = functools.partial(self.buf.write, Action.INSTALL, self.name)
+ cmd = 'git clone {} --recursive {} -b {} {} 2>&1'.format(
+ G_PROGRESS, self.args['uri'], self.checkout, esc(target))
+ com = Command(cmd, None, G_TIMEOUT, G_RETRIES, callback, clean(target))
+ result = com.attempt_cmd()
+ self.write(Action.DONE, self.name, 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:
+ msg = ['',
+ 'Invalid URI: {}'.format(actual_uri),
+ 'Expected {}'.format(expect_uri),
+ 'PlugClean required.']
+ raise InvalidURI(msg)
+
+ if G_PULL:
+ self.write(Action.UPDATE, self.name, ['Updating ...'])
+ callback = functools.partial(self.buf.write, Action.UPDATE, self.name)
+ cmds = ['git fetch {}'.format(G_PROGRESS),
+ 'git checkout -q {}'.format(self.checkout),
+ 'git merge --ff-only {}'.format(self.merge),
+ 'git submodule update --init --recursive']
+ cmd = ' 2>&1 && '.join(cmds)
+ GLog.write(cmd)
+ com = Command(cmd, self.args['dir'], G_TIMEOUT, G_RETRIES, callback)
+ result = com.attempt_cmd()
+ GLog.write(result)
+ 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):
+ GLog.write('{} {}: {}'.format(action, name, '\n'.join(msg)))
+ self.buf.write(action, name, msg)
+
+class PlugThread(thr.Thread):
+ def __init__(self, tname, args):
+ super(PlugThread, self).__init__()
+ self.tname = tname
+ self.args = args
+
+ def run(self):
+ thr.current_thread().name = self.tname
+ work_q, lock, buf = self.args
+
+ try:
+ while not G_STOP.is_set():
+ name, args = work_q.get_nowait()
+ GLog.write('{}: Dir {}'.format(name, args['dir']))
+ plug = Plugin(name, args, buf, lock)
+ plug.manage()
+ work_q.task_done()
+ except Queue.Empty:
+ GLog.write('Queue now empty.')
+
+class RefreshThread(thr.Thread):
+ def __init__(self, lock):
+ super(RefreshThread, self).__init__()
+ self.lock = lock
+ self.running = True
+
+ def run(self):
+ while self.running:
+ with self.lock:
+ vim.command('noautocmd normal! a')
+ time.sleep(0.2)
+
+ def stop(self):
+ self.running = False
+
+def esc(name):
+ return '"' + name.replace('"', '\"') + '"'
+
+def nonblock_read(fname):
+ """ Read a file with nonblock flag. Return the last line. """
+ fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK)
+ buf = os.read(fread, 100000)
+ os.close(fread)
+
+ line = buf.rstrip('\r\n')
+ left = max(line.rfind('\r'), line.rfind('\n'))
+ if left != -1:
+ left += 1
+ line = line[left:]
+
+ return line
+
+def main():
+ thr.current_thread().name = 'main'
+ GLog.write('')
+ if GLog.ON and os.path.exists(GLog.LOGDIR):
+ shutil.rmtree(GLog.LOGDIR)
+
+ threads = []
+ 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'
+ GLog.write('Plugs: {}'.format(plugs))
+ GLog.write('PULL: {}, WIN: {}, MAC: {}'.format(G_PULL, is_win, mac_gui))
+ GLog.write('Num Threads: {}'.format(nthreads))
+
+ lock = thr.Lock()
+ buf = Buffer(lock, len(plugs))
+ work_q = Queue.Queue()
+ for work in plugs.items():
+ work_q.put(work)
+
+ GLog.write('Starting Threads')
+ for num in range(nthreads):
+ tname = 'PlugT-{0:02}'.format(num)
+ thread = PlugThread(tname, (work_q, lock, buf))
+ thread.start()
+ threads.append(thread)
+ if mac_gui:
+ rthread = RefreshThread(lock)
+ rthread.start()
+
+ GLog.write('Joining Live Threads')
+ for thread in threads:
+ thread.join()
+ if mac_gui:
+ rthread.stop()
+ rthread.join()
+ GLog.write('Cleanly Exited Main')
+
+main()
+EOF
+endfunction
+
+function! s:update_ruby()
+ ruby << EOF
+ module PlugStream
+ SEP = ["\r", "\n", nil]
+ def get_line
+ buffer = ''
+ loop do
+ char = readchar rescue return
+ if SEP.include? char.chr
+ buffer << $/
+ break
+ else
+ buffer << char
+ end
+ end
+ buffer
+ end
+ end unless defined?(PlugStream)
+
+ def esc arg
+ %["#{arg.gsub('"', '\"')}"]
+ end
+
+ 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
+ end
+ end
+ pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil }
+ end
+
+ require 'thread'
+ require 'fileutils'
+ require 'timeout'
+ running = true
+ iswin = VIM::evaluate('s:is_win').to_i == 1
+ pull = VIM::evaluate('s:update.pull').to_i == 1
+ base = VIM::evaluate('g:plug_home')
+ all = VIM::evaluate('s:update.todo')
+ limit = VIM::evaluate('get(g:, "plug_timeout", 60)')
+ tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1
+ nthr = VIM::evaluate('s:update.threads').to_i
+ maxy = VIM::evaluate('winheight(".")').to_i
+ cd = iswin ? 'cd /d' : 'cd'
+ tot = VIM::evaluate('len(s:update.todo)') || 0
+ bar = ''
+ skip = 'Already installed'
+ mtx = Mutex.new
+ take1 = proc { mtx.synchronize { running && all.shift } }
+ logh = proc {
+ cnt = bar.length
+ $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})"
+ $curbuf[2] = '[' + bar.ljust(tot) + ']'
+ VIM::command('normal! 2G')
+ VIM::command('redraw') unless iswin
+ }
+ where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } }
+ log = proc { |name, result, type|
+ mtx.synchronize do
+ ing = ![true, false].include?(type)
+ bar += type ? '=' : 'x' unless ing
+ b = case type
+ when :install then '+' when :update then '*'
+ when true, nil then '-' else
+ VIM::command("call add(s:update.errors, '#{name}')")
+ 'x'
+ end
+ result =
+ if type || type.nil?
+ ["#{b} #{name}: #{result.lines.to_a.last}"]
+ elsif result =~ /^Interrupted|^Timeout/
+ ["#{b} #{name}: #{result}"]
+ else
+ ["#{b} #{name}"] + result.lines.map { |l| " " << l }
+ end
+ if lnum = where.call(name)
+ $curbuf.delete lnum
+ lnum = 4 if ing && lnum > maxy
+ end
+ result.each_with_index do |line, offset|
+ $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp)
+ end
+ logh.call
+ end
+ }
+ bt = proc { |cmd, name, type, cleanup|
+ tried = timeout = 0
+ begin
+ tried += 1
+ timeout += limit
+ fd = nil
+ data = ''
+ if iswin
+ Timeout::timeout(timeout) do
+ tmp = VIM::evaluate('tempname()')
+ system("(#{cmd}) > #{tmp}")
+ data = File.read(tmp).chomp
+ File.unlink tmp rescue nil
+ end
+ else
+ fd = IO.popen(cmd).extend(PlugStream)
+ first_line = true
+ log_prob = 1.0 / nthr
+ while line = Timeout::timeout(timeout) { fd.get_line }
+ data << line
+ log.call name, line.chomp, type if name && (first_line || rand < log_prob)
+ first_line = false
+ end
+ fd.close
+ end
+ [$? == 0, data.chomp]
+ rescue Timeout::Error, Interrupt => e
+ if fd && !fd.closed?
+ killall fd.pid
+ fd.close
+ end
+ cleanup.call if cleanup
+ if e.is_a?(Timeout::Error) && tried < tries
+ 3.downto(1) do |countdown|
+ s = countdown > 1 ? 's' : ''
+ log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type
+ sleep 1
+ end
+ log.call name, 'Retrying ...', type
+ retry
+ end
+ [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"]
+ end
+ }
+ main = Thread.current
+ threads = []
+ watcher = Thread.new {
+ while VIM::evaluate('getchar(1)')
+ sleep 0.1
+ end
+ mtx.synchronize do
+ running = false
+ threads.each { |t| t.raise Interrupt }
+ end
+ threads.each { |t| t.join rescue nil }
+ main.kill
+ }
+ refresh = Thread.new {
+ while true
+ mtx.synchronize do
+ break unless running
+ VIM::command('noautocmd normal! a')
+ end
+ sleep 0.2
+ end
+ } if VIM::evaluate('s:mac_gui') == 1
+
+ progress = VIM::evaluate('s:progress_opt(1)')
+ nthr.times do
+ 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"
+ 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
+ current_uri = data.lines.to_a.last
+ if !ret
+ if data =~ /^Interrupted|^Timeout/
+ [false, data]
+ else
+ [false, [data.chomp, "PlugClean required."].join($/)]
+ end
+ elsif current_uri.sub(/git::?@/, '') != uri.sub(/git::?@/, '')
+ [false, ["Invalid URI: #{current_uri}",
+ "Expected: #{uri}",
+ "PlugClean required."].join($/)]
+ else
+ if pull
+ log.call name, 'Updating ...', :update
+ bt.call "#{cd} #{dir} && git fetch #{progress} 2>&1 && git checkout -q #{checkout} 2>&1 && git merge --ff-only #{merge} 2>&1 && #{subm}", name, :update, nil
+ else
+ [true, skip]
+ end
+ end
+ else
+ d = esc dir.sub(%r{[\\/]+$}, '')
+ log.call name, 'Installing ...', :install
+ bt.call "git clone #{progress} --recursive #{uri} -b #{checkout} #{d} 2>&1", name, :install, proc {
+ FileUtils.rm_rf dir
+ }
+ end
+ mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok
+ log.call name, result, ok
+ end
+ } if running
+ end
+ end
+ threads.each { |t| t.join rescue nil }
+ logh.call
+ refresh.kill if refresh
+ watcher.kill
+EOF
+endfunction
+
+function! s:shellesc(arg)
+ 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)')
+endfunction
+
+function! s:progress_bar(line, bar, total)
+ call setline(a:line, '[' . s:lpad(a:bar, a: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
+endfunction
+
+function! s:format_message(bullet, name, message)
+ if a:bullet != 'x'
+ return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))]
+ else
+ let lines = map(s:lines(a:message), '" ".v:val')
+ return extend([printf('x %s:', a:name)], lines)
+ endif
+endfunction
+
+function! s:with_cd(cmd, dir)
+ return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
+endfunction
+
+function! s:system(cmd, ...)
+ try
+ let sh = &shell
+ if !s:is_win
+ set shell=sh
+ endif
+ let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
+ return system(s:is_win ? '('.cmd.')' : cmd)
+ finally
+ let &shell = sh
+ endtry
+endfunction
+
+function! s:system_chomp(...)
+ let ret = call('s:system', a:000)
+ return v:shell_error ? '' : substitute(ret, '\n$', '', '')
+endfunction
+
+function! s:git_valid(spec, check_branch)
+ let ret = 1
+ let msg = 'OK'
+ 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 remote = result[-1]
+ if v:shell_error
+ let msg = join([remote, 'PlugClean required.'], "\n")
+ let ret = 0
+ elseif !s:compare_git_uri(remote, a:spec.uri)
+ let msg = join(['Invalid URI: '.remote,
+ \ 'Expected: '.a:spec.uri,
+ \ 'PlugClean required.'], "\n")
+ let ret = 0
+ 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.',
+ \ (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.',
+ \ branch, a:spec.branch)
+ let ret = 0
+ endif
+ endif
+ else
+ let msg = 'Not found'
+ let ret = 0
+ endif
+ return [ret, msg]
+endfunction
+
+function! s:clean(force)
+ call s:prepare()
+ call append(0, 'Searching for unused plugins in '.g:plug_home)
+ call append(1, '')
+
+ " List of valid directories
+ let dirs = []
+ 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]
+ call add(dirs, spec.dir)
+ endif
+ let cnt += 1
+ call s:progress_bar(2, repeat('=', cnt), total)
+ normal! 2G
+ redraw
+ endfor
+
+ let allowed = {}
+ for dir in dirs
+ let allowed[s:dirpath(fnamemodify(dir, ':h:h'))] = 1
+ let allowed[dir] = 1
+ for child in s:glob_dir(dir)
+ let allowed[child] = 1
+ endfor
+ endfor
+
+ let todo = []
+ let found = sort(s:glob_dir(g:plug_home))
+ while !empty(found)
+ let f = remove(found, 0)
+ if !has_key(allowed, f) && isdirectory(f)
+ call add(todo, f)
+ call append(line('$'), '- ' . f)
+ let found = filter(found, 'stridx(v:val, f) != 0')
+ end
+ endwhile
+
+ normal! G
+ 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
+ if isdirectory(dir)
+ call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(dir))
+ endif
+ endfor
+ call append(line('$'), 'Removed.')
+ else
+ call append(line('$'), 'Cancelled.')
+ endif
+ endif
+ normal! G
+endfunction
+
+function! s:upgrade()
+ let new = s:me . '.new'
+ echo 'Downloading '. s:plug_src
+ redraw
+ try
+ if executable('curl')
+ let output = s:system(printf('curl -fLo %s %s', s:shellesc(new), s:plug_src))
+ if v:shell_error
+ throw get(s:lines(output), -1, v:shell_error)
+ endif
+ elseif s:ruby
+ call s:upgrade_using_ruby(new)
+ elseif s:py2
+ call s:upgrade_using_python(new)
+ else
+ return s:err('Missing: curl executable, ruby support or python support')
+ endif
+ catch
+ return s:err('Error upgrading vim-plug: '. v:exception)
+ endtry
+
+ if readfile(s:me) ==# readfile(new)
+ echo 'vim-plug is already up-to-date'
+ silent! call delete(new)
+ return 0
+ else
+ call rename(s:me, s:me . '.old')
+ call rename(new, s:me)
+ unlet g:loaded_plug
+ echo 'vim-plug has been upgraded'
+ return 1
+ endif
+endfunction
+
+function! s:upgrade_using_ruby(new)
+ ruby << EOF
+ require 'open-uri'
+ File.open(VIM::evaluate('a:new'), 'w') do |f|
+ f << open(VIM::evaluate('s:plug_src')).read
+ end
+EOF
+endfunction
+
+function! s:upgrade_using_python(new)
+python << EOF
+import urllib
+import vim
+psrc, dest = vim.eval('s:plug_src'), vim.eval('a:new')
+urllib.urlretrieve(psrc, dest)
+EOF
+endfunction
+
+function! s:upgrade_specs()
+ for spec in values(g:plugs)
+ let spec.frozen = get(spec, 'frozen', 0)
+ endfor
+endfunction
+
+function! s:status()
+ call s:prepare()
+ call append(0, 'Checking plugins')
+ call append(1, '')
+
+ let ecnt = 0
+ let unloaded = 0
+ let [cnt, total] = [0, len(g:plugs)]
+ for [name, spec] in items(g:plugs)
+ if has_key(spec, 'uri')
+ if isdirectory(spec.dir)
+ let [valid, msg] = s:git_valid(spec, 1)
+ else
+ let [valid, msg] = [0, 'Not found. Try PlugInstall.']
+ endif
+ else
+ if isdirectory(spec.dir)
+ let [valid, msg] = [1, 'OK']
+ else
+ let [valid, msg] = [0, 'Not found.']
+ endif
+ endif
+ let cnt += 1
+ let ecnt += !valid
+ " `s:loaded` entry can be missing if PlugUpgraded
+ if valid && get(s:loaded, name, -1) == 0
+ let unloaded = 1
+ let msg .= ' (not loaded)'
+ endif
+ call s:progress_bar(2, repeat('=', cnt), total)
+ call append(3, s:format_message(valid ? '-' : 'x', name, msg))
+ normal! 2G
+ redraw
+ endfor
+ call setline(1, 'Finished. '.ecnt.' error(s).')
+ normal! gg
+ setlocal nomodifiable
+ if unloaded
+ echo "Press 'L' on each line to load plugin, or 'U' to update"
+ nnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr>
+ xnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr>
+ end
+endfunction
+
+function! s:extract_name(str, prefix, suffix)
+ return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$')
+endfunction
+
+function! s:status_load(lnum)
+ let line = getline(a:lnum)
+ let name = s:extract_name(line, '-', '(not loaded)')
+ if !empty(name)
+ call plug#load(name)
+ setlocal modifiable
+ call setline(a:lnum, substitute(line, ' (not loaded)$', '', ''))
+ setlocal nomodifiable
+ endif
+endfunction
+
+function! s:status_update() range
+ let lines = getline(a:firstline, a:lastline)
+ let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)')
+ if !empty(names)
+ echo
+ execute 'PlugUpdate' join(names)
+ endif
+endfunction
+
+function! s:is_preview_window_open()
+ silent! wincmd P
+ if &previewwindow
+ wincmd p
+ return 1
+ endif
+ return 0
+endfunction
+
+function! s:find_name(lnum)
+ for lnum in reverse(range(1, a:lnum))
+ let line = getline(lnum)
+ if empty(line)
+ return ''
+ endif
+ let name = s:extract_name(line, '-', '')
+ if !empty(name)
+ return name
+ endif
+ endfor
+ return ''
+endfunction
+
+function! s:preview_commit()
+ if b:plug_preview < 0
+ let b:plug_preview = !s:is_preview_window_open()
+ endif
+
+ let sha = matchstr(getline('.'), '\(^ \)\@<=[0-9a-z]\{7}')
+ if empty(sha)
+ return
+ endif
+
+ let name = s:find_name(line('.'))
+ 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
+ execute 'silent read !cd' s:shellesc(g:plugs[name].dir) '&& git show' sha
+ normal! gg"_dd
+ wincmd p
+endfunction
+
+function! s:section(flags)
+ call search('\(^[x-] \)\@<=[^:]\+:', a:flags)
+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)
+ 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
+ redraw
+ endif
+ endfor
+
+ 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
+ echo "Press 'X' on each block to revert the update"
+ endif
+endfunction
+
+function! s:revert()
+ 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'
+ return
+ endif
+
+ 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.'
+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)]]
+
+ call s:prepare()
+ execute 'setf' type
+ call append(0, header)
+ call append('$', '')
+ 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)
+ if !empty(sha)
+ call append(anchor, printf('cd %s && git reset --hard %s',
+ \ substitute(dir, '^\V'.escape(g:plug_home, '\'), var, ''), sha))
+ redraw
+ endif
+ endfor
+
+ if a:0 > 0
+ let fn = expand(a:1)
+ let fne = s:esc(fn)
+ 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
+ endif
+endfunction
+
+function! s:split_rtp()
+ return split(&rtp, '\\\@<!,')
+endfunction
+
+let s:first_rtp = s:escrtp(get(s:split_rtp(), 0, ''))
+let s:last_rtp = s:escrtp(get(s:split_rtp(), -1, ''))
+
+if exists('g:plugs')
+ let g:plugs_order = get(g:, 'plugs_order', keys(g:plugs))
+ call s:upgrade_specs()
+ call s:define_commands()
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+