This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2501

py3: make sure we write in mergestate in bytes mode
ClosedPublic

Authored by pulkit on Feb 28 2018, 5:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG035b77bf01d2: py3: make sure we write in mergestate in bytes mode
rHG4af56aaccba4: py3: make sure we write in mergestate in bytes mode
Summary

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.Feb 28 2018, 5:29 PM
Closed by commit rHG4af56aaccba4: py3: make sure we write in mergestate in bytes mode (authored by pulkit). · Explain WhyMar 1 2018, 4:35 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Mar 1 2018, 4:39 AM

This is actually noop since vfs adds 'b' automatically, but an explicit 'b' looks better.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (4 lines)

Diff 6233

mercurial/merge.py

def _writerecords(self, records): def _writerecords(self, records):
"""Write current state on disk (both v1 and v2)""" """Write current state on disk (both v1 and v2)"""
self._writerecordsv1(records) self._writerecordsv1(records)
self._writerecordsv2(records) self._writerecordsv2(records)
def _writerecordsv1(self, records): def _writerecordsv1(self, records):
"""Write current state on disk in a version 1 file""" """Write current state on disk in a version 1 file"""
f = self._repo.vfs(self.statepathv1, 'w') f = self._repo.vfs(self.statepathv1, 'wb')
irecords = iter(records) irecords = iter(records)
lrecords = next(irecords) lrecords = next(irecords)
assert lrecords[0] == 'L' assert lrecords[0] == 'L'
f.write(hex(self._local) + '\n') f.write(hex(self._local) + '\n')
for rtype, data in irecords: for rtype, data in irecords:
if rtype == 'F': if rtype == 'F':
f.write('%s\n' % _droponode(data)) f.write('%s\n' % _droponode(data))
f.close() f.close()
def _writerecordsv2(self, records): def _writerecordsv2(self, records):
"""Write current state on disk in a version 2 file """Write current state on disk in a version 2 file
See the docstring for _readrecordsv2 for why we use 't'.""" See the docstring for _readrecordsv2 for why we use 't'."""
# these are the records that all version 2 clients can read # these are the records that all version 2 clients can read
whitelist = 'LOF' whitelist = 'LOF'
f = self._repo.vfs(self.statepathv2, 'w') f = self._repo.vfs(self.statepathv2, 'wb')
for key, data in records: for key, data in records:
assert len(key) == 1 assert len(key) == 1
if key not in whitelist: if key not in whitelist:
key, data = 't', '%s%s' % (key, data) key, data = 't', '%s%s' % (key, data)
format = '>sI%is' % len(data) format = '>sI%is' % len(data)
f.write(_pack(format, key, len(data), data)) f.write(_pack(format, key, len(data), data))
f.close() f.close()