##// END OF EJS Templates
manifest: change treemanifestctx to construct subtrees from the manifestlog...
Durham Goode -
r30404:a1beadaa default
parent child Browse files
Show More
@@ -1489,7 +1489,10 b' class treemanifestctx(object):'
1489 def gettext():
1489 def gettext():
1490 return rl.revision(self._node)
1490 return rl.revision(self._node)
1491 def readsubtree(dir, subm):
1491 def readsubtree(dir, subm):
1492 return treemanifestctx(self._repo, dir, subm).read()
1492 # Set verify to False since we need to be able to create
1493 # subtrees for trees that don't exist on disk.
1494 return self._repo.manifestlog.get(dir, subm,
1495 verify=False).read()
1493 m.read(gettext, readsubtree)
1496 m.read(gettext, readsubtree)
1494 m.setnode(self._node)
1497 m.setnode(self._node)
1495 self._data = m
1498 self._data = m
@@ -1531,7 +1534,7 b' class treemanifestctx(object):'
1531 else:
1534 else:
1532 # Need to perform a slow delta
1535 # Need to perform a slow delta
1533 r0 = revlog.deltaparent(revlog.rev(self._node))
1536 r0 = revlog.deltaparent(revlog.rev(self._node))
1534 m0 = treemanifestctx(self._repo, self._dir, revlog.node(r0)).read()
1537 m0 = self._repo.manifestlog.get(self._dir, revlog.node(r0)).read()
1535 m1 = self.read()
1538 m1 = self.read()
1536 md = treemanifest(dir=self._dir)
1539 md = treemanifest(dir=self._dir)
1537 for f, ((n0, fl0), (n1, fl1)) in m0.diff(m1).iteritems():
1540 for f, ((n0, fl0), (n1, fl1)) in m0.diff(m1).iteritems():
General Comments 0
You need to be logged in to leave comments. Login now