Mercurial > hg-stable

changeset 33222:593ad8df9dd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'server.concurrent-push-mode' config
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 30 Jun 2017 03:44:09 +0200
parents 4237398c67c0
children d227451ee280
files mercurial/bundle2.py mercurial/configitems.py
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,
 )