Patchwork docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 15, 2013, 12:54 a.m.
Message ID <c56de2419483028c0766.1358211261@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/625/
State Superseded
Commit 26627c30735a610f59979a36885b327b25d8dbff
Headers show

Comments

Mads Kiilerich - Jan. 15, 2013, 12:54 a.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1358211231 -3600
# Node ID c56de2419483028c07669d020175075951c35d88
# Parent  a8c9154dd941cf6eb95298aad2d7134d3aed4375
docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration

These settings were replaced by check=changed and check=conflicts in
a912f26777d3. There is no reason to announce two different ways to achieve the
same. The old way should be kept but not announced.
Bryan O'Sullivan - Jan. 15, 2013, 10:17 p.m.
On Mon, Jan 14, 2013 at 4:54 PM, Mads Kiilerich <mads@kiilerich.com> wrote:
> docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration

Looks good, thanks.
Mads Kiilerich - Jan. 15, 2013, 10:39 p.m.
On 01/15/2013 11:17 PM, Bryan O'Sullivan wrote:
> On Mon, Jan 14, 2013 at 4:54 PM, Mads Kiilerich <mads@kiilerich.com> wrote:
>> docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration
> Looks good, thanks.

Crewed

/Mads

Patch

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -19,7 +19,7 @@  vimdiff.args=$local $other $base
 vimdiff.check=changed
 vimdiff.priority=-10
 
-merge.checkconflicts=True
+merge.check=conflicts
 merge.priority=-100
 
 gpyfm.gui=True
@@ -43,7 +43,7 @@  diffmerge.regkeyalt=Software\Wow6432Node
 diffmerge.regname=Location
 diffmerge.priority=-7
 diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
-diffmerge.checkchanged=True
+diffmerge.check=changed
 diffmerge.gui=True
 diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child
 
@@ -59,7 +59,7 @@  p4merge.diffargs=$parent $child
 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
 tortoisemerge.regkey=Software\TortoiseSVN
 tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
-tortoisemerge.checkchanged=True
+tortoisemerge.check=changed
 tortoisemerge.gui=True
 tortoisemerge.priority=-8
 tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'
@@ -93,7 +93,7 @@  winmerge.args=/e /x /wl /ub /dl other /d
 winmerge.regkey=Software\Thingamahoochie\WinMerge
 winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
 winmerge.regname=Executable
-winmerge.checkchanged=True
+winmerge.check=changed
 winmerge.gui=True
 winmerge.priority=-10
 winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child
@@ -119,6 +119,5 @@  UltraCompare.args = $base $local $other 
 UltraCompare.priority = -2
 UltraCompare.gui = True
 UltraCompare.binary = True
-UltraCompare.checkconflicts = True
-UltraCompare.checkchanged = True
+UltraCompare.check = conflicts,changed
 UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1
diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -850,14 +850,6 @@  Supported arguments:
   ``prompt``
     Always prompt for merge success, regardless of success reported by tool.
 
-``checkchanged``
-  True is equivalent to ``check = changed``.
-  Default: False
-
-``checkconflicts``
-  True is equivalent to ``check = conflicts``.
-  Default: False
-
 ``fixeol``
   Attempt to fix up EOL changes caused by the merge tool.
   Default: False