Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: stringify IOError/OSError without loosing local character
authorYuya Nishihara <yuya@tcha.org>
Wed, 14 Feb 2018 21:29:27 +0900
changeset 36239 46260fac5563
parent 36238 deb851914fd7
child 36240 707aba4d48b5
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.
mercurial/branchmap.py file | annotate | diff | comparison | revisions 
--- 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))
hg-stable