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

cli: move definition of global arguments to separate struct

Browse source 
By having the global arguments on a separate struct, I think it will
be easier to improve how we resolve aliases (#292).
This commit is contained in:
Martin von Zweigbergk 2022-05-01 08:46:47 -07:00 committed by Martin von Zweigbergk
parent f5f363f079
commit 0bbf360432
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/commands.rs
View file

@ -201,24 +201,24 @@ impl From<FilePathParseError> for CommandError {
struct CommandHelper<'help> { struct CommandHelper<'help> {
app: clap::Command<'help>, app: clap::Command<'help>,
string_args: Vec<String>, string_args: Vec<String>,
args: Args, global_args: GlobalArgs,
} }
impl<'help> CommandHelper<'help> { impl<'help> CommandHelper<'help> {
fn new(app: clap::Command<'help>, string_args: Vec<String>, root_args: Args) -> Self { fn new(app: clap::Command<'help>, string_args: Vec<String>, global_args: GlobalArgs) -> Self {
Self { Self {
app, app,
string_args, string_args,
args: root_args, global_args,
} }
} }
fn args(&self) -> &Args { fn global_args(&self) -> &GlobalArgs {
&self.args &self.global_args
} }
fn workspace_helper(&self, ui: &mut Ui) -> Result<WorkspaceCommandHelper, CommandError> { fn workspace_helper(&self, ui: &mut Ui) -> Result<WorkspaceCommandHelper, CommandError> {
let wc_path_str = self.args.repository.as_deref().unwrap_or("."); let wc_path_str = self.global_args.repository.as_deref().unwrap_or(".");
let wc_path = ui.cwd().join(wc_path_str); let wc_path = ui.cwd().join(wc_path_str);
let workspace = match Workspace::load(ui.settings(), wc_path) { let workspace = match Workspace::load(ui.settings(), wc_path) {
Ok(workspace) => workspace, Ok(workspace) => workspace,
@ -245,7 +245,7 @@ jj init --git-repo=.";
let op_heads = resolve_op_for_load( let op_heads = resolve_op_for_load(
repo_loader.op_store(), repo_loader.op_store(),
repo_loader.op_heads_store(), repo_loader.op_heads_store(),
&self.args.at_operation, &self.global_args.at_operation,
)?; )?;
let repo = match op_heads { let repo = match op_heads {
OpHeads::Single(op) => repo_loader.load_at(&op), OpHeads::Single(op) => repo_loader.load_at(&op),
@ -292,7 +292,7 @@ jj init --git-repo=.";
ui, ui,
workspace, workspace,
self.string_args.clone(), self.string_args.clone(),
&self.args, &self.global_args,
repo, repo,
) )
} }
@ -316,11 +316,11 @@ impl WorkspaceCommandHelper {
ui: &mut Ui, ui: &mut Ui,
workspace: Workspace, workspace: Workspace,
string_args: Vec<String>, string_args: Vec<String>,
root_args: &Args, global_args: &GlobalArgs,
repo: Arc<ReadonlyRepo>, repo: Arc<ReadonlyRepo>,
) -> Result<Self, CommandError> { ) -> Result<Self, CommandError> {
let loaded_at_head = &root_args.at_operation == "@"; let loaded_at_head = &global_args.at_operation == "@";
let may_update_working_copy = loaded_at_head && !root_args.no_commit_working_copy; let may_update_working_copy = loaded_at_head && !global_args.no_commit_working_copy;
let mut working_copy_shared_with_git = false; let mut working_copy_shared_with_git = false;
let maybe_git_repo = repo.store().git_repo(); let maybe_git_repo = repo.store().git_repo();
if let Some(git_workdir) = maybe_git_repo if let Some(git_workdir) = maybe_git_repo
@ -1049,8 +1049,14 @@ fn update_working_copy(
.help_heading("GLOBAL OPTIONS") .help_heading("GLOBAL OPTIONS")
}))] }))]
struct Args { struct Args {
#[clap(flatten)]
global_args: GlobalArgs,
#[clap(subcommand)] #[clap(subcommand)]
command: Commands, command: Commands,
}
#[derive(clap::Args, Clone, Debug)]
struct GlobalArgs {
/// Path to repository to operate on /// Path to repository to operate on
/// ///
/// By default, Jujutsu searches for the closest .jj/ directory in an /// By default, Jujutsu searches for the closest .jj/ directory in an
@ -2015,7 +2021,7 @@ fn add_to_git_exclude(ui: &mut Ui, git_repo: &git2::Repository) -> Result<(), Co
} }
fn cmd_init(ui: &mut Ui, command: &CommandHelper, args: &InitArgs) -> Result<(), CommandError> { fn cmd_init(ui: &mut Ui, command: &CommandHelper, args: &InitArgs) -> Result<(), CommandError> {
if command.args().repository.is_some() { if command.global_args().repository.is_some() {
return Err(CommandError::UserError( return Err(CommandError::UserError(
"'--repository' cannot be used with 'init'".to_string(), "'--repository' cannot be used with 'init'".to_string(),
)); ));
@ -4527,7 +4533,7 @@ fn cmd_workspace_add(
ui, ui,
new_workspace, new_workspace,
command.string_args.clone(), command.string_args.clone(),
command.args(), command.global_args(),
repo, repo,
)?; )?;
let mut tx = new_workspace_command let mut tx = new_workspace_command
@ -4757,7 +4763,7 @@ fn cmd_git_clone(
command: &CommandHelper, command: &CommandHelper,
args: &GitCloneArgs, args: &GitCloneArgs,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
if command.args().repository.is_some() { if command.global_args().repository.is_some() {
return Err(CommandError::UserError( return Err(CommandError::UserError(
"'--repository' cannot be used with 'git clone'".to_string(), "'--repository' cannot be used with 'git clone'".to_string(),
)); ));
@ -5077,7 +5083,7 @@ where
let string_args = resolve_alias(ui.settings(), string_args)?; let string_args = resolve_alias(ui.settings(), string_args)?;
let app = Args::command(); let app = Args::command();
let args: Args = clap::Parser::parse_from(&string_args); let args: Args = clap::Parser::parse_from(&string_args);
let command_helper = CommandHelper::new(app, string_args, args.clone()); let command_helper = CommandHelper::new(app, string_args, args.global_args.clone());
match &args.command { match &args.command {
Commands::Init(sub_args) => cmd_init(ui, &command_helper, sub_args), Commands::Init(sub_args) => cmd_init(ui, &command_helper, sub_args),
Commands::Checkout(sub_args) => cmd_checkout(ui, &command_helper, sub_args), Commands::Checkout(sub_args) => cmd_checkout(ui, &command_helper, sub_args),