Mercurial > public > mercurial-scm > hg-stable

diff mercurial/config.py @ 43276:d201a637c971

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: encode underlying error message during parse error of %include
author Denis Laxalde <denis.laxalde@logilab.fr>
date Thu, 17 Oct 2019 12:10:42 +0200
parents d783f945a701
children 6ada8a274b9c
line wrap: on
line diff
--- a/mercurial/config.py	Fri Oct 11 18:08:50 2019 +0100
+++ b/mercurial/config.py	Thu Oct 17 12:10:42 2019 +0200
@@ -13,6 +13,7 @@
 from .i18n import _
 from .pycompat import getattr
 from . import (
+    encoding,
     error,
     pycompat,
     util,
@@ -173,7 +174,7 @@
                         if inst.errno != errno.ENOENT:
                             raise error.ParseError(
                                 _(b"cannot include %s (%s)")
-                                % (inc, inst.strerror),
+                                % (inc, encoding.strtolocal(inst.strerror)),
                                 b"%s:%d" % (src, line),
                             )
                 continue