Show More
@@ -38,6 +38,7 b' ones.' | |||||
38 | - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation) |
|
38 | - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation) | |
39 | - ``/etc/mercurial/hgrc`` (per-system) |
|
39 | - ``/etc/mercurial/hgrc`` (per-system) | |
40 | - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) |
|
40 | - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) | |
|
41 | - ``<internal>/default.d/*.rc`` (defaults) | |||
41 |
|
42 | |||
42 | .. container:: verbose.windows |
|
43 | .. container:: verbose.windows | |
43 |
|
44 | |||
@@ -51,6 +52,7 b' ones.' | |||||
51 | - ``<install-dir>\Mercurial.ini`` (per-installation) |
|
52 | - ``<install-dir>\Mercurial.ini`` (per-installation) | |
52 | - ``<install-dir>\hgrc.d\*.rc`` (per-installation) |
|
53 | - ``<install-dir>\hgrc.d\*.rc`` (per-installation) | |
53 | - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) |
|
54 | - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) | |
|
55 | - ``<internal>/default.d/*.rc`` (defaults) | |||
54 |
|
56 | |||
55 | .. note:: |
|
57 | .. note:: | |
56 |
|
58 | |||
@@ -67,6 +69,7 b' ones.' | |||||
67 | - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) |
|
69 | - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) | |
68 | - ``/lib/mercurial/hgrc`` (per-system) |
|
70 | - ``/lib/mercurial/hgrc`` (per-system) | |
69 | - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) |
|
71 | - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) | |
|
72 | - ``<internal>/default.d/*.rc`` (defaults) | |||
70 |
|
73 | |||
71 | Per-repository configuration options only apply in a |
|
74 | Per-repository configuration options only apply in a | |
72 | particular repository. This file is not version-controlled, and |
|
75 | particular repository. This file is not version-controlled, and | |
@@ -102,6 +105,13 b' is running. Options in these files apply' | |||||
102 | executed by any user in any directory. Options in these files |
|
105 | executed by any user in any directory. Options in these files | |
103 | override per-installation options. |
|
106 | override per-installation options. | |
104 |
|
107 | |||
|
108 | Mercurial comes with some default configuration. The default configuration | |||
|
109 | files are installed with Mercurial and will be overwritten on upgrades. Default | |||
|
110 | configuration files should never be edited by users or administrators but can | |||
|
111 | be overridden in other configuration files. So far the directory only contains | |||
|
112 | merge tool configuration but packagers can also put other default configuration | |||
|
113 | there. | |||
|
114 | ||||
105 | Syntax |
|
115 | Syntax | |
106 | ====== |
|
116 | ====== | |
107 |
|
117 |
@@ -495,7 +495,13 b' def walkrepos(path, followsym=False, see' | |||||
495 |
|
495 | |||
496 | def osrcpath(): |
|
496 | def osrcpath(): | |
497 | '''return default os-specific hgrc search path''' |
|
497 | '''return default os-specific hgrc search path''' | |
498 | path = systemrcpath() |
|
498 | path = [] | |
|
499 | defaultpath = os.path.join(util.datapath, 'default.d') | |||
|
500 | if os.path.isdir(defaultpath): | |||
|
501 | for f, kind in osutil.listdir(defaultpath): | |||
|
502 | if f.endswith('.rc'): | |||
|
503 | path.append(os.path.join(defaultpath, f)) | |||
|
504 | path.extend(systemrcpath()) | |||
499 | path.extend(userrcpath()) |
|
505 | path.extend(userrcpath()) | |
500 | path = [os.path.normpath(f) for f in path] |
|
506 | path = [os.path.normpath(f) for f in path] | |
501 | return path |
|
507 | return path |
@@ -517,6 +517,7 b' cygwinccompiler.Mingw32CCompiler = Hacke' | |||||
517 |
|
517 | |||
518 | packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo', |
|
518 | packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo', | |
519 | 'help/*.txt', |
|
519 | 'help/*.txt', | |
|
520 | 'default.d/*.rc', | |||
520 | 'dummycert.pem']} |
|
521 | 'dummycert.pem']} | |
521 |
|
522 | |||
522 | def ordinarypath(p): |
|
523 | def ordinarypath(p): |
General Comments 0
You need to be logged in to leave comments.
Login now