This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4268

manifest: rename dir to tree to avoid shadowing built-in
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG43387fd2aa1f: manifest: rename dir to tree to avoid shadowing built-in
Summary

And update the argument name in the imanifestlog interface.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Aug 13 2018, 12:55 PM
Closed by commit rHG43387fd2aa1f: manifest: rename dir to tree to avoid shadowing built-in (authored by indygreg). · Explain WhyAug 22 2018, 12:37 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (22 lines)
Mmercurial/repository.py (8 lines)

Diff 10340

mercurial/manifest.py

self._cachesize = cachesize self._cachesize = cachesize
def __getitem__(self, node): def __getitem__(self, node):
"""Retrieves the manifest instance for the given node. Throws a """Retrieves the manifest instance for the given node. Throws a
LookupError if not found. LookupError if not found.
""" """
return self.get('', node) return self.get('', node)
def get(self, dir, node, verify=True): def get(self, tree, node, verify=True):
"""Retrieves the manifest instance for the given node. Throws a """Retrieves the manifest instance for the given node. Throws a
LookupError if not found. LookupError if not found.
`verify` - if True an exception will be thrown if the node is not in `verify` - if True an exception will be thrown if the node is not in
the revlog the revlog
""" """
if node in self._dirmancache.get(dir, ()): if node in self._dirmancache.get(tree, ()):
return self._dirmancache[dir][node] return self._dirmancache[tree][node]
if not self._narrowmatch.always(): if not self._narrowmatch.always():
if not self._narrowmatch.visitdir(dir[:-1] or '.'): if not self._narrowmatch.visitdir(tree[:-1] or '.'):
return excludeddirmanifestctx(dir, node) return excludeddirmanifestctx(tree, node)
if dir: if tree:
if self._revlog._treeondisk: if self._revlog._treeondisk:
if verify: if verify:
dirlog = self._revlog.dirlog(dir) dirlog = self._revlog.dirlog(tree)
if node not in dirlog.nodemap: if node not in dirlog.nodemap:
raise LookupError(node, dirlog.indexfile, raise LookupError(node, dirlog.indexfile,
_('no node')) _('no node'))
m = treemanifestctx(self, dir, 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") % dir) "manifest") % tree)
else: else:
if verify: if verify:
if node not in self._revlog.nodemap: if node not in self._revlog.nodemap:
raise LookupError(node, self._revlog.indexfile, raise LookupError(node, self._revlog.indexfile,
_('no node')) _('no node'))
if self._treeinmem: if self._treeinmem:
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(dir) mancache = self._dirmancache.get(tree)
if not mancache: if not mancache:
mancache = util.lrucachedict(self._cachesize) mancache = util.lrucachedict(self._cachesize)
self._dirmancache[dir] = mancache self._dirmancache[tree] = mancache
mancache[node] = m mancache[node] = m
return m return m
def clearcaches(self, clear_persisted_data=False): def clearcaches(self, clear_persisted_data=False):
self._dirmancache.clear() self._dirmancache.clear()
self._revlog.clearcaches(clear_persisted_data=clear_persisted_data) self._revlog.clearcaches(clear_persisted_data=clear_persisted_data)
def rev(self, node): def rev(self, node):

mercurial/repository.py

"""Obtain a manifest instance for a given binary node. """Obtain a manifest instance for a given binary node.
Equivalent to calling ``self.get('', node)``. Equivalent to calling ``self.get('', node)``.
The returned object conforms to the ``imanifestrevisionstored`` The returned object conforms to the ``imanifestrevisionstored``
interface. interface.
""" """
def get(dir, node, verify=True): def get(tree, node, verify=True):
"""Retrieve the manifest instance for a given directory and binary node. """Retrieve the manifest instance for a given directory and binary node.
``node`` always refers to the node of the root manifest (which will be ``node`` always refers to the node of the root manifest (which will be
the only manifest if flat manifests are being used). the only manifest if flat manifests are being used).
If ``dir`` is the empty string, the root manifest is returned. Otherwise If ``tree`` is the empty string, the root manifest is returned.
the manifest for the specified directory will be returned (requires Otherwise the manifest for the specified directory will be returned
tree manifests). (requires tree manifests).
If ``verify`` is True, ``LookupError`` is raised if the node is not If ``verify`` is True, ``LookupError`` is raised if the node is not
known. known.
The returned object conforms to the ``imanifestrevisionstored`` The returned object conforms to the ``imanifestrevisionstored``
interface. interface.
""" """