Patchwork [STABLE] share: move config item declarations into core

login
register
mail settings
Submitter Gregory Szorc
Date Nov. 6, 2017, 6:41 p.m.
Message ID <0f6f27367dae401905a7.1509993661@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/25408/
State Accepted
Headers show

Comments

Gregory Szorc - Nov. 6, 2017, 6:41 p.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1509993220 28800
#      Mon Nov 06 10:33:40 2017 -0800
# Branch stable
# Node ID 0f6f27367dae401905a789f4e7fa1d672304b24a
# Parent  f445b10dc7fb3495d24d1c22b0996148864c77f7
share: move config item declarations into core

These config items control share behavior that is implemented in core.
Since the functionality is implemented in core, extensions may
leverage it.

Mozilla has one such extension. And, it needs to access share.pool.
Before this patch, a devel warning regarding accessing an unregistered
config option would be issued unless the share extension were loaded.
Moving the registration of the config options to core fixes this.
Yuya Nishihara - Nov. 7, 2017, 12:27 p.m.
On Mon, 06 Nov 2017 10:41:01 -0800, Gregory Szorc wrote:
> # HG changeset patch
> # User Gregory Szorc <gregory.szorc@gmail.com>
> # Date 1509993220 28800
> #      Mon Nov 06 10:33:40 2017 -0800
> # Branch stable
> # Node ID 0f6f27367dae401905a789f4e7fa1d672304b24a
> # Parent  f445b10dc7fb3495d24d1c22b0996148864c77f7
> share: move config item declarations into core

Queued for stable, thanks.

Patch

diff --git a/hgext/share.py b/hgext/share.py
--- a/hgext/share.py
+++ b/hgext/share.py
@@ -63,16 +63,6 @@  command = registrar.command(cmdtable)
 # leave the attribute unspecified.
 testedwith = 'ships-with-hg-core'
 
-configtable = {}
-configitem = registrar.configitem(configtable)
-
-configitem('share', 'pool',
-    default=None,
-)
-configitem('share', 'poolnaming',
-    default='identity',
-)
-
 @command('share',
     [('U', 'noupdate', None, _('do not create a working directory')),
      ('B', 'bookmarks', None, _('also share bookmarks')),
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -790,6 +790,12 @@  coreconfigitem('server', 'validate',
 coreconfigitem('server', 'zliblevel',
     default=-1,
 )
+coreconfigitem('share', 'pool',
+    default=None,
+)
+coreconfigitem('share', 'poolnaming',
+    default='identity',
+)
 coreconfigitem('smtp', 'host',
     default=None,
 )