mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
exchange: don't attempt phase exchange if phase-heads was in bundle
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. Differential Revision: https://phab.mercurial-scm.org/D440
This commit is contained in:
parent
10555b029c
commit
7603f48c32
@ -1815,6 +1815,7 @@ def handlephases(op, inpart):
|
|||||||
"""apply phases from bundle part to repo"""
|
"""apply phases from bundle part to repo"""
|
||||||
headsbyphase = _readphaseheads(inpart)
|
headsbyphase = _readphaseheads(inpart)
|
||||||
phases.updatephases(op.repo.unfiltered(), op.gettransaction(), headsbyphase)
|
phases.updatephases(op.repo.unfiltered(), op.gettransaction(), headsbyphase)
|
||||||
|
op.records.add('phase-heads', {})
|
||||||
|
|
||||||
@parthandler('reply:pushkey', ('return', 'in-reply-to'))
|
@parthandler('reply:pushkey', ('return', 'in-reply-to'))
|
||||||
def handlepushkeyreply(op, inpart):
|
def handlepushkeyreply(op, inpart):
|
||||||
|
@ -1401,6 +1401,10 @@ def _pullbundle2(pullop):
|
|||||||
if pullop.fetch:
|
if pullop.fetch:
|
||||||
pullop.cgresult = bundle2.combinechangegroupresults(op)
|
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
|
# processing phases change
|
||||||
for namespace, value in op.records['listkeys']:
|
for namespace, value in op.records['listkeys']:
|
||||||
if namespace == 'phases':
|
if namespace == 'phases':
|
||||||
|
Loading…
Reference in New Issue
Block a user