comparison mercurial/context.py @ 47706:5bbf304271a0

context: use `update_file` instead of `normal` in `markcommitted`

This is the newer, more semantic API.

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

47705:6975cef3add1

        return sorted(f for f in ds.matches(match) if ds[f] != b'r')

    def markcommitted(self, node):
        with self._repo.dirstate.parentchange():
            for f in self.modified() + self.added():
                self._repo.dirstate.normal(f)
            for f in self.removed():
                self._repo.dirstate.drop(f)
            self._repo.dirstate.setparents(node)
            self._repo._quick_access_changeid_invalidate()

47706:5bbf304271a0

        return sorted(f for f in ds.matches(match) if ds[f] != b'r')

    def markcommitted(self, node):
        with self._repo.dirstate.parentchange():
            for f in self.modified() + self.added():
                self._repo.dirstate.update_file(
                    f, p1_tracked=True, wc_tracked=True
                )
            for f in self.removed():
                self._repo.dirstate.drop(f)
            self._repo.dirstate.setparents(node)
            self._repo._quick_access_changeid_invalidate()