Mercurial > hg-stable
changeset 36133:59adb3051718
manifest: clean up dirlog() to take a d parameter to avoid shadowing dir()
Differential Revision: https://phab.mercurial-scm.org/D2187
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 12 Feb 2018 14:01:44 -0500 |
| parents | 142ce66a4118 |
| children | 48b592d986e7 |
| files | hgext/narrow/narrowrevlog.py mercurial/manifest.py |
| diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/narrow/narrowrevlog.py Mon Feb 12 14:00:02 2018 -0500 +++ b/hgext/narrow/narrowrevlog.py Mon Feb 12 14:01:44 2018 -0500 @@ -116,12 +116,12 @@ # This function is called via debug{revlog,index,data}, but also during # at least some push operations. This will be used to wrap/exclude the # child directories when using treemanifests. - def dirlog(self, dir): - if dir and not dir.endswith('/'): - dir = dir + '/' - if not repo.narrowmatch().visitdir(dir[:-1] or '.'): - return excludedmanifestrevlog(dir) - result = super(narrowmanifestrevlog, self).dirlog(dir) + def dirlog(self, d): + if d and not d.endswith('/'): + d = d + '/' + if not repo.narrowmatch().visitdir(d[:-1] or '.'): + return excludedmanifestrevlog(d) + result = super(narrowmanifestrevlog, self).dirlog(d) makenarrowmanifestrevlog(result, repo) return result
--- a/mercurial/manifest.py Mon Feb 12 14:00:02 2018 -0500 +++ b/mercurial/manifest.py Mon Feb 12 14:01:44 2018 -0500 @@ -1245,15 +1245,15 @@ self._fulltextcache.clear() self._dirlogcache = {'': self} - def dirlog(self, dir): - if dir: + def dirlog(self, d): + if d: assert self._treeondisk - if dir not in self._dirlogcache: - mfrevlog = manifestrevlog(self.opener, dir, + if d not in self._dirlogcache: + mfrevlog = manifestrevlog(self.opener, d, self._dirlogcache, treemanifest=self._treeondisk) - self._dirlogcache[dir] = mfrevlog - return self._dirlogcache[dir] + self._dirlogcache[d] = mfrevlog + return self._dirlogcache[d] def add(self, m, transaction, link, p1, p2, added, removed, readtree=None): if (p1 in self.fulltextcache and util.safehasattr(m, 'fastdelta')