Mercurial > hg

diff mercurial/repair.py @ 36702:f659a407e5ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use util.forcebytestr instead of str to convert error messages Differential Revision: https://phab.mercurial-scm.org/D2649
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 04 Mar 2018 22:37:41 +0530
parents 128dd940bedc
children 17692fefc8f2
line wrap: on
line diff
--- a/mercurial/repair.py	Sat Mar 03 23:49:39 2018 -0500
+++ b/mercurial/repair.py	Sun Mar 04 22:37:41 2018 +0530
@@ -235,7 +235,7 @@
             except OSError as e:
                 if e.errno != errno.ENOENT:
                     ui.warn(_('error removing %s: %s\n') %
-                            (undovfs.join(undofile), str(e)))
+                            (undovfs.join(undofile), util.forcebytestr(e)))
 
     except: # re-raises
         if backupfile: