comparison mercurial/dirstate.py @ 49467:0705afae6253 stable

dirstate-v2: backup the data file during the transaction (issue6730)

If we backup of the docket, without doing a backup of the data file, we
highly risk restoring a docket pointing to a missing file in the future.

So we now backup the data-file alongside the docket.

49466:486b8a383100

    scmutil,
    util,
)

from .dirstateutils import (
    timestamp,
)

from .interfaces import (
    dirstate as intdirstate,

        if tr:
            return self._pendingfilename
        else:
            return self._filename

    def savebackup(self, tr, backupname):
        '''Save current dirstate into backup file'''
        filename = self._actualfilename(tr)
        assert backupname != filename

        util.copyfile(
            self._opener.join(filename),
            self._opener.join(backupname),
            hardlink=True,
        )

    def restorebackup(self, tr, backupname):
        '''Restore dirstate by backup file'''
        # this "invalidate()" prevents "wlock.release()" from writing
        # changes of dirstate out after restoring from backup file
        self.invalidate()
        filename = self._actualfilename(tr)
        o = self._opener
        if util.samefile(o.join(backupname), o.join(filename)):
            o.unlink(backupname)
        else:
            o.rename(backupname, filename, checkambig=True)

    def clearbackup(self, tr, backupname):
        '''Clear backup file'''
        self._opener.unlink(backupname)

    def verify(self, m1, m2):
        """check the dirstate content again the parent manifest and yield errors"""
        missing_from_p1 = b"%s in state %s, but not in manifest1\n"
        unexpected_in_p1 = b"%s in state %s, but also in manifest1\n"

49467:0705afae6253

    scmutil,
    util,
)

from .dirstateutils import (
    docket as docketmod,
    timestamp,
)

from .interfaces import (
    dirstate as intdirstate,

        if tr:
            return self._pendingfilename
        else:
            return self._filename

    def data_backup_filename(self, backupname):
        if not self._use_dirstate_v2:
            return None
        return backupname + b'.v2-data'

    def _new_backup_data_filename(self, backupname):
        """return a filename to backup a data-file or None"""
        if not self._use_dirstate_v2:
            return None
        data_filename = self._map.docket.data_filename()
        return data_filename, self.data_backup_filename(backupname)

    def backup_data_file(self, backupname):
        if not self._use_dirstate_v2:
            return None
        docket = docketmod.DirstateDocket.parse(
            self._opener.read(backupname),
            self._nodeconstants,
        )
        return self.data_backup_filename(backupname), docket.data_filename()

    def savebackup(self, tr, backupname):
        '''Save current dirstate into backup file'''
        filename = self._actualfilename(tr)
        assert backupname != filename

        util.copyfile(
            self._opener.join(filename),
            self._opener.join(backupname),
            hardlink=True,
        )
        data_pair = self._new_backup_data_filename(backupname)
        if data_pair is not None:
            data_filename, bck_data_filename = data_pair
            util.copyfile(
                self._opener.join(data_filename),
                self._opener.join(bck_data_filename),
                hardlink=True,
            )
            if tr is not None:
                # ensure that pending file written above is unlinked at
                # failure, even if tr.writepending isn't invoked until the
                # end of this transaction
                tr.registertmp(bck_data_filename, location=b'plain')

    def restorebackup(self, tr, backupname):
        '''Restore dirstate by backup file'''
        # this "invalidate()" prevents "wlock.release()" from writing
        # changes of dirstate out after restoring from backup file
        self.invalidate()
        filename = self._actualfilename(tr)
        o = self._opener
        data_pair = self.backup_data_file(backupname)
        if util.samefile(o.join(backupname), o.join(filename)):
            o.unlink(backupname)
        else:
            o.rename(backupname, filename, checkambig=True)

        if data_pair is not None:
            data_backup, target = data_pair
            if o.exists(target) and util.samefile(
                o.join(data_backup), o.join(target)
            ):
                o.unlink(data_backup)
            else:
                o.rename(data_backup, target, checkambig=True)

    def clearbackup(self, tr, backupname):
        '''Clear backup file'''
        o = self._opener
        data_backup = self.backup_data_file(backupname)
        o.unlink(backupname)

        if data_backup is not None:
            o.unlink(data_backup[0])

    def verify(self, m1, m2):
        """check the dirstate content again the parent manifest and yield errors"""
        missing_from_p1 = b"%s in state %s, but not in manifest1\n"
        unexpected_in_p1 = b"%s in state %s, but also in manifest1\n"