rust/hg-cpython/src/dirstate/status.rs
changeset 49351 0b00998e336a
parent 49349 0043c7aa3250
child 49352 97dcd6906e6f
--- a/rust/hg-cpython/src/dirstate/status.rs	Wed Jun 08 18:09:24 2022 +0200
+++ b/rust/hg-cpython/src/dirstate/status.rs	Wed Jun 08 18:12:55 2022 +0200
@@ -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),