This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2187

manifest: clean up dirlog() to take a d parameter to avoid shadowing dir()
ClosedPublic

Authored by durin42 on Feb 12 2018, 3:03 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG59adb3051718: manifest: clean up dirlog() to take a d parameter to avoid shadowing dir()
Summary

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

durin42 created this revision.Feb 12 2018, 3:03 PM
durin42 updated this revision to Diff 5517.Feb 12 2018, 3:24 PM
indygreg accepted this revision.Feb 12 2018, 5:54 PM
This revision is now accepted and ready to land.Feb 12 2018, 5:54 PM
Closed by commit rHG59adb3051718: manifest: clean up dirlog() to take a d parameter to avoid shadowing dir() (authored by durin42). · Explain WhyFeb 12 2018, 6:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowrevlog.py (12 lines)
Mmercurial/manifest.py (12 lines)

Diff 5557

hgext/narrow/narrowrevlog.py

def makenarrowmanifestrevlog(mfrevlog, repo): def makenarrowmanifestrevlog(mfrevlog, repo):
if util.safehasattr(mfrevlog, '_narrowed'): if util.safehasattr(mfrevlog, '_narrowed'):
return return
class narrowmanifestrevlog(mfrevlog.__class__): class narrowmanifestrevlog(mfrevlog.__class__):
# This function is called via debug{revlog,index,data}, but also during # 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 # at least some push operations. This will be used to wrap/exclude the
# child directories when using treemanifests. # child directories when using treemanifests.
def dirlog(self, dir): def dirlog(self, d):
if dir and not dir.endswith('/'): if d and not d.endswith('/'):
dir = dir + '/' d = d + '/'
if not repo.narrowmatch().visitdir(dir[:-1] or '.'): if not repo.narrowmatch().visitdir(d[:-1] or '.'):
return excludedmanifestrevlog(dir) return excludedmanifestrevlog(d)
result = super(narrowmanifestrevlog, self).dirlog(dir) result = super(narrowmanifestrevlog, self).dirlog(d)
makenarrowmanifestrevlog(result, repo) makenarrowmanifestrevlog(result, repo)
return result return result
mfrevlog.__class__ = narrowmanifestrevlog mfrevlog.__class__ = narrowmanifestrevlog
mfrevlog._narrowed = True mfrevlog._narrowed = True
def makenarrowmanifestlog(mfl, repo): def makenarrowmanifestlog(mfl, repo):
class narrowmanifestlog(mfl.__class__): class narrowmanifestlog(mfl.__class__):

mercurial/manifest.py

def fulltextcache(self): def fulltextcache(self):
return self._fulltextcache return self._fulltextcache
def clearcaches(self): def clearcaches(self):
super(manifestrevlog, self).clearcaches() super(manifestrevlog, self).clearcaches()
self._fulltextcache.clear() self._fulltextcache.clear()
self._dirlogcache = {'': self} self._dirlogcache = {'': self}
def dirlog(self, dir): def dirlog(self, d):
if dir: if d:
assert self._treeondisk assert self._treeondisk
if dir not in self._dirlogcache: if d not in self._dirlogcache:
mfrevlog = manifestrevlog(self.opener, dir, mfrevlog = manifestrevlog(self.opener, d,
self._dirlogcache, self._dirlogcache,
treemanifest=self._treeondisk) treemanifest=self._treeondisk)
self._dirlogcache[dir] = mfrevlog self._dirlogcache[d] = mfrevlog
return self._dirlogcache[dir] return self._dirlogcache[d]
def add(self, m, transaction, link, p1, p2, added, removed, readtree=None): def add(self, m, transaction, link, p1, p2, added, removed, readtree=None):
if (p1 in self.fulltextcache and util.safehasattr(m, 'fastdelta') if (p1 in self.fulltextcache and util.safehasattr(m, 'fastdelta')
and not self._usemanifestv2): and not self._usemanifestv2):
# If our first parent is in the manifest cache, we can # If our first parent is in the manifest cache, we can
# compute a delta here using properties we know about the # compute a delta here using properties we know about the
# manifest up-front, which may save time later for the # manifest up-front, which may save time later for the
# revlog layer. # revlog layer.