TortoiseHGとコマンドライン版HG

TortoiseHGのMercurila.iniにこんなことが書いてある。

; !!!  Do Not Edit This File !!!

;

; This file will be replaced by the installer on every upgrade.

; Editing this file can cause strange side effects on Vista.

;

; http://bitbucket.org/tortoisehg/stable/issue/135

;

; To change settings you see in this file, override (or enable) them in

; your user Mercurial.ini file, where USERNAME is your Windows user name:

ムーー。Mercurial.iniの内容は：

$ grep '^[^[;]' Mercurial.ini

editor = notepad

ssh = "C:\Installed\TortoiseHg\TortoisePlink.exe" -ssh -2

kdiff3.priority=-1

kdiff3.args=-L1 base --L2 local --L3 other $base $local $other -o $output

kdiff3.regkey=Software\KDiff3

kdiff3.regappend=\kdiff3.exe

kdiff3.fixeol=True

kdiff3.gui=True

beyondcompare3.priority=-2

beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitl

e=base /righttitle=other /automerge /reviewconflicts /solo

beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3

beyondcompare3.regname=ExePath

beyondcompare3.gui=True

diffmerge.priority=-7

diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other

diffmerge.checkchanged=True

diffmerge.gui=True

p4merge.priority=-8

p4merge.args=$base $local $other $output

p4merge.regkey=Software\Perforce\Environment

p4merge.regname=P4INSTROOT

p4merge.regappend=\p4merge.exe

p4merge.gui=True

tortoisemerge.priority=-9

tortoisemerge.args=/base:$output /mine:$local /theirs:$other /merged:$output

tortoisemerge.regkey=Software\TortoiseSVN

tortoisemerge.gui=True

winmergeu.regkey=Software\Thingamahoochie\WinMerge\

winmergeu.regname=Executable

winmergeu.priority=-10

winmergeu.args=/e /ub /dl other /dr local $other $local $output

winmergeu.fixeol=True

winmergeu.gui=True

extdiff =

cmd.vdiff = C:\Installed\TortoiseHg\kdiff3

opts.vdiff = $parent1 $child $parent2

コマンドライン版のHGと統合することはできないのかな？ 以下は、コマンドライン版のini。

$ grep '^[^[;]' Mercurial.ini

editor =  emacsclient
username = Masayuki HIYAMA
# Some default global settings for common merge tools

kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $outpu

t

kdiff3.regkey=Software\KDiff3

kdiff3.regappend=\kdiff3.exe

kdiff3.fixeol=True

kdiff3.gui=True

gvimdiff.args=--nofork -d -g -O $local $other $base

gvimdiff.regkey=Software\Vim\GVim

gvimdiff.regname=path

gvimdiff.priority=-9

merge.checkconflicts=True

merge.priority=-10

gpyfm.gui=True

meld.gui=True

tkdiff.args=$local $other -a $base -o $output

tkdiff.gui=True

tkdiff.priority=-8

xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2

base --title3 other --merged-filename $output --merge $local $base $other

xxdiff.gui=True

xxdiff.priority=-8

diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $b

ase $local $other

diffmerge.checkchanged=True

diffmerge.gui=True

p4merge.args=$base $local $other $output

p4merge.regkey=Software\Perforce\Environment

p4merge.regname=P4INSTROOT

p4merge.regappend=\p4merge.exe

p4merge.gui=True

p4merge.priority=-8

tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output

tortoisemerge.regkey=Software\TortoiseSVN

tortoisemerge.checkchanged=True

tortoisemerge.gui=True

ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --ti

tle2=other --to=$output

ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge

ecmerge.gui=True

filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/Ma

cOS/FileMerge

filemerge.args=-left $other -right $local -ancestor $base -merge $output

filemerge.gui=True

beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitl

e=base /righttitle=other /automerge /reviewconflicts /solo

beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3

beyondcompare3.regname=ExePath

beyondcompare3.gui=True

winmerge.args=/e /u /dl local /dr other /wr $local $other $output

winmerge.regkey=Software\Thingamahoochie\WinMerge

winmerge.regname=Executable

winmerge.checkchanged=True

winmerge.gui=True