# HG changeset patch # User Martin von Zweigbergk # Date 1604426162 28800 # Node ID 9ac96b9fa76eb6a92e9c70a6fb14b0bc3041580a # Parent 793976f9029cc551cdc3538c8a8960f085ea51be config: read system hgrc in lexicographical order This is similar to edbcf5b239f9 (config: read configs from directories in lexicographical order, 2019-04-03). Apparently I forgot to sort the system hgrc files there. That's fixed by this patch. Differential Revision: https://phab.mercurial-scm.org/D9269 diff -r 793976f9029c -r 9ac96b9fa76e mercurial/scmposix.py --- a/mercurial/scmposix.py Sun Nov 08 20:12:32 2020 +0100 +++ b/mercurial/scmposix.py Tue Nov 03 09:56:02 2020 -0800 @@ -27,7 +27,7 @@ rcs.extend( [ os.path.join(rcdir, f) - for f, kind in util.listdir(rcdir) + for f, kind in sorted(util.listdir(rcdir)) if f.endswith(b".rc") ] ) diff -r 793976f9029c -r 9ac96b9fa76e mercurial/scmwindows.py --- a/mercurial/scmwindows.py Sun Nov 08 20:12:32 2020 +0100 +++ b/mercurial/scmwindows.py Tue Nov 03 09:56:02 2020 -0800 @@ -31,7 +31,7 @@ def _processdir(progrcd): if os.path.isdir(progrcd): - for f, kind in util.listdir(progrcd): + for f, kind in sorted(util.listdir(progrcd)): if f.endswith(b'.rc'): rcpath.append(os.path.join(progrcd, f))