( )⚙ D11759 rhg: Propagate config errors in `rhg status`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11759

rhg: Propagate config errors in `rhg status`
ClosedPublic

Authored by SimonSapin on Nov 15 2021, 12:42 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3bd62274cbc9: rhg: Propagate config errors in `rhg status`
Summary

This code was calling Result::unwrap_or instead of Option::unwrap_or
as was presumably intended.

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.Nov 15 2021, 12:42 PM
Alphare accepted this revision.Nov 24 2021, 6:24 AM
This revision is now accepted and ready to land.Nov 24 2021, 6:24 AM
SimonSapin added a commit: rHG3bd62274cbc9: rhg: Propagate config errors in `rhg status`.Nov 26 2021, 10:02 AM
Closed by commit rHG3bd62274cbc9: rhg: Propagate config errors in `rhg status` (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 31157.Nov 26 2021, 10:32 AM

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

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/commands/status.rs (9 lines)

Diff 31144

rust/rhg/src/commands/status.rs

if !status_enabled.unwrap_or(status_enabled_default) { if !status_enabled.unwrap_or(status_enabled_default) {
return Err(CommandError::unsupported( return Err(CommandError::unsupported(
"status is experimental in rhg (enable it with 'rhg.status = true' \ "status is experimental in rhg (enable it with 'rhg.status = true' \
or enable fallback with 'rhg.on-unsupported = fallback')" or enable fallback with 'rhg.on-unsupported = fallback')"
)); ));
} }
// TODO: lift these limitations // TODO: lift these limitations
if invocation.config.get_bool(b"ui", b"tweakdefaults").ok() == Some(true) { if invocation.config.get_bool(b"ui", b"tweakdefaults")? {
return Err(CommandError::unsupported( return Err(CommandError::unsupported(
"ui.tweakdefaults is not yet supported with rhg status", "ui.tweakdefaults is not yet supported with rhg status",
)); ));
} }
if invocation.config.get_bool(b"ui", b"statuscopies").ok() == Some(true) { if invocation.config.get_bool(b"ui", b"statuscopies")? {
return Err(CommandError::unsupported( return Err(CommandError::unsupported(
"ui.statuscopies is not yet supported with rhg status", "ui.statuscopies is not yet supported with rhg status",
)); ));
} }
let ui = invocation.ui; let ui = invocation.ui;
let config = invocation.config; let config = invocation.config;
let args = invocation.subcommand_args; let args = invocation.subcommand_args;
fn display_status_paths( fn display_status_paths(
ui: &Ui, ui: &Ui,
repo: &Repo, repo: &Repo,
config: &Config, config: &Config,
paths: &mut [HgPathCow], paths: &mut [HgPathCow],
status_prefix: &[u8], status_prefix: &[u8],
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
paths.sort_unstable(); paths.sort_unstable();
let mut relative: bool = let mut relative: bool = config.get_bool(b"ui", b"relative-paths")?;
config.get_bool(b"ui", b"relative-paths").unwrap_or(false);
relative = config relative = config
.get_bool(b"commands", b"status.relative") .get_option(b"commands", b"status.relative")?
.unwrap_or(relative); .unwrap_or(relative);
if relative && !ui.plain() { if relative && !ui.plain() {
relativize_paths( relativize_paths(
repo, repo,
paths, paths,
|path: Cow<[u8]>| -> Result<(), UiError> { |path: Cow<[u8]>| -> Result<(), UiError> {
ui.write_stdout( ui.write_stdout(
&[status_prefix, b" ", path.as_ref(), b"\n"].concat(), &[status_prefix, b" ", path.as_ref(), b"\n"].concat(),