This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7690

windows: don't return early from building the hgrc search path
ClosedPublic

Authored by mharbison72 on Dec 17 2019, 10:49 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfa3835a15a17: windows: don't return early from building the hgrc search path
Summary

This will minimize the changes needed to add other sources.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmwindows.py (19 lines)

Diff 18850

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))
# next look for a system rcpath in the registry # next 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, bytes) or not value: if value and isinstance(value, bytes):
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'):
rcpath.append(os.path.join(p, f)) rcpath.append(os.path.join(p, f))
return rcpath return rcpath
def userrcpath(): def userrcpath():
'''return os-specific hgrc search path to the user dir''' '''return os-specific hgrc search path to the user dir'''
home = os.path.expanduser(b'~') home = os.path.expanduser(b'~')
path = [os.path.join(home, b'mercurial.ini'), os.path.join(home, b'.hgrc')] path = [os.path.join(home, b'mercurial.ini'), os.path.join(home, b'.hgrc')]
userprofile = encoding.environ.get(b'USERPROFILE') userprofile = encoding.environ.get(b'USERPROFILE')
if userprofile and userprofile != home: if userprofile and userprofile != home:
path.append(os.path.join(userprofile, b'mercurial.ini')) path.append(os.path.join(userprofile, b'mercurial.ini'))
path.append(os.path.join(userprofile, b'.hgrc')) path.append(os.path.join(userprofile, b'.hgrc'))
return path return path
def termsize(ui): def termsize(ui):
return win32.termsize() return win32.termsize()