##// END OF EJS Templates
manifest: delete unused dirlog and _newmanifest functions...
Durham Goode -
r30371:fccc3eea default
parent child Browse files
Show More
@@ -555,7 +555,7 b' def openrevlog(repo, cmd, file_, opts):'
555 if 'treemanifest' not in repo.requirements:
555 if 'treemanifest' not in repo.requirements:
556 raise error.Abort(_("--dir can only be used on repos with "
556 raise error.Abort(_("--dir can only be used on repos with "
557 "treemanifest enabled"))
557 "treemanifest enabled"))
558 dirlog = repo.manifest.dirlog(dir)
558 dirlog = repo.manifestlog._revlog.dirlog(dir)
559 if len(dirlog):
559 if len(dirlog):
560 r = dirlog
560 r = dirlog
561 elif mf:
561 elif mf:
@@ -1581,19 +1581,3 b' class manifest(manifestrevlog):'
1581 self._mancache = util.lrucachedict(cachesize)
1581 self._mancache = util.lrucachedict(cachesize)
1582 self._treeinmem = usetreemanifest
1582 self._treeinmem = usetreemanifest
1583 super(manifest, self).__init__(opener, dir=dir, dirlogcache=dirlogcache)
1583 super(manifest, self).__init__(opener, dir=dir, dirlogcache=dirlogcache)
1584
1585 def _newmanifest(self, data=''):
1586 if self._treeinmem:
1587 return treemanifest(self._dir, data)
1588 return manifestdict(data)
1589
1590 def dirlog(self, dir):
1591 """This overrides the base revlog implementation to allow construction
1592 'manifest' types instead of manifestrevlog types. This is only needed
1593 until we migrate off the 'manifest' type."""
1594 if dir:
1595 assert self._treeondisk
1596 if dir not in self._dirlogcache:
1597 self._dirlogcache[dir] = manifest(self.opener, dir,
1598 self._dirlogcache)
1599 return self._dirlogcache[dir]
@@ -174,7 +174,7 b' def strip(ui, repo, nodelist, backup=Tru'
174 if (unencoded.startswith('meta/') and
174 if (unencoded.startswith('meta/') and
175 unencoded.endswith('00manifest.i')):
175 unencoded.endswith('00manifest.i')):
176 dir = unencoded[5:-12]
176 dir = unencoded[5:-12]
177 repo.manifest.dirlog(dir).strip(striprev, tr)
177 repo.manifestlog._revlog.dirlog(dir).strip(striprev, tr)
178 for fn in files:
178 for fn in files:
179 repo.file(fn).strip(striprev, tr)
179 repo.file(fn).strip(striprev, tr)
180 tr.endgroup()
180 tr.endgroup()
General Comments 0
You need to be logged in to leave comments. Login now