Mercurial > hg
comparison mercurial/exchange.py @ 33886:13dc7f29531e
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
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 17 Aug 2017 13:04:47 -0700 |
parents | 800bb35d891e |
children | f85dfde1731a |
comparison
equal
deleted
inserted
replaced
33885:800bb35d891e | 33886:13dc7f29531e |
---|---|
1399 raise error.Abort(_('missing support for %s') % exc) | 1399 raise error.Abort(_('missing support for %s') % exc) |
1400 | 1400 |
1401 if pullop.fetch: | 1401 if pullop.fetch: |
1402 pullop.cgresult = bundle2.combinechangegroupresults(op) | 1402 pullop.cgresult = bundle2.combinechangegroupresults(op) |
1403 | 1403 |
1404 # If the bundle had a phase-heads part, then phase exchange is already done | |
1405 if op.records['phase-heads']: | |
1406 pullop.stepsdone.add('phases') | |
1407 | |
1404 # processing phases change | 1408 # processing phases change |
1405 for namespace, value in op.records['listkeys']: | 1409 for namespace, value in op.records['listkeys']: |
1406 if namespace == 'phases': | 1410 if namespace == 'phases': |
1407 _pullapplyphases(pullop, value) | 1411 _pullapplyphases(pullop, value) |
1408 | 1412 |