diff -r d71e0ba34d9b -r da0319e024c0 mercurial/manifest.py --- a/mercurial/manifest.py Wed Aug 08 23:17:16 2018 -0700 +++ b/mercurial/manifest.py Tue Oct 02 13:37:12 2018 -0700 @@ -706,9 +706,11 @@ self._lazydirs = {} def _loadlazy(self, d): - path, node, readsubtree = self._lazydirs[d] - self._dirs[d] = readsubtree(path, node) - del self._lazydirs[d] + v = self._lazydirs.get(d) + if v: + path, node, readsubtree = v + self._dirs[d] = readsubtree(path, node) + del self._lazydirs[d] def _loadchildrensetlazy(self, visit): if not visit: