This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10141

rhg: Silently ignore missing files in config %include
ClosedPublic

Authored by SimonSapin on Mar 9 2021, 4:41 AM.

Details

Reviewers
marmoute
Alphare
Group Reviewers
hg-reviewers
Commits
rHG84a3deca963a: rhg: Silently ignore missing files in config %include
Summary

… instead of aborting with an error message.
This is what Python-based hg does.

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 9 2021, 4:41 AM
baymax updated this revision to Diff 26200.Mar 9 2021, 8:40 AM

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

marmoute accepted this revision.Mar 9 2021, 1:24 PM
marmoute added a subscriber: marmoute.

This is what the python code does.

Alphare accepted this revision.Mar 10 2021, 4:07 AM
SimonSapin edited the summary of this revision. (Show Details)Mar 12 2021, 5:07 PM
baymax updated this revision to Diff 26347.Mar 15 2021, 9:10 AM

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

SimonSapin added a commit: rHG84a3deca963a: rhg: Silently ignore missing files in config %include.Mar 16 2021, 5:47 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG84a3deca963a: rhg: Silently ignore missing files in config %include (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/layer.rs (34 lines)

Diff 26424

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

// which `src` can’t be since we’ve managed to open it as a // which `src` can’t be since we’ve managed to open it as a
// file. // file.
let dir = src let dir = src
.parent() .parent()
.expect("Path::parent fail on a file we’ve read"); .expect("Path::parent fail on a file we’ve read");
// `Path::join` with an absolute argument correctly ignores the // `Path::join` with an absolute argument correctly ignores the
// base path // base path
let filename = dir.join(&get_path_from_bytes(&filename_bytes)); let filename = dir.join(&get_path_from_bytes(&filename_bytes));
let data = std::fs::read(&filename).map_err(|io_error| { match std::fs::read(&filename) {
ConfigParseError { Ok(data) => {
layers.push(current_layer);
layers.extend(Self::parse(&filename, &data)?);
current_layer =
Self::new(ConfigOrigin::File(src.to_owned()));
}
Err(error) => {
if error.kind() != std::io::ErrorKind::NotFound {
return Err(ConfigParseError {
origin: ConfigOrigin::File(src.to_owned()), origin: ConfigOrigin::File(src.to_owned()),
line, line,
message: format_bytes!( message: format_bytes!(
b"cannot include {} ({})", b"cannot include {} ({})",
filename_bytes, filename_bytes,
format_bytes::Utf8(io_error) format_bytes::Utf8(error)
), ),
} }
})?; .into());
layers.push(current_layer); }
layers.extend(Self::parse(&filename, &data)?); }
current_layer = Self::new(ConfigOrigin::File(src.to_owned())); }
} else if let Some(_) = EMPTY_RE.captures(&bytes) { } else if let Some(_) = EMPTY_RE.captures(&bytes) {
} else if let Some(m) = SECTION_RE.captures(&bytes) { } else if let Some(m) = SECTION_RE.captures(&bytes) {
section = m[1].to_vec(); section = m[1].to_vec();
} else if let Some(m) = ITEM_RE.captures(&bytes) { } else if let Some(m) = ITEM_RE.captures(&bytes) {
let item = m[1].to_vec(); let item = m[1].to_vec();
let mut value = m[2].to_vec(); let mut value = m[2].to_vec();
loop { loop {
match lines_iter.peek() { match lines_iter.peek() {