[PATCH] Assign unique priorities in mergetools.hgrc

Mads Kiilerich mads at kiilerich.com
Mon Dec 1 00:45:28 UTC 2008


# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1228092187 -3600
# Node ID cbd6e0539c7aa15e0f837f233870eb2c5fd828b6
# Parent  4fd92687f331a38ddb38d3f71753ab92cd9cb174
Assign unique priorities in mergetools.hgrc

Merge tools are chosen by priority, but in case of tools with same priority
there is no well-defined order. The default is 0.

This patch gives all merge tools in mergetools.hgrc a unique priority less
than 0. New tools with default priority will thus get higher priority.

The assigned priorities could be different. They are based on existing values
and ordering and how common and usable I think they are.

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -6,6 +6,7 @@
 kdiff3.regappend=\kdiff3.exe
 kdiff3.fixeol=True
 kdiff3.gui=True
+kdiff3.priority=-1
 
 gvimdiff.args=--nofork -d -g -O $local $other $base
 gvimdiff.regkey=Software\Vim\GVim
@@ -16,8 +17,10 @@
 merge.priority=-10
 
 gpyfm.gui=True
+gpyfm.priority=-3
 
 meld.gui=True
+meld.priority=-2
 
 tkdiff.args=$local $other -a $base -o $output
 tkdiff.gui=True
@@ -25,27 +28,31 @@
 
 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
+xxdiff.priority=-7
 
 diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
 diffmerge.checkchanged=True
 diffmerge.gui=True
+diffmerge.priority=-11
 
 p4merge.args=$base $local $other $output
 p4merge.regkey=Software\Perforce\Environment
 p4merge.regname=P4INSTROOT
 p4merge.regappend=\p4merge.exe
 p4merge.gui=True
-p4merge.priority=-8
+p4merge.priority=-6
 
 tortoisemerge.args=/base: $output /mine:$local /theirs:$other /merged:$output
 tortoisemerge.regkey=Software\TortoiseSVN
 tortoisemerge.gui=True
+tortoisemerge.priority=-5
 
 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
 ecmerge.gui=True
+ecmerge.priority=-12
 
 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
 filemerge.args=-left $other -right $local -ancestor $base -merge $output
 filemerge.gui=True
+filemerge.priority=-4


More information about the Mercurial-devel mailing list