Show More
@@ -826,9 +826,7 b' class treemanifest(object):' | |||||
826 | def _loadalllazy(self): |
|
826 | def _loadalllazy(self): | |
827 | selfdirs = self._dirs |
|
827 | selfdirs = self._dirs | |
828 | subpath = self._subpath |
|
828 | subpath = self._subpath | |
829 |
for d, (node, readsubtree, docopy) in |
|
829 | for d, (node, readsubtree, docopy) in self._lazydirs.items(): | |
830 | self._lazydirs |
|
|||
831 | ): |
|
|||
832 | if docopy: |
|
830 | if docopy: | |
833 | selfdirs[d] = readsubtree(subpath(d), node).copy() |
|
831 | selfdirs[d] = readsubtree(subpath(d), node).copy() | |
834 | else: |
|
832 | else: | |
@@ -2245,7 +2243,7 b' class treemanifestctx(object):' | |||||
2245 | m0 = self._manifestlog.get(self._dir, store.node(r0)).read() |
|
2243 | m0 = self._manifestlog.get(self._dir, store.node(r0)).read() | |
2246 | m1 = self.read() |
|
2244 | m1 = self.read() | |
2247 | md = treemanifest(self._manifestlog.nodeconstants, dir=self._dir) |
|
2245 | md = treemanifest(self._manifestlog.nodeconstants, dir=self._dir) | |
2248 |
for f, ((n0, fl0), (n1, fl1)) in |
|
2246 | for f, ((n0, fl0), (n1, fl1)) in m0.diff(m1).items(): | |
2249 | if n1: |
|
2247 | if n1: | |
2250 | md[f] = n1 |
|
2248 | md[f] = n1 | |
2251 | if fl1: |
|
2249 | if fl1: |
General Comments 0
You need to be logged in to leave comments.
Login now