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 a9334b37b19a
This commit is contained in:
Durham Goode 2014-05-07 17:20:38 -07:00
parent bc04e2c6cd
commit f8ebc64925

View File

@ -537,7 +537,7 @@ def pull(repo, remote, heads=None, force=False):
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: