-" $Id$ vim: set 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 @" != ""
+ if @" != "grgergregergeg"
+ " 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
- r!p4 diff
+ if l:files != ""
+ exe "r!env P4DIFF= p4 diff -du " . substitute(l:files, "\n", " ", "g")
+ endif
+
setf diff
" Delete the blank line left above the diff.
1
delete
set nobuflisted
- set buftype=nofile
+ set buftype=nowrite
set bufhidden=hide
setlocal noswapfile
+ file [p4 diff]
" Switch back to the top window and put the cursor by the description.
wincmd k
" Expand the command line window so we don't have to press RETURN later.
let s:cmdheight = &cmdheight
-set cmdheight=2
+set cmdheight=3
" Call and then discard our function.
call P4submit()