comparison mercurial/revlog.py @ 48571:ccd9cb73125c stable

revlog: fix a bug where transaction can be aborted partially

Fix a repo corruption bug caused by a partial transaction rollback.

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

48570:f38ae2d7390e

        troffset = tr.findoffset(self._indexfile)
        if troffset is None:
            raise error.RevlogError(
                _(b"%s not found in the transaction") % self._indexfile
            )
        trindex = 0
        tr.add(self._datafile, 0)

        existing_handles = False
        if self._writinghandles is not None:
            existing_handles = True

        new_dfh.truncate(0)  # drop any potentially existing data
        try:
            with self._indexfp() as read_ifh:
                for r in self:
                    new_dfh.write(self._getsegmentforrevs(r, r, df=read_ifh)[1])
                    if troffset <= self.start(r) + r * self.index.entry_size:
                        trindex = r
                new_dfh.flush()

            with self.__index_new_fp() as fp:
                self._format_flags &= ~FLAG_INLINE_DATA
                self._inline = False
                for i in self:

48571:ccd9cb73125c

        troffset = tr.findoffset(self._indexfile)
        if troffset is None:
            raise error.RevlogError(
                _(b"%s not found in the transaction") % self._indexfile
            )
        trindex = None
        tr.add(self._datafile, 0)

        existing_handles = False
        if self._writinghandles is not None:
            existing_handles = True

        new_dfh.truncate(0)  # drop any potentially existing data
        try:
            with self._indexfp() as read_ifh:
                for r in self:
                    new_dfh.write(self._getsegmentforrevs(r, r, df=read_ifh)[1])
                    if (
                        trindex is None
                        and troffset
                        <= self.start(r) + r * self.index.entry_size
                    ):
                        trindex = r
                new_dfh.flush()

            if trindex is None:
                trindex = 0

            with self.__index_new_fp() as fp:
                self._format_flags &= ~FLAG_INLINE_DATA
                self._inline = False
                for i in self: