DarkMatter in Cyberspace
  • Home
  • Categories
  • Tags
  • Archives

使用vimdiff做hg的版本比较工具


gvim的文本比较功能很强,命令行用法:gvim -d file1 file2,hg自带的hg diff没有颜色标示,含义也不够清晰,所以需要用vim的diff代替它,实现方法是在全局配置文件中增加:

[extensions] hgext.extdiff = [extdiff] cmd.vdiff = D:\Apps\Vim\vim73\gvim.exe opts.vdiff = -d

使用时首先用hg st定位哪些文件有变化,然后hg vdiff filename查看文件的变动,例如:

E:\workspace\JDK6UTF8\GoduServerGD>hg st M conf\logback.xml M ... E:\workspace\JDK6UTF8\GoduServerGD>hg vdiff conf/logback.xml

文件路径和文件名在唯一的情况下可以使用通配符,例如上面的指令可以简写为"hg vdiff conf/log*";



Published

Apr 26, 2013

Last Updated

Apr 26, 2013

Category

Tech

Tags

  • diff 2
  • Hg 11
  • Vim 92

Contact

  • Powered by Pelican. Theme: Elegant by Talha Mansoor