mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-29 23:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

cli: resolve command alias without using UserSettings, use config::Config

Browse source 
For the same reason as the previous commit. -R/--repository can't be parsed
until the real command name gets available.
This commit is contained in:
Yuya Nishihara 2023-01-05 14:52:12 +09:00
parent d0d92a0e06
commit b3c792f7bf
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cli_util.rs
View file

@ -1547,14 +1547,11 @@ impl ValueParserFactory for RevisionArg {
} }
fn resolve_aliases( fn resolve_aliases(
user_settings: &UserSettings, config: &config::Config,
app: &clap::Command, app: &clap::Command,
string_args: &[String], string_args: &[String],
) -> Result<Vec<String>, CommandError> { ) -> Result<Vec<String>, CommandError> {
let mut aliases_map = user_settings let mut aliases_map = config.get_table("alias").unwrap_or_default();
.config()
.get_table("alias")
.unwrap_or_default();
let mut resolved_aliases = HashSet::new(); let mut resolved_aliases = HashSet::new();
let mut string_args = string_args.to_vec(); let mut string_args = string_args.to_vec();
let mut real_commands = HashSet::new(); let mut real_commands = HashSet::new();
@ -1631,7 +1628,7 @@ fn handle_early_args(
pub fn expand_args( pub fn expand_args(
app: &clap::Command, app: &clap::Command,
args_os: ArgsOs, args_os: ArgsOs,
settings: &UserSettings, config: &config::Config,
) -> Result<Vec<String>, CommandError> { ) -> Result<Vec<String>, CommandError> {
let mut string_args: Vec<String> = vec![]; let mut string_args: Vec<String> = vec![];
for arg_os in args_os { for arg_os in args_os {
@ -1642,7 +1639,7 @@ pub fn expand_args(
} }
} }
resolve_aliases(settings, app, &string_args) resolve_aliases(config, app, &string_args)
} }
pub fn parse_args( pub fn parse_args(
@ -1785,7 +1782,7 @@ impl CliRunner {
let cwd = env::current_dir().unwrap(); // TODO: maybe map_err to CommandError? let cwd = env::current_dir().unwrap(); // TODO: maybe map_err to CommandError?
let mut settings = crate::config::read_config()?; let mut settings = crate::config::read_config()?;
ui.reset(settings.config()); ui.reset(settings.config());
let string_args = expand_args(&self.app, std::env::args_os(), &settings)?; let string_args = expand_args(&self.app, std::env::args_os(), settings.config())?;
let (matches, args) = parse_args( let (matches, args) = parse_args(
ui, ui,
&self.app, &self.app,