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

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

From: Hari Krishna Dara <haridara_at_gmail.com>
Date: Fri, 28 Aug 2009 17:29:03 -0700

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"

and used the /configdir:c:\tmp option to the "repostatus" command, but
when I tried to compare against base, it started my default diff
command, not gvim. I know it is reading the c:\tmp\config file because
when I the [helpers] header missing, it complained about it. What am I
missing here? The command-line that I use is:

"C:\apps\TortoiseSVN\bin\TortoiseProc.exe" /closeonend:2
/configdir:"c:\tmp" /command:"repostatus" /path:"."

On the same note, I would like to override editor-cmd also in this
config file, but don't understand in what context it is used. I see
"Open file" which I believe opens them with windows explorer (this
e.g., causes python files to get executed with python.exe), so
wondering which menu options actually use this config setting. I would
appreciate any help.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2388428

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-29 07:39:25 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.