( )⚙ D10606 revlog: rename variable in `rewrite_sidedata` to match other code

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10606

revlog: rename variable in `rewrite_sidedata` to match other code
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG042388bba644: revlog: rename variable in `rewrite_sidedata` to match other code
Summary

Let's call the index file object and ifh and the data file object dfh as the
rest of the revlog code. This will make future change clearer.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

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

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

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

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

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

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

marmoute added a commit: rHG042388bba644: revlog: rename variable in `rewrite_sidedata` to match other code.May 17 2021, 8:55 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG042388bba644: revlog: rename variable in `rewrite_sidedata` to match other code (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (12 lines)

Diff 28006

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 fp: with self._datafp(b'a+') as dfh:
# Maybe this bug still exists, see revlog._writeentry # Maybe this bug still exists, see revlog._writeentry
fp.seek(0, os.SEEK_END) dfh.seek(0, os.SEEK_END)
current_offset = fp.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={},
rev=rev, rev=rev,
) )
raise error.Abort(msg) raise error.Abort(msg)
# Apply (potential) flags to add and to remove after running # Apply (potential) flags to add and to remove after running
# the sidedata helpers # the sidedata helpers
new_offset_flags = entry[0] | flags[0] & ~flags[1] new_offset_flags = entry[0] | flags[0] & ~flags[1]
entry = (new_offset_flags,) + entry[1:8] entry = (new_offset_flags,) + entry[1:8]
entry += (current_offset, len(serialized_sidedata)) entry += (current_offset, len(serialized_sidedata))
fp.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 fp: with self._indexfp(b'r+') as ifh:
fp.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
fp.write(packed) ifh.write(packed)