Mercurial > hg
diff rust/hg-cpython/src/dirstate/status.rs @ 49346:75119bbee3d1
hg-cpython: refactor matcher transformation logic
This reduces duplication and will allow for recursive transformation in
UnionMatcher.
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Wed, 08 Jun 2022 15:30:58 +0200 |
parents | 137d6bb71937 |
children | 0043c7aa3250 |
line wrap: on
line diff
--- a/rust/hg-cpython/src/dirstate/status.rs Wed Jun 08 15:12:34 2022 +0200 +++ b/rust/hg-cpython/src/dirstate/status.rs Wed Jun 08 15:30:58 2022 +0200 @@ -15,6 +15,7 @@ PyResult, PyTuple, Python, PythonObject, ToPyObject, }; use hg::dirstate::status::StatusPath; +use hg::matchers::Matcher; use hg::{ matchers::{AlwaysMatcher, FileMatcher, IncludeMatcher}, parse_pattern_syntax, @@ -133,24 +134,30 @@ build_response(py, status_res, warnings) }; + let matcher = extract_matcher(py, matcher)?; + dmap.with_status( + &*matcher, + root_dir.to_path_buf(), + ignore_files, + StatusOptions { + check_exec, + list_clean, + list_ignored, + list_unknown, + list_copies, + collect_traversed_dirs, + }, + after_status, + ) +} + +/// Transform a Python matcher into a Rust matcher. +fn extract_matcher( + py: Python, + matcher: PyObject, +) -> PyResult<Box<dyn Matcher + Sync>> { match matcher.get_type(py).name(py).borrow() { - "alwaysmatcher" => { - let matcher = AlwaysMatcher; - dmap.with_status( - &matcher, - root_dir.to_path_buf(), - ignore_files, - StatusOptions { - check_exec, - list_clean, - list_ignored, - list_unknown, - list_copies, - collect_traversed_dirs, - }, - after_status, - ) - } + "alwaysmatcher" => Ok(Box::new(AlwaysMatcher)), "exactmatcher" => { let files = matcher.call_method( py, @@ -169,22 +176,9 @@ .collect(); let files = files?; - let matcher = FileMatcher::new(files) + let file_matcher = FileMatcher::new(files) .map_err(|e| PyErr::new::<ValueError, _>(py, e.to_string()))?; - dmap.with_status( - &matcher, - root_dir.to_path_buf(), - ignore_files, - StatusOptions { - check_exec, - list_clean, - list_ignored, - list_unknown, - list_copies, - collect_traversed_dirs, - }, - after_status, - ) + Ok(Box::new(file_matcher)) } "includematcher" => { // Get the patterns from Python even though most of them are @@ -221,20 +215,7 @@ let matcher = IncludeMatcher::new(ignore_patterns) .map_err(|e| handle_fallback(py, e.into()))?; - dmap.with_status( - &matcher, - root_dir.to_path_buf(), - ignore_files, - StatusOptions { - check_exec, - list_clean, - list_ignored, - list_unknown, - list_copies, - collect_traversed_dirs, - }, - after_status, - ) + Ok(Box::new(matcher)) } e => Err(PyErr::new::<FallbackError, _>( py,