This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2522

py3: slice over bytes to prevent getting ascii values
ClosedPublic

Authored by pulkit on Mar 1 2018, 5:06 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG1d99260c3a81: py3: slice over bytes to prevent getting ascii values
Summary

This fixed reading of mergestate files and fixes 14 tests on Python 3.

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

pulkit created this revision.Mar 1 2018, 5:06 PM
durin42 accepted this revision.Mar 1 2018, 5:16 PM
This revision is now accepted and ready to land.Mar 1 2018, 5:16 PM
Closed by commit rHG1d99260c3a81: py3: slice over bytes to prevent getting ascii values (authored by pulkit). · Explain WhyMar 1 2018, 5:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (4 lines)

Diff 6294

mercurial/merge.py

Returns list of records [(TYPE, data), ...].""" Returns list of records [(TYPE, data), ...]."""
records = [] records = []
try: try:
f = self._repo.vfs(self.statepathv2) f = self._repo.vfs(self.statepathv2)
data = f.read() data = f.read()
off = 0 off = 0
end = len(data) end = len(data)
while off < end: while off < end:
rtype = data[off] rtype = data[off:off + 1]
off += 1 off += 1
length = _unpack('>I', data[off:(off + 4)])[0] length = _unpack('>I', data[off:(off + 4)])[0]
off += 4 off += 4
record = data[off:(off + length)] record = data[off:(off + length)]
off += length off += length
if rtype == 't': if rtype == 't':
rtype, record = record[0], record[1:] rtype, record = record[0:1], record[1:]
records.append((rtype, record)) records.append((rtype, record))
f.close() f.close()
except IOError as err: except IOError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
return records return records
@util.propertycache @util.propertycache