# HG changeset patch # User Pierre-Yves David # Date 2017-06-30 01:42:20 # Node ID b838e857439d47fdfde9f8b209cf9e16af131f42 # Parent b62d13506860b3a4ec6b0b92a6fcb573e16f8e70 configitems: register the 'format.aggressivemergedeltas' config diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -104,6 +104,9 @@ coreconfigitem('devel', 'serverrequirece coreconfigitem('devel', 'strip-obsmarkers', default=True, ) +coreconfigitem('format', 'aggressivemergedeltas', + default=False, +) coreconfigitem('hostsecurity', 'ciphers', default=None, ) diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -439,7 +439,7 @@ class localrepository(object): 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)