comparison mercurial/context.py @ 47605:a5701ffc10e4

sparse: make sure we adjust the dirstate at the same time as the parent

This is more correct and help our API split.

Differential Revision: https://phab.mercurial-scm.org/D11028

47604:090fc6a95e50

            for f in self.removed():
                self._repo.dirstate.drop(f)
            self._repo.dirstate.setparents(node)
            self._repo._quick_access_changeid_invalidate()

        # write changes out explicitly, because nesting wlock at
        # runtime may prevent 'wlock.release()' in 'repo.commit()'
        # from immediately doing so for subsequent changing files
        self._repo.dirstate.write(self._repo.currenttransaction())

        sparse.aftercommit(self._repo, node)

    def mergestate(self, clean=False):
        if clean:
            return mergestatemod.mergestate.clean(self._repo)
        return mergestatemod.mergestate.read(self._repo)

47605:a5701ffc10e4

            for f in self.removed():
                self._repo.dirstate.drop(f)
            self._repo.dirstate.setparents(node)
            self._repo._quick_access_changeid_invalidate()

            sparse.aftercommit(self._repo, node)

        # write changes out explicitly, because nesting wlock at
        # runtime may prevent 'wlock.release()' in 'repo.commit()'
        # from immediately doing so for subsequent changing files
        self._repo.dirstate.write(self._repo.currenttransaction())

    def mergestate(self, clean=False):
        if clean:
            return mergestatemod.mergestate.clean(self._repo)
        return mergestatemod.mergestate.read(self._repo)