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

Re: svn commit: r1500884 - /subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c

From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Mon, 8 Jul 2013 23:23:58 +0200

On Mon, Jul 8, 2013 at 10:20 PM, Gabriela Gibson
<gabriela.gibson_at_gmail.com> wrote:
> On Mon, Jul 8, 2013 at 8:23 PM, Johan Corveleyn <jcorvel_at_gmail.com> wrote:
>>
>> On Mon, Jul 8, 2013 at 9:03 PM, <gbg_at_apache.org> wrote:
>> > Author: gbg
>>
>> I didn't realize you intended to deprecate --diff-cmd in favor of
>> --invoke-diff-cmd. Are you sure? I can see that they're related and
>> mutually exclusive, but not sure if they are direct "successors".
>>
> I think it depends on the perspective. Technically, diff-cmd is a subset of
> invoke-diff-cmd, but in practice, people will probably think of
> invoke-diff-cmd as an extension.
>
>>
>> You made this change only for 'svnlook diff', but not for 'svn diff'.
>> Is that intentional, or just Work In Progress?
>>
> diff-cmd itself has been rerouted through the code for invoke-diff-cmd and
> the code it used to run on has been deprecated in r1500647.
>
>> Does --invoke-diff-cmd support the "simple invocation style of
>> --diff-cmd" as well? I.e. can I do 'svnlook diff -r3 $REPOS
>> --invoke-diff-cmd /usr/bin/diff' and get the same result as with
>> --diff-cmd?
>>
> No, -- invoke-diff-cmd just takes whatever you give it, substitutes ;f1 ...
> ;l3 and passes that expansion on to your diff command.
>
> I changed the help string in svnlook.c with the idea that it will move
> people towards using invoke-diff-cmd (which does not have diff-cmd's
> restrictions)

I don't think changing svnlook's help text will influence how people
use 'svn'. The audiences tend to be quite different (svnlook's users
are mainly svn admins, which might be 0.1% of all svn users). I think
it's more important that svnlook and svn are consistent (also in their
help texts).

>, but as you rightly point out, one man's restrictions are
> another man's labour saving device :-)
>
> So I don't know what to do here, I can just change the help string back and
> we keep diff-cmd around(and it keeps life simple for everyone) or, I can
> made all the other help strings match the deprecation notice.

I think 'diff-cmd' should stick around un-deprecated. I think people
would see it as a regression if they can't just run 'svn diff
--diff-cmd /usr/bin/diff' anymore but have to run 'svn diff
--invoke-diff-cmd <provide all the right arguments myself>'. That's a
lot more typing :-).

Perhaps you could say that --diff-cmd ARG is now a shorthand for
--invoke-diff-cmd ARG $somethingsomething, to correlate the two, but
I'm not sure. It might be a way to demonstrate the use of
--invoke-diff-cmd though, as an example.

--
Johan
Received on 2013-07-08 23:24:49 CEST

This is an archived mail posted to the Subversion Dev mailing list.