Re: Diff Project --invoke-diff-cmd part

2013-05-17 Thread Gabriela Gibson
Hi, I made a feature branch for the project here: https://svn.apache.org/repos/asf/subversion/branches/invoke-diff-cmd-feature/ Gabriela

Re: Diff Project --invoke-diff-cmd part

2013-05-13 Thread Gabriela Gibson
On 13/05/13 22:53, Gabriela Gibson wrote: Hi, thanks for all the comments and help, here is the next attempt. Gabriela Sorry I had one mistake in the patch that has now been fixed. Please ignore the patch in the previous post, the attached patch is the working one. Gabriela Index: subve

Re: Diff Project --invoke-diff-cmd part

2013-05-13 Thread Gabriela Gibson
Hi, thanks for all the comments and help, here is the next attempt. Gabriela [[[ Add new diff option "--invoke-diff-cmd" which allows the user to define a custom command line or config file entry for an external diff program. * subversion/include/svn_client.h (svn_client_diff7, svn_client_d

Re: Diff Project --invoke-diff-cmd part

2013-04-30 Thread Branko Čibej
On 28.04.2013 11:24, Daniel Shahaf wrote: > P.S. It appears our config files' %-interpolation feature doesn't kick > in for --config-option's argument. I'm not sure whether that's a good > thing or not. This is probably because we interpolate upon getting a value from the svn_config_t, not during

Re: Diff Project --invoke-diff-cmd part

2013-04-29 Thread Daniel Shahaf
Gabriela Gibson wrote on Mon, Apr 29, 2013 at 21:31:09 +0100: > Take two. > > Thanks for looking! > > Gabriela > > [[[ > Add new diff option "--invoke-diff-cmd" which allows the user to > define a custom command line or config file entry for an external > diff program. > > * subversion/include/svn_

Re: Diff Project --invoke-diff-cmd part

2013-04-29 Thread Gabriela Gibson
Sorry I forgot to explain the changed syntax. Here is the help section: --invoke-diff-cmd ARG: use ARG as format string for external diff command invocation. Substitutions: %f1 %f2 files to compare %l1 %l2 user defined labels Examples: --invoke-diff-cmd="diff -y %f1 %f2 --invok

Re: Diff Project --invoke-diff-cmd part

2013-04-29 Thread Gabriela Gibson
Take two. Thanks for looking! Gabriela [[[ Add new diff option "--invoke-diff-cmd" which allows the user to define a custom command line or config file entry for an external diff program. * subversion/include/svn_client.h (svn_client_diff6): Deprecate. Add new Doxygen comment. (svn

Re: Diff Project --invoke-diff-cmd part

2013-04-28 Thread Gabriela Gibson
On 28/04/13 10:24, Daniel Shahaf wrote: Alan Barrett wrote on Wed, Apr 24, 2013 at 09:44:11 +0200: On Tue, 23 Apr 2013, Gabriela Gibson wrote: Also, a minor design nit (sorry, no code review): The "---f1" construct is something I've never seen before. That's why I picked it --- I checked exte

Re: Diff Project --invoke-diff-cmd part

2013-04-28 Thread Daniel Shahaf
Alan Barrett wrote on Wed, Apr 24, 2013 at 09:44:11 +0200: > On Tue, 23 Apr 2013, Gabriela Gibson wrote: >>> Also, a minor design nit (sorry, no code review): The "---f1" >>> construct is something I've never seen before. >> >> That's why I picked it --- I checked extensively, and no-one uses a

Re: Diff Project --invoke-diff-cmd part

2013-04-24 Thread Alan Barrett
On Tue, 23 Apr 2013, Gabriela Gibson wrote: Also, a minor design nit (sorry, no code review): The "---f1" construct is something I've never seen before. That's why I picked it --- I checked extensively, and no-one uses a triple dash, so it does exactly what we hope it will: never interfere wi

Re: Diff Project --invoke-diff-cmd part

2013-04-23 Thread Gabriela Gibson
Many thanks for the inspiring feedback! Gabriela Julian Foad wrote: >> * This patch breaks the override --internal-diff for now, because >> this part has to be revised anyway when the invoke-diff3-cmd part >> gets added. > OK, we'll have to dec

Re: Diff Project --invoke-diff-cmd part

2013-04-12 Thread C. Michael Pilato
On 04/11/2013 05:39 PM, Gabriela Gibson wrote: > This patch plugs in a new option --invoke-diff-cmd into the existing > diff command structure, but does leave the existing "diff-cmd" option > untouched. > > This addition allows the user to define a complex diff command, to be > applied in place of

Re: Diff Project --invoke-diff-cmd part

2013-04-11 Thread Julian Foad
Daniel Shahaf wrote: >> + * @deprecated Provided for backward compatibility with the 1.8 API. >>   * @since New in 1.8. >>   */ >> +SVN_DEPRECATED >>   svn_error_t * >>   svn_client_diff6(const apr_array_header_t *diff_options, > > Since this API is new in 1.8, you should just extend it witho

Re: Diff Project --invoke-diff-cmd part

2013-04-11 Thread Daniel Shahaf
Julian Foad wrote on Fri, Apr 12, 2013 at 00:58:55 +0100: > Gabriela Gibson wrote: > > * subversion/svn/cl.h > >   (struct svn_cl__opt_state_t): Add new variable. > >   (struct svn_cl__opt_state_t.diff): Add new variable. Nitpick: you mean "struct member", not "variable". And you might as well me

Re: Diff Project --invoke-diff-cmd part

2013-04-11 Thread Daniel Shahaf
Partial review, including only the public API changes, and only the diff hunks (without their context not in the patch): Gabriela Gibson wrote on Thu, Apr 11, 2013 at 22:39:24 +0100: > Index: subversion/include/svn_client.h > === > --

Re: Diff Project --invoke-diff-cmd part

2013-04-11 Thread Julian Foad
Gabriela Gibson wrote: > This patch plugs in a new option --invoke-diff-cmd into the existing > diff command structure, but does leave the existing "diff-cmd" option > untouched. > > This addition allows the user to define a complex diff command, to be > applied in place of the internal diff, for

Diff Project --invoke-diff-cmd part

2013-04-11 Thread Gabriela Gibson
This patch plugs in a new option --invoke-diff-cmd into the existing diff command structure, but does leave the existing "diff-cmd" option untouched. This addition allows the user to define a complex diff command, to be applied in place of the internal diff, for example: svn diff --invoke-diff-c