( )⚙ D10609 revlog: use `_writing` in `rewrite_sidedata`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10609

revlog: use `_writing` in `rewrite_sidedata`
ClosedPublic

Authored by marmoute on May 3 2021, 7:52 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGb3acefded601: revlog: use `_writing` in `rewrite_sidedata`
Summary

Special cases aren't special enough to break the rules.

Diff Detail

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

Event Timeline

marmoute created this revision.May 3 2021, 7:52 AM
baymax updated this revision to Diff 27524.May 3 2021, 9:44 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27855.May 11 2021, 1:42 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27981.May 17 2021, 7:02 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHGb3acefded601: revlog: use `_writing` in `rewrite_sidedata`.May 17 2021, 8:56 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb3acefded601: revlog: use `_writing` in `rewrite_sidedata` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (9 lines)

Diff 27855

mercurial/revlog.py

delayed = getattr(self, '_delayed', False) delayed = getattr(self, '_delayed', False)
diverted = getattr(self, '_divert', False) diverted = getattr(self, '_divert', False)
if delayed and not diverted: if delayed and not diverted:
msg = "cannot rewrite_sidedata of a delayed revlog" msg = "cannot rewrite_sidedata of a delayed revlog"
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
new_entries = [] new_entries = []
# append the new sidedata # append the new sidedata
with self._datafp(b'a+') as dfh: with self._writing(transaction):
# Maybe this bug still exists, see revlog._writeentry ifh, dfh = self._writinghandles
dfh.seek(0, os.SEEK_END) dfh.seek(0, os.SEEK_END)
current_offset = dfh.tell() current_offset = dfh.tell()
for rev in range(startrev, endrev + 1): for rev in range(startrev, endrev + 1):
entry = self.index[rev] entry = self.index[rev]
new_sidedata, flags = sidedatautil.run_sidedata_helpers( new_sidedata, flags = sidedatautil.run_sidedata_helpers(
store=self, store=self,
sidedata_helpers=helpers, sidedata_helpers=helpers,
sidedata={}, sidedata={},
entry += (current_offset, len(serialized_sidedata)) entry += (current_offset, len(serialized_sidedata))
# the sidedata computation might have move the file cursors around # the sidedata computation might have move the file cursors around
dfh.seek(current_offset, os.SEEK_SET) dfh.seek(current_offset, os.SEEK_SET)
dfh.write(serialized_sidedata) dfh.write(serialized_sidedata)
new_entries.append(entry) new_entries.append(entry)
current_offset += len(serialized_sidedata) current_offset += len(serialized_sidedata)
# rewrite the new index entries # rewrite the new index entries
with self._indexfp(b'r+') as ifh: ifh.seek(startrev * self.index.entry_size)
fp.seek(startrev * self.index.entry_size)
for i, e in enumerate(new_entries): for i, e in enumerate(new_entries):
rev = startrev + i rev = startrev + i
self.index.replace_sidedata_info(rev, e[8], e[9], e[0]) self.index.replace_sidedata_info(rev, e[8], e[9], e[0])
packed = self.index.entry_binary(rev) packed = self.index.entry_binary(rev)
if rev == 0: if rev == 0:
header = self._format_flags | self._format_version header = self._format_flags | self._format_version
header = self.index.pack_header(header) header = self.index.pack_header(header)
packed = header + packed packed = header + packed
ifh.write(packed) ifh.write(packed)