Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync: ensure projects get cloned when project paths go missing #119

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sync: ensure projects get cloned when project paths go missing #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,12 +586,21 @@ impl Tree {
let tree_root = std::fs::canonicalize(&self.path).context("failed to canonicalize tree path")?;
let mut paths = Vec::new();
for path in under.unwrap_or_default() {
let requested_path =
std::fs::canonicalize(&path).context(format!("failed to canonicalize requested path '{}'", path.display()))?;
paths.push(
pathdiff::diff_paths(&requested_path, &tree_root)
.ok_or_else(|| format_err!("failed to calculate path diff for {}", path.display()))?,
);
if std::fs::exists(&path)? {
let requested_path = std::fs::canonicalize(&path)
.context(format!("failed to canonicalize requested path '{}'", path.display()))?;
paths.push(
pathdiff::diff_paths(&requested_path, &tree_root)
.ok_or_else(|| format_err!("failed to calculate path diff for {}", path.display()))?,
);
} else if path.is_relative() {
paths.push(path)
} else {
return Err(format_err!(
"requested project path is not relative to tree root and does not exist '{}'",
path.display()
));
}
}

let filtered_projects = manifest
Expand Down