comparison mercurial/dirstate.py @ 50076:63c4e9639753

dirstate: generalize the dirstate's invalidation on transaction abort

The previous code was too specific, we should add the invalidation at next to
the `addfilegenerator` in the `write` call.

50075:8eb460e0a202

                        # We don't have more straightforward code, because the
                        # Exception catching (and the associated `invalidate`
                        # calling) might have been called by a nested context
                        # instead of the top level one.
                        tr = repo.currenttransaction()
                        if tr is not None:
                            abort_cb = lambda tr: self.invalidate()
                            tr.addabort(b'dirstate', abort_cb)
                        self.write(tr)

    @contextlib.contextmanager
    def changing_parents(self, repo):
        with self._changing(repo, CHANGE_TYPE_PARENTS) as c:

        if not self._dirty:
            return

        write_key = self._use_tracked_hint and self._dirty_tracked_set
        if tr:
            # delay writing in-memory changes out
            tr.addfilegenerator(
                b'dirstate-1-main',
                (self._filename,),
                lambda f: self._writedirstate(tr, f),

50076:63c4e9639753

                        # We don't have more straightforward code, because the
                        # Exception catching (and the associated `invalidate`
                        # calling) might have been called by a nested context
                        # instead of the top level one.
                        tr = repo.currenttransaction()
                        self.write(tr)

    @contextlib.contextmanager
    def changing_parents(self, repo):
        with self._changing(repo, CHANGE_TYPE_PARENTS) as c:

        if not self._dirty:
            return

        write_key = self._use_tracked_hint and self._dirty_tracked_set
        if tr:
            # make sure we invalidate the current change on abort
            if tr is not None:
                tr.addabort(
                    b'dirstate-invalidate',
                    lambda tr: self.invalidate(),
                )
            # delay writing in-memory changes out
            tr.addfilegenerator(
                b'dirstate-1-main',
                (self._filename,),
                lambda f: self._writedirstate(tr, f),