cli: rename jj git refresh to jj git import

I've been planning to add a command for exporting refs to the backing
Git repo, so `jj git import` and `jj git export` seem like obvious
names then.
This commit is contained in:
Martin von Zweigbergk 2021-10-13 16:13:48 -07:00
parent 08b5193942
commit e9f57332cc

View file

@ -1149,7 +1149,7 @@ By default, all branches are pushed. Use `--branch` if you want to push only one
), ),
) )
.subcommand( .subcommand(
SubCommand::with_name("refresh") SubCommand::with_name("import")
.about("Update repo with changes made in the underlying Git repo"), .about("Update repo with changes made in the underlying Git repo"),
); );
let bench_command = SubCommand::with_name("bench") let bench_command = SubCommand::with_name("bench")
@ -3611,7 +3611,7 @@ fn cmd_git_push(
Ok(()) Ok(())
} }
fn cmd_git_refresh( fn cmd_git_import(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
_git_matches: &ArgMatches, _git_matches: &ArgMatches,
@ -3640,8 +3640,8 @@ fn cmd_git(
cmd_git_clone(ui, command, sub_matches, command_matches)?; cmd_git_clone(ui, command, sub_matches, 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, sub_matches, command_matches)?;
} else if let Some(command_matches) = sub_matches.subcommand_matches("refresh") { } else if let Some(command_matches) = sub_matches.subcommand_matches("import") {
cmd_git_refresh(ui, command, sub_matches, command_matches)?; cmd_git_import(ui, command, sub_matches, command_matches)?;
} else { } else {
panic!("unhandled command: {:#?}", command.root_matches()); panic!("unhandled command: {:#?}", command.root_matches());
} }