mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-03 08:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Worktree: handle files being renamed to overwrite dirs

Browse source
This commit is contained in:
Max Brunsfeld 2021-04-19 13:07:32 -07:00
parent 47f0b94d0c
commit e44a59dc7d
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
zed/src/worktree.rs
View file

@ -282,8 +282,6 @@ impl Snapshot {
*children = new_children.into(); *children = new_children.into();
edits.push(Edit::Insert(parent_entry)); edits.push(Edit::Insert(parent_entry));
} else {
unreachable!();
} }
if let Some(entry_inode) = entry_inode { if let Some(entry_inode) = entry_inode {
@ -1153,11 +1151,24 @@ mod tests {
.filter(|d| !d.starts_with(old_path)) .filter(|d| !d.starts_with(old_path))
.choose(rng) .choose(rng)
.unwrap(); .unwrap();
let new_path = new_path_parent.join(gen_name(rng));
let overwrite_existing_dir =
!old_path.starts_with(&new_path_parent) && rng.gen_bool(0.3);
let new_path = if overwrite_existing_dir {
fs::remove_dir_all(&new_path_parent).ok();
new_path_parent.to_path_buf()
} else {
new_path_parent.join(gen_name(rng))
};
log::info!( log::info!(
"Renaming {:?} to {:?}", "Renaming {:?} to {}{:?}",
old_path.strip_prefix(&root_path)?, old_path.strip_prefix(&root_path)?,
if overwrite_existing_dir {
"overwrite "
} else {
""
},
new_path.strip_prefix(&root_path)? new_path.strip_prefix(&root_path)?
); );
fs::rename(&old_path, &new_path)?; fs::rename(&old_path, &new_path)?;