This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10111

rhg: Sort config files when adding a directory
ClosedPublic

Authored by SimonSapin on Mar 4 2021, 6:11 AM.

Details

Reviewers
Alphare
marmoute
Group Reviewers
hg-reviewers
Commits
rHG60fe9ebae29b: rhg: Sort config files when adding a directory
Summary

For example in /etc/mercurial/hgrc.d/ or with HGRCPATH=some-directory.
Previously files where parsed in the order returned by the filesystem,
which is undefined. But order is significant when multiple files
define the same configuration key: the "last" one wins.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Mar 4 2021, 6:11 AM
baymax updated this revision to Diff 26078.Mar 4 2021, 8:00 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Mar 5 2021, 4:04 AM
baymax updated this revision to Diff 26189.Mar 9 2021, 8:39 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute accepted this revision.Mar 9 2021, 1:07 PM
SimonSapin edited the summary of this revision. (Show Details)Mar 12 2021, 5:06 PM
SimonSapin updated this revision to Diff 26291.
SimonSapin added a commit: rHG60fe9ebae29b: rhg: Sort config files when adding a directory.Mar 16 2021, 5:45 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG60fe9ebae29b: rhg: Sort config files when adding a directory (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/config/config.rs (9 lines)

Diff 26413

rust/hg-core/src/config/config.rs

Ok(config) Ok(config)
} }
fn add_trusted_dir(&mut self, path: &Path) -> Result<(), ConfigError> { fn add_trusted_dir(&mut self, path: &Path) -> Result<(), ConfigError> {
if let Some(entries) = std::fs::read_dir(path) if let Some(entries) = std::fs::read_dir(path)
.when_reading_file(path) .when_reading_file(path)
.io_not_found_as_none()? .io_not_found_as_none()?
{ {
for entry in entries { let mut file_paths = entries
let file_path = entry.when_reading_file(path)?.path(); .map(|result| {
result.when_reading_file(path).map(|entry| entry.path())
})
.collect::<Result<Vec<_>, _>>()?;
file_paths.sort();
for file_path in &file_paths {
if file_path.extension() == Some(std::ffi::OsStr::new("rc")) { if file_path.extension() == Some(std::ffi::OsStr::new("rc")) {
self.add_trusted_file(&file_path)? self.add_trusted_file(&file_path)?
} }
} }
} }
Ok(()) Ok(())
} }