Mercurial > dotfiles.old

comparison vim/autoload/plug.vim @ 223:ed108055146c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update Plug
author zegervdv <zegervdv@me.com>
date Tue, 13 Jan 2015 18:49:19 +0100
parents d216f4d5508e
children 55ff9bb3ea22
comparison
equal deleted inserted replaced
222:529bb6ae8e5e 223:ed108055146c
912 if !new 912 if !new
913 let [valid, msg] = s:git_valid(spec, 0) 913 let [valid, msg] = s:git_valid(spec, 0)
914 if valid 914 if valid
915 if pull 915 if pull
916 call s:spawn(name, 916 call s:spawn(name,
917 \ printf('git checkout -q %s 2>&1 && git pull --progress --no-rebase origin %s 2>&1 && git submodule update --init --recursive 2>&1', 917 \ printf('(git fetch --progress 2>&1 && git checkout -q %s 2>&1 && git merge --ff-only origin/%s 2>&1 && git submodule update --init --recursive 2>&1)',
918 \ s:shellesc(spec.branch), s:shellesc(spec.branch)), { 'dir': spec.dir }) 918 \ s:shellesc(spec.branch), s:shellesc(spec.branch)), { 'dir': spec.dir })
919 else 919 else
920 let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 } 920 let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 }
921 endif 921 endif
922 else 922 else
1123 "Expected: #{uri}", 1123 "Expected: #{uri}",
1124 "PlugClean required."].join($/)] 1124 "PlugClean required."].join($/)]
1125 else 1125 else
1126 if pull 1126 if pull
1127 log.call name, 'Updating ...', :update 1127 log.call name, 'Updating ...', :update
1128 bt.call "#{cd} #{dir} && git checkout -q #{branch} 2>&1 && (git pull --no-rebase origin #{branch} #{progress} 2>&1 && #{subm})", name, :update, nil 1128 bt.call "#{cd} #{dir} && (git fetch #{progress} 2>&1 && git checkout -q #{branch} 2>&1 && git merge --ff-only origin/#{branch} 2>&1 && #{subm})", name, :update, nil
1129 else 1129 else
1130 [true, skip] 1130 [true, skip]
1131 end 1131 end
1132 end 1132 end
1133 else 1133 else