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

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 1:13 a.m.
Message ID <a675279b05d284c872cb16d3d6e93a76@localhost.localdomain>
Download mbox | patch
Permalink /patch/28641/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2018, 1:13 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG32b3d050d997: py3: use pycompat.bytestr() to convert None to bytes (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2533?vs=6312&id=6314

REVISION DETAIL
  https://phab.mercurial-scm.org/D2533

AFFECTED FILES
  mercurial/localrepo.py

CHANGE DETAILS




To: pulkit, #hg-reviewers, durin42
Cc: mercurial-devel

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -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')