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

Re: Disable diff-cmd

From: anatoly techtonik <techtonik_at_gmail.com>
Date: Tue, 24 Aug 2010 15:28:58 +0300

On Tue, Aug 24, 2010 at 2:29 PM, Stefan Sperling <stsp_at_elego.de> wrote:
>> >
>> > --internal-diff seems to be new in 1.7 so i guess the only option is using
>> > --config-dir to override it.
>>
>> Why not to stop proliferation of options by allowing an empty value
>> for --diff-cmd to be treated as an instructions to use internal
>> implementation?
>
> Boils down to personal preference.
> See http://svn.haxx.se/dev/archive-2010-05/0456.shtml

I believe Git has --no-ext-diff option for that purpose, but I still
think that universal ability to reset option to default with
`--diff-cmd=""` or `--config-option config:helpers:diff-cmd=""` is a
better approach, because it will also allow to use default values for
other cmd options like editor-cmd, diff3-cmd, merge-tool-cmd and ssh.

>> This looks like a bug that can be fixed in 1.6 series as well.
>
> If there is strong demand for backporting the --internal-diff option
> I guess we could do it. But is using --config-dir an acceptable
> workaround for now?

Not really. In Rietveld project we call "svn diff" by upload.py script
used to send diffs for review to remote server. We can't instruct
users to copy config dir, so we need to do this automatically. That
means copying the whole config dir and comment only one option just
for the sake of running "svn diff"

Copying is required, because there are some options that may affect
"svn diff" output. Some options may even be specified in windows
registry. Extracting them from there is an overkill. That's why a
simple solution with one option override at a time is better.

Having --internal-diff option backported will allow us to detect if an
external diff tool is used and advise users to upgrade to a newer 1.6
Subversion instead of implementing config dir copy and override logic.
Not many will be ready to switch to 1.7 and I doubt that it will
appear in Debian backports any time soon.

http://code.google.com/p/rietveld/issues/detail?id=217

Please, CC.

-- 
anatoly t.
Received on 2010-08-24 14:29:35 CEST

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