From 8f1df15cc34abc5356954178578a423f12c22c70 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Tue, 28 Apr 2015 13:47:14 +0900 Subject: [PATCH] Revert "Shallow clone by default (#122 #217)" This reverts commit c632c1fd6a02eb425eaf8282d5039ebe4a99fc54. --- README.md | 1 - plug.vim | 14 ++++---------- test/workflow.vader | 11 ++++------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index cf12b26..92e2b2a 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,6 @@ Reload .vimrc and `:PlugInstall` to install plugins. | `g:plug_threads` | 16 | Default number of threads to use | | `g:plug_timeout` | 60 | Time limit of each task in seconds (*Ruby & Python*) | | `g:plug_retries` | 2 | Number of retries in case of timeout (*Ruby & Python*) | -| `g:plug_shallow` | 1 | Use shallow clone | | `g:plug_window` | `vertical topleft new` | Command to open plug window | | `g:plug_url_format` | `https://git::@github.com/%s.git` | `printf` format to build repo URL | diff --git a/plug.vim b/plug.vim index 925d19d..a2e057f 100644 --- a/plug.vim +++ b/plug.vim @@ -763,9 +763,6 @@ function! s:update_impl(pull, force, args) abort call append(0, ['', '']) normal! 2G - 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 redir => pyv @@ -982,8 +979,7 @@ while 1 " Without TCO, Vim stack is bound to explode endif else call s:spawn(name, - \ printf('git clone %s %s --recursive %s -b %s %s 2>&1', - \ s:clone_opt, + \ printf('git clone %s --recursive %s -b %s %s 2>&1', \ prog, \ s:shellesc(spec.uri), \ checkout, @@ -1020,7 +1016,6 @@ 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_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() @@ -1242,8 +1237,8 @@ class Plugin(object): self.write(Action.INSTALL, self.name, ['Installing ...']) callback = functools.partial(self.buf.write, Action.INSTALL, self.name) - cmd = 'git clone {0} {1} --recursive {2} -b {3} {4} 2>&1'.format( - G_CLONE_OPT, G_PROGRESS, self.args['uri'], self.checkout, esc(target)) + cmd = 'git clone {0} --recursive {1} -b {2} {3} 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:]) @@ -1538,7 +1533,6 @@ 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 @@ -1576,7 +1570,7 @@ function! s:update_ruby() else d = esc dir.sub(%r{[\\/]+$}, '') log.call name, 'Installing ...', :install - bt.call "git clone #{clone_opt} #{progress} --recursive #{uri} -b #{checkout} #{d} 2>&1", name, :install, proc { + bt.call "git clone #{progress} --recursive #{uri} -b #{checkout} #{d} 2>&1", name, :install, proc { FileUtils.rm_rf dir } end diff --git a/test/workflow.vader b/test/workflow.vader index 5ce6f92..d8ad34b 100644 --- a/test/workflow.vader +++ b/test/workflow.vader @@ -270,11 +270,9 @@ Execute (PlugDiff - 'No updates.'): AssertEqual 'No updates.', getline(1) q -Execute (New commits on remote, PlugUpdate, then PlugDiff): +Execute (Rollback recent updates, PlugUpdate, then PlugDiff): for repo in ['seoul256.vim', 'vim-emoji'] - for _ in range(2) - call system(printf('cd /tmp/junegunn/%s && git commit --allow-empty -m "update"', repo)) - endfor + call system(printf('cd %s/%s && git reset HEAD^^ --hard', g:plug_home, repo)) endfor PlugUpdate @@ -641,8 +639,8 @@ Execute (On update): Plug 'junegunn/vim-pseudocl', { 'do': 'touch updated' } call plug#end() - " New commits on remote - call system('cd /tmp/junegunn/vim-pseudocl && git commit --allow-empty -m "update"') + " Reset for updates + call system('cd '.g:plugs['vim-pseudocl'].dir.' && git reset --hard HEAD^') silent PlugUpdate Log getline(1, '$') @@ -705,7 +703,6 @@ Execute (Using Funcref): Plug 'junegunn/vim-pseudocl', { 'do': function('PlugUpdated') } call plug#end() - call system('cd /tmp/junegunn/vim-easy-align && git commit --allow-empty -m "update"') call system('cd '.g:plugs['vim-easy-align'].dir.' && git reset --hard HEAD^') call system('rm -rf '.g:plugs['vim-pseudocl'].dir)