mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 07:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

cli: rename ConfigArgs to ConfigLevelArgs

Browse source
This commit is contained in:
Yuya Nishihara 2024-05-12 22:19:01 +09:00
parent 95593598d5
commit 717b42245c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cli/src/commands/config.rs
View file

@ -31,7 +31,7 @@ use crate::ui::Ui;
#[derive(clap::Args, Clone, Debug)]
#[command(group = clap::ArgGroup::new("config_level").multiple(false).required(true))]
pub(crate) struct ConfigArgs {
pub(crate) struct ConfigLevelArgs {
/// Target the user-level config
#[arg(long, group = "config_level")]
user: bool,
@ -41,7 +41,7 @@ pub(crate) struct ConfigArgs {
repo: bool,
}
impl ConfigArgs {
impl ConfigLevelArgs {
fn get_source_kind(&self) -> ConfigSource {
if self.user {
ConfigSource::User
@ -145,7 +145,7 @@ pub(crate) struct ConfigSetArgs {
#[arg(required = true)]
value: String,
#[command(flatten)]
config_args: ConfigArgs,
level: ConfigLevelArgs,
}
/// Start an editor on a jj config file.
@ -155,7 +155,7 @@ pub(crate) struct ConfigSetArgs {
#[derive(clap::Args, Clone, Debug)]
pub(crate) struct ConfigEditArgs {
#[command(flatten)]
pub config_args: ConfigArgs,
pub level: ConfigLevelArgs,
}
/// Print the path to the config file
@ -166,7 +166,7 @@ pub(crate) struct ConfigEditArgs {
#[derive(clap::Args, Clone, Debug)]
pub(crate) struct ConfigPathArgs {
#[command(flatten)]
pub config_args: ConfigArgs,
pub level: ConfigLevelArgs,
}
#[instrument(skip_all)]
@ -309,7 +309,7 @@ pub(crate) fn cmd_config_set(
command: &CommandHelper,
args: &ConfigSetArgs,
) -> Result<(), CommandError> {
let config_path = get_new_config_file_path(&args.config_args.get_source_kind(), command)?;
let config_path = get_new_config_file_path(&args.level.get_source_kind(), command)?;
if config_path.is_dir() {
return Err(user_error(format!(
"Can't set config in path {path} (dirs not supported)",
@ -325,7 +325,7 @@ pub(crate) fn cmd_config_edit(
command: &CommandHelper,
args: &ConfigEditArgs,
) -> Result<(), CommandError> {
let config_path = get_new_config_file_path(&args.config_args.get_source_kind(), command)?;
let config_path = get_new_config_file_path(&args.level.get_source_kind(), command)?;
run_ui_editor(command.settings(), &config_path)
}
@ -335,7 +335,7 @@ pub(crate) fn cmd_config_path(
command: &CommandHelper,
args: &ConfigPathArgs,
) -> Result<(), CommandError> {
let config_path = get_new_config_file_path(&args.config_args.get_source_kind(), command)?;
let config_path = get_new_config_file_path(&args.level.get_source_kind(), command)?;
writeln!(
ui.stdout(),
"{}",