ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: don't panic on invalid config

Browse source 
If `~/.jjconfig` is invalid, we currently simply panic. That results
in a poor error message. We should handle the error instead.

Closes #55.
This commit is contained in:
Martin von Zweigbergk 2022-02-17 22:44:14 -08:00
parent f4cadff6e1
commit 108b785a36
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/src/settings.rs
View file

@ -14,7 +14,7 @@
use std::path::Path; use std::path::Path;
#[derive(Debug, Clone)] #[derive(Debug, Clone, Default)]
pub struct UserSettings { pub struct UserSettings {
config: config::Config, config: config::Config,
} }

16
src/main.rs
View file

@ -20,8 +20,16 @@ fn main() {
// TODO: We need to do some argument parsing here, at least for things like // TODO: We need to do some argument parsing here, at least for things like
// --config, and for reading user configs from the repo pointed to by // --config, and for reading user configs from the repo pointed to by
// -R. // -R.
let user_settings = UserSettings::for_user().unwrap(); match UserSettings::for_user() {
let ui = Ui::for_terminal(user_settings); Ok(user_settings) => {
let status = dispatch(ui, &mut std::env::args_os()); let ui = Ui::for_terminal(user_settings);
std::process::exit(status); let status = dispatch(ui, &mut std::env::args_os());
std::process::exit(status);
}
Err(err) => {
let mut ui = Ui::for_terminal(UserSettings::default());
ui.write_error(&format!("Invalid config: {}\n", err))
.unwrap();
}
}
} }