From patchwork Thu May 15 05:50:13 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1,of,4,STABLE] bundle2: fix configuration name mismatch
From: Pierre-Yves David <pierre-yves.david@ens-lyon.org>
X-Patchwork-Id: 4748
Message-Id: <4a4efce2dc1350fc85c4.1400133013@marginatus.alto.octopoid.net>
To: mercurial-devel@selenic.com
Cc: pierre-yves.david@ens-lyon.org
Date: Wed, 14 May 2014 22:50:13 -0700

# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1399508438 25200
#      Wed May 07 17:20:38 2014 -0700
# Branch stable
# Node ID 4a4efce2dc1350fc85c4e4807c0b92e94b8e82f0
# Parent  54d7657d7d1e6a62315eea53f4498657e766bb60
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 --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: