From patchwork Thu May  8 01:44:16 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1,of,3] bundle2: fix configuration name mismatch
From: Durham Goode <durham@fb.com>
X-Patchwork-Id: 4663
Message-Id: <c727b16938123025ab73.1399513456@dev2000.prn2.facebook.com>
To: <mercurial-devel@selenic.com>
Date: Wed, 7 May 2014 18:44:16 -0700

# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1399508438 25200
#      Wed May 07 17:20:38 2014 -0700
# Node ID c727b16938123025ab733c7c996bec556e45860a
# Parent  62a2749895e4151f766a4243fa870b1ddd7386d0
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.

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -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: