Re: Review of invoke-diff-cmd-feature branch

2013-06-14 Thread Daniel Shahaf
Gabriela Gibson wrote on Wed, Jun 12, 2013 at 14:18:08 +0100: > On 6/11/13, Daniel Shahaf wrote: > > Gabriela Gibson wrote on Mon, Jun 10, 2013 at 23:39:45 +0100: > >> On 6/10/13, Daniel Shahaf wrote: > >> > >> * @a invoke_diff_cmd takes an argument which is used to call an > >> * external diff

Re: Review of invoke-diff-cmd-feature branch

2013-06-12 Thread Gabriela Gibson
On 6/11/13, Daniel Shahaf wrote: > Gabriela Gibson wrote on Mon, Jun 10, 2013 at 23:39:45 +0100: >> On 6/10/13, Daniel Shahaf wrote: >> >> * @a invoke_diff_cmd takes an argument which is used to call an >> * external diff program. When invoked, the argument may not be @c >> * NULL or the empt

RE: Review of invoke-diff-cmd-feature branch

2013-06-11 Thread Bert Huijben
different workarounds. And we have more than enough escaping problems via white space paths and quoting characters being valid in paths. Bert From: Julian Foad Sent: 11/06/2013 10:48 To: Daniel Shahaf Cc: Gabriela Gibson; Gabriela Gibson; dev@subversion.apache.org Subject: Re: Review of invoke-diff-c

Re: Review of invoke-diff-cmd-feature branch

2013-06-11 Thread Branko Čibej
On 11.06.2013 10:45, Julian Foad wrote: > If there's a scheme that we're already using in Subversion, that would > be a good choice. Is there one? Yes; the one we already use in config files, which is a ripoff from Python. In this case you'd have to use %%(foo)s in the config file instead of %(fo

Re: Review of invoke-diff-cmd-feature branch

2013-06-11 Thread Julian Foad
Daniel Shahaf wrote: > Gabriela Gibson wrote on Mon, Jun 10, 2013 at 23:39:45 +0100: >> On 6/10/13, Daniel Shahaf wrote: [...] >> >> --    >> >> >> >> + How does this parse "%%%f1%"? Is "%%f1%%" an error? >> >> >> >> %%%f1% becomes %%f1% and %%f1%% becomes %f1%%, ne

Re: Review of invoke-diff-cmd-feature branch

2013-06-10 Thread Daniel Shahaf
Gabriela Gibson wrote on Mon, Jun 10, 2013 at 23:39:45 +0100: > On 6/10/13, Daniel Shahaf wrote: > > >> Index: subversion/include/svn_client.h > >> === > >> --- subversion/include/svn_client.h (revision 1484305) > >> +++ subversion/i

Re: Review of invoke-diff-cmd-feature branch

2013-06-10 Thread Gabriela Gibson
On 6/10/13, Daniel Shahaf wrote: >> Index: subversion/include/svn_client.h >> === >> --- subversion/include/svn_client.h (revision 1484305) >> +++ subversion/include/svn_client.h (working copy) >> @@ -2988,8 +2988,8 @@ svn_client_bla

Re: Review of invoke-diff-cmd-feature branch

2013-06-10 Thread Daniel Shahaf
Gabriela Gibson wrote on Tue, Jun 04, 2013 at 09:56:57 +0100: > Hi, > > I hope I've resolved most issues, here are ones I need to ask about: > > > Index: subversion/include/svn_client.h > === > --- subversion/include/svn_client.h (r

Re: Review of invoke-diff-cmd-feature branch

2013-06-04 Thread Gabriela Gibson
Hi, I hope I've resolved most issues, here are ones I need to ask about: Index: subversion/include/svn_client.h === --- subversion/include/svn_client.h (revision 1484305) +++ subversion/include/svn_client.h (working copy) @@ -2988,8

Re: Review of invoke-diff-cmd-feature branch

2013-05-21 Thread Gabriela Gibson
Because there is no option object that we can query from within io.c, diff.c and other places, we have to add extra courier parameters for every command line option we wish to add, in a number of places. We have 4 (potential) diff commands -- diff-cmd, diff3-cmd, invoke-diff-cmd and invoke-diff3

Re: Review of invoke-diff-cmd-feature branch

2013-05-19 Thread Daniel Shahaf
On Sun, May 19, 2013 at 08:23:13PM +0300, Daniel Shahaf wrote: > @@ -3018,6 +3032,7 @@ svn_io_run_external_diff(const char *dir, >if (0 == strlen(external_diff_cmd)) > return svn_error_createf(SVN_ERR_CL_INSUFFICIENT_ARGS, NULL, > _("The --invoke-diff-cmd string