# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 2017-10-11 15:51:40
# Node ID 5e61cd5fb0fcb3dc21624f846f93e94efa04f717
# Parent  c2cb6be4212fe38b0f1447b70223c1f9bcc0c588

configitems: register the 'server.bundle*' family of config

All these config use the same function specifying a default value. We need to
register them all at the same time.

diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -500,6 +500,18 @@ coreconfigitem('server', 'bundle1',
 coreconfigitem('server', 'bundle1gd',
     default=None,
 )
+coreconfigitem('server', 'bundle1.pull',
+    default=None,
+)
+coreconfigitem('server', 'bundle1gd.pull',
+    default=None,
+)
+coreconfigitem('server', 'bundle1.push',
+    default=None,
+)
+coreconfigitem('server', 'bundle1gd.push',
+    default=None,
+)
 coreconfigitem('server', 'compressionengines',
     default=list,
 )
diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++ b/mercurial/wireproto.py
@@ -595,11 +595,11 @@ def bundle1allowed(repo, action):
     gd = 'generaldelta' in repo.requirements
 
     if gd:
-        v = ui.configbool('server', 'bundle1gd.%s' % action, None)
+        v = ui.configbool('server', 'bundle1gd.%s' % action)
         if v is not None:
             return v
 
-    v = ui.configbool('server', 'bundle1.%s' % action, None)
+    v = ui.configbool('server', 'bundle1.%s' % action)
     if v is not None:
         return v