This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2232

treemanifest: add an optimized __nonzero__()
ClosedPublic

Authored by martinvonz on Feb 13 2018, 5:42 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGb42c47b8c9d4: treemanifest: add an optimized __nonzero__()
rHGdbb131ffdc4d: treemanifest: add an optimized __nonzero__()
Summary

We use bool(manifest) in at least some places:

localrepo.py:1730
hgweb/webcommands.py:524

Since the treemanifest class doesn't define nonzero() (before this
patch), bool(manifest) will instead call len(), which can be slow
for treemanifests. This patch may make a noticeable difference in the
localrepo case above, but that only happens when committing a merge
and I haven't timed it.

Note that Durham already added a nonzero implementation to
manifestdict in b19291e5d506 (manifest: add nonzero method,
2016-11-03).

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.Feb 13 2018, 5:42 PM
indygreg accepted this revision.Feb 14 2018, 12:11 AM
indygreg added a subscriber: indygreg.

Perhaps we should formalize the manifest interface with an abstract base class...

This revision is now accepted and ready to land.Feb 14 2018, 12:11 AM
Closed by commit rHGdbb131ffdc4d: treemanifest: add an optimized __nonzero__() (authored by martinvonz). · Explain WhyFeb 14 2018, 12:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (6 lines)

Diff 5684

mercurial/manifest.py

def __len__(self): def __len__(self):
self._load() self._load()
size = len(self._files) size = len(self._files)
for m in self._dirs.values(): for m in self._dirs.values():
size += m.__len__() size += m.__len__()
return size return size
def __nonzero__(self):
# Faster than "__len() != 0" since it avoids loading sub-manifests
return not self._isempty()
__bool__ = __nonzero__
def _isempty(self): def _isempty(self):
self._load() # for consistency; already loaded by all callers self._load() # for consistency; already loaded by all callers
return (not self._files and (not self._dirs or return (not self._files and (not self._dirs or
all(m._isempty() for m in self._dirs.values()))) all(m._isempty() for m in self._dirs.values())))
def __repr__(self): def __repr__(self):
return ('<treemanifest dir=%s, node=%s, loaded=%s, dirty=%s at 0x%x>' % return ('<treemanifest dir=%s, node=%s, loaded=%s, dirty=%s at 0x%x>' %
(self._dir, revlog.hex(self._node), (self._dir, revlog.hex(self._node),