--- a/mercurial/exchange.py Thu Apr 17 15:27:54 2014 -0400
+++ b/mercurial/exchange.py Thu Apr 17 15:33:17 2014 -0400
@@ -132,7 +132,7 @@
pushop.repo.prepushoutgoinghooks(pushop.repo,
pushop.remote,
pushop.outgoing)
- if pushop.remote.capable('bundle2'):
+ if pushop.remote.capable('bundle2-exp'):
_pushbundle2(pushop)
else:
_pushchangeset(pushop)
@@ -207,7 +207,7 @@
The only currently supported type of data is changegroup but this will
evolve in the future."""
# Send known head to the server for race detection.
- capsblob = urllib.unquote(pushop.remote.capable('bundle2'))
+ capsblob = urllib.unquote(pushop.remote.capable('bundle2-exp'))
caps = bundle2.decodecaps(capsblob)
bundler = bundle2.bundle20(pushop.ui, caps)
# create reply capability
@@ -515,7 +515,7 @@
lock = pullop.repo.lock()
try:
_pulldiscovery(pullop)
- if pullop.remote.capable('bundle2'):
+ if pullop.remote.capable('bundle2-exp'):
_pullbundle2(pullop)
if 'changegroup' in pullop.todosteps:
_pullchangeset(pullop)