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 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 To: durin42, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel