##// END OF EJS Templates
windows: read all global config files, not just the first (issue4491) (BC)...
Mads Kiilerich -
r26625:adae8928 default
parent child Browse files
Show More
@@ -62,9 +62,9 b' ones.'
62 - ``%USERPROFILE%\Mercurial.ini`` (per-user)
62 - ``%USERPROFILE%\Mercurial.ini`` (per-user)
63 - ``%HOME%\.hgrc`` (per-user)
63 - ``%HOME%\.hgrc`` (per-user)
64 - ``%HOME%\Mercurial.ini`` (per-user)
64 - ``%HOME%\Mercurial.ini`` (per-user)
65 - ``<install-dir>\Mercurial.ini`` (per-installation)
65 - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
66 - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
66 - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
67 - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
67 - ``<install-dir>\Mercurial.ini`` (per-installation)
68 - ``<internal>/default.d/*.rc`` (defaults)
68 - ``<internal>/default.d/*.rc`` (defaults)
69
69
70 .. note::
70 .. note::
@@ -9,16 +9,13 b' def systemrcpath():'
9 filename = util.executablepath()
9 filename = util.executablepath()
10 # Use mercurial.ini found in directory with hg.exe
10 # Use mercurial.ini found in directory with hg.exe
11 progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini')
11 progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini')
12 if os.path.isfile(progrc):
12 rcpath.append(progrc)
13 rcpath.append(progrc)
14 return rcpath
15 # Use hgrc.d found in directory with hg.exe
13 # Use hgrc.d found in directory with hg.exe
16 progrcd = os.path.join(os.path.dirname(filename), 'hgrc.d')
14 progrcd = os.path.join(os.path.dirname(filename), 'hgrc.d')
17 if os.path.isdir(progrcd):
15 if os.path.isdir(progrcd):
18 for f, kind in osutil.listdir(progrcd):
16 for f, kind in osutil.listdir(progrcd):
19 if f.endswith('.rc'):
17 if f.endswith('.rc'):
20 rcpath.append(os.path.join(progrcd, f))
18 rcpath.append(os.path.join(progrcd, f))
21 return rcpath
22 # else look for a system rcpath in the registry
19 # else look for a system rcpath in the registry
23 value = util.lookupreg('SOFTWARE\\Mercurial', None,
20 value = util.lookupreg('SOFTWARE\\Mercurial', None,
24 _winreg.HKEY_LOCAL_MACHINE)
21 _winreg.HKEY_LOCAL_MACHINE)
General Comments 0
You need to be logged in to leave comments. Login now