Submitter | Pierre-Yves David |
---|---|
Date | May 15, 2014, 5:50 a.m. |
Message ID | <4a4efce2dc1350fc85c4.1400133013@marginatus.alto.octopoid.net> |
Download | mbox | patch |
Permalink | /patch/4748/ |
State | Accepted |
Commit | 341039aa11543c404dcf525241aa04f0611483c8 |
Headers | show |
Comments
Patch
diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -535,11 +535,11 @@ def pull(repo, remote, heads=None, force raise util.Abort(msg) 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: _pullchangeset(pullop) if 'phases' in pullop.todosteps: