# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1498787049 -7200
# Node ID 593ad8df9dd21239e41d3521121cb6dde5dd94f7
# Parent  4237398c67c0323d586d35632e66aa5226905964
configitems: register the 'server.concurrent-push-mode' config

diff -r 4237398c67c0 -r 593ad8df9dd2 mercurial/bundle2.py
--- a/mercurial/bundle2.py	Fri Jun 30 03:44:08 2017 +0200
+++ b/mercurial/bundle2.py	Fri Jun 30 03:44:09 2017 +0200
@@ -1343,7 +1343,7 @@
         caps['obsmarkers'] = supportedformat
     if allowpushback:
         caps['pushback'] = ()
-    cpmode = repo.ui.config('server', 'concurrent-push-mode', 'strict')
+    cpmode = repo.ui.config('server', 'concurrent-push-mode')
     if cpmode == 'check-related':
         caps['checkheads'] = ('related',)
     return caps
diff -r 4237398c67c0 -r 593ad8df9dd2 mercurial/configitems.py
--- a/mercurial/configitems.py	Fri Jun 30 03:44:08 2017 +0200
+++ b/mercurial/configitems.py	Fri Jun 30 03:44:09 2017 +0200
@@ -122,6 +122,9 @@
 coreconfigitem('server', 'compressionengines',
     default=list,
 )
+coreconfigitem('server', 'concurrent-push-mode',
+    default='strict',
+)
 coreconfigitem('ui', 'clonebundleprefers',
     default=list,
 )