--- a/mercurial/exchange.py Mon Aug 25 18:35:39 2014 +0200
+++ b/mercurial/exchange.py Mon Aug 25 19:17:06 2014 +0200
@@ -465,7 +465,7 @@
evolve in the future."""
bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote))
# create reply capability
- capsblob = bundle2.encodecaps(pushop.repo.bundle2caps)
+ capsblob = bundle2.encodecaps(bundle2.capabilities)
bundler.newpart('b2x:replycaps', data=capsblob)
replyhandlers = []
for partgenname in b2partsgenorder:
@@ -922,7 +922,7 @@
def caps20to10(repo):
"""return a set with appropriate options to use bundle20 during getbundle"""
caps = set(['HG2X'])
- capsblob = bundle2.encodecaps(repo.bundle2caps)
+ capsblob = bundle2.encodecaps(bundle2.capabilities)
caps.add('bundle2=' + urllib.quote(capsblob))
return caps