Update Beyond Compare support to version 5

[Garret Handel]

Hello TortoiseHg team,

As we have passed the 1 year mark from the release of BC5 we are no longer actively developing BC4: https://www.scootersoftware.com/kb/lifecycle

Can you please update the BC integration in the Windows version to support BC5? Users currently have to manually edit their config files to use BC5 correctly with TortoiseHg. BC5 is currently being detected as 'beyondcompare2' in the settings dialog which works for the 'vdiff' command, but will not work for merge as the 'beyondcompare2' settings do not include a 'diff3args' directive.

Thanks!

--
Regards,
Garret

Garret Handel | Support and Testing Engineer
gar...@scootersoftware.com
Home of Beyond Compare

[Matt Harbison]

Thanks for the heads up.

Are there any command line differences between BC4 (which I have), and BC5 (which I don't)?  It looks like the detection is via registry key (BC2 is "Software\Scooter Software\Beyond Compare", and BC4 is "Software\Scooter Software\Beyond Compare 4"), so hopefully it's just a copy/paste of BC4 and changing the registry key to "Beyond Compare 5".  (I'm wondering if the regkey is the same as BC2 though, because otherwise I'm not sure why that would be detected.)

Linux uses the same config for BC3 and BC4, so maybe that config is still OK.  There's also a config for macOS in core Mercurial, and we'll need to update all of these configs there too.

Can BC4 and the trial version of BC5 coexist on Windows for testing purposes?  (Mostly I'm thinking about Explorer context menus, since I assume the install paths are slightly different. IDR where I stashed my registration key, so I don't want to screw up a working setup.)