pt/vundle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change function g:shellesc_cd into vundle#installer#shellesc_cd

Browse Source
This commit is contained in:
Lucas Hoffmann 2014-04-25 11:30:50 +02:00 committed by Jacobo de Vera
parent ad3f20fa6f
commit 0afe058353
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autoload/vundle/installer.vim
View File

@ -331,7 +331,7 @@ endf
" --------------------------------------------------------------------------- " ---------------------------------------------------------------------------
func! s:get_current_origin_url(bundle) abort func! s:get_current_origin_url(bundle) abort
let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git config --get remote.origin.url' let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git config --get remote.origin.url'
let cmd = g:shellesc_cd(cmd) let cmd = vundle#installer#shellesc_cd(cmd)
let out = s:strip(s:system(cmd)) let out = s:strip(s:system(cmd))
return out return out
endf endf
@ -345,7 +345,7 @@ endf
" --------------------------------------------------------------------------- " ---------------------------------------------------------------------------
func! s:get_current_sha(bundle) func! s:get_current_sha(bundle)
let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git rev-parse HEAD' let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git rev-parse HEAD'
let cmd = g:shellesc_cd(cmd) let cmd = vundle#installer#shellesc_cd(cmd)
let out = s:system(cmd)[0:15] let out = s:system(cmd)[0:15]
return out return out
endf endf
@ -382,7 +382,7 @@ func! s:make_sync_command(bang, bundle) abort
\ 'git submodule update --init --recursive', \ 'git submodule update --init --recursive',
\ ] \ ]
let cmd = join(cmd_parts, ' && ') let cmd = join(cmd_parts, ' && ')
let cmd = g:shellesc_cd(cmd) let cmd = vundle#installer#shellesc_cd(cmd)
let initial_sha = '' let initial_sha = ''
return [cmd, initial_sha] return [cmd, initial_sha]
endif endif
@ -398,7 +398,7 @@ func! s:make_sync_command(bang, bundle) abort
\ 'git submodule update --init --recursive', \ 'git submodule update --init --recursive',
\ ] \ ]
let cmd = join(cmd_parts, ' && ') let cmd = join(cmd_parts, ' && ')
let cmd = g:shellesc_cd(cmd) let cmd = vundle#installer#shellesc_cd(cmd)
let initial_sha = s:get_current_sha(a:bundle) let initial_sha = s:get_current_sha(a:bundle)
else else
@ -479,7 +479,7 @@ endf
" cmd -- the command to be fixed (string) " cmd -- the command to be fixed (string)
" return -- the fixed command (string) " return -- the fixed command (string)
" --------------------------------------------------------------------------- " ---------------------------------------------------------------------------
func! g:shellesc_cd(cmd) abort func! vundle#installer#shellesc_cd(cmd) abort
if ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh'))) if ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh')))
let cmd = substitute(a:cmd, '^cd ','cd /d ','') " add /d switch to change drives let cmd = substitute(a:cmd, '^cd ','cd /d ','') " add /d switch to change drives
return cmd return cmd

2
autoload/vundle/scripts.vim
View File

@ -72,7 +72,7 @@ func! s:create_changelog() abort
\ ' && git log --pretty=format:"%s %an, %ar" --graph '. \ ' && git log --pretty=format:"%s %an, %ar" --graph '.
\ initial_sha.'..'.updated_sha \ initial_sha.'..'.updated_sha
let cmd = g:shellesc_cd(cmd) let cmd = vundle#installer#shellesc_cd(cmd)
let updates = system(cmd) let updates = system(cmd)