From 2be8b73f0cbc7eef32fb1cbecbb215890858ccb1 Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Tue, 26 Jan 2010 13:11:25 +0000
Subject: [PATCH] Handle git p4 submit.

git p4 submit includes the diff in its change spec so just copy that
rather than doing a diff manually.
---
 .vim/script/p4 | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/.vim/script/p4 b/.vim/script/p4
index 3dd4217..404d80d 100644
--- a/.vim/script/p4
+++ b/.vim/script/p4
@@ -20,13 +20,24 @@ fun! P4submit()
         " 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
 
@@ -42,8 +53,8 @@ fun! P4submit()
         " 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
-- 
2.20.1