comparison mercurial/manifest.py @ 26401:e93e12e2ff9a

manifest: rename treemanifest load functions to ease debugging

I'm hunting an infinite recursion bug at the moment, and having both
of these methods named just _load is muddying the waters slightly.

26400:6f9d9e2a661f

    def copy(self):
        copy = treemanifest(self._dir)
        copy._node = self._node
        copy._dirty = self._dirty
        def _load():
            self._load()
            for d in self._dirs:
                copy._dirs[d] = self._dirs[d].copy()
            copy._files = dict.copy(self._files)
            copy._flags = dict.copy(self._flags)
            copy._load = _noop
        copy._load = _load
        if self._load == _noop:
            # Chaining _load if it's _noop is functionally correct, but the
            # chain may end up excessively long (stack overflow), and
            # will prevent garbage collection of 'self'.
            copy._load()

        dirs = [(d[:-1], self._dirs[d]._node, 'd') for d in self._dirs]
        files = [(f, self._files[f], flags(f)) for f in self._files]
        return _text(sorted(dirs + files), usemanifestv2)

    def read(self, gettext, readsubtree):
        def _load():
            # Mark as loaded already here, so __setitem__ and setflag() don't
            # cause infinite loops when they try to load.
            self._load = _noop
            self.parse(gettext(), readsubtree)
            self._dirty = False
        self._load = _load

    def writesubtrees(self, m1, m2, writesubtree):
        self._load() # for consistency; should never have any effect here
        emptytree = treemanifest()
        for d, subm in self._dirs.iteritems():

26401:e93e12e2ff9a

    def copy(self):
        copy = treemanifest(self._dir)
        copy._node = self._node
        copy._dirty = self._dirty
        def _load_for_copy():
            self._load()
            for d in self._dirs:
                copy._dirs[d] = self._dirs[d].copy()
            copy._files = dict.copy(self._files)
            copy._flags = dict.copy(self._flags)
            copy._load = _noop
        copy._load = _load_for_copy
        if self._load == _noop:
            # Chaining _load if it's _noop is functionally correct, but the
            # chain may end up excessively long (stack overflow), and
            # will prevent garbage collection of 'self'.
            copy._load()

        dirs = [(d[:-1], self._dirs[d]._node, 'd') for d in self._dirs]
        files = [(f, self._files[f], flags(f)) for f in self._files]
        return _text(sorted(dirs + files), usemanifestv2)

    def read(self, gettext, readsubtree):
        def _load_for_read():
            # Mark as loaded already here, so __setitem__ and setflag() don't
            # cause infinite loops when they try to load.
            self._load = _noop
            self.parse(gettext(), readsubtree)
            self._dirty = False
        self._load = _load_for_read

    def writesubtrees(self, m1, m2, writesubtree):
        self._load() # for consistency; should never have any effect here
        emptytree = treemanifest()
        for d, subm in self._dirs.iteritems():