( )⚙ D272 bundle2: convert ints to strings using pycompat.bytestring()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D272

bundle2: convert ints to strings using pycompat.bytestring()
ClosedPublic

Authored by durin42 on Aug 8 2017, 3:49 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHG373ca5103ba8: bundle2: convert ints to strings using pycompat.bytestring()
Summary

Fixes some Python 3 regressions.

We don't use %d here because the part id is actually an
Optional[int]. It should always be initialized to a non-None value by
the time this code executes, but we shouldn't blindly depend on that
being the case.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Aug 8 2017, 3:49 PM
quark accepted this revision.Aug 9 2017, 1:13 AM
Closed by commit rHG373ca5103ba8: bundle2: convert ints to strings using pycompat.bytestring() (authored by durin42). · Explain WhyAug 9 2017, 10:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (4 lines)

Diff 637

mercurial/bundle2.py

msg.append('\n') msg.append('\n')
ui.debug(''.join(msg)) ui.debug(''.join(msg))
#### header #### header
if self.mandatory: if self.mandatory:
parttype = self.type.upper() parttype = self.type.upper()
else: else:
parttype = self.type.lower() parttype = self.type.lower()
outdebug(ui, 'part %s: "%s"' % (self.id, parttype)) outdebug(ui, 'part %s: "%s"' % (pycompat.bytestr(self.id), parttype))
## parttype ## parttype
header = [_pack(_fparttypesize, len(parttype)), header = [_pack(_fparttypesize, len(parttype)),
parttype, _pack(_fpartid, self.id), parttype, _pack(_fpartid, self.id),
] ]
## parameters ## parameters
# count # count
manpar = self.mandatoryparams manpar = self.mandatoryparams
advpar = self.advisoryparams advpar = self.advisoryparams
raise ValueError('Unknown chunk') raise ValueError('Unknown chunk')
def _readheader(self): def _readheader(self):
"""read the header and setup the object""" """read the header and setup the object"""
typesize = self._unpackheader(_fparttypesize)[0] typesize = self._unpackheader(_fparttypesize)[0]
self.type = self._fromheader(typesize) self.type = self._fromheader(typesize)
indebug(self.ui, 'part type: "%s"' % self.type) indebug(self.ui, 'part type: "%s"' % self.type)
self.id = self._unpackheader(_fpartid)[0] self.id = self._unpackheader(_fpartid)[0]
indebug(self.ui, 'part id: "%s"' % self.id) indebug(self.ui, 'part id: "%s"' % pycompat.bytestr(self.id))
# extract mandatory bit from type # extract mandatory bit from type
self.mandatory = (self.type != self.type.lower()) self.mandatory = (self.type != self.type.lower())
self.type = self.type.lower() self.type = self.type.lower()
## reading parameters ## reading parameters
# param count # param count
mancount, advcount = self._unpackheader(_fpartparamcount) mancount, advcount = self._unpackheader(_fpartparamcount)
indebug(self.ui, 'part parameters: %i' % (mancount + advcount)) indebug(self.ui, 'part parameters: %i' % (mancount + advcount))
# param size # param size