vim/vim-signify
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

using proper shellslash

Browse Source
This commit is contained in:
Marco Hinz 2013-03-27 01:25:29 +01:00
parent cd26e1c7b3
commit 1de08cbd9b
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugin/signify.vim
View File

@ -272,7 +272,7 @@ endfunction
" Functions -> s:repo_get_diff_git {{{1 " Functions -> s:repo_get_diff_git {{{1
function! s:repo_get_diff_git(path) abort function! s:repo_get_diff_git(path) abort
if executable('git') if executable('git')
let diff = system('cd '. shellescape(fnamemodify(a:path, ':h')) .' && git diff --no-ext-diff -U0 -- '. shellescape(a:path)) let diff = system('cd '. s:escape(fnamemodify(a:path, ':h')) .' && git diff --no-ext-diff -U0 -- '. s:escape(a:path))
return v:shell_error ? '' : diff return v:shell_error ? '' : diff
endif endif
endfunction endfunction
@ -280,7 +280,7 @@ endfunction
" Functions -> s:repo_get_diff_hg {{{1 " Functions -> s:repo_get_diff_hg {{{1
function! s:repo_get_diff_hg(path) abort function! s:repo_get_diff_hg(path) abort
if executable('hg') if executable('hg')
let diff = system('hg diff --nodates -U0 -- '. shellescape(a:path)) let diff = system('hg diff --nodates -U0 -- '. s:escape(a:path))
return v:shell_error ? '' : diff return v:shell_error ? '' : diff
endif endif
endfunction endfunction
@ -288,7 +288,7 @@ endfunction
" Functions -> s:repo_get_diff_svn {{{1 " Functions -> s:repo_get_diff_svn {{{1
function! s:repo_get_diff_svn(path) abort function! s:repo_get_diff_svn(path) abort
if executable('svn') if executable('svn')
let diff = system('svn diff --diff-cmd '. s:difftool .' -x -U0 -- '. shellescape(a:path)) let diff = system('svn diff --diff-cmd '. s:difftool .' -x -U0 -- '. s:escape(a:path))
return v:shell_error ? '' : diff return v:shell_error ? '' : diff
endif endif
endfunction endfunction
@ -296,7 +296,7 @@ endfunction
" Functions -> s:repo_get_diff_bzr {{{1 " Functions -> s:repo_get_diff_bzr {{{1
function! s:repo_get_diff_bzr(path) abort function! s:repo_get_diff_bzr(path) abort
if executable('bzr') if executable('bzr')
let diff = system('bzr diff --using '. s:difftool .' --diff-options=-U0 -- '. shellescape(a:path)) let diff = system('bzr diff --using '. s:difftool .' --diff-options=-U0 -- '. s:escape(a:path))
return v:shell_error ? '' : diff return v:shell_error ? '' : diff
endif endif
endfunction endfunction
@ -304,7 +304,7 @@ endfunction
" Functions -> s:repo_get_diff_darcs {{{1 " Functions -> s:repo_get_diff_darcs {{{1
function! s:repo_get_diff_darcs(path) abort function! s:repo_get_diff_darcs(path) abort
if executable('darcs') if executable('darcs')
let diff = system('cd '. shellescape(fnamemodify(a:path, ':h')) .' && darcs diff --no-pause-for-gui --diff-command="'. s:difftool .' -U0 %1 %2" -- '. shellescape(a:path)) let diff = system('cd '. s:escape(fnamemodify(a:path, ':h')) .' && darcs diff --no-pause-for-gui --diff-command="'. s:difftool .' -U0 %1 %2" -- '. s:escape(a:path))
return v:shell_error ? '' : diff return v:shell_error ? '' : diff
endif endif
endfunction endfunction
@ -312,7 +312,7 @@ endfunction
" Functions -> s:repo_get_diff_cvs {{{1 " Functions -> s:repo_get_diff_cvs {{{1
function! s:repo_get_diff_cvs(path) abort function! s:repo_get_diff_cvs(path) abort
if executable('cvs') if executable('cvs')
let diff = system('cd '. shellescape(fnamemodify(a:path, ':h')) .' && cvs diff -U0 -- '. shellescape(fnamemodify(a:path, ':t'))) let diff = system('cd '. s:escape(fnamemodify(a:path, ':h')) .' && cvs diff -U0 -- '. s:escape(fnamemodify(a:path, ':t')))
return v:shell_error ? '' : diff return v:shell_error ? '' : diff
endif endif
endfunction endfunction
@ -320,7 +320,7 @@ endfunction
" Functions -> s:repo_get_diff_rcs {{{1 " Functions -> s:repo_get_diff_rcs {{{1
function! s:repo_get_diff_rcs(path) abort function! s:repo_get_diff_rcs(path) abort
if executable('rcs') if executable('rcs')
let diff = system('rcsdiff -U0 '. shellescape(a:path) .' 2>/dev/null') let diff = system('rcsdiff -U0 '. s:escape(a:path) .' 2>/dev/null')
return v:shell_error ? '' : diff return v:shell_error ? '' : diff
endif endif
endfunction endfunction
@ -572,6 +572,22 @@ function! s:jump_to_prev_hunk(count)
let s:sy[s:path].last_jump_was_next = 0 let s:sy[s:path].last_jump_was_next = 0
endfunction endfunction
" Functions -> s:s:escape() {{{1
function s:escape(path) abort
if has('+shellslash')
let old_ssl = &shellslash
set noshellslash
endif
let path = shellescape(a:path)
if exists('old_ssl')
let &shellslash = old_ssl
endif
return path
endfunction
" Functions -> SignifyDebugListActiveBuffers() {{{1 " Functions -> SignifyDebugListActiveBuffers() {{{1
function! SignifyDebugListActiveBuffers() abort function! SignifyDebugListActiveBuffers() abort
if len(s:sy) == 0 if len(s:sy) == 0