Comments (5)
I've now tested this and git handles the patterns as they appear in the ".gitignore" file. It does not run inclusion patterns before exclusion patterns. I'd recommend to sort the patterns after they're compiled. I.e.,
import pathspec
spec = pathspec.PathSpec.from_lines('gitwildmatch', ...)
# This will only work if the lines passed into `.from_lines()` is a `list` or a
# non-collection iterable which will be consumed as a `list`.
spec.patterns.sort(key=lambda p: -p.include)
# This is more reliable.
spec.patterns = sorted(spec.patterns, key=lambda p: -p.include)
Test 1 - git
Files:
- .gitignore
- a.txt
- b.txt
- keep.txt
.gitignore:
!keep.txt
*.txt
Files matched by git:
- .gitignore
Test 1 - pathspec
source_files = [
".gitignore",
"a.txt",
"b.txt",
"keep.txt",
]
ignore_spec = pathspec.PathSpec.from_lines('gitwildmatch', [
"!keep.txt",
"*.txt",
])
remove_files = list(ignore_spec.match_files(source_files))
print(remove_files)
# ['keep.txt', 'b.txt', 'a.txt']
keep_files = sorted(set(source_files).difference(remove_files))
# ['.gitignore']
Test 2 - git
Files:
- .gitignore
- a.txt
- b.txt
- keep.txt
.gitignore:
*.txt
!keep.txt
Files matched by git:
- .gitignore
- keep.txt
Test 2 - pathspec
source_files = [
".gitignore",
"a.txt",
"b.txt",
"keep.txt",
]
ignore_spec = pathspec.PathSpec.from_lines('gitwildmatch', [
"*.txt",
"!keep.txt",
])
remove_files = list(ignore_spec.match_files(source_files))
print(remove_files)
# ['b.txt', 'a.txt']
keep_files = sorted(set(source_files).difference(remove_files))
# ['.gitignore', 'keep.txt']
from python-pathspec.
Here's another way of fixing it:
---
pathspec/util.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pathspec/util.py b/pathspec/util.py
index bcba878..c040f5a 100644
--- a/pathspec/util.py
+++ b/pathspec/util.py
@@ -7,6 +7,7 @@ import os
import os.path
import posixpath
import stat
+from operator import attrgetter
from .compat import Collection, Iterable, string_types, unicode
@@ -268,7 +269,10 @@ def match_files(patterns, files):
"""
all_files = files if isinstance(files, Collection) else list(files)
return_files = set()
- for pattern in patterns:
+
+ # We need to apply the include patterns first
+ sorted_patterns = sorted(patterns, key=attrgetter('include'), reverse=True)
+ for pattern in sorted_patterns:
if pattern.include is not None:
result_files = pattern.match(all_files)
if pattern.include:
--
from python-pathspec.
Let me know which way you would prefer and I can try to create a PR (or you can apply the changes yourself if you prefer.)
from python-pathspec.
A workaround until this is fixed in the library itself is be to sort the patterns on the client side before calling pathspec:
specs = sorted(specs, key=lambda s: s.startswith('!'))
from python-pathspec.
@cpburnz Any update on this?
from python-pathspec.
Related Issues (20)
- `match_files()` is not a pure generator function, and it impacts `tree_*()` gravely HOT 1
- Symlink pathspec_meta.py breaks Windows HOT 1
- test_util.py uses os.symlink which can fail on Windows HOT 1
- Backslashes at start of pattern not handled correctly HOT 1
- `!` doesn't exclude files in directories if the pattern doesn't have a trailing slash HOT 1
- Dist failure for Fedora, CentOS, EPEL HOT 11
- Since version 0.10.0 pure wildcard does not work in some cases HOT 4
- The pattern_to_regex method does not seem to work correctly on windows. HOT 4
- IndexError with my .gitignore file when trying to build a Python package HOT 4
- Checking directories via match_file() does not work on Path objects HOT 5
- Package not marked as `py.typed` HOT 1
- Exports are considered private HOT 1
- `'Self'` string literal type is `Unknown` in pyright HOT 1
- Please consider switching the build-system to flit_core to ease setuptools bootstrap HOT 5
- Include directory should override exclude file HOT 3
- On bracket expression negation HOT 2
- match_files with negated path spec HOT 5
- `GitIgnoreSpec` behaviors differ from git HOT 2
- PathSpec.match_file() returns None since 0.12.0 HOT 3
- Exclusions not working HOT 2
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from python-pathspec.