Mercurial > public > mercurial-scm > hg

comparison mercurial/manifest.py @ 48926:3d35e7483602

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifest: remove pycompat.iteritems() Differential Revision: https://phab.mercurial-scm.org/D12331
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 21 Feb 2022 11:11:27 -0700
parents f254fc73d956
children 642e31cb55f0
comparison
equal deleted inserted replaced
48925:1414b65303d5 48926:3d35e7483602
824 return self._dir + path 824 return self._dir + path
825 825
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 pycompat.iteritems( 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:
835 selfdirs[d] = readsubtree(subpath(d), node) 833 selfdirs[d] = readsubtree(subpath(d), node)
836 self._lazydirs = {} 834 self._lazydirs = {}
2243 # Need to perform a slow delta 2241 # Need to perform a slow delta
2244 r0 = store.deltaparent(store.rev(self._node)) 2242 r0 = store.deltaparent(store.rev(self._node))
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 pycompat.iteritems(m0.diff(m1)): 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:
2252 md.setflag(f, fl1) 2250 md.setflag(f, fl1)
2253 return md 2251 return md