Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/scmutil.py
changeset 38312 79dd61a4554f
parent 38250 d0abd7949ea3
child 38331 cf59de802883 
--- a/mercurial/scmutil.py	Fri Jun 15 02:07:39 2018 +0530
+++ b/mercurial/scmutil.py	Wed Jun 13 22:51:08 2018 +0530
@@ -233,7 +233,7 @@
             except (AttributeError, IndexError):
                 # it might be anything, for example a string
                 reason = inst.reason
-            if isinstance(reason, unicode):
+            if isinstance(reason, pycompat.unicode):
                 # SSLError of Python 2.7.9 contains a unicode
                 reason = encoding.unitolocal(reason)
             ui.warn(_("abort: error: %s\n") % reason)
Mercurial