mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-11 15:07:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

cli_util: don't clone arguments when resolving default command

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-07-06 01:52:11 -07:00 committed by Martin von Zweigbergk
parent 1094109dfb
commit b3691e93fb
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cli_util.rs
View file

@ -2177,22 +2177,22 @@ fn resolve_default_command(
ui: &mut Ui,
config: &config::Config,
app: &Command,
string_args: &mut Vec<String>,
) -> Result<(), CommandError> {
mut string_args: Vec<String>,
) -> Result<Vec<String>, CommandError> {
const PRIORITY_FLAGS: &[&str] = &["help", "--help", "-h", "--version", "-V"];
let has_priority_flag = string_args
.iter()
.any(|arg| PRIORITY_FLAGS.contains(&arg.as_str()));
if has_priority_flag {
return Ok(());
return Ok(string_args);
}
let app_clone = app
.clone()
.allow_external_subcommands(true)
.ignore_errors(true);
let matches = app_clone.try_get_matches_from(string_args.clone()).ok();
let matches = app_clone.try_get_matches_from(&string_args).ok();
if let Some(matches) = matches {
if matches.subcommand_name().is_none() {
@ -2213,7 +2213,7 @@ fn resolve_default_command(
string_args.insert(1, default_command);
}
}
Ok(())
Ok(string_args)
}
fn resolve_aliases(
@ -2326,7 +2326,7 @@ pub fn expand_args(
}
}
resolve_default_command(ui, config, app, &mut string_args)?;
let string_args = resolve_default_command(ui, config, app, string_args)?;
resolve_aliases(config, app, string_args)
}