Mercurial > hg

changeset 34818:6709b5661d1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Boris Feld <boris.feld@octobus.net>
date Wed, 11 Oct 2017 18:39:34 +0200
parents a80142b03552
children eb6375651974
files mercurial/exchange.py
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py	Mon Oct 16 12:36:42 2017 +0200
+++ b/mercurial/exchange.py	Wed Oct 11 18:39:34 2017 +0200
@@ -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)