This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8641

phases: improve performance of _retractboundary
ClosedPublic

Authored by joerg.sonnenberger on Jun 18 2020, 4:23 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfa151f7af275: phases: improve performance of _retractboundary
rHGa54ee130210a: phases: improve performance of _retractboundary
rHGae6890f108f2: phases: improve performance of _retractboundary
Summary

The old version repeatedly converts nodes to revisions, which is a
moderately expensive operation. Mapping all new changes once to
revisions and back at the end reduces the time spend in _retractboundary
during the unbundling of NetBSD's src from 67s to 17s.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/phases.py (28 lines)

Diff 21667

mercurial/phases.py

# Be careful to preserve shallow-copied values: do not update # Be careful to preserve shallow-copied values: do not update
# phaseroots values, replace them. # phaseroots values, replace them.
if targetphase in (archived, internal) and not supportinternal(repo): if targetphase in (archived, internal) and not supportinternal(repo):
name = phasenames[targetphase] name = phasenames[targetphase]
msg = b'this repository does not support the %s phase' % name msg = b'this repository does not support the %s phase' % name
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
repo = repo.unfiltered() repo = repo.unfiltered()
currentroots = self.phaseroots[targetphase] torev = repo.changelog.rev
tonode = repo.changelog.node
currentroots = {torev(node) for node in self.phaseroots[targetphase]}
finalroots = oldroots = set(currentroots) finalroots = oldroots = set(currentroots)
newroots = [ newroots = [torev(node) for node in nodes]
n for n in nodes if self.phase(repo, repo[n].rev()) < targetphase newroots = [rev for rev in newroots if self.phase(repo, rev) < targetphase]
]
if newroots:
if nullid in newroots: if newroots:
if nullrev in newroots:
raise error.Abort(_(b'cannot change null revision phase')) raise error.Abort(_(b'cannot change null revision phase'))
currentroots = currentroots.copy()
currentroots.update(newroots) currentroots.update(newroots)
# Only compute new roots for revs above the roots that are being # Only compute new roots for revs above the roots that are being
# retracted. # retracted.
minnewroot = min(repo[n].rev() for n in newroots) minnewroot = min(newroots)
aboveroots = [ aboveroots = [rev for rev in currentroots if rev >= minnewroot]
n for n in currentroots if repo[n].rev() >= minnewroot updatedroots = repo.set(b'roots(%ld::)', aboveroots)
]
updatedroots = repo.set(b'roots(%ln::)', aboveroots)
finalroots = {n for n in currentroots if repo[n].rev() < minnewroot} finalroots = {rev for rev in currentroots if rev < minnewroot}
finalroots.update(ctx.node() for ctx in updatedroots) finalroots.update(ctx.rev() for ctx in updatedroots)
if finalroots != oldroots: if finalroots != oldroots:
self._updateroots(targetphase, finalroots, tr) self._updateroots(targetphase, {tonode(rev) for rev in finalroots}, tr)
return True return True
return False return False
def filterunknown(self, repo): def filterunknown(self, repo):
"""remove unknown nodes from the phase boundary """remove unknown nodes from the phase boundary
Nothing is lost as unknown nodes only hold data for their descendants. Nothing is lost as unknown nodes only hold data for their descendants.
""" """