[PATCH 3 of 8 V2] phase: simplify the check for issue3781 shortcut in discovery
Boris Feld
boris.feld at octobus.net
Mon Oct 16 14:23:44 EDT 2017
# HG changeset patch
# User Boris Feld <boris.feld at octobus.net>
# Date 1507739974 -7200
# Wed Oct 11 18:39:34 2017 +0200
# Node ID 9fb76d6c80d20b5af8ee1d0e7d6c221924b1d7bb
# Parent 29a71a5125a7beb8334a7f7386a3023bfa1f66f8
# EXP-Topic b2.phases.push
# Available At https://bitbucket.org/octobus/mercurial-devel/
# hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 9fb76d6c80d2
phase: simplify the check for issue3781 shortcut in discovery
We'll rework the code around this check. Limiting the entanglement will help
with later changesets
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -531,7 +531,7 @@
if (pushop.ui.configbool('ui', '_usedassubrepo')
and remotephases # server supports phases
and not pushop.outgoing.missing # no changesets to be pushed
- and publishing):
+ and remotephases.get('publishing', False)):
# When:
# - this is a subrepo push
# - and remote support phase
@@ -541,7 +541,9 @@
# We drop the possible phase synchronisation done by
# courtesy to publish changesets possibly locally draft
# on the remote.
- remotephases = {'publishing': 'True'}
+ pushop.outdatedphases = []
+ pushop.fallbackoutdatedphases = []
+ return
ana = phases.analyzeremotephases(pushop.repo,
pushop.fallbackheads,
remotephases)
More information about the Mercurial-devel
mailing list