Is possible to change the default diff tool in Mercurial?

本秂侑毒 提交于 2020-01-11 15:28:07

问题


Every time I do an hg diff file.ext I end up using a console diff application. I would like to use Kdiff3 or WinMerge (I'm using Windows).

Is there a way to change that? I can't find a reference in Mercurial documentation (I'm not talking about merge!).


回答1:


I've solved this using a Mercurial built-in extension... I just have to add the following lines to Mercurial.ini (on Mercurial folder):

[extensions]
hgext.extdiff=

[extdiff]
cmd.vdiff = kdiff3

When I want to use kdiff3 instead of diff I only have to use:

hg vdiff file.ext



回答2:


With this config

[extdiff]
cmd.kdiff3 =

I use this command to see diffs:

hg kdiff

This shows a directory tree with all files that have changed. You click a file to see diffs for just the file. You may be able to add a file parameter to the command to just see one file.

More info here.




回答3:


If you are looking for something like git difftool, where you don't need to type the filenames and see the diff for all changed files, add these to your ~/.hgrc, and run hg difftool.

[extensions]
extdiff =

[extdiff]
cmd.vimdiff = vimdiff

[alias]
difftool = !for file in $(hg status -n); do hg vimdiff $file; done



回答4:


I just had this problem a few minutes ago; I just installed it and added its path (default is at c:\program files\kdiff3) to my system PATH e.v. Restarted my window to pick up the new path, and "hg kdiff3" just worked. As it turns out the following is in my base "mercurial.ini" file, this allows the kdiff3 to work for all hg repos on the system.

[extensions]  
hgext.extdiff =  

[extdiff]  
cmd.kdiff3 =

[merge-tools]  
kdiff3.args = $base $local $other -o $output


来源:https://stackoverflow.com/questions/238183/is-possible-to-change-the-default-diff-tool-in-mercurial

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!