This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1906

revlog: correct type in check to verify rawtext is immutable
ClosedPublic

Authored by durin42 on Jan 18 2018, 11:13 AM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbe923ce44d6a: revlog: correct type in check to verify rawtext is immutable
rHG24dd168d712a: revlog: correct type in check to verify rawtext is immutable
Summary

This fixes far more failures than I feel like it has any right to, so
there's clearly some subtle interaction between self._cache and other
parts of this code. :(

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Jan 18 2018, 11:13 AM
pulkit accepted this revision.Jan 18 2018, 12:08 PM
durin42 updated this revision to Diff 4952.Jan 19 2018, 3:12 PM
indygreg accepted this revision.Feb 1 2018, 3:41 PM
This revision is now accepted and ready to land.Feb 1 2018, 3:41 PM
Closed by commit rHG24dd168d712a: revlog: correct type in check to verify rawtext is immutable (authored by durin42). · Explain WhyFeb 1 2018, 3:42 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (2 lines)

Diff 4952

mercurial/revlog.py

self.nodemap[node] = curr self.nodemap[node] = curr
entry = self._io.packentry(e, self.node, self.version, curr) entry = self._io.packentry(e, self.node, self.version, curr)
self._writeentry(transaction, ifh, dfh, entry, data, link, offset) self._writeentry(transaction, ifh, dfh, entry, data, link, offset)
if alwayscache and rawtext is None: if alwayscache and rawtext is None:
rawtext = deltacomputer._buildtext(revinfo, fh) rawtext = deltacomputer._buildtext(revinfo, fh)
if type(rawtext) == str: # only accept immutable objects if type(rawtext) == bytes: # only accept immutable objects
self._cache = (node, curr, rawtext) self._cache = (node, curr, rawtext)
self._chainbasecache[curr] = chainbase self._chainbasecache[curr] = chainbase
return node return node
def _writeentry(self, transaction, ifh, dfh, entry, data, link, offset): def _writeentry(self, transaction, ifh, dfh, entry, data, link, offset):
# Files opened in a+ mode have inconsistent behavior on various # Files opened in a+ mode have inconsistent behavior on various
# platforms. Windows requires that a file positioning call be made # platforms. Windows requires that a file positioning call be made
# when the file handle transitions between reads and writes. See # when the file handle transitions between reads and writes. See