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: use str to query registry values on Windows
authorMatt Harbison <matt_harbison@yahoo.com>
Fri, 12 Oct 2018 17:34:45 -0400
changeset 40266 ab04ce6f0674
parent 40265 d6b7c4e77bb4
child 40267 9d5ddf55415b
py3: use str to query registry values on Windows This blew up launching any command if extdiff processed a tool with a regkey config.
mercurial/windows.py file | annotate | diff | comparison | revisions 
--- a/mercurial/windows.py	Sat Oct 13 16:57:28 2018 +0200
+++ b/mercurial/windows.py	Fri Oct 12 17:34:45 2018 -0400
@@ -583,7 +583,8 @@
     for s in scope:
         try:
             with winreg.OpenKey(s, encoding.strfromlocal(key)) as hkey:
-                val = winreg.QueryValueEx(hkey, valname)[0]
+                name = valname and encoding.strfromlocal(valname) or valname
+                val = winreg.QueryValueEx(hkey, name)[0]
                 # never let a Unicode string escape into the wild
                 return encoding.unitolocal(val)
         except EnvironmentError:
hg-stable