diff mercurial/wireproto.py @ 21148:468cd774aa22

bundle2: require both client and server to opt in Even if the server is bundle2-enabled, the client now has to opt-in in the config too.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 17 Apr 2014 16:04:58 -0400
parents 2a246e737f92
children 60ad2ea5b106
line wrap: on
line diff
--- a/mercurial/wireproto.py	Thu Apr 17 16:01:58 2014 -0400
+++ b/mercurial/wireproto.py	Thu Apr 17 16:04:58 2014 -0400
@@ -585,7 +585,7 @@
         # otherwise, add 'streamreqs' detailing our local revlog format
         else:
             caps.append('streamreqs=%s' % ','.join(requiredformats))
-    if self.ui.configbool('experimental', 'bundle2-exp', False):
+    if repo.ui.configbool('experimental', 'bundle2-exp', False):
         capsblob = bundle2.encodecaps(repo.bundle2caps)
         caps.append('bundle2-exp=' + urllib.quote(capsblob))
     caps.append('unbundle=%s' % ','.join(changegroupmod.bundlepriority))