@@ -3,7 +3,6 @@ Bugs * After exiting (:q) a buffer that has diff enabled, subsequent diffs appear to fail. * Should restore options like 'wrap' to their original state when turning diff off * winsaveview() and winrestview() require Vim 7.x. Autodetect and degrade gracefully. -* Look for SCM directories based on path of file in current buffer, not on getcwd() Features TODO @@ -40,30 +40,30 @@ endfunction function! s:detectSCM() " Cache the results we find here to save time - if exists("g:scmCWD") && g:scmCWD == getcwd() && exists("g:scmDiffCommand") + if exists("g:scmBufPath") && g:scmBufPath == expand("%:p:h") && exists("g:scmDiffCommand") return endif - let g:scmCWD = getcwd() + let g:scmBufPath = expand("%:p:h") " Detect CVS or .svn directories in current path - if !exists("g:scmDiffCommand") && isdirectory(g:scmCWD."/.svn") + if !exists("g:scmDiffCommand") && isdirectory(g:scmBufPath."/.svn") let g:scmDiffCommand = "svn" return endif - if !exists("g:scmDiffCommand") && isdirectory(g:scmCWD."/CVS") + if !exists("g:scmDiffCommand") && isdirectory(g:scmBufPath."/CVS") let g:scmDiffCommand = "cvs" return endif " Detect .git directories recursively in reverse - let my_cwd = g:scmCWD - while my_cwd != "/" - if !exists("g:scmDiffCommand") && isdirectory(my_cwd."/.git") + let my_path = g:scmBufPath + while my_path != "/" + if !exists("g:scmDiffCommand") && isdirectory(my_path."/.git") let g:scmDiffCommand = "git" return endif - let my_cwd = simplify(my_cwd."/../") + let my_path = simplify(my_path."/../") endwhile endfunction @@ -98,7 +98,7 @@ function! s:scmDiff(...) let cmd = 'cat ' . bufname('%') . ' > ' . b:scmDiffTmpfile let cmdOutput = system(cmd) let tmpdiff = tempname() - let cmd = g:scmDiffCommand . ' diff ' . g:scmDiffRev . ' ' . bufname('%') . ' > ' . tmpdiff + let cmd = 'cd ' . g:scmBufPath . ' && ' . g:scmDiffCommand . ' diff ' . g:scmDiffRev . ' ' . expand('%:p') . ' > ' . tmpdiff let cmdOutput = system(cmd) if v:shell_error && cmdOutput != '' scmdiff.vim f0d9b81b5e6f3ea08691873166cb85a7dd2cc516 Brian Shire shire@shirebook.local http://github.com/ghewgill/vim-scmdiff/commit/fdef9196e9e65ade1f6cc737512173fb9254fa55 fdef9196e9e65ade1f6cc737512173fb9254fa55 2008-08-17T17:46:36-07:00 2008-08-17T17:46:36-07:00 Look for SCM directories based on path of file in current buffer, not on getcwd() (nice catch Greg) 7777cc415bb2da256a2975c0f111553c84480740 Brian Shire shire@shirebook.local