Mercurial > hg

diff mercurial/commands.py @ 36492:6e90c59b6da1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.bytestr() to convert error instances to bytes Differential Revision: https://phab.mercurial-scm.org/D2516
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 01 Mar 2018 23:54:52 +0530
parents ab5f18a9dcac
children aa3294027936
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Mar 01 23:52:30 2018 +0530
+++ b/mercurial/commands.py	Thu Mar 01 23:54:52 2018 +0530
@@ -2370,7 +2370,7 @@
     try:
         regexp = util.re.compile(pattern, reflags)
     except re.error as inst:
-        ui.warn(_("grep: invalid match pattern: %s\n") % inst)
+        ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
         return 1
     sep, eol = ':', '\n'
     if opts.get('print0'):