Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
mercurial-devel
Commits
0b00998e336a
Commit
0b00998e336a
authored
2 years ago
by
Raphaël Gomès
Browse files
Options
Downloads
Patches
Plain Diff
rust-dirstate: add `intersectionmatcher` to the allowed matchers
`IntersectionMatcher` is now implemented in Rust.
parent
5e53ecbc308f
Loading
Loading
2 merge requests
!168
branching: merge default into stable
,
!155
Rust Matcher support improvement
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
mercurial/dirstate.py
+1
-0
1 addition, 0 deletions
mercurial/dirstate.py
rust/hg-cpython/src/dirstate/status.rs
+7
-1
7 additions, 1 deletion
rust/hg-cpython/src/dirstate/status.rs
with
8 additions
and
1 deletion
mercurial/dirstate.py
+
1
−
0
View file @
0b00998e
...
...
@@ -1247,6 +1247,7 @@
matchmod
.
alwaysmatcher
,
matchmod
.
exactmatcher
,
matchmod
.
includematcher
,
matchmod
.
intersectionmatcher
,
matchmod
.
unionmatcher
,
)
...
...
This diff is collapsed.
Click to expand it.
rust/hg-cpython/src/dirstate/status.rs
+
7
−
1
View file @
0b00998e
...
...
@@ -15,7 +15,7 @@
PyResult
,
PyTuple
,
Python
,
PythonObject
,
ToPyObject
,
};
use
hg
::
dirstate
::
status
::
StatusPath
;
use
hg
::
matchers
::{
Matcher
,
UnionMatcher
};
use
hg
::
matchers
::{
Matcher
,
UnionMatcher
,
IntersectionMatcher
};
use
hg
::{
matchers
::{
AlwaysMatcher
,
FileMatcher
,
IncludeMatcher
},
parse_pattern_syntax
,
...
...
@@ -226,6 +226,12 @@
Ok
(
Box
::
new
(
UnionMatcher
::
new
(
matchers
?
)))
}
"intersectionmatcher"
=>
{
let
m1
=
extract_matcher
(
py
,
matcher
.getattr
(
py
,
"_m1"
)
?
)
?
;
let
m2
=
extract_matcher
(
py
,
matcher
.getattr
(
py
,
"_m2"
)
?
)
?
;
Ok
(
Box
::
new
(
IntersectionMatcher
::
new
(
m1
,
m2
)))
}
e
=>
Err
(
PyErr
::
new
::
<
FallbackError
,
_
>
(
py
,
format!
(
"Unsupported matcher {}"
,
e
),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment