X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vim%2Fscript%2Fsvn;h=d5244fb1d185b5453bc7519c8f4b8d1e999ca498;hp=8ee0390feb7b886c00f10c32c7afc40d3f52845d;hb=1ec94025a15c0e0fecfdc27e3bfd51f1e52d642f;hpb=87fd00a95f29f7c98cef42dacc16910b243d81ff diff --git a/.vim/script/svn b/.vim/script/svn index 8ee0390..d5244fb 100644 --- a/.vim/script/svn +++ b/.vim/script/svn @@ -1,13 +1,19 @@ -" $Id$ vim: se syntax=vim: " Define the function we'll use. It's easier to do this than to faff about " trying to run a sequence of normal mode commands. fun! SVNcommit() " Allow closing an unmodified spec. set nomod + " Get the modified files. Discount new files. + let l:files = system("sed -n '1,/^$/d;/^[MR]..../{s//\"/;s/$/\"/p;}' " . bufname("")) + + if l:files == "" + return + endif + " Create a new window, move it below the spec and read in a diff. botright new - r!svn diff + exe "r!svn diff " . substitute(l:files, "\n", " ", "g") setf diff " Delete the blank line left above the diff. @@ -17,7 +23,7 @@ fun! SVNcommit() set buftype=nowrite set bufhidden=hide setlocal noswapfile - file [svn diff] + file [svn diff\] " Switch back to the top window. wincmd k @@ -25,7 +31,7 @@ endfun " Expand the command line window so we don't have to press RETURN later. let s:cmdheight = &cmdheight -se cmdheight=2 +se cmdheight=3 " Call and then discard our function. call SVNcommit()