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

Re: Using an external diff program with Subversion

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2003-08-13 06:20:05 CEST

On Tue, 2003-08-12 at 18:46, Philip Martin wrote:
> > [It would be nice if one could specify something like:]
> >> diff-cmd = /path/to/diff/program %f1 %f2 -L %N1 -L %N2
>
> I don't think that will work. The external diff command isn't a
> single string, it's a program name and a list of arguments.

APR gives us apr_tokenize_to_argv(), which provides quoting semantics
similar to Unix shells (but without $foo or `foo` substitution, of
course). ra_svn uses it.

It's the % substitutions which get tricky. We could go over the result
of apr_tokenize_to_argv() and perform the % substitutions, but you
really want to do them at the same time to get sane quoting semantics.
I would think that "%f1" (with the quotes) should produce an
unsubstituted %f1, for instance, but the information that there were
quotes there is lost by the time we'd look at it.

(That's primarily why ra_svn tunnel agent commands don't let you
substitute in a username or portname or anything, right now.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 13 06:21:20 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.