Mercurial > hg-stable

changeset 36583:06f59bdde626

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.bytestr() to convert None to bytes Differential Revision: https://phab.mercurial-scm.org/D2533
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 02 Mar 2018 04:47:56 +0530
parents 24897a9d18ac
children c28de190e20a
files mercurial/localrepo.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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')