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

Re: automation question: is it possible to override the diff tool?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 01 Sep 2009 19:15:10 +0200

On 01.09.2009 00:13, Hari Krishna Dara wrote:
> On Aug 30, 10:09 pm, Stefan Küng<tortoise..._at_gmail.com> wrote:
>> On 29.08.2009 02:29, Hari Krishna Dara wrote:
>>
>>
>>
>>> I have been working on a plugin for vim to invoke tortoisesvn commands
>>> from with in vim. It works very nicely and I hardly ever go to the
>>> windows explorer. Thanks a lot for supporting command-line options,
>>> though it is meant as a GUI tool.
>>
>>> Now about the issue that I need help with, I am content with most of
>>> the external dialogs that naturally result by executing tortoisesvn
>>> commands (compared to executing the command-line client), but one
>>> particular option that I would like to change is the diff command. I
>>> would like to optionally be able to use vimdiff for 2-way and 3-way
>>> diffs and so wondering if it is possible to specify the diff-cmd that
>>> should be used for that invocation. I know that I can specify gvim as
>>> the diff-cmd in the global settings, but that would result in starting
>>> up a new gvim instance, but what I want is to be able to use the
>>> original vim window from which the tortoisesvn command was issued
>>> (which means, I need to embed the vim servername/windowname in the
>>> diff command line). Is this possible using the "configdir" option ?
>>> Starting from %APPDIR%\Subversion\config, I created a config under
>>> c:\tmp that has only the below two lines:
>>
>>> [helpers]
>>> diff-cmd = gvim --servername gvimtest --remote-tab-silent +"set
>>> bufhidden=wipe | vert diffsplit %mine | wincmd x" "%base"
>>
>> The diff-cmd param in the config file is used only by the svn library
>> when doing diffs that happen for updates/merges (*during* that
>> operation). It's meant to be used if someone doesn't want to use the
>> internal diff algorithm of svn but e.g. GNU diff or something like that.
>>
>> Since the diff-cmd option is for non-UI diff tools, TSVN disabled that
>> option before doing an UI diff.
>>
>
> Thanks Stefan for the response .So, where does the diff command set in
> the external commands part of settings stored? Only in the registry?
>
> Is there anything that TortoiseSVN itself reads from the config file,
> or is it merely passed down to the subversion library?

The svn config file is only used by the svn library. TSVN does not
really use it.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2389816
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-01 19:15:26 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.