jcdickinson/pijul - Change SQVWP4LU7AAJSEIHK5CNNUK3XBUVT3FGIJIOPTKMR53PO2P4ARNQC

When clone fails, only remove directories we have created (not other directories)

Created by pmeunier on January 13, 2021

SQVWP4LU7AAJSEIHK5CNNUK3XBUVT3FGIJIOPTKMR53PO2P4ARNQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/clone.rs at line 60 [5.182891]

B:BD[4.1] → [4.1:35]

        let path_ = path.clone();

[4.1]

[4.35]

        let repo_path = RepoPath::new(path.clone());
        let repo_path_ = repo_path.clone();

Replacement in pijul/src/commands/clone.rs at line 63 [5.182891]

B:BD[4.72] → [4.72:131]

            std::fs::remove_dir_all(&path_).unwrap_or(());

[4.72]

[2.1705]

            if repo_path_.remove {
                std::fs::remove_dir_all(&repo_path_.path).unwrap_or(());
            }

Replacement in pijul/src/commands/clone.rs at line 70 [5.182891]

B:BD[4.167] → [3.0:62]

∅:D[3.62] → [4.167:207]

B:BD[4.167] → [4.167:207]

        let mut repo = Repository::init(Some(path.clone()))?;
        let repo_path = RepoPath(path);

[4.167]

[5.184784]

        let mut repo = Repository::init(Some(path))?;

Replacement in pijul/src/commands/clone.rs at line 129 [5.182891]

B:BD[4.316] → [4.316:342]

struct RepoPath(PathBuf);

[4.316]

[4.342]

#[derive(Debug, Clone)]
struct RepoPath {
    path: PathBuf,
    remove: bool,
}
impl RepoPath {
    fn new(path: PathBuf) -> Self {
        RepoPath {
            remove: std::fs::metadata(&path).is_err(),
            path,
        }
    }
}

Replacement in pijul/src/commands/clone.rs at line 146 [5.182891]

B:BD[4.393] → [4.393:449]

        std::fs::remove_dir_all(&self.0).unwrap_or(());

[4.393]

[4.449]

        if self.remove {
            std::fs::remove_dir_all(&self.path).unwrap_or(());
        }