Mercurial > hg
changeset 29689:39537bc64442
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.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 03 Aug 2016 16:23:26 +0200 |
| parents | 30c59bdd4f41 |
| children | 5684bc429e6a |
| files | mercurial/bundlerepo.py mercurial/exchange.py |
| diffstat | 2 files changed, 2 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- 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'))
--- 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):