Re: svn diff fix for bug 2044

2013-03-20 Thread Gabriela Gibson
Thanks for all the feedback, advice and ideas so far :) IIRC Subversion needs to communicate the following file names to the user's diff program: mine, yours, base and output It then takes the user input (--diff-cmd) from either the command line or a script, and produces a command to run the ex

Re: svn diff fix for bug 2044

2013-03-20 Thread Branko Čibej
On 20.03.2013 13:22, Philip Martin wrote: > Turning to the command itself, Subversion would have to parse the string > and split it into arguments. That gets compilcated if the user wants to > be able to use quotes to pass whitespace: > >diff-cmd='prog --arg "foo bar" ' > > A unix user probab

Re: svn diff fix for bug 2044

2013-03-20 Thread Philip Martin
Stefan Sperling writes: > I agree. I like the idea of allowing users to specify a template in the > configuration file to control the way a diff tool is invoked. > I also like the format you proposed. Do you think it would be reasonable > to add this new template support to the existing diff-cmd

Re: svn diff fix for bug 2044

2013-03-19 Thread Stefan Sperling
On Tue, Mar 19, 2013 at 09:28:50PM +, Julian Foad wrote: > Of course, users won't normally want to be typing this configuration > on the command line, they'll want it to be in a config file.  But it's > useful to have the possibility of doing it on the command line as > well. If it's a config

Re: svn diff fix for bug 2044

2013-03-19 Thread Julian Foad
I (Julian Foad) wrote: > [...]  For example, one possibility is we could use some sort of > pattern-substitution in a specified template: we could take a pattern > argument, in which any text enclosed in angle brackets is a special > keyword that Subversion replaces with one of a small fixed set of

Re: svn diff fix for bug 2044

2013-03-19 Thread Julian Foad
Gabriela Gibson wrote: > On 19/03/13 13:09, Julian Foad wrote: >> For the record, the summary line of issue #2044 is 'Fully customizable >> external diff invocations'. (I like to mention the summary alongside >> the number as I am not good at memorizing issue numbers.) I'm curious >> about you

Re: svn diff fix for bug 2044

2013-03-19 Thread Johan Corveleyn
On Tue, Mar 19, 2013 at 8:56 PM, Gabriela Gibson wrote: > On 19/03/13 13:09, Julian Foad wrote: > > Julian Foad wrote: > >> For the record, the summary line of issue #2044 is 'Fully customizable >> external diff invocations'. (I like to mention the summary alongside >> the number as I am not good

Re: svn diff fix for bug 2044

2013-03-19 Thread Gabriela Gibson
On 19/03/13 13:09, Julian Foad wrote: Julian Foad wrote: > For the record, the summary line of issue #2044 is 'Fully customizable > external diff invocations'. (I like to mention the summary alongside > the number as I am not good at memorizing issue numbers.) I'm curious > about your patch becau

Re: svn diff fix for bug 2044

2013-03-19 Thread Julian Foad
Hi Gabriela. Gabriela Gibson wrote: > I've made some changes to meet some feature requests regarding svn diff. > > Could you please take a look and let me know if I'm on the right track? > [[[ > Change "svn diff" to allow removal of "-u" and use of > arbitrary strings in place of current hard-

Re: svn diff fix for bug 2044

2013-03-19 Thread Philip Martin
Gabriela Gibson writes: > Index: subversion/libsvn_subr/io.c > === > --- subversion/libsvn_subr/io.c (revision 1458203) > +++ subversion/libsvn_subr/io.c (working copy) > @@ -2831,7 +2831,105 @@ svn_io_run_cmd(const char

svn diff fix for bug 2044

2013-03-19 Thread Gabriela Gibson
Hi, I've made some changes to meet some feature requests regarding svn diff. Could you please take a look and let me know if I'm on the right track? thanks, Gabriela [[[ Change "svn diff" to allow removal of "-u" and use of arbitrary strings in place of current hard-coded "-L" switch. Thi