Patchwork [STABLE] config: rename `revlog` section into `storage`

login
register
mail settings
Submitter Boris Feld
Date July 20, 2018, 7:42 a.m.
Message ID <d5418790e3a154041704.1532072537@FB-lair>
Download mbox | patch
Permalink /patch/32922/
State Accepted
Headers show

Comments

Boris Feld - July 20, 2018, 7:42 a.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1532070500 -7200
#      Fri Jul 20 09:08:20 2018 +0200
# Branch stable
# Node ID d5418790e3a154041704d4dc479c68ae68ca4a95
# Parent  10d40c83205b69e000016f6d2b83c9d4be453f6b
# EXP-Topic config-storage
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r d5418790e3a1
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.
Augie Fackler - July 24, 2018, 10:25 p.m.
> On Jul 20, 2018, at 03:42, Boris Feld <boris.feld@octobus.net> wrote:
> 
> # HG changeset patch
> # User Boris Feld <boris.feld@octobus.net>
> # Date 1532070500 -7200
> #      Fri Jul 20 09:08:20 2018 +0200
> # Branch stable
> # Node ID d5418790e3a154041704d4dc479c68ae68ca4a95
> # Parent  10d40c83205b69e000016f6d2b83c9d4be453f6b
> # EXP-Topic config-storage
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r d5418790e3a1
> config: rename `revlog` section into `storage`

Queued for stable per IRC discussion etc, thanks.

Patch

diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -927,7 +927,7 @@  coreconfigitem('progress', 'width',
 coreconfigitem('push', 'pushvars.server',
     default=False,
 )
-coreconfigitem('revlog', 'optimize-delta-parent-choice',
+coreconfigitem('storage', 'revlog.optimize-delta-parent-choice',
     default=True,
     alias=[('format', 'aggressivemergedeltas')],
 )
diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -1773,13 +1773,13 @@  have a definite end point.
 
 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.
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -668,8 +668,8 @@  class localrepository(object):
         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')
diff --git a/tests/test-generaldelta.t b/tests/test-generaldelta.t
--- a/tests/test-generaldelta.t
+++ b/tests/test-generaldelta.t
@@ -146,7 +146,7 @@  Test revlog.optimize-delta-parent-choice
 - 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