This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5583

discovery: using the new basesheads()
ClosedPublic

Authored by gracinet on Jan 14 2019, 9:14 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2a8782cc2e16: discovery: using the new basesheads()
Summary

Our ultimate goal is to switch eventually to a Rust implementation, but
this move actually seems to increase the performance in a pure Python
build.

What follows is a quick measurement done on PyPy on repos prepared with
contrib/discovery-helper.sh 50 100.

Before:
! wall 0.894384 comb 0.890000 user 0.890000 sys 0.000000 (best of 11)
! wall 0.971199 comb 0.970000 user 0.950000 sys 0.020000 (max of 11)
! wall 0.927993 comb 0.925455 user 0.919091 sys 0.006364 (avg of 11)
! wall 0.921619 comb 0.920000 user 0.910000 sys 0.010000 (median of 11)

After:
! wall 0.614278 comb 0.610000 user 0.610000 sys 0.000000 (best of 14)
! wall 0.789459 comb 0.790000 user 0.770000 sys 0.020000 (max of 14)
! wall 0.722765 comb 0.720000 user 0.715714 sys 0.004286 (avg of 14)
! wall 0.734448 comb 0.720000 user 0.720000 sys 0.000000 (median of 14)

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

gracinet created this revision.Jan 14 2019, 9:14 PM
Closed by commit rHG2a8782cc2e16: discovery: using the new basesheads() (authored by gracinet). · Explain WhyJan 16 2019, 7:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/setdiscovery.py (4 lines)

Diff 13253

mercurial/setdiscovery.py

return self._undecided return self._undecided
self._undecided = set(self._common.missingancestors(self._targetheads)) self._undecided = set(self._common.missingancestors(self._targetheads))
return self._undecided return self._undecided
def commonheads(self): def commonheads(self):
"""the heads of the known common set""" """the heads of the known common set"""
# heads(common) == heads(common.bases) since common represents # heads(common) == heads(common.bases) since common represents
# common.bases and all its ancestors # common.bases and all its ancestors
# The presence of nullrev will confuse heads(). So filter it out. return self._common.basesheads()
return set(self._repo.revs('heads(%ld)',
self._common.bases - {nullrev}))
def findcommonheads(ui, local, remote, def findcommonheads(ui, local, remote,
initialsamplesize=100, initialsamplesize=100,
fullsamplesize=200, fullsamplesize=200,
abortwhenunrelated=True, abortwhenunrelated=True,
ancestorsof=None): ancestorsof=None):
'''Return a tuple (common, anyincoming, remoteheads) used to identify '''Return a tuple (common, anyincoming, remoteheads) used to identify
missing nodes from or in remote. missing nodes from or in remote.