Mercurial > hg

diff mercurial/scmwindows.py @ 43793:29adf0a087a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Thu, 05 Dec 2019 11:15:19 -0500
parents fe73ec69350e a50fecefa691
children 9a3ac902d597
line wrap: on
line diff
--- a/mercurial/scmwindows.py	Tue Dec 03 17:17:57 2019 -0800
+++ b/mercurial/scmwindows.py	Thu Dec 05 11:15:19 2019 -0500
@@ -38,7 +38,7 @@
     value = util.lookupreg(
         b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE
     )
-    if not isinstance(value, str) or not value:
+    if not isinstance(value, bytes) or not value:
         return rcpath
     value = util.localpath(value)
     for p in value.split(pycompat.ospathsep):