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

cli_util: make resolve_aliases() take only settings, not whole ui

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-11-13 23:58:04 -08:00 committed by Martin von Zweigbergk
parent 8d7a9e729b
commit c7b90bbe1c
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/cli_util.rs
View file

@ -1246,7 +1246,7 @@ fn string_list_from_config(value: config::Value) -> Option<Vec<String>> {
} }
fn resolve_aliases( fn resolve_aliases(
ui: &mut Ui, user_settings: &UserSettings,
app: &clap::Command, app: &clap::Command,
string_args: &[String], string_args: &[String],
) -> Result<Vec<String>, CommandError> { ) -> Result<Vec<String>, CommandError> {
@ -1275,8 +1275,7 @@ fn resolve_aliases(
r#"Recursive alias definition involving "{alias_name}""# r#"Recursive alias definition involving "{alias_name}""#
))); )));
} }
match ui match user_settings
.settings()
.config() .config()
.get::<config::Value>(&format!("alias.{}", alias_name)) .get::<config::Value>(&format!("alias.{}", alias_name))
{ {
@ -1322,7 +1321,7 @@ pub fn parse_args(
} }
} }
let string_args = resolve_aliases(ui, &app, &string_args)?; let string_args = resolve_aliases(ui.settings(), &app, &string_args)?;
let matches = app.clone().try_get_matches_from(&string_args)?; let matches = app.clone().try_get_matches_from(&string_args)?;
let mut args: Args = Args::from_arg_matches(&matches).unwrap(); let mut args: Args = Args::from_arg_matches(&matches).unwrap();