erik/svndiff
erik/svndiff
1
0
Fork 0
Code Issues Pull requests Releases Activity

Fixed the -r flag processing.

Browse source 
Added support for files in directories (Francesc)
Added a trap to make sure the temp file is removed regardless of how the script exits (Balbir Singh, http://www.dbacorner.com/)
This commit is contained in:
Erik C. Thauvin 2011-01-18 12:54:25 +00:00
parent c6bd983409
commit dc58603161
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
svndiff.sh
View file

@ -1,11 +1,12 @@
#!/bin/sh
# svndiff -- svn diff with vimdiff.
# http://erik.thauvin.net/blog/posts/1024/subversion-diff-with-vim
#
# Written by Erik C. Thauvin (erik@thauvin.net)
# May 11, 2006
#
# Copyright (C) 2006 Erik C. Thauvin. All rights reserved.
# Copyright (C) 2006-2011 Erik C. Thauvin. All rights reserved.
#
# This software is provided "as is" without express or implied warranties.
#
@ -13,28 +14,35 @@
# provided this disclaimer and copyright are preserved on all copies. This
# software may not, however, be sold or distributed for profit, or included
# with other software which is sold or distributed for profit, without the
# permission of the author.
#
# $Id$
# permission of the author.
#
# Modified by felix021 (felix021@gmail.com)
# Aug 3, 2010
#
# Fixed the -r flag processing.
# Added support for files in directories (Francesc)
# Added a trap to make sure the temp file is removed regardless of how the
# script exits (Balbir Singh, http://www.dbacorner.com/)
# Jan 18, 2011
#
# $Id$
PROGNAME=`basename $0`
if [ $# -lt 1 ]; then
echo "Usage: $PROGNAME <file>"
echo "Usage: $PROGNAME <file> [-r rev]"
exit;
fi
filename=$1
pid=$$
TEMP=/tmp/tmp.$pid.$filename
TEMP=/tmp/tmp.$pid.`basename $filename`
pv=
if [ $# -gt 3 -a $2 = "-r" ]; then
trap 'rm -f $TEMP' 0 1 2 15
if [ $# -eq 3 -a $2 = "-r" ]; then
pv="-r $3"
fi
svn cat $filename $pv > $TEMP
vimdiff $TEMP $filename
rm -f $TEMP
vimdiff $TEMP $filename