[PATCH 9 of 9] bundle2: remove 'experimental.bundle2-exp' boolean config (BC)
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Wed Aug 3 14:54:54 UTC 2016
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1470234206 -7200
# Wed Aug 03 16:23:26 2016 +0200
# Node ID 3def1869ed1f49e89484b48a6eb6b391fbf736a1
# Parent 1777c92b13f9413ea71332680de92a43baaf669b
# EXP-Topic bundle2.devel
bundle2: remove 'experimental.bundle2-exp' boolean config (BC)
All users are migrated to 'devel.legacy.exchange', we can clean up the
experimental namespace.
Marking as (BC) because I know some large installation have bundle2 off and I
want to make sure they notice the change.
diff -r 1777c92b13f9 -r 3def1869ed1f mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py Wed Aug 03 15:52:11 2016 +0200
+++ b/mercurial/bundlerepo.py Wed Aug 03 16:23:26 2016 +0200
@@ -483,10 +483,7 @@ def getremotechanges(ui, repo, other, on
forcebundle1 = False
# 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'))
diff -r 1777c92b13f9 -r 3def1869ed1f mercurial/exchange.py
--- 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 @@ def _forcebundle1(op):
#
# 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):
More information about the Mercurial-devel
mailing list