--- a/mercurial/exchange.py Wed Aug 03 15:52:11 2016 +0200
+++ b/mercurial/exchange.py Wed Aug 03 16:23:26 2016 +0200
@@ -270,12 +270,7 @@
#
# developer config: devel.legacy.exchange
exchange = ui.configlist('devel', 'legacy.exchange')
- if not exchange:
- forcebundle1 = not ui.configbool('experimental', 'bundle2-exp', True)
- # developer config: devel.legacy.exchange
- else:
- forcebundle1 = 'bundle2' not in exchange and 'bundle1' in exchange
-
+ forcebundle1 = 'bundle2' not in exchange and 'bundle1' in exchange
return forcebundle1 or not op.remote.capable('bundle2')
class pushoperation(object):