D440: exchange: don't attempt phase exchange if phase-heads was in bundle

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Thu Aug 17 23:14:40 UTC 2017


martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The Mercurial core server doesn't yet include phase-heads parts in the
  bundle, but our Google-internal server wants to do
  that. Unfortunately, the usual exchange still happens even if
  phase-heads part is included (including the short-circuited one for
  old/publishing servers). That means that even if our server (again,
  the Google-internal one, but also future Mercurial core servers)
  includes a phase-heads part to indicate that some heads should be
  drafts, that would still get overwritten by the phase updating that
  happens after. So let's fix that by marking the phase step done if we
  receive at least one phase-heads part in the bundle.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D440

AFFECTED FILES
  mercurial/bundle2.py
  mercurial/exchange.py

CHANGE DETAILS

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -1389,6 +1389,10 @@
     if pullop.fetch:
         pullop.cgresult = bundle2.combinechangegroupresults(op)
 
+    # If the bundle had a phase-heads part, then phase exchange is already done
+    if op.records['phase-heads']:
+        pullop.stepsdone.add('phases')
+
     # processing phases change
     for namespace, value in op.records['listkeys']:
         if namespace == 'phases':
diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -1815,6 +1815,7 @@
     """apply phases from bundle part to repo"""
     headsbyphase = _readphaseheads(inpart)
     phases.updatephases(op.repo.unfiltered(), op.gettransaction(), headsbyphase)
+    op.records.add('phase-heads', {})
 
 @parthandler('reply:pushkey', ('return', 'in-reply-to'))
 def handlepushkeyreply(op, inpart):



To: martinvonz, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list