X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fp4;h=404d80d98a1677c7802a8767774452beb0d33a0d;hb=e6077f4815d9799443877377cf93428f9083c7fd;hp=9319906d7a7ac4cc9ed21c6a8b7bf731a4cc94b2;hpb=e7ce6e6adb47b17329876cfedb137c9f182e1cb7;p=profile.git

diff --git a/.vim/script/p4 b/.vim/script/p4
index 9319906..404d80d 100644
--- a/.vim/script/p4
+++ b/.vim/script/p4
@@ -1,27 +1,43 @@
-" $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@^	\\(//.*\\)	#.*@\\1@p' " . bufname(""))
-        " Create a new window, move it 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
+        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
 
         setf diff
 
@@ -32,13 +48,13 @@ 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 @/ = ""
       endif
     catch