# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1519946276 -19800 # Node ID 06f59bdde62695909bcf8d4f0e55944a98967daa # Parent 24897a9d18ace811cabb69d9b59f0789b0a0e60f py3: use pycompat.bytestr() to convert None to bytes Differential Revision: https://phab.mercurial-scm.org/D2533 diff -r 24897a9d18ac -r 06f59bdde626 mercurial/localrepo.py --- a/mercurial/localrepo.py Thu Mar 01 18:39:21 2018 -0500 +++ b/mercurial/localrepo.py Fri Mar 02 04:47:56 2018 +0530 @@ -191,7 +191,9 @@ def debugwireargs(self, one, two, three=None, four=None, five=None): """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, **kwargs): @@ -2231,7 +2233,9 @@ def debugwireargs(self, one, two, three=None, four=None, five=None): '''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): fp = self.vfs('last-message.txt', 'wb')