[PATCH 2 of 9] bundle2: rename the _canusebundle2 method to _forcebundle1

Yuya Nishihara yuya at tcha.org
Thu Aug 4 10:22:24 EDT 2016


On Wed, 03 Aug 2016 16:54:47 +0200, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1470229283 -7200
> #      Wed Aug 03 15:01:23 2016 +0200
> # Node ID 2d61469ee8d3af037aa4e2730576777bbe12ff57
> # Parent  cba97bcff849b3d366ca56f597efa7ccc6df458a
> # EXP-Topic bundle2.devel
> bundle2: rename the _canusebundle2 method to _forcebundle1

> --- a/mercurial/exchange.py	Wed Aug 03 14:24:09 2016 +0200
> +++ b/mercurial/exchange.py	Wed Aug 03 15:01:23 2016 +0200
> @@ -257,12 +257,12 @@ def buildobsmarkerspart(bundler, markers
>          return bundler.newpart('obsmarkers', data=stream)
>      return None
>  
> -def _canusebundle2(op):
> +def _forcebundle1(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', True)
> -            and op.remote.capable('bundle2'))
> +    return not (op.repo.ui.configbool('experimental', 'bundle2-exp', True)
> +                and op.remote.capable('bundle2'))

Updated the docstring as s/can use bundle2/must use bundle1/.


More information about the Mercurial-devel mailing list