Robot
/
watchexec
mirror of https://github.com/watchexec/watchexec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Canonicalise origin and workdir

This commit is contained in:
Félix Saparelli 2022-01-16 17:42:49 +13:00
parent 2a1a386208
commit 6a925fc392
No known key found for this signature in database
GPG Key ID: B948C4BAE44FC474
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cli/src/filterer/common.rs
View File

@ -23,11 +23,13 @@ pub async fn dirs(args: &ArgMatches<'static>) -> Result<(PathBuf, PathBuf)> {
debug!(?origins, "resolved all project origins"); debug!(?origins, "resolved all project origins");
let project_origin = common_prefix(&origins).unwrap_or_else(|| PathBuf::from(".")); let project_origin =
canonicalize(common_prefix(&origins).unwrap_or_else(|| PathBuf::from(".")))
.into_diagnostic()?;
debug!(?project_origin, "resolved common/project origin"); debug!(?project_origin, "resolved common/project origin");
let workdir = env::current_dir() let workdir = env::current_dir()
.and_then(|wd| wd.canonicalize()) .and_then(|wd| canonicalize(wd))
.into_diagnostic()?; .into_diagnostic()?;
debug!(?workdir, "resolved working directory"); debug!(?workdir, "resolved working directory");
@ -111,7 +113,10 @@ pub async fn ignores(
Some(pt) if pt.is_vcs() => vcs_types.contains(&pt), Some(pt) if pt.is_vcs() => vcs_types.contains(&pt),
_ => true, _ => true,
})); }));
debug!(?ignores, "combined and applied final filter over ignores"); debug!(
?ignores,
"combined and applied overall vcs filter over ignores"
);
} }
if args.is_present("no-project-ignore") { if args.is_present("no-project-ignore") {