Patchwork D2529: convert: fix two %r output formats with pycompat.bytestr() wrapping

login
register
mail settings
Submitter phabricator
Date March 1, 2018, 11:22 p.m.
Message ID <differential-rev-PHID-DREV-5wqyj6bm7knpthd3kbs4-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28621/
State Superseded
Headers show

Comments

phabricator - March 1, 2018, 11:22 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/convert/filemap.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/convert/filemap.py b/hgext/convert/filemap.py
--- a/hgext/convert/filemap.py
+++ b/hgext/convert/filemap.py
@@ -11,6 +11,7 @@ 
 from mercurial.i18n import _
 from mercurial import (
     error,
+    pycompat,
 )
 from . import common
 SKIPREV = common.SKIPREV
@@ -67,7 +68,8 @@ 
                 name.endswith('/') or
                 '//' in name):
                 self.ui.warn(_('%s:%d: superfluous / in %s %r\n') %
-                             (lex.infile, lex.lineno, listname, name))
+                             (lex.infile, lex.lineno, listname,
+                              pycompat.bytestr(name)))
                 return 1
             return 0
         lex = common.shlexer(
@@ -92,7 +94,7 @@ 
                 errs += self.parse(normalize(lex.get_token()))
             else:
                 self.ui.warn(_('%s:%d: unknown directive %r\n') %
-                             (lex.infile, lex.lineno, cmd))
+                             (lex.infile, lex.lineno, pycompat.bytestr(cmd)))
                 errs += 1
             cmd = lex.get_token()
         return errs