Patchwork [2,of,3,main] bundle2: use bundle2 by default

login
register
mail settings
Submitter Pierre-Yves David
Date June 1, 2015, 5:34 p.m.
Message ID <80ae589654ea1c670aec.1433180080@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/9426/
State Accepted
Headers show

Comments

Pierre-Yves David - June 1, 2015, 5:34 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1423244484 0
#      Fri Feb 06 17:41:24 2015 +0000
# Node ID 80ae589654ea1c670aecc0bbf2b5de3dc480db78
# Parent  b2f643a640da8176791eebb449c9be85b29aeb72
bundle2: use bundle2 by default

All the test change have been isolated and validated. We have free to turn on
bundle2 as the default exchange protocol.

"To reach a port we must set sail –
Sail, not tie at anchor
Sail, not drift."

Patch

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -56,11 +56,11 @@  def buildobsmarkerspart(bundler, markers
 
 def _canusebundle2(op):
     """return true if a pull/push can use bundle2
 
     Feel free to nuke this function when we drop the experimental option"""
-    return (op.repo.ui.configbool('experimental', 'bundle2-exp', False)
+    return (op.repo.ui.configbool('experimental', 'bundle2-exp', True)
             and op.remote.capable('bundle2'))
 
 
 class pushoperation(object):
     """A object that represent a single push operation
diff --git a/mercurial/repair.py b/mercurial/repair.py
--- a/mercurial/repair.py
+++ b/mercurial/repair.py
@@ -11,11 +11,11 @@  from mercurial.node import short
 from mercurial.i18n import _
 import errno
 
 def _bundle(repo, bases, heads, node, suffix, compress=True):
     """create a bundle with the specified revisions as a backup"""
-    usebundle2 = (repo.ui.config('experimental', 'bundle2-exp') and
+    usebundle2 = (repo.ui.config('experimental', 'bundle2-exp', True) and
                   repo.ui.config('experimental', 'strip-bundle2-version'))
     if usebundle2:
         cgversion = repo.ui.config('experimental', 'strip-bundle2-version')
         if cgversion not in changegroup.packermap:
             repo.ui.warn(_('unknown strip-bundle2-version value %r; '