[PATCH] Updated contrib/vim/patchreview.* to version 0.2.2
Manpreet Singh
junkblocker at yahoo.com
Wed Feb 24 21:49:28 CST 2010
# HG changeset patch
# User Manpreet Singh <junkblocker at yahoo.com>
# Date 1267069393 28800
# Branch stable
# Node ID f6e85e0e9bafe9b9c697d5162297db74c1b79402
# Parent b9e4a67329cdd5bcd7d170b95bf3b355100e6db2
Updated contrib/vim/patchreview.* to version 0.2.2
- Security fixes by removing custom tempfile creation
- Removed need for DiffReviewCleanup/PatchReviewCleanup
- Better command execution error detection and display
- Improved diff view and folding by ignoring modelines
- Improved tab labels display
diff -r b9e4a67329cd -r f6e85e0e9baf contrib/vim/patchreview.txt
--- a/contrib/vim/patchreview.txt Wed Feb 24 13:12:17 2010 -0800
+++ b/contrib/vim/patchreview.txt Wed Feb 24 19:43:13 2010 -0800
@@ -1,5 +1,5 @@
*patchreview.txt* Vim global plugin for doing single, multi-patch or diff code reviews
- Version v0.2.1 (for Vim version 7.0 or higher)
+ Version v0.2.2 (for Vim version 7.0 or higher)
Author: Manpreet Singh < junkblocker at yahoo.com >
Copyright (C) 2006-2010 by Manpreet Singh
@@ -15,8 +15,6 @@
4. PatchReview Usage................................: |patchreview-usage|
4.1 DiffReview Usage.............................: |:DiffReview|
4.2 PatchReview Usage............................: |:PatchReview|
- 4.3 DiffReviewCleanup Usage......................: |:DiffReviewCleanup|
- 4.4 PatchReviewCleanup Usage.....................: |:PatchReviewCleanup|
=============================================================================
@@ -36,21 +34,25 @@
the same directory as original file which can lead to project workspace
pollution.
+It does automatic diff generation for various version control systems by
+running their diff command.
+
=============================================================================
PatchReview Options *patchreview-options*
- g:patchreview_tmpdir = {string}
- Optional path where the plugin can save temporary files. If this is not
- specified, the plugin tries to use TMP, TEMP and TMPDIR environment
- variables in succession.
+ g:patchreview_patch = {string}
+ Optional path to patch binary. PatchReview tries to locate patch on
+ system path automatically. If the binary is not on system path, this
+ option tell PatchReview the full path to the binary. This option, if
+ specified, overrides the default patch binary on the path.
examples:
- (On Windows) >
- let g:patchreview_tmpdir = 'c:\\tmp'
+ (On Windows with Cygwin) >
+ let g:patchreview_patch = 'c:\\cygwin\\bin\\patch.exe'
<
(On *nix systems) >
- let g:patchreview_tmpdir = '~/tmp'
+ let g:patchreview_patch = '/usr/bin/gpatch'
<
g:patchreview_filterdiff = {string}
@@ -69,20 +71,6 @@
>
let g:patchreview_filterdiff = '/usr/bin/filterdiff'
<
- g:patchreview_patch = {string}
- Optional path to patch binary. PatchReview tries to locate patch on
- system path automatically. If the binary is not on system path, this
- option tell PatchReview the full path to the binary. This option, if
- specified, overrides the default patch binary on the path.
-
- examples:
- (On Windows with Cygwin) >
- let g:patchreview_patch = 'c:\\cygwin\\bin\\patch.exe'
-<
- (On *nix systems) >
- let g:patchreview_patch = '/usr/bin/gpatch'
-<
-
=============================================================================
PatchReview Usage *patchreview-usage*
@@ -105,16 +93,5 @@
Only supports context or unified format patches.
- *:DiffReviewCleanup*
- *:PatchReviewCleanup*
-
- :DiffReviewCleanup
- :PatchReviewCleanup
-
- After you are done using the :DiffReview or :PatchReview command, you can
- cleanup the temporary files in the temporary directory using either of
- these commands.
-
------------------------------------------------------------------------------
-
vim: ft=help:ts=2:sts=2:sw=2:tw=78:norl:
diff -r b9e4a67329cd -r f6e85e0e9baf contrib/vim/patchreview.vim
--- a/contrib/vim/patchreview.vim Wed Feb 24 13:12:17 2010 -0800
+++ b/contrib/vim/patchreview.vim Wed Feb 24 19:43:13 2010 -0800
@@ -1,7 +1,7 @@
" VIM plugin for doing single, multi-patch or diff code reviews {{{
" Home: http://www.vim.org/scripts/script.php?script_id=1563
-" Version : 0.2.1 "{{{
+" Version : 0.2.2 "{{{
" Author : Manpreet Singh < junkblocker at yahoo.com >
" Copyright : 2006-2010 by Manpreet Singh
" License : This file is placed in the public domain.
@@ -9,6 +9,12 @@
"
" Changelog :
"
+" 0.2.2 - Security fixes by removing custom tempfile creation
+" - Removed need for DiffReviewCleanup/PatchReviewCleanup
+" - Better command execution error detection and display
+" - Improved diff view and folding by ignoring modelines
+" - Improved tab labels display
+"
" 0.2.1 - Minor temp directory autodetection logic and cleanup
"
" 0.2 - Removed the need for filterdiff by implemeting it in pure vim script
@@ -33,7 +39,10 @@
"
" Installing:
"
-" For a quick start...
+" For a quick start, unzip patchreview.zip into your ~/.vim directory and
+" restart Vim.
+"
+" Details:
"
" Requirements:
"
@@ -68,13 +77,11 @@
" and location of a temporary directory to use in your .vimrc.
"
" let g:patchreview_patch = '/path/to/gnu/patch'
-" let g:patchreview_tmpdir = '/tmp/or/something'
"
" " If you are using filterdiff
" let g:patchreview_filterdiff = '/path/to/filterdiff'
"
"
-"
" Usage:
"
" Please see :help patchreview or :help diffreview for details.
@@ -83,7 +90,6 @@
" Enabled only during development
" unlet! g:loaded_patchreview " DEBUG
-" unlet! g:patchreview_tmpdir " DEBUG
" unlet! g:patchreview_patch " DEBUG
" unlet! g:patchreview_filterdiff " DEBUG
" let g:patchreview_patch = 'patch' " DEBUG
@@ -100,7 +106,7 @@
if (! exists('g:patchreview_debug') && exists('g:loaded_patchreview')) || &compatible
finish
endif
-let g:loaded_patchreview="0.2.1"
+let g:loaded_patchreview="0.2.2"
let s:msgbufname = '-PatchReviewMessages-'
@@ -183,56 +189,6 @@
endfunction
"}}}
-function! <SID>PR_GetTempDirLocation(Quiet) "{{{
- if exists('g:patchreview_tmpdir')
- if ! isdirectory(g:patchreview_tmpdir) || ! filewritable(g:patchreview_tmpdir)
- if ! a:Quiet
- Pecho 'Temporary directory specified by g:patchreview_tmpdir [' . g:patchreview_tmpdir . '] is not accessible.'
- return 0
- endif
- endif
- elseif exists("$TMP") && isdirectory($TMP) && filewritable($TMP)
- let g:patchreview_tmpdir = $TMP
- elseif exists("$TEMP") && isdirectory($TEMP) && filewritable($TEMP)
- let g:patchreview_tmpdir = $TEMP
- elseif exists("$TMPDIR") && isdirectory($TMPDIR) && filewritable($TMPDIR)
- let g:patchreview_tmpdir = $TMPDIR
- else
- if has("unix")
- if isdirectory("/tmp")
- let g:patchreview_tmpdir = "/tmp"
- elseif isdirectory(expand("~/tmp"))
- let g:patchreview_tmpdir = expand("~/tmp")
- endif
- elseif has("win32")
- if isdirectory('c:\\tmp')
- let g:patchreview_tmpdir = 'c:\\tmp'
- elseif isdirectory('c:\\temp')
- let g:patchreview_tmpdir = 'c:\\temp'
- elseif isdirectory('c:\\windows\\temp')
- let g:patchreview_tmpdir = 'c:\\windows\\temp'
- elseif isdirectory($USERPROFILE . '\Local Settings\Temp') # NOTE : No \ issue here
- let g:patchreview_tmpdir = $USERPROFILE . '\Local Settings\Temp'
- endif
- endif
- if !exists('g:patchreview_tmpdir')
- if ! a:Quiet
- Pecho 'Could not figure out a temporary directory to use. Please specify g:patchreview_tmpdir in your .vimrc.'
- endif
- return 0
- endif
- endif
- let g:patchreview_tmpdir = expand(g:patchreview_tmpdir, ':p')
- let g:patchreview_tmpdir = g:patchreview_tmpdir . '/'
- let g:patchreview_tmpdir = substitute(g:patchreview_tmpdir, '\\', '/', 'g')
- let g:patchreview_tmpdir = substitute(g:patchreview_tmpdir, '/\+$', '/', '')
- if has('win32')
- let g:patchreview_tmpdir = substitute(g:patchreview_tmpdir, '/', '\\', 'g')
- endif
- return 1
-endfunction
-"}}}
-
function! <SID>ExtractDiffsNative(...) "{{{
" Sets g:patches = {'reason':'', 'patch':[
" {
@@ -680,11 +636,6 @@
return
endif
- let retval = s:PR_GetTempDirLocation(0)
- if ! retval
- return
- endif
-
" Requirements met, now execute
let PatchFilePath = fnamemodify(PatchFilePath, ':p')
if s:reviewmode == 'patch'
@@ -739,12 +690,7 @@
Pecho 'Old buffer for file [' . relpath . '] exists in modified state. Skipping review.', 1
continue
endif
- let tmpname = substitute(relpath, '/', '_', 'g')
- let tmpname = substitute(tmpname, '\\', '_', 'g')
- let tmpname = g:patchreview_tmpdir . 'PatchReview.' . tmpname . '.' . strftime('%Y%m%d%H%M%S')
- if has('win32')
- let tmpname = substitute(tmpname, '/', '\\', 'g')
- endif
+ let tmpname = tempname()
" write patch for patch.filename into tmpname
call writefile(patch.content, tmpname)
@@ -770,10 +716,26 @@
continue
endif
endif
+ call delete(tmpname)
let s:origtabpagenr = tabpagenr()
silent! exe 'tabedit ' . StrippedRelativeFilePath
if exists('patchcmd')
+ " modelines in loaded files mess with diff comparision
+ let s:keep_modeline=&modeline
+ let &modeline=0
silent! exe 'vert diffsplit ' . tmpname . '.file'
+ setlocal buftype=nofile
+ setlocal noswapfile
+ setlocal syntax=none
+ setlocal bufhidden=delete
+ setlocal nobuflisted
+ setlocal modifiable
+ setlocal nowrap
+ " Remove buffer name
+ silent! 0f
+ " Switch to original to get a nice tab title
+ silent! wincmd p
+ let &modeline=s:keep_modeline
else
silent! exe 'vnew'
endif
@@ -791,18 +753,6 @@
endfunction
"}}}
-function! <SID>PatchReviewCleanup() "{{{
- let retval = s:PR_GetTempDirLocation(1)
- if retval && exists('g:patchreview_tmpdir') && isdirectory(g:patchreview_tmpdir) && filewritable(g:patchreview_tmpdir)
- let zefilestr = globpath(g:patchreview_tmpdir, 'PatchReview.*')
- let fileslist = split(zefilestr, '\m[\r\n]\+')
- for thefile in fileslist
- call delete(thefile)
- endfor
- endif
-endfunction
-"}}}
-
function! <SID>DiffReview(...) "{{{
let s:save_shortmess = &shortmess
set shortmess=aW
@@ -848,21 +798,17 @@
return
endif
- let retval = s:PR_GetTempDirLocation(0)
- if ! retval
- Pecho 'DiffReview aborted.'
- let &shortmess = s:save_shortmess
- return
- endif
- let outfile = g:patchreview_tmpdir . 'PatchReview.diff.' . strftime('%Y%m%d%H%M%S')
- let cmd = '!' . s:theDiffCmd . ' > "' . outfile . '"'
+ let outfile = tempname()
+ let cmd = s:theDiffCmd . ' > "' . outfile . '"'
let v:errmsg = ''
- silent exe cmd
+ let cout = system(cmd)
if v:errmsg == '' && exists('l:vcs') && l:vcs == 'cvs' && v:shell_error == 1
" Ignoring CVS non-error
elseif v:errmsg != '' || v:shell_error
+ Pecho v:errmsg
Pecho 'Could not execute [' . s:theDiffCmd . ']'
- Pecho v:errmsg
+ Pecho 'Error code: ' . v:shell_error
+ Pecho cout
Pecho 'Diff review aborted.'
let &shortmess = s:save_shortmess
return
@@ -880,10 +826,6 @@
" :DiffReview
command! -nargs=0 DiffReview call s:DiffReview()
-
-" :PatchReviewCleanup
-command! -nargs=0 PatchReviewCleanup call s:PatchReviewCleanup ()
-command! -nargs=0 DiffReviewCleanup call s:PatchReviewCleanup ()
"}}}
" Development "{{{
More information about the Mercurial-devel
mailing list