This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10713

revlog: fix the the computation of indexes on revlog split
AbandonedPublic

Authored by valentin.gatienbaron on May 16 2021, 3:31 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Summary

It probably got broken in 63edc384d3b7, since there was no test about
this scenario until the previous commit.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

Diff 27955

mercurial/revlog.py

fp.close() fp.close()
# We can't use the cached file handle after close(). So prevent # We can't use the cached file handle after close(). So prevent
# its usage. # its usage.
self._writinghandles = None self._writinghandles = None
with self._indexfp(b'r') as ifh, self._datafp(b'w') as dfh: with self._indexfp(b'r') as ifh, self._datafp(b'w') as dfh:
for r in self: for r in self:
dfh.write(self._getsegmentforrevs(r, r, df=ifh)[1]) dfh.write(self._getsegmentforrevs(r, r, df=ifh)[1])
if troffset <= self.start(r): if troffset <= self.start(r) + r * self.index.entry_size:
trindex = r trindex = r
with self._indexfp(b'w') as fp: with self._indexfp(b'w') as fp:
self._format_flags &= ~FLAG_INLINE_DATA self._format_flags &= ~FLAG_INLINE_DATA
self._inline = False self._inline = False
for i in self: for i in self:
e = self.index.entry_binary(i) e = self.index.entry_binary(i)
if i == 0: if i == 0:

tests/test-transaction-rollback-on-revlog-split.t

rollback failed - please run hg recover rollback failed - please run hg recover
(failure reason: attempted to truncate data/file.i to 1065 bytes, but it was already 128 bytes) (failure reason: attempted to truncate data/file.i to 1065 bytes, but it was already 128 bytes)
abort: pretxncommit hook exited with status 1 abort: pretxncommit hook exited with status 1
[40] [40]
$ cat .hg/store/journal | tr -s '\000' ' ' $ cat .hg/store/journal | tr -s '\000' ' '
data/file.i 1065 data/file.i 1065
data/file.d 0 data/file.d 0
data/file.i 0 data/file.i 64
00manifest.i 111 00manifest.i 111
00changelog.i 122 00changelog.i 122
$ hg recover $ hg recover
rolling back interrupted transaction rolling back interrupted transaction
abort: attempted to truncate data/file.i to 1065 bytes, but it was already 128 bytes abort: attempted to truncate data/file.i to 1065 bytes, but it was already 128 bytes
[255] [255]