Mercurial > hg

diff mercurial/scmutil.py @ 38605:85c74c5a1590

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: drop b'' while formatting ResponseError
author Yuya Nishihara <yuya@tcha.org>
date Sun, 08 Jul 2018 18:58:11 +0900
parents 152f4822d210
children cc76692f401d
line wrap: on
line diff
--- a/mercurial/scmutil.py	Sun Jul 08 18:52:28 2018 +0900
+++ b/mercurial/scmutil.py	Sun Jul 08 18:58:11 2018 +0900
@@ -201,7 +201,7 @@
         elif not msg:
             ui.warn(_(" empty string\n"))
         else:
-            ui.warn("\n%r\n" % stringutil.ellipsis(msg))
+            ui.warn("\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg)))
     except error.CensoredNodeError as inst:
         ui.warn(_("abort: file censored %s!\n") % inst)
     except error.RevlogError as inst: