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

Re: graphical diffs

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-11-12 19:23:59 CET

Karl Fogel <kfogel@newton.ch.collab.net> writes:

> Philip Martin <philip@codematters.co.uk> writes:
> > Make that four arguments: the two, possibly temporary, files and two
> > labels telling you what the files represent.
>
> Ooooh. This could get tricky, since for many programs, those labels
> will need to be passed as arguments to `--label' options (or
> whatever). Not sure how we're going to work that out... One step at a
> time.

Easy, "svn diff --diff-file" simply passes the four arguments without
modification. The program supplied by the user as the --diff-file
parameter converts the four arguments into the form understood by the
program the user really wants to run. This wrapper program can also
convert the program's exit status into a return value that the
Subversion library understands, so that it can determine whether to
abort or continue. We could even supply a set of "standard" wrappers
for common programs.

I suppose we could wrap it ourselves, on the fly, using some sort of
parsing system, something like

  svn diff --diff-file "wizzy-diff %1 %2 --first \"%3\" --second \"%4\""

(Why do some of the old $EDITOR threads come to mind?)

Just avoiding the issue isn't going to work, seeing a cute, graphical
diff between tmp.58928.00001 and tmp.53776.00001 is not going to
satisfy the user.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 12 19:24:47 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.