+212
-63
lines changedFilter options
+212
-63
lines changed Original file line number Diff line number Diff line change
@@ -37,7 +37,10 @@ pub fn query(
37 37
let index = repo.index()?;
38 38
let mut cache = repo.excludes(
39 39
&index,
40 -
Some(gix::ignore::Search::from_overrides(overrides.into_iter())),
40 +
Some(gix::ignore::Search::from_overrides(
41 +
overrides.into_iter(),
42 +
repo.ignore_pattern_parser()?,
43 +
)),
41 44
Default::default(),
42 45
)?;
43 46
@@ -58,7 +58,8 @@ impl Search {
58 58
) -> std::io::Result<bool> {
59 59
// TODO: should `Pattern` trait use an instance as first argument to carry this information
60 60
// (so no `retain` later, it's slower than skipping)
61 -
let was_added = gix_glob::search::add_patterns_file(&mut self.patterns, source, follow_symlinks, root, buf)?;
61 +
let was_added =
62 +
gix_glob::search::add_patterns_file(&mut self.patterns, source, follow_symlinks, root, buf, Attributes)?;
62 63
if was_added {
63 64
let last = self.patterns.last_mut().expect("just added");
64 65
if !allow_macros {
@@ -80,7 +81,8 @@ impl Search {
80 81
collection: &mut MetadataCollection,
81 82
allow_macros: bool,
82 83
) {
83 -
self.patterns.push(pattern::List::from_bytes(bytes, source, root));
84 +
self.patterns
85 +
.push(pattern::List::from_bytes(bytes, source, root, Attributes));
84 86
let last = self.patterns.last_mut().expect("just added");
85 87
if !allow_macros {
86 88
last.patterns
@@ -124,7 +126,7 @@ impl Search {
124 126
impl Pattern for Attributes {
125 127
type Value = Value;
126 128 127 -
fn bytes_to_patterns(bytes: &[u8], _source: &std::path::Path) -> Vec<pattern::Mapping<Self::Value>> {
129 +
fn bytes_to_patterns(&self, bytes: &[u8], _source: &std::path::Path) -> Vec<pattern::Mapping<Self::Value>> {
128 130
fn into_owned_assignments<'a>(
129 131
attrs: impl Iterator<Item = Result<crate::AssignmentRef<'a>, crate::name::Error>>,
130 132
) -> Option<Assignments> {
@@ -330,6 +330,7 @@ pub fn try_collect_filtered_opts(
330 330
Default::default(),
331 331
None,
332 332
gix_worktree::stack::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped,
333 +
gix_ignore::search::Ignore { support_precious: true },
333 334
)),
334 335
&index,
335 336
index.path_backing(),
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4