[PATCH 3 of 4 STABLE] exchange: don't update local phases if remote is non-publishing

[Martin von Zweigbergk]

Please ignore patches 3 and 4. I was confused by my log output and copied
"stable" instead of the hash from patch 2/4.

On Mon, Aug 3, 2015 at 9:40 AM Martin von Zweigbergk <martinvonz at google.com>
wrote:

> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1437430676 25200
> #      Mon Jul 20 15:17:56 2015 -0700
> # Branch stable
> # Node ID 0a97524ab5dfa8f6a2ca022f74ba65895a04d9bf
> # Parent  c8d4bb838f9a3cc3fb427a1e121c026b68b784ab
> exchange: don't update local phases if remote is non-publishing
>
> diff --git a/mercurial/exchange.py b/mercurial/exchange.py
> --- a/mercurial/exchange.py
> +++ b/mercurial/exchange.py
> @@ -743,9 +743,6 @@
>          ### Apply remote phase on local
>          if remotephases.get('publishing', False):
>              _localphasemove(pushop, cheads)
> -        else: # publish = False
> -            _localphasemove(pushop, pheads)
> -            _localphasemove(pushop, cheads, phases.draft)
>          ### Apply local phase on remote
>
>          if pushop.cgresult:
> diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
> --- a/tests/test-bundle2-exchange.t
> +++ b/tests/test-bundle2-exchange.t
> @@ -342,10 +342,6 @@
>    remote: postclose-tip:5fddd98957c8 draft book_5fdd
>    remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1
> HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b
> HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:ssh:127.0.0.1
> (glob)
>    updating bookmark book_5fdd
> -  pre-close-tip:02de42196ebe draft book_02de
> -  postclose-tip:02de42196ebe draft book_02de
> -  txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:*
> HG_TXNNAME=push-response (glob)
> -  ssh://user@dummy/other HG_URL=ssh://user@dummy/other
>    $ hg -R other log -G
>    o  6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits at gmail.com>
> book_5fdd C
>    |
> @@ -396,10 +392,6 @@
>    remote: postclose-tip:32af7686d403 public book_32af
>    remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1
> HG_NEW_OBSMARKERS=1 HG_NODE=32af7686d403cf45b5d95f2d70cebea587ac806a
> HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve
> HG_URL=remote:http:127.0.0.1: (glob)
>    updating bookmark book_32af
> -  pre-close-tip:02de42196ebe draft book_02de
> -  postclose-tip:02de42196ebe draft book_02de
> -  txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:*
> HG_TXNNAME=push-response (glob)
> -  http://localhost:$HGPORT2/ HG_URL=http://localhost:$HGPORT2/
>    $ cat other-error.log
>
>  Check final content.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150803/c109238e/attachment.html>