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

Re: [PATCH] help setting up Visual Diff

From: Robert Spier <rspier_at_pobox.com>
Date: 2003-06-30 05:46:43 CEST

> Robert Spier wrote:
> > Below find two patches. The first implements the above.
> You have removed "-u" and the two "-L label" arguments. I agree
> that removing "-u" is a good idea if we are to support arbitrary
> external diff programs; it can easily be passed within "-x" when
> required. However, the "-L" options cannot so easily be passed by
> the user, but they are reasonably important in some circumstances.
> I think we need to devise a better way of invoking an arbitrary diff
> program.

I removed the -L, because "my pet itch" was to get xxdiff working.
While "most" diff programs generally work with <program> <old> <new>
-- all flags are going to be different.

I'd much rather have a diff with incorrect labels, than no diff at

The current --diff-cmd scheme is broken for everything except
> Here's another idea: we could specify that the external diff program
> always takes exactly four arguments: the two file names and the two
> labels. The user can provide a simple shell script or similar
> wrapper that accepts those four arguments and invokes the desired
> diff program with an appropriate combination of those arguments and
> other options. This is flexible (in Unix; maybe not in Windows) but
> ugly for the simple cases.

I like the simplicity of this idea. But I think I might want to use a
different argument name, instead of '--diff-cmd'.

  svn diff --type xxdiff file1 file2

On Windows this should be relatively simple as well. Batch files or
simple .cmd scripts would be able to handle the needs of the wrapper

> It would be useful to list the various diff programs that we have
> access to now, to see what sort of invocation syntax is required for
> each. This will indicate how much flexibility we need. Here is a
> start:


      --title1 <arg> Display 'str' instead of filename in filename
                               label 1 (left).

      --title2 <arg> Display 'str' instead of filename in filename
                               label 2 (middle).

   But this is probably futile. While we may be able to list 10
   different diff programs we know about, there will be another 5 we
   don't know about.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 30 05:47:36 2003

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.