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

login
register
mail settings
Submitter phabricator
Date Aug. 9, 2017, 2:18 p.m.
Message ID <545a48ccafff65aec13a466f6cf2f9c1@localhost.localdomain>
Download mbox | patch
Permalink /patch/22782/
State Not Applicable
Headers show

Comments

phabricator - Aug. 9, 2017, 2:18 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG373ca5103ba8: bundle2: convert ints to strings using pycompat.bytestring() (authored by durin42).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D272?vs=637&id=667

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

AFFECTED FILES
  mercurial/bundle2.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -1000,7 +1000,7 @@ 
             parttype = self.type.upper()
         else:
             parttype = self.type.lower()
-        outdebug(ui, 'part %s: "%s"' % (self.id, parttype))
+        outdebug(ui, 'part %s: "%s"' % (pycompat.bytestr(self.id), parttype))
         ## parttype
         header = [_pack(_fparttypesize, len(parttype)),
                   parttype, _pack(_fpartid, self.id),
@@ -1239,7 +1239,7 @@ 
         self.type = self._fromheader(typesize)
         indebug(self.ui, 'part type: "%s"' % self.type)
         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
         self.mandatory = (self.type != self.type.lower())
         self.type = self.type.lower()