martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-11-13 06:06:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

cli: add support for matching directories

Browse Source 
A few commands (`restore`, `diff`, and `untrack` so far) accept path
arguments, but they only support files. Let's make them work with
directories too.
This commit is contained in:
Martin von Zweigbergk 2022-02-06 11:04:23 -08:00
parent cce12261d8
commit 2dbdff1ad1
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/commands.rs
View File

@ -41,7 +41,7 @@ use jujutsu_lib::diff::{Diff, DiffHunk};
use jujutsu_lib::files::DiffLine;
use jujutsu_lib::git::{GitExportError, GitFetchError, GitImportError, GitRefUpdate};
use jujutsu_lib::index::HexPrefix;
use jujutsu_lib::matchers::{EverythingMatcher, FilesMatcher, Matcher};
use jujutsu_lib::matchers::{EverythingMatcher, Matcher, PrefixMatcher};
use jujutsu_lib::op_heads_store::OpHeadsStore;
use jujutsu_lib::op_store::{OpStore, OpStoreError, OperationId, RefTarget, WorkspaceId};
use jujutsu_lib::operation::Operation;
@ -766,20 +766,13 @@ fn matcher_from_values(
values: Option<clap::Values>,
) -> Result<Box<dyn Matcher>, CommandError> {
if let Some(values) = values {
// TODO: Add support for matching directories (and probably globs and other
// formats)
let mut paths = HashSet::new();
// TODO: Add support for globs and other formats
let mut paths = vec![];
for value in values {
let repo_path = ui.parse_file_path(wc_path, value)?;
// TODO: Remove this when we have support for directories
if repo_path.is_root() {
return Err(CommandError::UserError(
"Directory patterns are not yet supported.".to_string(),
));
}
paths.insert(repo_path);
paths.push(repo_path);
}
Ok(Box::new(FilesMatcher::new(paths)))
Ok(Box::new(PrefixMatcher::new(&paths)))
} else {
Ok(Box::new(EverythingMatcher))
}