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

Re: Bad quoting of URL keywords passed to external diff viewer

From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Tue, 5 Feb 2013 11:01:04 -0600

The below applies when diff is invoked by double-clicking a file in
the changes pane of the
"show log" dialog.

If I invoke the "Diff" command from my working copy after
right-clicking a modified file, the URLs seem to be passed correctly,
so my workaround fails. The same thing for "Diff to previous revision"
from my working copy.

On Tue, Feb 5, 2013 at 10:56 AM, Benjamin Fritz <fritzophrenic_at_gmail.com> wrote:
> I had trouble trying to configure diff pane names in KDiff3 to include
> both URL and revision, like %burl@%brev.
>
> For testing, I used the following .bat file contents as a diff viewer:
>
> @echo off
> setlocal
>
> echo rev one is %1
> echo rev two is %2
> echo url one is %3
> echo url two is %4
> pause
>
> :END
> endlocal
> echo on
>
> I set up my diff viewer settings to invoke it as follows:
>
> C:\Temp\test.bat %brev %yrev %burl %yurl
>
> This results in:
>
> rev one is "1796"
> rev two is "1797"
> url one is "http://example.com/trunk/.project "http://example.com/trunk/.project
> url two is "C:\tmp\.project-rev1796.svn007.tmp.project"
>
> Notice that %burl is missing an end quote. I'm not 100% sure it needs
> to be quoted at all, but certainly it should have both start and end
> quotes.
>
> If I modify my diff viewer settings to the following:
>
> C:\Temp\test.bat %brev %yrev %burl" %yurl"
>
> Then I get the intended result:
>
> rev one is "1796"
> rev two is "1797"
> url one is "http://example.com/trunk/.project"
> url two is "http://example.com/trunk/.project"

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-02-05 18:01:33 CET

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