Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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
authorPulkit Goyal <7895pulkit@gmail.com>
Thu, 01 Mar 2018 23:54:52 +0530
changeset 36492 6e90c59b6da1
parent 36491 149c5af35de5
child 36493 5b5cc44b2cdc
py3: use pycompat.bytestr() to convert error instances to bytes Differential Revision: https://phab.mercurial-scm.org/D2516
mercurial/commands.py file | annotate | diff | comparison | revisions
mercurial/debugcommands.py file | annotate | diff | comparison | revisions 
--- 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'):
--- a/mercurial/debugcommands.py	Thu Mar 01 23:52:30 2018 +0530
+++ b/mercurial/debugcommands.py	Thu Mar 01 23:54:52 2018 +0530
@@ -1591,7 +1591,8 @@
                                      metadata=metadata, ui=ui)
                 tr.close()
             except ValueError as exc:
-                raise error.Abort(_('bad obsmarker input: %s') % exc)
+                raise error.Abort(_('bad obsmarker input: %s') %
+                                  pycompat.bytestr(exc))
             finally:
                 tr.release()
         finally:
Mercurial