Mercurial > hg
changeset 42093:edbcf5b239f9
config: read configs from directories in lexicographical order
Mercurial currently reads the .rc files specified in HGRCPATH (and the
system-default paths) in directory order, which is unspecified. My
team at work maintains a set of .rc files. So far there has been no
overlap between them, so we had not noticed this behavior. However, we
would now like to release some common .rc files and then have another
one per plaform with platform-specific overrides. It would be nice if
we can determine the load order by choosing names carefully. This
patch enables that by loading the .rc files in lexicographical order.
Before this patch, the added test case would consistently say "30" on
my file system (whatever I have -- some Linux FS).
Differential Revision: https://phab.mercurial-scm.org/D6193
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 03 Apr 2019 16:03:41 -0700 |
| parents | 91cc8dc866ed |
| children | b1b216a241cc |
| files | mercurial/rcutil.py tests/test-config.t |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/rcutil.py Wed Apr 03 17:41:58 2019 -0700 +++ b/mercurial/rcutil.py Wed Apr 03 16:03:41 2019 -0700 @@ -29,7 +29,8 @@ p = util.expandpath(path) if os.path.isdir(p): join = os.path.join - return [join(p, f) for f, k in util.listdir(p) if f.endswith('.rc')] + return sorted(join(p, f) for f, k in util.listdir(p) + if f.endswith('.rc')) return [p] def envrcitems(env=None):
--- a/tests/test-config.t Wed Apr 03 17:41:58 2019 -0700 +++ b/tests/test-config.t Wed Apr 03 16:03:41 2019 -0700 @@ -211,3 +211,12 @@ $ hg log --template '{author}\n' repo user $ cd .. + +configs should be read in lexicographical order + + $ mkdir configs + $ for i in `$TESTDIR/seq.py 10 99`; do + > printf "[section]\nkey=$i" > configs/$i.rc + > done + $ HGRCPATH=configs hg config section.key + 99