[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: graphical diff'ing script

From: <kbrannen_at_gte.net>
Date: 2002-12-09 20:56:22 CET

Timothee Besset wrote:
> Awesome!
>
> This doesn't quite work with xxdiff here though.
> $ svndiff neo/sys/linux/ChangeLog
> xxdiff: invalid option -- g
> xxdiff (cmdline.cpp:616):
> Argument error.
> Use 'xxdiff --help' for more information.
>
> (regular xxdiff on a Debian Sid box)

Most interesting. Unfortunately, I have a typo in the "diff" call. ARGH!!!
Maybe that affected you. See below... (Thanks Daniele for the catch!)

>
> But .. I got it working with meld (needed to remove the -geometry part as
> well) http://meld.sf.net/

OK, 1 extra line below for you. I've never heard of meld, I'll have to check
it out.

>
> Again, great work..

Thanks! :-)

>
> TTimo
>
> On Mon, 09 Dec 2002 03:43:47 -0600
> kbrannen@gte.net wrote:

>>-----
>>
>>#!/bin/bash
>># also works with ksh
>>#
>># usage: svndiff file
>># graphically show the diff between our file and that last thing
>># in the repository
>># uses the program in the env.var. $DIFF, or "xxdiff" by default
>># tested with: xxdiff, mgdiff, tkdiff
>>
>>###################################### start configurable stuff
>># default graphical diff program
>>dif=${DIFF:-xxdiff}
>># default geometry, works for the average X program
>>geometry="-geometry 1000x400+0+0"
>># handle tkdiff not liking geometries
>>[[ $dif = tkdiff ]] && geometry=""
[[ $dif = meld ]] && geometry=""
>>###################################### end configurable stuff
>>
>>if [[ ! -d .svn ]]
>>then
>> echo ERROR: You are not in a SVN working copy directory.
>> exit 1
>>fi
>>file=$1
>>last=${file}_LasT
>>
>>trap "rm -f $last" 2 3 15
>>
>>svn cat $file > $last 2>/dev/null
>>${DIFF:-xxdiff} $geometry $last $file
$dif $geometry $last $file
>>rm -f $last
>>
>>#end

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 9 20:53:12 2002

This is an archived mail posted to the Subversion Dev mailing list.