Mercurial > hg-stable
changeset 38744:ae17555ef93f stable
config: rename `revlog` section into `storage`
The idea was suggested by Gregory Szorc on IRC. It is more generic and seems
better. It is probably best to rename the section before it ever makes into an
official (non-rc) release.
The only config option currently in this section have been prefixed with
`revlog` to clarify it applies to `revlog` related storage.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 20 Jul 2018 09:08:20 +0200 |
| parents | 10d40c83205b |
| children | 258d90f69076 |
| files | mercurial/configitems.py mercurial/help/config.txt mercurial/localrepo.py tests/test-generaldelta.t |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/configitems.py Thu Jul 19 14:17:26 2018 -0400 +++ b/mercurial/configitems.py Fri Jul 20 09:08:20 2018 +0200 @@ -927,7 +927,7 @@ coreconfigitem('push', 'pushvars.server', default=False, ) -coreconfigitem('revlog', 'optimize-delta-parent-choice', +coreconfigitem('storage', 'revlog.optimize-delta-parent-choice', default=True, alias=[('format', 'aggressivemergedeltas')], )
--- a/mercurial/help/config.txt Thu Jul 19 14:17:26 2018 -0400 +++ b/mercurial/help/config.txt Fri Jul 20 09:08:20 2018 +0200 @@ -1773,13 +1773,13 @@ Alias definitions for revsets. See :hg:`help revsets` for details. -``revlog`` +``storage`` ---------- Control the strategy Mercurial uses internally to store history. Options in this category impact performance and repository size. -``optimize-delta-parent-choice`` +``revlog.optimize-delta-parent-choice`` When storing a merge revision, both parents will be equally considered as a possible delta base. This results in better delta selection and improved revlog compression. This option is enabled by default.
--- a/mercurial/localrepo.py Thu Jul 19 14:17:26 2018 -0400 +++ b/mercurial/localrepo.py Fri Jul 20 09:08:20 2018 +0200 @@ -668,8 +668,8 @@ manifestcachesize = self.ui.configint('format', 'manifestcachesize') if manifestcachesize is not None: self.svfs.options['manifestcachesize'] = manifestcachesize - deltabothparents = self.ui.configbool('revlog', - 'optimize-delta-parent-choice') + deltabothparents = self.ui.configbool('storage', + 'revlog.optimize-delta-parent-choice') self.svfs.options['deltabothparents'] = deltabothparents self.svfs.options['lazydeltabase'] = not scmutil.gddeltaconfig(self.ui) chainspan = self.ui.configbytes('experimental', 'maxdeltachainspan')
--- a/tests/test-generaldelta.t Thu Jul 19 14:17:26 2018 -0400 +++ b/tests/test-generaldelta.t Fri Jul 20 09:08:20 2018 +0200 @@ -146,7 +146,7 @@ - Verify aggressive merge uses p2 (commit 0) as delta parent $ hg up -q -C 1 $ hg merge -q 0 - $ hg commit -q -m merge --config revlog.optimize-delta-parent-choice=yes + $ hg commit -q -m merge --config storage.revlog.optimize-delta-parent-choice=yes $ hg debugdeltachain -m rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000