Mercurial > public > mercurial-scm > hg

diff hgext/mq.py @ 36632:9e2866065982

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use util.forcevytestr to convert error to bytes Differential Revision: https://phab.mercurial-scm.org/D2585
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 03 Mar 2018 21:01:07 +0530
parents c6061cadb400
children bcfc4e3b6548
line wrap: on
line diff
--- a/hgext/mq.py	Sat Mar 03 09:50:07 2018 -0500
+++ b/hgext/mq.py	Sat Mar 03 21:01:07 2018 +0530
@@ -723,7 +723,8 @@
         try:
             os.unlink(undo)
         except OSError as inst:
-            self.ui.warn(_('error removing undo: %s\n') % str(inst))
+            self.ui.warn(_('error removing undo: %s\n') %
+                         util.forcebytestr(inst))
 
     def backup(self, repo, files, copy=False):
         # backup local changes in --force case