This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6193

config: read configs from directories in lexicographical order
ClosedPublic

Authored by martinvonz on Apr 3 2019, 7:07 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGedbcf5b239f9: config: read configs from directories in lexicographical order
Summary

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).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 3 2019, 7:07 PM
martinvonz updated this revision to Diff 14646.Apr 3 2019, 7:07 PM
martinvonz edited the summary of this revision. (Show Details)Apr 3 2019, 7:12 PM
Closed by commit rHGedbcf5b239f9: config: read configs from directories in lexicographical order (authored by martinvonz). · Explain WhyApr 8 2019, 2:50 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/rcutil.py (3 lines)
Mtests/test-config.t (9 lines)

Diff 14646

mercurial/rcutil.py

systemrcpath = scmplatform.systemrcpath systemrcpath = scmplatform.systemrcpath
userrcpath = scmplatform.userrcpath userrcpath = scmplatform.userrcpath
def _expandrcpath(path): def _expandrcpath(path):
'''path could be a file or a directory. return a list of file paths''' '''path could be a file or a directory. return a list of file paths'''
p = util.expandpath(path) p = util.expandpath(path)
if os.path.isdir(p): if os.path.isdir(p):
join = os.path.join 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] return [p]
def envrcitems(env=None): def envrcitems(env=None):
'''Return [(section, name, value, source)] config items. '''Return [(section, name, value, source)] config items.
The config items are extracted from environment variables specified by env, The config items are extracted from environment variables specified by env,
used to override systemrc, but not userrc. used to override systemrc, but not userrc.

tests/test-config.t

> EOF > EOF
$ touch index $ touch index
$ unset HGUSER $ unset HGUSER
$ hg ci -Am test $ hg ci -Am test
adding index adding index
$ hg log --template '{author}\n' $ hg log --template '{author}\n'
repo user repo user
$ cd .. $ 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