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

Look up project origin on implicit pwd 

This may cause some more issues to crop up while waiting for --project-origin,
but it is the more correct behaviour.

Fixes #270
This commit is contained in:
Félix Saparelli 2022-03-27 16:31:52 +13:00
parent 7baf79e929
commit d38428f297
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ use std::{
use clap::ArgMatches;
use dunce::canonicalize;
use miette::{IntoDiagnostic, Result};
use miette::{IntoDiagnostic, Result, miette};
use tracing::{debug, warn};
use watchexec::{
ignore::{self, IgnoreFile},
@ -15,16 +15,29 @@ use watchexec::{
};
pub async fn dirs(args: &ArgMatches<'static>) -> Result<(PathBuf, PathBuf)> {
let mut origins = HashSet::new();
let mut paths = HashSet::new();
for path in args.values_of("paths").unwrap_or_default() {
let path = canonicalize(path).into_diagnostic()?;
paths.insert(
canonicalize(path).into_diagnostic()?
);
}
if paths.is_empty() {
debug!("no paths, using current directory");
paths.insert(canonicalize(".").into_diagnostic()?);
}
debug!(?paths, "resolved all watched paths");
let mut origins = HashSet::new();
for path in paths {
origins.extend(project::origins(&path).await);
}
debug!(?origins, "resolved all project origins");
let project_origin =
canonicalize(common_prefix(&origins).unwrap_or_else(|| PathBuf::from(".")))
canonicalize(common_prefix(&origins).ok_or_else(|| miette!("no common prefix, but this should never fail"))?)
.into_diagnostic()?;
debug!(?project_origin, "resolved common/project origin");