Mercurial > public > mercurial-scm > hg-stable

diff mercurial/scmutil.py @ 38340:cf59de802883

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: remove b'' from error message of disallowed filename
author Yuya Nishihara <yuya@tcha.org>
date Sat, 16 Jun 2018 17:56:37 +0900
parents 79dd61a4554f
children bec1212eceaa
line wrap: on
line diff
--- a/mercurial/scmutil.py	Sat Jun 16 17:54:29 2018 +0900
+++ b/mercurial/scmutil.py	Sat Jun 16 17:56:37 2018 +0900
@@ -287,7 +287,8 @@
 def checkfilename(f):
     '''Check that the filename f is an acceptable filename for a tracked file'''
     if '\r' in f or '\n' in f:
-        raise error.Abort(_("'\\n' and '\\r' disallowed in filenames: %r") % f)
+        raise error.Abort(_("'\\n' and '\\r' disallowed in filenames: %r")
+                          % pycompat.bytestr(f))
 
 def checkportable(ui, f):
     '''Check if filename f is portable and warn or abort depending on config'''