aboutsummaryrefslogtreecommitdiffstats
path: root/plugin
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2018-03-08 03:15:40 -0500
committerJesse Luehrs <doy@tozt.net>2018-03-08 03:15:40 -0500
commit8e77a808fa110489f32729b97400f7f36a5039d7 (patch)
treecb59d13c15bb022566483e4340b79f4132524975 /plugin
parent1dfa13b10155b579756d2ca136ddeb077e039396 (diff)
downloadvim-diff-changes-8e77a808fa110489f32729b97400f7f36a5039d7.tar.gz
vim-diff-changes-8e77a808fa110489f32729b97400f7f36a5039d7.zip
initial implementation
Diffstat (limited to 'plugin')
-rw-r--r--plugin/diff-changes.vim75
1 files changed, 75 insertions, 0 deletions
diff --git a/plugin/diff-changes.vim b/plugin/diff-changes.vim
new file mode 100644
index 0000000..acd2cbd
--- /dev/null
+++ b/plugin/diff-changes.vim
@@ -0,0 +1,75 @@
+if exists('g:loaded_diff_changes') || &cp
+ finish
+endif
+let g:loaded_diff_changes = 1
+
+let s:foldmethod = &foldmethod
+let s:foldenable = &foldenable
+let s:diffwindow = 0
+
+function! s:diffstart(read_cmd)
+ if s:diffwindow != 0
+ return
+ endif
+ let s:foldmethod = &foldmethod
+ let s:foldenable = &foldenable
+ let l:filetype = &filetype
+ vert new
+ let s:diffwindow = winnr()
+ set buftype=nofile
+ try
+ exe a:read_cmd
+ catch /.*/
+ echohl ErrorMsg
+ echo v:exception
+ echohl NONE
+ call s:diffstop()
+ return
+ endtry
+ let &filetype = l:filetype
+ diffthis
+ wincmd p
+ diffthis
+endfunction
+
+function! s:diffstop()
+ if s:diffwindow == 0
+ return
+ endif
+ diffoff!
+ exe s:diffwindow . 'wincmd w'
+ bdelete
+ let &foldmethod = s:foldmethod
+ let &foldenable = s:foldenable
+ if &foldenable
+ if &foldmethod == 'marker'
+ normal! zv
+ else
+ normal! zE
+ end
+ endif
+ let s:diffwindow = 0
+endfunction
+
+function! s:vcs_orig(file)
+ " XXX: would be nice to use a:file rather than # here...
+ let l:dir = expand('#:p:h')
+ if filewritable(l:dir . '/.svn') == 2
+ return system('svn cat ' . a:file)
+ elseif filewritable(l:dir . '/CVS') == 2
+ return system("AFILE=" . a:file . "; MODFILE=`tempfile`; DIFF=`tempfile`; cp $AFILE $MODFILE && cvs diff -u $AFILE > $DIFF; patch -R $MODFILE $DIFF 2>&1 > /dev/null && cat $MODFILE; rm $MODFILE $DIFF")
+ elseif finddir('_darcs', l:dir . ';') =~# '_darcs'
+ return system('darcs show contents ' . a:file)
+ elseif finddir('.git', l:dir . ';') =~# '.git'
+ let l:prefix = system('git rev-parse --show-prefix')
+ let l:prefix = substitute(l:prefix, '\n', '', 'g')
+ let l:cmd = 'git show HEAD:'.l:prefix.a:file
+ return system(l:cmd)
+ else
+ throw 'No VCS directory found'
+ endif
+endfunction
+
+command DiffAgainstFilesystem call <SID>diffstart('read # | normal! ggdd')
+command DiffAgainstVCS call <SID>diffstart('call append(0, split(s:vcs_orig(expand("#:.")), "\n", 1)) | normal! Gdddd')
+command DiffStop call <SID>diffstop()