comparison mercurial/dirstate.py @ 50255:fa04407bda7a

dirstate: factor the transaction abort logic

We will need it in more occasion if the branch is to be written as part of the
transaction.

50254:df76808d5f21

        for f in to_drop:
            self._map.reset_state(f)

        self._dirty = True

    def write(self, tr):
        if not self._dirty:
            return
        # make sure we don't request a write of invalidated content
        # XXX move before the dirty check once `unlock` stop calling `write`
        assert not self._invalidated_context

        write_key = self._use_tracked_hint and self._dirty_tracked_set
        if tr:

            def on_abort(tr):
                self._attached_to_a_transaction = False
                self.invalidate()

            # make sure we invalidate the current change on abort
            if tr is not None:
                tr.addabort(
                    b'dirstate-invalidate%s' % self._tr_key_suffix,
                    on_abort,
                )

            self._attached_to_a_transaction = True

            def on_success(f):
                self._attached_to_a_transaction = False
                self._writedirstate(tr, f),

50255:fa04407bda7a

        for f in to_drop:
            self._map.reset_state(f)

        self._dirty = True

    def _setup_tr_abort(self, tr):
        """make sure we invalidate the current change on abort"""
        if tr is None:
            return

        def on_abort(tr):
            self._attached_to_a_transaction = False
            self.invalidate()

        tr.addabort(
            b'dirstate-invalidate%s' % self._tr_key_suffix,
            on_abort,
        )

    def write(self, tr):
        if not self._dirty:
            return
        # make sure we don't request a write of invalidated content
        # XXX move before the dirty check once `unlock` stop calling `write`
        assert not self._invalidated_context

        write_key = self._use_tracked_hint and self._dirty_tracked_set
        if tr:

            self._setup_tr_abort(tr)
            self._attached_to_a_transaction = True

            def on_success(f):
                self._attached_to_a_transaction = False
                self._writedirstate(tr, f),