X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vim%2Fscript%2Fp4;h=56958f88335b5673edacc742f29670668c0eb17c;hp=f69cfb6a5b86c4f687d8077437ce4c994b1d4bb6;hb=67fb88faeb67ebc6a6401ca8935364f5a2ee68e3;hpb=e04927534891bc179e49d461e1cedd99f201cd1f

diff --git a/.vim/script/p4 b/.vim/script/p4
index f69cfb6..56958f8 100644
--- a/.vim/script/p4
+++ b/.vim/script/p4
@@ -1,26 +1,44 @@
-" $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! P4submit()
   " There's no point doing this if the spec is readonly.  That probably means 
   " it's a submitted change.
   if ! &ro
+    setf perforce
+
     " Clear the unnamed register.
     let @" = ""
     try
       " Delete the spec blurb if it exists.
-      /^# A Perforce Change Spec/,/^$/d
+      /^# A Perforce Change Spec/,/^# *(New changelists only\.)$/d
       " If the blurb was deleted the text will be in the unnamed register.
       if @" != ""
+        " Delete the blank line left above the remaining fields.
+        1
+        delete
+
         " Allow closing an unmodified spec.
         set nomod
 
-        " Get the files in the changelist.
-        let l:files = system("sed -n 's@	\(//.*\)	#.*@@p' " . bufname(""))
+        try
+          /everything below this line is just the diff/
+
+          " We are submitting through git p4 so yank the diff.
+          normal j
+          normal yG
+          " Create a new window below the spec and paste the diff.
+          botright new
+          normal p
+        catch
+          " Get the files in the changelist.
+          let l:files = system("sed -n 's@^	\\(//.*\\)	#.*@\"\\1\"@p' " . bufname(""))
+          " Create a new window below the spec and read in a diff.
+          botright new
+          if l:files != ""
+            exe "r!env P4DIFF= p4 diff -du " .  substitute(l:files, "\n", " ", "g")
+          endif
+        endtry
 
-        " Create a new window, move it below the spec and read in a diff.
-        botright new
-        exe "r!env P4DIFF= p4 diff -du " .  substitute(l:files, "\n", "", "g")
         setf diff
 
         " Delete the blank line left above the diff.
@@ -30,14 +48,20 @@ fun! P4submit()
         set buftype=nowrite
         set bufhidden=hide
         setlocal noswapfile
-        file [p4 diff]
+        file [p4 diff\]
 
         " Switch back to the top window and put the cursor by the description.
         wincmd k
         resize 10
-        exe "normal G"
-        ?<enter description here>
+        normal G
+        ?^Description:
         let @/ = ""
+        normal j
+        normal ^
+
+        " Set formatting.
+        se noexpandtab
+        se ts=8
       endif
     catch
       " We get here if no blurb was deleted.  This is the case if we aren't