Mercurial > public > mercurial-scm > hg-stable

diff mercurial/configitems.py @ 34826:18a3274ed675

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the full 'merge-tools' config and sub-options We register the merge-tools config section (which has an arbitrary base config value) and the possible sub-attribute. The sub-attribute has to be registered first or at the same time otherwise the '.*' item would shadow them. Merge tools could include "." in their name so we can't constrain any more than just ".*".
author Boris Feld <boris.feld@octobus.net>
date Sun, 08 Oct 2017 20:37:13 +0200
parents 4d5d5009bd75
children 96802496ecc0
line wrap: on
line diff
--- a/mercurial/configitems.py	Sat Oct 14 17:05:41 2017 +0200
+++ b/mercurial/configitems.py	Sun Oct 08 20:37:13 2017 +0200
@@ -544,6 +544,60 @@
 coreconfigitem('merge', 'preferancestor',
         default=lambda: ['*'],
 )
+coreconfigitem('merge-tools', '.*',
+    default=None,
+    generic=True,
+)
+coreconfigitem('merge-tools', r'.*\.args$',
+    default="$local $base $other",
+    generic=True,
+    priority=-1,
+)
+coreconfigitem('merge-tools', r'.*\.binary$',
+    default=False,
+    generic=True,
+    priority=-1,
+)
+coreconfigitem('merge-tools', r'.*\.check$',
+    default=list,
+    generic=True,
+    priority=-1,
+)
+coreconfigitem('merge-tools', r'.*\.checkchanged$',
+    default=False,
+    generic=True,
+    priority=-1,
+)
+coreconfigitem('merge-tools', r'.*\.executable$',
+    default=dynamicdefault,
+    generic=True,
+    priority=-1,
+)
+coreconfigitem('merge-tools', r'.*\.fixeol$',
+    default=False,
+    generic=True,
+    priority=-1,
+)
+coreconfigitem('merge-tools', r'.*\.gui$',
+    default=False,
+    generic=True,
+    priority=-1,
+)
+coreconfigitem('merge-tools', r'.*\.priority$',
+    default=0,
+    generic=True,
+    priority=-1,
+)
+coreconfigitem('merge-tools', r'.*\.premerge$',
+    default=dynamicdefault,
+    generic=True,
+    priority=-1,
+)
+coreconfigitem('merge-tools', r'.*\.symlink$',
+    default=False,
+    generic=True,
+    priority=-1,
+)
 coreconfigitem('pager', 'attend-.*',
     default=dynamicdefault,
     generic=True,