# HG changeset patch # User Durham Goode # Date 1399508438 25200 # Node ID 341039aa11543c404dcf525241aa04f0611483c8 # Parent 6c9b7712ac69647b8979e5987c59f6db3f4925bd bundle2: fix configuration name mismatch During pulls bundle2 was checking server.bundle2, but during pushes it was checking experimental.bundle2. This makes them both experimental.bundle2. This is a backport of 750c7c14a637 diff -r 6c9b7712ac69 -r 341039aa1154 mercurial/exchange.py --- a/mercurial/exchange.py Sat May 17 15:14:18 2014 +0900 +++ b/mercurial/exchange.py Wed May 07 17:20:38 2014 -0700 @@ -537,7 +537,7 @@ lock = pullop.repo.lock() try: _pulldiscovery(pullop) - if (pullop.repo.ui.configbool('server', 'bundle2', False) + if (pullop.repo.ui.configbool('experimental', 'bundle2-exp', False) and pullop.remote.capable('bundle2-exp')): _pullbundle2(pullop) if 'changegroup' in pullop.todosteps: