--- a/mercurial/bundlerepo.py Wed Aug 03 15:52:11 2016 +0200
+++ b/mercurial/bundlerepo.py Wed Aug 03 16:23:26 2016 +0200
@@ -482,11 +482,7 @@
# developer config: devel.legacy.exchange
legexc = ui.configlist('devel', 'legacy.exchange')
- if not legexc:
- forcebundle1 = not ui.configbool('experimental', 'bundle2-exp',
- True)
- else:
- forcebundle1 = 'bundle2' not in legexc and 'bundle1' in legexc
+ forcebundle1 = 'bundle2' not in legexc and 'bundle1' in legexc
canbundle2 = (not forcebundle1
and other.capable('getbundle')
and other.capable('bundle2'))