This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10234

revlog: convert an Abort message to bytes
ClosedPublic

Authored by mharbison72 on Mar 18 2021, 6:57 PM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9ff4672c8c26: revlog: convert an Abort message to bytes
Summary

Flagged by pytype.

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

mharbison72 created this revision.Mar 18 2021, 6:57 PM
pulkit accepted this revision.Mar 19 2021, 4:10 AM
This revision is now accepted and ready to land.Mar 19 2021, 4:10 AM
mharbison72 added a commit: rHG9ff4672c8c26: revlog: convert an Abort message to bytes.Mar 22 2021, 2:29 PM
Closed by commit rHG9ff4672c8c26: revlog: convert an Abort message to bytes (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (2 lines)

Diff 26540

mercurial/revlog.py

serialized_sidedata = sidedatautil.serialize_sidedata( serialized_sidedata = sidedatautil.serialize_sidedata(
new_sidedata new_sidedata
) )
if entry[8] != 0 or entry[9] != 0: if entry[8] != 0 or entry[9] != 0:
# rewriting entries that already have sidedata is not # rewriting entries that already have sidedata is not
# supported yet, because it introduces garbage data in the # supported yet, because it introduces garbage data in the
# revlog. # revlog.
msg = "Rewriting existing sidedata is not supported yet" msg = b"Rewriting existing sidedata is not supported yet"
raise error.Abort(msg) raise error.Abort(msg)
entry = entry[:8] entry = entry[:8]
entry += (current_offset, len(serialized_sidedata)) entry += (current_offset, len(serialized_sidedata))
fp.write(serialized_sidedata) fp.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'w+') as fp: with self._indexfp(b'w+') as fp:
fp.seek(startrev * self._io.size) fp.seek(startrev * self._io.size)
for i, entry in enumerate(new_entries): for i, entry in enumerate(new_entries):
rev = startrev + i rev = startrev + i
self.index.replace_sidedata_info(rev, entry[8], entry[9]) self.index.replace_sidedata_info(rev, entry[8], entry[9])
packed = self._io.packentry(entry, self.node, self.version, rev) packed = self._io.packentry(entry, self.node, self.version, rev)
fp.write(packed) fp.write(packed)