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

cli: check that clone target is an empty dir if it exists

Browse source 
We used to check only if the destination already had a `.jj/`
directory. This patch changes that to check that the destination is an
empty directory.

Closes #399.
This commit is contained in:
Martin von Zweigbergk 2022-06-29 21:55:20 -07:00 committed by Martin von Zweigbergk
parent 5d871810a1
commit a2b4bd239f
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/commands.rs
View file

@ -4964,6 +4964,14 @@ fn clone_destination_for_source(source: &str) -> Option<&str> {
.map(|(_, name)| name) .map(|(_, name)| name)
} }
fn is_empty_dir(path: &Path) -> bool {
if let Ok(mut entries) = path.read_dir() {
entries.next().is_none()
} else {
false
}
}
fn cmd_git_clone( fn cmd_git_clone(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
@ -4986,7 +4994,11 @@ fn cmd_git_clone(
})?; })?;
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()); if !is_empty_dir(&wc_path) {
return Err(CommandError::UserError(
"Destination path exists and is not an empty directory".to_string(),
));
}
} else { } else {
fs::create_dir(&wc_path).unwrap(); fs::create_dir(&wc_path).unwrap();
} }

20
tests/test_git_clone.rs
View file

@ -61,24 +61,20 @@ fn test_git_clone() {
// Try cloning into an existing workspace // Try cloning into an existing workspace
let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["git", "clone", "source", "clone"]); let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["git", "clone", "source", "clone"]);
insta::assert_snapshot!(stderr.replace(test_env.env_root().join("clone").to_str().unwrap(), "<dest>"), @r###" insta::assert_snapshot!(stderr.replace(test_env.env_root().join("clone").to_str().unwrap(), "<dest>"), @r###"
Error: The target repo already exists Error: Destination path exists and is not an empty directory
"###); "###);
// Try cloning into an existing file // Try cloning into an existing file
std::fs::write(test_env.env_root().join("file"), "contents").unwrap(); std::fs::write(test_env.env_root().join("file"), "contents").unwrap();
// TODO: This shouldn't crash (i.e. not exit code 101) let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["git", "clone", "source", "file"]);
test_env insta::assert_snapshot!(stderr.replace(test_env.env_root().join("file").to_str().unwrap(), "<dest>"), @r###"
.jj_cmd(test_env.env_root(), &["git", "clone", "source", "file"]) Error: Destination path exists and is not an empty directory
.assert() "###);
.code(101);
// Try cloning into non-empty, non-workspace directory // Try cloning into non-empty, non-workspace directory
std::fs::remove_dir_all(test_env.env_root().join("clone").join(".jj")).unwrap(); std::fs::remove_dir_all(test_env.env_root().join("clone").join(".jj")).unwrap();
// TODO: This should fail (https://github.com/martinvonz/jj/issues/399) let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["git", "clone", "source", "clone"]);
let stdout = test_env.jj_cmd_success(test_env.env_root(), &["git", "clone", "source", "clone"]); insta::assert_snapshot!(stderr.replace(test_env.env_root().join("clone").to_str().unwrap(), "<dest>"), @r###"
insta::assert_snapshot!(stdout.replace(test_env.env_root().join("clone").to_str().unwrap(), "<dest>"), @r###" Error: Destination path exists and is not an empty directory
Fetching into new repo in "<dest>"
Working copy now at: b56015e38065 (no description set)
Added 1 files, modified 0 files, removed 0 files
"###); "###);
} }