( )⚙ D7532 windows: fix an issue causing registry config paths to be ignored on py3

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7532

windows: fix an issue causing registry config paths to be ignored on py3
ClosedPublic

Authored by mharbison72 on Nov 30 2019, 2:14 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa50fecefa691: windows: fix an issue causing registry config paths to be ignored on py3
Summary

util.lookupreg() returns bytes.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Nov 30 2019, 2:14 AM
pulkit accepted this revision.Dec 2 2019, 10:10 AM
This revision is now accepted and ready to land.Dec 2 2019, 10:10 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/scmwindows.py (2 lines)

Diff 18433

mercurial/scmwindows.py

if os.path.isdir(progrcd): if os.path.isdir(progrcd):
for f, kind in util.listdir(progrcd): for f, kind in util.listdir(progrcd):
if f.endswith(b'.rc'): if f.endswith(b'.rc'):
rcpath.append(os.path.join(progrcd, f)) rcpath.append(os.path.join(progrcd, f))
# else look for a system rcpath in the registry # else look for a system rcpath in the registry
value = util.lookupreg( value = util.lookupreg(
b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE 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 return rcpath
value = util.localpath(value) value = util.localpath(value)
for p in value.split(pycompat.ospathsep): for p in value.split(pycompat.ospathsep):
if p.lower().endswith(b'mercurial.ini'): if p.lower().endswith(b'mercurial.ini'):
rcpath.append(p) rcpath.append(p)
elif os.path.isdir(p): elif os.path.isdir(p):
for f, kind in util.listdir(p): for f, kind in util.listdir(p):
if f.endswith(b'.rc'): if f.endswith(b'.rc'):