comparison mercurial/transaction.py @ 50284:a43f0562220c stable

undo-files: have the transaction directly tracks and manages journal rename

This is much simpler this way.

50283:dda43856ef96

        self._vfsmap = vfsmap
        self._after = after
        self._offsetmap = {}
        self._newfiles = set()
        self._journal = journalname
        self._undoname = undoname
        self._queue = []
        # A callback to do something just after releasing transaction.
        if releasefn is None:
            releasefn = lambda tr, success: None

        """abort the transaction (generally called on error, or when the
        transaction is not explicitly committed before going out of
        scope)"""
        self._abort()

    def _writeundo(self):
        """write transaction data for possible future undo call"""
        if self._undoname is None:
            return

                vfs = self._vfsmap[l]
                u = undoname(b)
                util.copyfile(vfs.join(b), vfs.join(u), hardlink=True)
            undobackupfile.write(b"%s\0%s\0%s\0%d\n" % (l, f, u, c))
        undobackupfile.close()

    def _abort(self):
        entries = self.readjournal()
        self._count = 0
        self._usages = 0

50284:a43f0562220c

        self._vfsmap = vfsmap
        self._after = after
        self._offsetmap = {}
        self._newfiles = set()
        self._journal = journalname
        self._journal_files = []
        self._undoname = undoname
        self._queue = []
        # A callback to do something just after releasing transaction.
        if releasefn is None:
            releasefn = lambda tr, success: None

        """abort the transaction (generally called on error, or when the
        transaction is not explicitly committed before going out of
        scope)"""
        self._abort()

    @active
    def add_journal(self, vfs_id, path):
        self._journal_files.append((vfs_id, path))

    def _writeundo(self):
        """write transaction data for possible future undo call"""
        if self._undoname is None:
            return

                vfs = self._vfsmap[l]
                u = undoname(b)
                util.copyfile(vfs.join(b), vfs.join(u), hardlink=True)
            undobackupfile.write(b"%s\0%s\0%s\0%d\n" % (l, f, u, c))
        undobackupfile.close()
        for vfs, src in self._journal_files:
            dest = undoname(src)
            # if src and dest refer to a same file, vfs.rename is a no-op,
            # leaving both src and dest on disk. delete dest to make sure
            # the rename couldn't be such a no-op.
            vfs.tryunlink(dest)
            try:
                vfs.rename(src, dest)
            except FileNotFoundError:  # journal file does not yet exist
                pass

    def _abort(self):
        entries = self.readjournal()
        self._count = 0
        self._usages = 0