This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4279

manifest: use rev() instead of nodemap.__contains__
ClosedPublic

Authored by indygreg on Aug 13 2018, 12:55 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG61700d525a3b: manifest: use rev() instead of nodemap.__contains__
Summary

nodemap is an implementation detail of revlogs and isn't
appropriate to expose on the manifest storage API.

While revlogs don't have a contains, they do have lookup()
for resolving a value to a node. And this calls rev(), whose API
is documented to raise LookupError if a node doesn't exist. And
the parameters to LookupError are identical to what was being
raised here. So this change should be backwards compatible.

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

indygreg created this revision.Aug 13 2018, 12:55 PM
Closed by commit rHG61700d525a3b: manifest: use rev() instead of nodemap.__contains__ (authored by indygreg). · Explain WhyAug 22 2018, 12:38 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (14 lines)

Diff 10526

mercurial/manifest.py

return self._dirmancache[tree][node] return self._dirmancache[tree][node]
if not self._narrowmatch.always(): if not self._narrowmatch.always():
if not self._narrowmatch.visitdir(tree[:-1] or '.'): if not self._narrowmatch.visitdir(tree[:-1] or '.'):
return excludeddirmanifestctx(tree, node) return excludeddirmanifestctx(tree, node)
if tree: if tree:
if self._revlog._treeondisk: if self._revlog._treeondisk:
if verify: if verify:
dirlog = self.getstorage(tree) # Side-effect is LookupError is raised if node doesn't
if node not in dirlog.nodemap: # exist.
raise LookupError(node, dirlog.indexfile, self.getstorage(tree).rev(node)
_('no node'))
m = treemanifestctx(self, tree, node) m = treemanifestctx(self, tree, node)
else: else:
raise error.Abort( raise error.Abort(
_("cannot ask for manifest directory '%s' in a flat " _("cannot ask for manifest directory '%s' in a flat "
"manifest") % tree) "manifest") % tree)
else: else:
if verify: if verify:
if node not in self._revlog.nodemap: # Side-effect is LookupError is raised if node doesn't exist.
raise LookupError(node, self._revlog.indexfile, self._revlog.rev(node)
_('no node'))
if self._treemanifests: if self._treemanifests:
m = treemanifestctx(self, '', node) m = treemanifestctx(self, '', node)
else: else:
m = manifestctx(self, node) m = manifestctx(self, node)
if node != revlog.nullid: if node != revlog.nullid:
mancache = self._dirmancache.get(tree) mancache = self._dirmancache.get(tree)
if not mancache: if not mancache: