Show More
@@ -28,12 +28,16 b' def systemrcpath():' | |||
|
28 | 28 | # Use mercurial.ini found in directory with hg.exe |
|
29 | 29 | progrc = os.path.join(os.path.dirname(filename), b'mercurial.ini') |
|
30 | 30 | rcpath.append(progrc) |
|
31 | ||
|
32 | def _processdir(progrcd): | |
|
33 | if os.path.isdir(progrcd): | |
|
34 | for f, kind in util.listdir(progrcd): | |
|
35 | if f.endswith(b'.rc'): | |
|
36 | rcpath.append(os.path.join(progrcd, f)) | |
|
37 | ||
|
31 | 38 | # Use hgrc.d found in directory with hg.exe |
|
32 |
|
|
|
33 | if os.path.isdir(progrcd): | |
|
34 | for f, kind in util.listdir(progrcd): | |
|
35 | if f.endswith(b'.rc'): | |
|
36 | rcpath.append(os.path.join(progrcd, f)) | |
|
39 | _processdir(os.path.join(os.path.dirname(filename), b'hgrc.d')) | |
|
40 | ||
|
37 | 41 | # next look for a system rcpath in the registry |
|
38 | 42 | value = util.lookupreg( |
|
39 | 43 | b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE |
@@ -43,10 +47,8 b' def systemrcpath():' | |||
|
43 | 47 | for p in value.split(pycompat.ospathsep): |
|
44 | 48 | if p.lower().endswith(b'mercurial.ini'): |
|
45 | 49 | rcpath.append(p) |
|
46 |
el |
|
|
47 |
|
|
|
48 | if f.endswith(b'.rc'): | |
|
49 | rcpath.append(os.path.join(p, f)) | |
|
50 | else: | |
|
51 | _processdir(p) | |
|
50 | 52 | return rcpath |
|
51 | 53 | |
|
52 | 54 |
General Comments 0
You need to be logged in to leave comments.
Login now