TortoiseHg with TortoiseSvn Diff

Question

I recently switched over from SVN to Hg. I used to use TortoiseSVN, and now I'm using TortoiseHg. One thing I really miss, though, are the TortoiseSVN style diffs; the Hg ones are just harder to read and understand.

Is there some way to tell TortoiseHg to use the TortoiseSVN diff tool?

Barnard

Answer 1

Right Click -> TortoiseHg -> Global Settings -> TortoiseHg -> Visual Diff tool -> Choose TortoiseMerge

Spiritualize

What if TortoiseMerge is not listed under Visual Diff Tools? – Barnard

@Barnard - it should be there if TortoiseSVN ( or TortoiseGit ) is installed – Spiritualize

that's what I expected too. Very strange. – Barnard

question asks for TortoiseDiff, answer gives TortoiseMerge. Very different tools. The second doesn't show diff on image files. From all I can say, the first can't be set that easily. – Truancy

For some reason this is not happening on my Windows 8.1 machine, anyone an idea why? – Burgas

Answer 2

No idea why TortoiseHg doesn't come with this built in, because both TortoiseSVN and TortoiseGIT do.

So we have to somehow download TortoiseIDiff.exe from either project, add it to our TortoiseHg folder and add something along those lines into Mercurial.ini, which currently can be found under Windows Explorer's contextual menu (right mouse click) > TortoiseHg > Global Settings > Edit File:

[extdiff]
cmd.tortoisediff = C:\Program Files\TortoiseHg\TortoiseIDiff.exe
opts.tortoisediff = /left:"$parent" /lefttitle:"$plabel1" /right:"$child" /righttitle:"$clabel" /showinfo

Truancy

Thanks for the trick, but I also had to copy the DLLs from TortoiseSVN in hg folder. Works with both tortoiseMerge and tortoiseIdiff. Note that tortoiseMerge parameters are not the same (and dont seem necessary for the diff to work) – Moneybag

I copied the TortoiseIDiff.exe with all other dlls to TortoiseHg folder (along thg.exe), setup the settings like cregox described and still doesn't work. The TortoiseIDiff window doesn't appear, there's nothing happening when I try to diff any two files. Wheareas if I change the vdiff tool to any other, it works! Grrr, this is very frustrating. Seems something is blocking the TortoiseIDiff tool from being run. I have newest TortoiseHg x64 and Win 7 x64. Any ideas what else to try? – Musky

@Musky it has been at least 2 years I don't touch a windows machine of my own so I've got little clues on what you could try, but... if you seem to be the only one complaining (on the web) then there's probably something wrong in your setup. so, the only advice I can give you right now is to double check every single thing - it could be a missing character on the settings or some conflicting tool you've got installed, among so many details that could go wrong. – Truancy

Answer 3

Put following into Mercurial.ini:

[tortoisehg]
vdiff = tortoisediff

[extdiff]
cmd.tortoisediff = C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
opts.tortoisediff = /base:"$parent" /basename:"$plabel1" /theirs:"$child" /theirsname:"$clabel"

Nasion