fix: support input globs #3812
Merged
fix: support input globs #3812
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nichmor
commented
May 22, 2025
| @@ -72,25 +75,55 @@ impl<'t> GlobSet<'t> { | |||
| .include | |||
| .iter() | |||
| .flat_map(move |glob| { | |||
| glob.walk(root_dir.clone()) | |||
| let (effective_walk_root, glob) = if glob.has_semantic_literals() { | |||
There was a problem hiding this comment.
this is basically new behaviour.
There was a problem hiding this comment.
is that check really necessary?
Can't you always use partition?
There was a problem hiding this comment.
Yes - let's take an example that we have pixi.toml glob
Calling partition on it, we will receive
pixi.toml prefix and empty glob, which when walking will not match.
nichmor
commented
May 22, 2025
crates/pixi_glob/src/glob_set.rs
Outdated
Comment on lines
227
to
255
| #[test] | ||
| fn test_filters_with_just_a_file_glob() { | ||
| let temp_dir = tempdir().unwrap(); | ||
| let root_path = temp_dir.path(); | ||
|
|
||
| // Create files and directories | ||
| File::create(root_path.join("pixi.toml")).unwrap(); | ||
|
|
||
| // Test globs: include all .txt but exclude exclude.txt | ||
| let filter_globs = GlobSet::create(vec!["pixi.toml", "!exclude.txt"]).unwrap(); | ||
|
|
||
| // Filter directory and get results as strings | ||
| let mut filtered_files: Vec<_> = filter_globs | ||
| // pretend that we are in the workspace folder | ||
| // and our recipe yaml is living inside some folder | ||
| // that will point outside | ||
| .filter_directory(root_path) | ||
| .collect::<Result<Vec<_>, _>>() | ||
| .unwrap() | ||
| .into_iter() | ||
| .map(|p| p.path().strip_prefix(root_path).unwrap().to_path_buf()) | ||
| .collect(); | ||
|
|
||
| // Assert the expected files are present | ||
| filtered_files.sort(); | ||
|
|
||
| let expected = vec!["pixi.toml".parse::<PathBuf>().unwrap()]; | ||
| assert_eq!(filtered_files, expected); | ||
| } |
There was a problem hiding this comment.
This test doesn't have a glob with .. in front.
Why did you add it?
There was a problem hiding this comment.
I wanted to test this edge case:
#3812 (comment)
| @@ -72,25 +75,55 @@ impl<'t> GlobSet<'t> { | |||
| .include | |||
| .iter() | |||
| .flat_map(move |glob| { | |||
| glob.walk(root_dir.clone()) | |||
| let (effective_walk_root, glob) = if glob.has_semantic_literals() { | |||
There was a problem hiding this comment.
is that check really necessary?
Can't you always use partition?
Hofer-Julian
approved these changes
May 22, 2025
Co-authored-by: Hofer-Julian <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes:
#3778
Overview
The idea is that sometimes, we can have
semanticinput globs.What do we mean by semantic? Semantic is something that has a special meaning on different platforms.
Example:
../*.toml- in this case,..is a semantic prefix, and it doesn't have therelativemeaning for glob patterns. Ourwaxwill try to match..as a wrong file.In this PR, we start checking if we have some semantic prefix - if yes, we
partitionit in two pieces - a prefix and a new glob, and create a neweffective_walk_rootwhich is the previous root_path + prefix.How to test it?
You can create a structure where you have a workspace in pixi.toml, then in some
sourcesfolder another packagepixi.tomlwhich will use pixi-build-rattler-build with arecipe.yamlthat points somewhere relative.When running
pixi install(pixi buildwill not trigger this code path ),pixi-build-rattler-buildwill emit a relative glob that will be used, for example, for caching.