cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-20 14:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: remove unused intermediate-level ArgMatches arguments

Browse Source
This commit is contained in:
Martin von Zweigbergk 2021-10-20 16:51:27 -07:00
parent 9a3127e659
commit fa09f1531d
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/commands.rs
View File

@ -3209,7 +3209,6 @@ fn format_timestamp(timestamp: &Timestamp) -> String {
fn cmd_op_log( fn cmd_op_log(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
_op_matches: &ArgMatches,
_cmd_matches: &ArgMatches, _cmd_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let repo_command = command.repo_helper(ui)?; let repo_command = command.repo_helper(ui)?;
@ -3283,7 +3282,6 @@ fn cmd_op_log(
fn cmd_op_undo( fn cmd_op_undo(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
_op_matches: &ArgMatches,
cmd_matches: &ArgMatches, cmd_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut repo_command = command.repo_helper(ui)?; let mut repo_command = command.repo_helper(ui)?;
@ -3312,7 +3310,6 @@ fn cmd_op_undo(
fn cmd_op_restore( fn cmd_op_restore(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
_op_matches: &ArgMatches,
_cmd_matches: &ArgMatches, _cmd_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut repo_command = command.repo_helper(ui)?; let mut repo_command = command.repo_helper(ui)?;
@ -3332,11 +3329,11 @@ fn cmd_operation(
sub_matches: &ArgMatches, sub_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
if let Some(command_matches) = sub_matches.subcommand_matches("log") { if let Some(command_matches) = sub_matches.subcommand_matches("log") {
cmd_op_log(ui, command, sub_matches, command_matches)?; cmd_op_log(ui, command, command_matches)?;
} else if let Some(command_matches) = sub_matches.subcommand_matches("undo") { } else if let Some(command_matches) = sub_matches.subcommand_matches("undo") {
cmd_op_undo(ui, command, sub_matches, command_matches)?; cmd_op_undo(ui, command, command_matches)?;
} else if let Some(command_matches) = sub_matches.subcommand_matches("restore") { } else if let Some(command_matches) = sub_matches.subcommand_matches("restore") {
cmd_op_restore(ui, command, sub_matches, command_matches)?; cmd_op_restore(ui, command, command_matches)?;
} else { } else {
panic!("unhandled command: {:#?}", command.root_matches()); panic!("unhandled command: {:#?}", command.root_matches());
} }
@ -3355,13 +3352,12 @@ fn get_git_repo(store: &Store) -> Result<git2::Repository, CommandError> {
fn cmd_git_remote( fn cmd_git_remote(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
_git_matches: &ArgMatches,
remote_matches: &ArgMatches, remote_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
if let Some(command_matches) = remote_matches.subcommand_matches("add") { if let Some(command_matches) = remote_matches.subcommand_matches("add") {
cmd_git_remote_add(ui, command, remote_matches, remote_matches, command_matches)?; cmd_git_remote_add(ui, command, command_matches)?;
} else if let Some(command_matches) = remote_matches.subcommand_matches("remove") { } else if let Some(command_matches) = remote_matches.subcommand_matches("remove") {
cmd_git_remote_remove(ui, command, remote_matches, remote_matches, command_matches)?; cmd_git_remote_remove(ui, command, command_matches)?;
} else { } else {
panic!("unhandled command: {:#?}", command.root_matches()); panic!("unhandled command: {:#?}", command.root_matches());
} }
@ -3371,8 +3367,6 @@ fn cmd_git_remote(
fn cmd_git_remote_add( fn cmd_git_remote_add(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
_git_matches: &ArgMatches,
_remote_matches: &ArgMatches,
cmd_matches: &ArgMatches, cmd_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let repo_command = command.repo_helper(ui)?; let repo_command = command.repo_helper(ui)?;
@ -3392,8 +3386,6 @@ fn cmd_git_remote_add(
fn cmd_git_remote_remove( fn cmd_git_remote_remove(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
_git_matches: &ArgMatches,
_remote_matches: &ArgMatches,
cmd_matches: &ArgMatches, cmd_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut repo_command = command.repo_helper(ui)?; let mut repo_command = command.repo_helper(ui)?;
@ -3425,7 +3417,6 @@ fn cmd_git_remote_remove(
fn cmd_git_fetch( fn cmd_git_fetch(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
_git_matches: &ArgMatches,
cmd_matches: &ArgMatches, cmd_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut repo_command = command.repo_helper(ui)?; let mut repo_command = command.repo_helper(ui)?;
@ -3450,7 +3441,6 @@ fn clone_destination_for_source(source: &str) -> Option<&str> {
fn cmd_git_clone( fn cmd_git_clone(
ui: &mut Ui, ui: &mut Ui,
_command: &CommandHelper, _command: &CommandHelper,
_git_matches: &ArgMatches,
cmd_matches: &ArgMatches, cmd_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let source = cmd_matches.value_of("source").unwrap(); let source = cmd_matches.value_of("source").unwrap();
@ -3507,7 +3497,6 @@ fn cmd_git_clone(
fn cmd_git_push( fn cmd_git_push(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
_git_matches: &ArgMatches,
cmd_matches: &ArgMatches, cmd_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut repo_command = command.repo_helper(ui)?; let mut repo_command = command.repo_helper(ui)?;
@ -3614,7 +3603,6 @@ fn cmd_git_push(
fn cmd_git_import( fn cmd_git_import(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
_git_matches: &ArgMatches,
_cmd_matches: &ArgMatches, _cmd_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut repo_command = command.repo_helper(ui)?; let mut repo_command = command.repo_helper(ui)?;
@ -3633,15 +3621,15 @@ fn cmd_git(
sub_matches: &ArgMatches, sub_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
if let Some(command_matches) = sub_matches.subcommand_matches("remote") { if let Some(command_matches) = sub_matches.subcommand_matches("remote") {
cmd_git_remote(ui, command, sub_matches, command_matches)?; cmd_git_remote(ui, command, command_matches)?;
} else if let Some(command_matches) = sub_matches.subcommand_matches("fetch") { } else if let Some(command_matches) = sub_matches.subcommand_matches("fetch") {
cmd_git_fetch(ui, command, sub_matches, command_matches)?; cmd_git_fetch(ui, command, command_matches)?;
} else if let Some(command_matches) = sub_matches.subcommand_matches("clone") { } else if let Some(command_matches) = sub_matches.subcommand_matches("clone") {
cmd_git_clone(ui, command, sub_matches, command_matches)?; cmd_git_clone(ui, command, command_matches)?;
} else if let Some(command_matches) = sub_matches.subcommand_matches("push") { } else if let Some(command_matches) = sub_matches.subcommand_matches("push") {
cmd_git_push(ui, command, sub_matches, command_matches)?; cmd_git_push(ui, command, command_matches)?;
} else if let Some(command_matches) = sub_matches.subcommand_matches("import") { } else if let Some(command_matches) = sub_matches.subcommand_matches("import") {
cmd_git_import(ui, command, sub_matches, command_matches)?; cmd_git_import(ui, command, command_matches)?;
} else { } else {
panic!("unhandled command: {:#?}", command.root_matches()); panic!("unhandled command: {:#?}", command.root_matches());
} }