mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 15:43:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

cli: guess destination for jj git clone if it's not provided

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-09-10 22:10:08 -07:00
parent 20e9d29c4b
commit 2a23ee3f15
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/commands.rs
View file

@ -1254,7 +1254,6 @@ https://github.com/martinvonz/jj/blob/main/docs/git-comparison.md.\
.arg( .arg(
Arg::with_name("destination") Arg::with_name("destination")
.index(2) .index(2)
.required(true)
.help("The directory to write the Jujutsu repo to"), .help("The directory to write the Jujutsu repo to"),
), ),
) )
@ -3227,6 +3226,14 @@ fn cmd_git_fetch(
Ok(()) Ok(())
} }
fn clone_destination_for_source(source: &str) -> Option<&str> {
let destination = source.strip_suffix(".git").unwrap_or(source);
let destination = destination.strip_suffix('/').unwrap_or(destination);
destination
.rsplit_once(&['/', '\\', ':'][..])
.map(|(_, name)| name)
}
fn cmd_git_clone( fn cmd_git_clone(
ui: &mut Ui, ui: &mut Ui,
_command: &CommandHelper, _command: &CommandHelper,
@ -3234,7 +3241,14 @@ fn cmd_git_clone(
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();
let wc_path_str = cmd_matches.value_of("destination").unwrap(); let wc_path_str = cmd_matches
.value_of("destination")
.or_else(|| clone_destination_for_source(source))
.ok_or_else(|| {
CommandError::UserError(
"No destination specified and wasn't able to guess it".to_string(),
)
})?;
let wc_path = ui.cwd().join(wc_path_str); let wc_path = ui.cwd().join(wc_path_str);
if wc_path.exists() { if wc_path.exists() {
assert!(wc_path.is_dir()); assert!(wc_path.is_dir());