( )⚙ D2533 py3: use pycompat.bytestr() to convert None to bytes

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2533

py3: use pycompat.bytestr() to convert None to bytes
ClosedPublic

Authored by pulkit on Mar 1 2018, 8:01 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG06f59bdde626: py3: use pycompat.bytestr() to convert None to bytes
rHG32b3d050d997: py3: use pycompat.bytestr() to convert None to bytes

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Mar 1 2018, 8:01 PM
durin42 accepted this revision.Mar 1 2018, 8:07 PM
This revision is now accepted and ready to land.Mar 1 2018, 8:07 PM
Closed by commit rHG32b3d050d997: py3: use pycompat.bytestr() to convert None to bytes (authored by pulkit). · Explain WhyMar 1 2018, 8:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (8 lines)

Diff 6312

mercurial/localrepo.py

def branchmap(self): def branchmap(self):
return self._repo.branchmap() return self._repo.branchmap()
def capabilities(self): def capabilities(self):
return self._caps return self._caps
def debugwireargs(self, one, two, three=None, four=None, five=None): def debugwireargs(self, one, two, three=None, four=None, five=None):
"""Used to test argument passing over the wire""" """Used to test argument passing over the wire"""
return "%s %s %s %s %s" % (one, two, three, four, five) return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
pycompat.bytestr(four),
pycompat.bytestr(five))
def getbundle(self, source, heads=None, common=None, bundlecaps=None, def getbundle(self, source, heads=None, common=None, bundlecaps=None,
**kwargs): **kwargs):
chunks = exchange.getbundlechunks(self._repo, source, heads=heads, chunks = exchange.getbundlechunks(self._repo, source, heads=heads,
common=common, bundlecaps=bundlecaps, common=common, bundlecaps=bundlecaps,
**kwargs)[1] **kwargs)[1]
cb = util.chunkbuffer(chunks) cb = util.chunkbuffer(chunks)
self.hook('prelistkeys', throw=True, namespace=namespace) self.hook('prelistkeys', throw=True, namespace=namespace)
self.ui.debug('listing keys for "%s"\n' % namespace) self.ui.debug('listing keys for "%s"\n' % namespace)
values = pushkey.list(self, namespace) values = pushkey.list(self, namespace)
self.hook('listkeys', namespace=namespace, values=values) self.hook('listkeys', namespace=namespace, values=values)
return values return values
def debugwireargs(self, one, two, three=None, four=None, five=None): def debugwireargs(self, one, two, three=None, four=None, five=None):
'''used to test argument passing over the wire''' '''used to test argument passing over the wire'''
return "%s %s %s %s %s" % (one, two, three, four, five) return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
pycompat.bytestr(four),
pycompat.bytestr(five))
def savecommitmessage(self, text): def savecommitmessage(self, text):
fp = self.vfs('last-message.txt', 'wb') fp = self.vfs('last-message.txt', 'wb')
try: try:
fp.write(text) fp.write(text)
finally: finally:
fp.close() fp.close()
return self.pathto(fp.name[len(self.root) + 1:]) return self.pathto(fp.name[len(self.root) + 1:])