TortoiseHg package comparison not working as expected

When I pressed Diff to Local

or Visual Diff

, it showed the CodeCompare directory comparison window, which looks really nice. If you want to see how it looks, click this link . But whatever happened, I don't know, it stopped working and now shows me this disgusting window when I say "Diff to Local" and "Visual Diff":

enter image description here

I have checked every possible solution and did everything I knew and found, but nothing seems to work. Here is the content of the mercurial.ini, which is also a global TortoiseHG setting:

[ui]
ssh="C:\Program Files\TortoiseHg\TortoisePlink.exe" -ssh -i "C:\Users\[Hidden]\ssh\id_rsa.ppk"
username = [Hidden]
merge = codecompare_merge

[tortoisehg]
fontdiff = Consolas,10,-1,5,50,0,0,0,0,0
fontlist = Consolas,10,-1,5,50,0,0,0,0,0
refreshwdstatus = always
fontcomment = Consolas,10,-1,5,50,0,0,0,0,0
fontlog = Consolas,10,-1,5,50,0,0,0,0,0
fontoutputlog = Consolas,8,-1,5,50,0,0,0,0,0
editor = notepad++
vdiff = codecompare_diff

[auth]
default.prefix = https://bitbucket.org
default.username = [Hidden]
default.password = [Hidden]

[merge-tools]
codecompare_merge.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
codecompare_merge.regname=InstallLocation
codecompare_merge.regappend=CodeMerge.exe
codecompare_merge.args=/SC=TortoiseHg /TF=$other /MF=$local /RF=$output /BF=$base /TT="Other: $other" /MT="Local: $local" /RT="Output: $output" /BT="Base: $base"
codecompare_merge.binary=False
codecompare_merge.gui=True
codecompare_merge.checkconflicts=True
codecompare_merge.premerge=Keep

[extensions]
extdiff=

[extdiff]
cmd.codecompare=C:\Program Files\Devart\Code Compare\CodeCompare.exe
opts.codecompare=/SC=Hg /W /title1="$plabel1" /title2="$clabel" $parent $child

[merge-patterns]
*.*=codecompare_merge

      

When I first installed CodeCompare, I honestly didn't add any of these things. It worked beautifully. However, when this problem came up lately, I found this link , hoping it might help me, and added everything in my Mercurial.ini file and no luck so far.

Can anyone help me with this?

Note. [Hidden]

contain sensitive data such as my computer name, username and password.

+3


source to share


1 answer


  • In (fresh) MergeTools.rc

    you already have 2 CodeCompare tools, extdiff is not required additionally (and your overload in [merge-tools]

    )
  • You forgot one key in the definition for a different directory (can be used in the merge tools section) ???.dirdiff=True

MergeTools.rc defines CodeCompare both different and merge in merge tools, diff-definition



; 2-way diff only version of Code Compare
codecompare_diff.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
codecompare_diff.regname=InstallLocation
codecompare_diff.regappend=CodeCompare.exe
codecompare_diff.diffargs=/SC=TortoiseHg /title1="$plabel1" /title2="$clabel" $parent $child
codecompare_diff.diff3args=/SC=TortoiseHg /title1="$plabel1" /title2="$clabel" /title3="$plabel2" $parent1 $child $parent2
codecompare_diff.binary=False
codecompare_diff.gui=True
codecompare_diff.dirdiff=True

      

and your diff tool in frontend will be codecompare_diff

+1


source







All Articles