Mercurial > hg

changeset 36201:46260fac5563

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: stringify IOError/OSError without loosing local character Follows up fa4d333cac58. An environment error may contain non-ascii characters on Windows, which should be encoded to a platform-native string.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 14 Feb 2018 21:29:27 +0900
parents deb851914fd7
children 707aba4d48b5
files mercurial/branchmap.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/branchmap.py	Fri Jan 26 19:48:39 2018 +0900
+++ b/mercurial/branchmap.py	Wed Feb 14 21:29:27 2018 +0900
@@ -377,7 +377,7 @@
                 self._rbcrevs[:] = data
             except (IOError, OSError) as inst:
                 repo.ui.debug("couldn't read revision branch cache: %s\n" %
-                              pycompat.bytestr(inst))
+                              util.forcebytestr(inst))
         # remember number of good records on disk
         self._rbcrevslen = min(len(self._rbcrevs) // _rbcrecsize,
                                len(repo.changelog))