# HG changeset patch # User Pierre-Yves David # Date 1423244484 0 # Node ID ff955e7b1085f90deb070c0b97975c3e95e2d67f # Parent 30ab130af2216d2ac3e01d3364dc4291e9c48eb8 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." diff -r 30ab130af221 -r ff955e7b1085 mercurial/exchange.py --- a/mercurial/exchange.py Mon Jun 01 10:28:40 2015 -0700 +++ b/mercurial/exchange.py Fri Feb 06 17:41:24 2015 +0000 @@ -59,7 +59,7 @@ """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')) diff -r 30ab130af221 -r ff955e7b1085 mercurial/repair.py --- a/mercurial/repair.py Mon Jun 01 10:28:40 2015 -0700 +++ b/mercurial/repair.py Fri Feb 06 17:41:24 2015 +0000 @@ -13,7 +13,7 @@ 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')