Patchwork [1,of,3,V2] bundle2: fix configuration name mismatch

login
register
mail settings
Submitter Durham Goode
Date May 8, 2014, 5:23 p.m.
Message ID <c727b16938123025ab73.1399569832@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/4671/
State Superseded
Commit 341039aa11543c404dcf525241aa04f0611483c8
Headers show

Comments

Durham Goode - May 8, 2014, 5:23 p.m.
# 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.

Patch

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: