Mercurial > hg-stable

changeset 33235:b838e857439d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'format.aggressivemergedeltas' config
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 30 Jun 2017 03:42:20 +0200
parents b62d13506860
children cf6c478bc339
files mercurial/configitems.py mercurial/localrepo.py
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/configitems.py	Wed Jul 05 00:01:30 2017 +0200
+++ b/mercurial/configitems.py	Fri Jun 30 03:42:20 2017 +0200
@@ -104,6 +104,9 @@
 coreconfigitem('devel', 'strip-obsmarkers',
     default=True,
 )
+coreconfigitem('format', 'aggressivemergedeltas',
+    default=False,
+)
 coreconfigitem('hostsecurity', 'ciphers',
     default=None,
 )
--- a/mercurial/localrepo.py	Wed Jul 05 00:01:30 2017 +0200
+++ b/mercurial/localrepo.py	Fri Jun 30 03:42:20 2017 +0200
@@ -439,7 +439,7 @@
             self.svfs.options['manifestcachesize'] = manifestcachesize
         # experimental config: format.aggressivemergedeltas
         aggressivemergedeltas = self.ui.configbool('format',
-            'aggressivemergedeltas', False)
+                                                   'aggressivemergedeltas')
         self.svfs.options['aggressivemergedeltas'] = aggressivemergedeltas
         self.svfs.options['lazydeltabase'] = not scmutil.gddeltaconfig(self.ui)
         chainspan = self.ui.configbytes('experimental', 'maxdeltachainspan', -1)