[PATCH 7 of 8 V2] phase: isolate logic to update remote phrase through bundle2 pushkey

Yuya Nishihara yuya at tcha.org
Thu Oct 19 09:30:30 EDT 2017


On Mon, 16 Oct 2017 20:23:48 +0200, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld <boris.feld at octobus.net>
> # Date 1505927857 -7200
> #      Wed Sep 20 19:17:37 2017 +0200
> # Node ID 9c084f14df72a2d511d414e0ecf50a086c0a2341
> # Parent  e688d8b13100c464897c7f872c498202f8e82272
> # EXP-Topic b2.phases.push
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 9c084f14df72
> phase: isolate logic to update remote phrase through bundle2 pushkey
> 
> Move the logic to build bundle2 pushkey part into its dedicated function. It
> will help to keep the logic clear when adding support for sending phases change
> using 'phase-heads' part.
> 
> diff --git a/mercurial/exchange.py b/mercurial/exchange.py
> --- a/mercurial/exchange.py
> +++ b/mercurial/exchange.py
> @@ -806,8 +806,11 @@
>      if 'phases' in pushop.stepsdone:
>          return
>      b2caps = bundle2.bundle2caps(pushop.remote)
> -    if not 'pushkey' in b2caps:
> -        return
> +    if 'pushkey' in b2caps:
> +        _pushb2phasespushkey(pushop, bundler)

Don't we need to return the handlereply function?


More information about the Mercurial-devel mailing list