CODEWITHSUNDEEP
mercurialwebstormtortoisehg
Katya Pavlenko
Katya Pavlenko

Reputation: 3383

Use WebStorm diff tool with TortoiseHg

Is there any way to use WebStorm diff tool with TortoiseHg?

I've tried to set vdiff = /usr/local/bin/wstorm in .hgrc, but it didn't help.

Upvotes: 1

Views: 241

Answers (2)

Glenn Mohammad
Glenn Mohammad

Reputation: 4745

  1. Enable invocation of WebStorm operations from the command line as instructed here (so that you can execute webstorm from the Terminal).
  2. Put the followings to your .hgrc file:
[extensions]
extdiff =

[extdiff]
cmd.wsdiff = webstorm
opts.wsdiff = diff
  1. (bonus) Make WebStorm as your default merge tool:
[ui]
merge = webstorm

[merge-tools]
webstorm.check = prompt
webstorm.args = merge $local $other $base $output

Upvotes: 0

Lazy Badger
Lazy Badger

Reputation: 97365

  • You must perform more jobs, if you want to use external diff with Extdiff extension
  • Now custom diff tool can be added to Mercurial without this extension: read [merge-tools] section in MergeTools.rc for any merge-tool, but note only *diff keys, namely diffargs, diff3args, dirdiff

Upvotes: 1

Related Questions