This is an archive of the discontinued Mercurial Phabricator instance.

Differential D440

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

Authored by martinvonz on Aug 17 2017, 7:14 PM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHG13dc7f29531e: exchange: don't attempt phase exchange if phase-heads was in bundle
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Aug 17 2017, 7:14 PM
quark accepted this revision.Aug 18 2017, 1:09 PM
quark added a subscriber: quark.

Looks good to me.

durin42 accepted this revision.Aug 23 2017, 11:52 AM
This revision is now accepted and ready to land.Aug 23 2017, 11:52 AM
Closed by commit rHG13dc7f29531e: exchange: don't attempt phase exchange if phase-heads was in bundle (authored by martinvonz). · Explain WhyAug 23 2017, 12:00 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (1 line)
Mmercurial/exchange.py (4 lines)

Diff 1204

mercurial/bundle2.py

headsbyphase[phase].append(node) headsbyphase[phase].append(node)
return headsbyphase return headsbyphase
@parthandler('phase-heads') @parthandler('phase-heads')
def handlephases(op, inpart): 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):
"""retrieve the result of a pushkey request""" """retrieve the result of a pushkey request"""
ret = int(inpart.params['return']) ret = int(inpart.params['return'])
partid = int(inpart.params['in-reply-to']) partid = int(inpart.params['in-reply-to'])
op.records.add('pushkey', {'return': ret}, partid) op.records.add('pushkey', {'return': ret}, partid)

mercurial/exchange.py

pullop.repo.ui.status(_('remote: abort: %s\n') % exc) pullop.repo.ui.status(_('remote: abort: %s\n') % exc)
raise error.Abort(_('pull failed on remote'), hint=exc.hint) raise error.Abort(_('pull failed on remote'), hint=exc.hint)
except error.BundleValueError as exc: except error.BundleValueError as exc:
raise error.Abort(_('missing support for %s') % exc) raise error.Abort(_('missing support for %s') % exc)
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':
_pullapplyphases(pullop, value) _pullapplyphases(pullop, value)
# processing bookmark update # processing bookmark update
for namespace, value in op.records['listkeys']: for namespace, value in op.records['listkeys']:
if namespace == 'bookmarks': if namespace == 'bookmarks':