mercurial-scm/hg: rust/hg-core/src/matchers.rs annotate

annotate rust/hg-core/src/matchers.rs @ 45591:f38adf8b0711

hg-core: Explain offset override of first revision (D8958#inline-14992 followup) Differential Revision: https://phab.mercurial-scm.org/D9095

author	Antoine cezar<acezar@chwitlabs.fr>
date	Mon, 28 Sep 2020 13:51:16 +0200
parents	26114bd6ec60
children	75f785888a7b

rev	line source
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	1 // matchers.rs
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	2 //
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	3 // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	4 //
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	5 // This software may be used and distributed according to the terms of the
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	6 // GNU General Public License version 2 or any later version.
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	7
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	8 //! Structs and types for matching files and directories.
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	9
44519 52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44353 diff changeset	10 use crate::{
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	11 dirstate::dirs_multiset::DirsChildrenMultiset,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	12 filepatterns::{
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	13 build_single_regex, filter_subincludes, get_patterns_from_file,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	14 PatternFileWarning, PatternResult, SubInclude,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	15 },
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	16 utils::{
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	17 files::find_dirs,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	18 hg_path::{HgPath, HgPathBuf},
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	19 Escaped,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	20 },
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	21 DirsMultiset, DirstateMapError, FastHashMap, IgnorePattern, PatternError,
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	22 PatternSyntax,
44519 52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44353 diff changeset	23 };
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	24
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	25 use crate::filepatterns::normalize_path_bytes;
44597 e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	26 use std::borrow::ToOwned;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	27 use std::collections::HashSet;
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	28 use std::fmt::{Display, Error, Formatter};
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	29 use std::iter::FromIterator;
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	30 use std::ops::Deref;
44597 e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	31 use std::path::{Path, PathBuf};
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	32
44784 83c97c0bd319 rust-matchers: add timing tracing to regex compilation Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	33 use micro_timer::timed;
83c97c0bd319 rust-matchers: add timing tracing to regex compilation Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	34
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	35 #[derive(Debug, PartialEq)]
43832 1bb4e9b02984 rust-matchers: improve `Matcher` trait ergonomics Rapha?l Gom?s <rgomes@octobus.net> parents: 43611 diff changeset	36 pub enum VisitChildrenSet<'a> {
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	37 /// Don't visit anything
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	38 Empty,
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	39 /// Only visit this directory
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	40 This,
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	41 /// Visit this directory and these subdirectories
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	42 /// TODO Should we implement a `NonEmptyHashSet`?
43832 1bb4e9b02984 rust-matchers: improve `Matcher` trait ergonomics Rapha?l Gom?s <rgomes@octobus.net> parents: 43611 diff changeset	43 Set(HashSet<&'a HgPath>),
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	44 /// Visit this directory and all subdirectories
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	45 Recursive,
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	46 }
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	47
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	48 pub trait Matcher {
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	49 /// Explicitly listed files
43832 1bb4e9b02984 rust-matchers: improve `Matcher` trait ergonomics Rapha?l Gom?s <rgomes@octobus.net> parents: 43611 diff changeset	50 fn file_set(&self) -> Option<&HashSet<&HgPath>>;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	51 /// Returns whether `filename` is in `file_set`
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	52 fn exact_match(&self, filename: impl AsRef<HgPath>) -> bool;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	53 /// Returns whether `filename` is matched by this matcher
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	54 fn matches(&self, filename: impl AsRef<HgPath>) -> bool;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	55 /// Decides whether a directory should be visited based on whether it
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	56 /// has potential matches in it or one of its subdirectories, and
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	57 /// potentially lists which subdirectories of that directory should be
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	58 /// visited. This is based on the match's primary, included, and excluded
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	59 /// patterns.
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	60 ///
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	61 /// # Example
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	62 ///
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	63 /// Assume matchers `['path:foo/bar', 'rootfilesin:qux']`, we would
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	64 /// return the following values (assuming the implementation of
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	65 /// visit_children_set is capable of recognizing this; some implementations
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	66 /// are not).
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	67 ///
44006 72bced4f2936 rust-matchers: fixing cargo doc Georges Racinet <georges.racinet@octobus.net> parents: 43914 diff changeset	68 /// ```text
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	69 /// ```ignore
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	70 /// '' -> {'foo', 'qux'}
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	71 /// 'baz' -> set()
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	72 /// 'foo' -> {'bar'}
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	73 /// // Ideally this would be `Recursive`, but since the prefix nature of
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	74 /// // matchers is applied to the entire matcher, we have to downgrade this
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	75 /// // to `This` due to the (yet to be implemented in Rust) non-prefix
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	76 /// // `RootFilesIn'-kind matcher being mixed in.
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	77 /// 'foo/bar' -> 'this'
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	78 /// 'qux' -> 'this'
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	79 /// ```
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	80 /// # Important
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	81 ///
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	82 /// Most matchers do not know if they're representing files or
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	83 /// directories. They see `['path:dir/f']` and don't know whether `f` is a
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	84 /// file or a directory, so `visit_children_set('dir')` for most matchers
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	85 /// will return `HashSet{ HgPath { "f" } }`, but if the matcher knows it's
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	86 /// a file (like the yet to be implemented in Rust `ExactMatcher` does),
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	87 /// it may return `VisitChildrenSet::This`.
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	88 /// Do not rely on the return being a `HashSet` indicating that there are
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	89 /// no files in this dir to investigate (or equivalently that if there are
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	90 /// files to investigate in 'dir' that it will always return
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	91 /// `VisitChildrenSet::This`).
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	92 fn visit_children_set(
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	93 &self,
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	94 directory: impl AsRef<HgPath>,
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	95 ) -> VisitChildrenSet;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	96 /// Matcher will match everything and `files_set()` will be empty:
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	97 /// optimization might be possible.
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	98 fn matches_everything(&self) -> bool;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	99 /// Matcher will match exactly the files in `files_set()`: optimization
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	100 /// might be possible.
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	101 fn is_exact(&self) -> bool;
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	102 }
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	103
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	104 /// Matches everything.
43834 542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	105 ///```
542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	106 /// use hg::{ matchers::{Matcher, AlwaysMatcher}, utils::hg_path::HgPath };
542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	107 ///
542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	108 /// let matcher = AlwaysMatcher;
542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	109 ///
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	110 /// assert_eq!(matcher.matches(HgPath::new(b"whatever")), true);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	111 /// assert_eq!(matcher.matches(HgPath::new(b"b.txt")), true);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	112 /// assert_eq!(matcher.matches(HgPath::new(b"main.c")), true);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	113 /// assert_eq!(matcher.matches(HgPath::new(br"re:.*\.c$")), true);
43834 542c8b277261 rust-matchers: add doctests for `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43832 diff changeset	114 /// ```
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	115 #[derive(Debug)]
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	116 pub struct AlwaysMatcher;
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	117
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	118 impl Matcher for AlwaysMatcher {
43832 1bb4e9b02984 rust-matchers: improve `Matcher` trait ergonomics Rapha?l Gom?s <rgomes@octobus.net> parents: 43611 diff changeset	119 fn file_set(&self) -> Option<&HashSet<&HgPath>> {
1bb4e9b02984 rust-matchers: improve `Matcher` trait ergonomics Rapha?l Gom?s <rgomes@octobus.net> parents: 43611 diff changeset	120 None
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	121 }
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	122 fn exact_match(&self, _filename: impl AsRef<HgPath>) -> bool {
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	123 false
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	124 }
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	125 fn matches(&self, _filename: impl AsRef<HgPath>) -> bool {
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	126 true
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	127 }
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	128 fn visit_children_set(
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	129 &self,
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	130 _directory: impl AsRef<HgPath>,
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	131 ) -> VisitChildrenSet {
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	132 VisitChildrenSet::Recursive
a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	133 }
43611 27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	134 fn matches_everything(&self) -> bool {
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	135 true
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	136 }
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	137 fn is_exact(&self) -> bool {
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	138 false
27c25c0dc967 rust-matchers: remove default implementations for `Matcher` trait Rapha?l Gom?s <rgomes@octobus.net> parents: 43438 diff changeset	139 }
43438 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	140 }
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	141
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	142 /// Matches the input files exactly. They are interpreted as paths, not
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	143 /// patterns.
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	144 ///
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	145 ///```
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	146 /// use hg::{ matchers::{Matcher, FileMatcher}, utils::hg_path::HgPath };
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	147 ///
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	148 /// let files = [HgPath::new(b"a.txt"), HgPath::new(br"re:.*\.c$")];
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	149 /// let matcher = FileMatcher::new(&files).unwrap();
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	150 ///
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	151 /// assert_eq!(matcher.matches(HgPath::new(b"a.txt")), true);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	152 /// assert_eq!(matcher.matches(HgPath::new(b"b.txt")), false);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	153 /// assert_eq!(matcher.matches(HgPath::new(b"main.c")), false);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	154 /// assert_eq!(matcher.matches(HgPath::new(br"re:.*\.c$")), true);
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	155 /// ```
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	156 #[derive(Debug)]
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	157 pub struct FileMatcher<'a> {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	158 files: HashSet<&'a HgPath>,
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	159 dirs: DirsMultiset,
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	160 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	161
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	162 impl<'a> FileMatcher<'a> {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	163 pub fn new(
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	164 files: &'a [impl AsRef<HgPath>],
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	165 ) -> Result<Self, DirstateMapError> {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	166 Ok(Self {
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44870 diff changeset	167 files: HashSet::from_iter(files.iter().map(AsRef::as_ref)),
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	168 dirs: DirsMultiset::from_manifest(files)?,
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	169 })
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	170 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	171 fn inner_matches(&self, filename: impl AsRef<HgPath>) -> bool {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	172 self.files.contains(filename.as_ref())
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	173 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	174 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	175
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	176 impl<'a> Matcher for FileMatcher<'a> {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	177 fn file_set(&self) -> Option<&HashSet<&HgPath>> {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	178 Some(&self.files)
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	179 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	180 fn exact_match(&self, filename: impl AsRef<HgPath>) -> bool {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	181 self.inner_matches(filename)
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	182 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	183 fn matches(&self, filename: impl AsRef<HgPath>) -> bool {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	184 self.inner_matches(filename)
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	185 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	186 fn visit_children_set(
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	187 &self,
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	188 directory: impl AsRef<HgPath>,
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	189 ) -> VisitChildrenSet {
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	190 if self.files.is_empty() \|\| !self.dirs.contains(&directory) {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	191 return VisitChildrenSet::Empty;
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	192 }
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44870 diff changeset	193 let dirs_as_set = self.dirs.iter().map(Deref::deref).collect();
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	194
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	195 let mut candidates: HashSet<&HgPath> =
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44870 diff changeset	196 self.files.union(&dirs_as_set).cloned().collect();
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	197 candidates.remove(HgPath::new(b""));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	198
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	199 if !directory.as_ref().is_empty() {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	200 let directory = [directory.as_ref().as_bytes(), b"/"].concat();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	201 candidates = candidates
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	202 .iter()
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	203 .filter_map(\|c\| {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	204 if c.as_bytes().starts_with(&directory) {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	205 Some(HgPath::new(&c.as_bytes()[directory.len()..]))
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	206 } else {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	207 None
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	208 }
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	209 })
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	210 .collect();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	211 }
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	212
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	213 // `self.dirs` includes all of the directories, recursively, so if
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	214 // we're attempting to match 'foo/bar/baz.txt', it'll have '', 'foo',
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	215 // 'foo/bar' in it. Thus we can safely ignore a candidate that has a
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	216 // '/' in it, indicating it's for a subdir-of-a-subdir; the immediate
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	217 // subdir will be in there without a slash.
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	218 VisitChildrenSet::Set(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	219 candidates
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	220 .iter()
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	221 .filter_map(\|c\| {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	222 if c.bytes().all(\|b\| *b != b'/') {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	223 Some(*c)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	224 } else {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	225 None
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	226 }
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	227 })
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	228 .collect(),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	229 )
43914 69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	230 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	231 fn matches_everything(&self) -> bool {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	232 false
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	233 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	234 fn is_exact(&self) -> bool {
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	235 true
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	236 }
69c4f3cf2cdf rust-matchers: add `FileMatcher` implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 43863 diff changeset	237 }
44519 52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44353 diff changeset	238
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	239 /// Matches files that are included in the ignore rules.
44870 9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	240 /// ```
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	241 /// use hg::{
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	242 /// matchers::{IncludeMatcher, Matcher},
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	243 /// IgnorePattern,
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	244 /// PatternSyntax,
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	245 /// utils::hg_path::HgPath
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	246 /// };
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	247 /// use std::path::Path;
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	248 /// ///
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	249 /// let ignore_patterns =
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	250 /// vec![IgnorePattern::new(PatternSyntax::RootGlob, b"this*", Path::new(""))];
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	251 /// let (matcher, _) = IncludeMatcher::new(ignore_patterns, "").unwrap();
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	252 /// ///
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	253 /// assert_eq!(matcher.matches(HgPath::new(b"testing")), false);
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	254 /// assert_eq!(matcher.matches(HgPath::new(b"this should work")), true);
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	255 /// assert_eq!(matcher.matches(HgPath::new(b"this also")), true);
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	256 /// assert_eq!(matcher.matches(HgPath::new(b"but not this")), false);
9f96beb9bafe rust: remove support for `re2` Rapha?l Gom?s <rgomes@octobus.net> parents: 44852 diff changeset	257 /// ```
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	258 pub struct IncludeMatcher<'a> {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	259 patterns: Vec<u8>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	260 match_fn: Box<dyn for<'r> Fn(&'r HgPath) -> bool + 'a + Sync>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	261 /// Whether all the patterns match a prefix (i.e. recursively)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	262 prefix: bool,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	263 roots: HashSet<HgPathBuf>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	264 dirs: HashSet<HgPathBuf>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	265 parents: HashSet<HgPathBuf>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	266 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	267
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	268 impl<'a> Matcher for IncludeMatcher<'a> {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	269 fn file_set(&self) -> Option<&HashSet<&HgPath>> {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	270 None
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	271 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	272
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	273 fn exact_match(&self, _filename: impl AsRef<HgPath>) -> bool {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	274 false
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	275 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	276
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	277 fn matches(&self, filename: impl AsRef<HgPath>) -> bool {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	278 (self.match_fn)(filename.as_ref())
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	279 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	280
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	281 fn visit_children_set(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	282 &self,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	283 directory: impl AsRef<HgPath>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	284 ) -> VisitChildrenSet {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	285 let dir = directory.as_ref();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	286 if self.prefix && self.roots.contains(dir) {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	287 return VisitChildrenSet::Recursive;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	288 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	289 if self.roots.contains(HgPath::new(b""))
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	290 \|\| self.roots.contains(dir)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	291 \|\| self.dirs.contains(dir)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	292 \|\| find_dirs(dir).any(\|parent_dir\| self.roots.contains(parent_dir))
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	293 {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	294 return VisitChildrenSet::This;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	295 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	296
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	297 if self.parents.contains(directory.as_ref()) {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	298 let multiset = self.get_all_parents_children();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	299 if let Some(children) = multiset.get(dir) {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	300 return VisitChildrenSet::Set(children.to_owned());
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	301 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	302 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	303 VisitChildrenSet::Empty
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	304 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	305
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	306 fn matches_everything(&self) -> bool {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	307 false
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	308 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	309
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	310 fn is_exact(&self) -> bool {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	311 false
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	312 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	313 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	314
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	315 /// Returns a function that matches an `HgPath` against the given regex
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	316 /// pattern.
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	317 ///
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	318 /// This can fail when the pattern is invalid or not supported by the
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	319 /// underlying engine (the `regex` crate), for instance anything with
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	320 /// back-references.
44784 83c97c0bd319 rust-matchers: add timing tracing to regex compilation Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	321 #[timed]
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	322 fn re_matcher(
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	323 pattern: &[u8],
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	324 ) -> PatternResult<impl Fn(&HgPath) -> bool + Sync> {
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	325 use std::io::Write;
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	326
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44803 diff changeset	327 // The `regex` crate adds `.*` to the start and end of expressions if there
ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44803 diff changeset	328 // are no anchors, so add the start anchor.
ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44803 diff changeset	329 let mut escaped_bytes = vec![b'^', b'(', b'?', b':'];
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	330 for byte in pattern {
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	331 if *byte > 127 {
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	332 write!(escaped_bytes, "\\x{:x}", *byte).unwrap();
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	333 } else {
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	334 escaped_bytes.push(*byte);
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	335 }
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	336 }
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44803 diff changeset	337 escaped_bytes.push(b')');
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	338
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	339 // Avoid the cost of UTF8 checking
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	340 //
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	341 // # Safety
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	342 // This is safe because we escaped all non-ASCII bytes.
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	343 let pattern_string = unsafe { String::from_utf8_unchecked(escaped_bytes) };
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	344 let re = regex::bytes::RegexBuilder::new(&pattern_string)
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	345 .unicode(false)
44779 b15a37d85dbe rust-regex: increase the DFA size limit for the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	346 // Big repos with big `.hgignore` will hit the default limit and
b15a37d85dbe rust-regex: increase the DFA size limit for the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	347 // incur a significant performance hit. One repo's `hg status` hit
b15a37d85dbe rust-regex: increase the DFA size limit for the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	348 // multiple minutes.
b15a37d85dbe rust-regex: increase the DFA size limit for the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44597 diff changeset	349 .dfa_size_limit(50 * (1 << 20))
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	350 .build()
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	351 .map_err(\|e\| PatternError::UnsupportedSyntax(e.to_string()))?;
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	352
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44541 diff changeset	353 Ok(move \|path: &HgPath\| re.is_match(path.as_bytes()))
44519 52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44353 diff changeset	354 }
52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44353 diff changeset	355
44521 a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	356 /// Returns the regex pattern and a function that matches an `HgPath` against
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	357 /// said regex formed by the given ignore patterns.
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	358 fn build_regex_match<'a>(
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	359 ignore_patterns: &'a [&'a IgnorePattern],
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	360 ) -> PatternResult<(Vec<u8>, Box<dyn Fn(&HgPath) -> bool + Sync>)> {
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	361 let mut regexps = vec![];
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	362 let mut exact_set = HashSet::new();
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	363
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	364 for pattern in ignore_patterns {
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	365 if let Some(re) = build_single_regex(pattern)? {
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	366 regexps.push(re);
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	367 } else {
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	368 let exact = normalize_path_bytes(&pattern.pattern);
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	369 exact_set.insert(HgPathBuf::from_bytes(&exact));
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	370 }
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	371 }
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	372
44521 a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	373 let full_regex = regexps.join(&b'\|');
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	374
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	375 // An empty pattern would cause the regex engine to incorrectly match the
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	376 // (empty) root directory
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	377 let func = if !(regexps.is_empty()) {
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	378 let matcher = re_matcher(&full_regex)?;
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	379 let func = move \|filename: &HgPath\| {
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	380 exact_set.contains(filename) \|\| matcher(filename)
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	381 };
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	382 Box::new(func) as Box<dyn Fn(&HgPath) -> bool + Sync>
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	383 } else {
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	384 let func = move \|filename: &HgPath\| exact_set.contains(filename);
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	385 Box::new(func) as Box<dyn Fn(&HgPath) -> bool + Sync>
e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44784 diff changeset	386 };
44521 a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	387
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	388 Ok((full_regex, func))
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	389 }
a21881b40942 rust-matchers: add `build_regex_match` function Rapha?l Gom?s <rgomes@octobus.net> parents: 44520 diff changeset	390
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	391 /// Returns roots and directories corresponding to each pattern.
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	392 ///
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	393 /// This calculates the roots and directories exactly matching the patterns and
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	394 /// returns a tuple of (roots, dirs). It does not return other directories
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	395 /// which may also need to be considered, like the parent directories.
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	396 fn roots_and_dirs(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	397 ignore_patterns: &[IgnorePattern],
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	398 ) -> (Vec<HgPathBuf>, Vec<HgPathBuf>) {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	399 let mut roots = Vec::new();
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	400 let mut dirs = Vec::new();
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	401
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	402 for ignore_pattern in ignore_patterns {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	403 let IgnorePattern {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	404 syntax, pattern, ..
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	405 } = ignore_pattern;
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	406 match syntax {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	407 PatternSyntax::RootGlob \| PatternSyntax::Glob => {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	408 let mut root = vec![];
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	409
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	410 for p in pattern.split(\|c\| *c == b'/') {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	411 if p.iter().any(\|c\| match *c {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	412 b'[' \| b'{' \| b'*' \| b'?' => true,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	413 _ => false,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	414 }) {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	415 break;
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	416 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	417 root.push(HgPathBuf::from_bytes(p));
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	418 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	419 let buf =
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	420 root.iter().fold(HgPathBuf::new(), \|acc, r\| acc.join(r));
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	421 roots.push(buf);
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	422 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	423 PatternSyntax::Path \| PatternSyntax::RelPath => {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	424 let pat = HgPath::new(if pattern == b"." {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	425 &[] as &[u8]
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	426 } else {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	427 pattern
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	428 });
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	429 roots.push(pat.to_owned());
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	430 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	431 PatternSyntax::RootFiles => {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	432 let pat = if pattern == b"." {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	433 &[] as &[u8]
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	434 } else {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	435 pattern
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	436 };
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	437 dirs.push(HgPathBuf::from_bytes(pat));
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	438 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	439 _ => {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	440 roots.push(HgPathBuf::new());
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	441 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	442 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	443 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	444 (roots, dirs)
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	445 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	446
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	447 /// Paths extracted from patterns
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	448 #[derive(Debug, PartialEq)]
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	449 struct RootsDirsAndParents {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	450 /// Directories to match recursively
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	451 pub roots: HashSet<HgPathBuf>,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	452 /// Directories to match non-recursively
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	453 pub dirs: HashSet<HgPathBuf>,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	454 /// Implicitly required directories to go to items in either roots or dirs
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	455 pub parents: HashSet<HgPathBuf>,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	456 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	457
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	458 /// Extract roots, dirs and parents from patterns.
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	459 fn roots_dirs_and_parents(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	460 ignore_patterns: &[IgnorePattern],
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	461 ) -> PatternResult<RootsDirsAndParents> {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	462 let (roots, dirs) = roots_and_dirs(ignore_patterns);
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	463
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	464 let mut parents = HashSet::new();
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	465
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	466 parents.extend(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	467 DirsMultiset::from_manifest(&dirs)
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	468 .map_err(\|e\| match e {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	469 DirstateMapError::InvalidPath(e) => e,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	470 _ => unreachable!(),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	471 })?
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	472 .iter()
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44870 diff changeset	473 .map(ToOwned::to_owned),
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	474 );
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	475 parents.extend(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	476 DirsMultiset::from_manifest(&roots)
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	477 .map_err(\|e\| match e {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	478 DirstateMapError::InvalidPath(e) => e,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	479 _ => unreachable!(),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	480 })?
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	481 .iter()
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44870 diff changeset	482 .map(ToOwned::to_owned),
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	483 );
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	484
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	485 Ok(RootsDirsAndParents {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	486 roots: HashSet::from_iter(roots),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	487 dirs: HashSet::from_iter(dirs),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	488 parents,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	489 })
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	490 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	491
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	492 /// Returns a function that checks whether a given file (in the general sense)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	493 /// should be matched.
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	494 fn build_match<'a, 'b>(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	495 ignore_patterns: &'a [IgnorePattern],
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	496 root_dir: impl AsRef<Path>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	497 ) -> PatternResult<(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	498 Vec<u8>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	499 Box<dyn Fn(&HgPath) -> bool + 'b + Sync>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	500 Vec<PatternFileWarning>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	501 )> {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	502 let mut match_funcs: Vec<Box<dyn Fn(&HgPath) -> bool + Sync>> = vec![];
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	503 // For debugging and printing
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	504 let mut patterns = vec![];
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	505 let mut all_warnings = vec![];
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	506
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	507 let (subincludes, ignore_patterns) =
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	508 filter_subincludes(ignore_patterns, root_dir)?;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	509
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	510 if !subincludes.is_empty() {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	511 // Build prefix-based matcher functions for subincludes
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	512 let mut submatchers = FastHashMap::default();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	513 let mut prefixes = vec![];
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	514
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	515 for SubInclude { prefix, root, path } in subincludes.into_iter() {
44597 e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	516 let (match_fn, warnings) =
e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	517 get_ignore_function(vec![path.to_path_buf()], root)?;
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	518 all_warnings.extend(warnings);
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	519 prefixes.push(prefix.to_owned());
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	520 submatchers.insert(prefix.to_owned(), match_fn);
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	521 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	522
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	523 let match_subinclude = move \|filename: &HgPath\| {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	524 for prefix in prefixes.iter() {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	525 if let Some(rel) = filename.relative_to(prefix) {
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44870 diff changeset	526 if (submatchers[prefix])(rel) {
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	527 return true;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	528 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	529 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	530 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	531 false
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	532 };
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	533
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	534 match_funcs.push(Box::new(match_subinclude));
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	535 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	536
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	537 if !ignore_patterns.is_empty() {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	538 // Either do dumb matching if all patterns are rootfiles, or match
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	539 // with a regex.
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	540 if ignore_patterns
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	541 .iter()
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	542 .all(\|k\| k.syntax == PatternSyntax::RootFiles)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	543 {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	544 let dirs: HashSet<_> = ignore_patterns
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	545 .iter()
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	546 .map(\|k\| k.pattern.to_owned())
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	547 .collect();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	548 let mut dirs_vec: Vec<_> = dirs.iter().cloned().collect();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	549
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	550 let match_func = move \|path: &HgPath\| -> bool {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	551 let path = path.as_bytes();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	552 let i = path.iter().rfind(\|a\| **a == b'/');
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	553 let dir = if let Some(i) = i {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	554 &path[..*i as usize]
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	555 } else {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	556 b"."
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	557 };
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	558 dirs.contains(dir.deref())
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	559 };
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	560 match_funcs.push(Box::new(match_func));
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	561
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	562 patterns.extend(b"rootfilesin: ");
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	563 dirs_vec.sort();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	564 patterns.extend(dirs_vec.escaped_bytes());
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	565 } else {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	566 let (new_re, match_func) = build_regex_match(&ignore_patterns)?;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	567 patterns = new_re;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	568 match_funcs.push(match_func)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	569 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	570 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	571
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	572 Ok(if match_funcs.len() == 1 {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	573 (patterns, match_funcs.remove(0), all_warnings)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	574 } else {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	575 (
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	576 patterns,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	577 Box::new(move \|f: &HgPath\| -> bool {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	578 match_funcs.iter().any(\|match_func\| match_func(f))
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	579 }),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	580 all_warnings,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	581 )
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	582 })
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	583 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	584
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	585 /// Parses all "ignore" files with their recursive includes and returns a
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	586 /// function that checks whether a given file (in the general sense) should be
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	587 /// ignored.
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	588 pub fn get_ignore_function<'a>(
44597 e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	589 all_pattern_files: Vec<PathBuf>,
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	590 root_dir: impl AsRef<Path>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	591 ) -> PatternResult<(
44597 e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	592 Box<dyn for<'r> Fn(&'r HgPath) -> bool + Sync + 'a>,
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	593 Vec<PatternFileWarning>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	594 )> {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	595 let mut all_patterns = vec![];
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	596 let mut all_warnings = vec![];
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	597
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	598 for pattern_file in all_pattern_files.into_iter() {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	599 let (patterns, warnings) =
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	600 get_patterns_from_file(pattern_file, &root_dir)?;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	601
44597 e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	602 all_patterns.extend(patterns.to_owned());
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	603 all_warnings.extend(warnings);
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	604 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	605 let (matcher, warnings) = IncludeMatcher::new(all_patterns, root_dir)?;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	606 all_warnings.extend(warnings);
44597 e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	607 Ok((
e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	608 Box::new(move \|path: &HgPath\| matcher.matches(path)),
e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	609 all_warnings,
e62052d0f377 rust-status: only involve ignore mechanism when needed Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	610 ))
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	611 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	612
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	613 impl<'a> IncludeMatcher<'a> {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	614 pub fn new(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	615 ignore_patterns: Vec<IgnorePattern>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	616 root_dir: impl AsRef<Path>,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	617 ) -> PatternResult<(Self, Vec<PatternFileWarning>)> {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	618 let (patterns, match_fn, warnings) =
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	619 build_match(&ignore_patterns, root_dir)?;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	620 let RootsDirsAndParents {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	621 roots,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	622 dirs,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	623 parents,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	624 } = roots_dirs_and_parents(&ignore_patterns)?;
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	625
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	626 let prefix = ignore_patterns.iter().any(\|k\| match k.syntax {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	627 PatternSyntax::Path \| PatternSyntax::RelPath => true,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	628 _ => false,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	629 });
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	630
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	631 Ok((
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	632 Self {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	633 patterns,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	634 match_fn,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	635 prefix,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	636 roots,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	637 dirs,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	638 parents,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	639 },
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	640 warnings,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	641 ))
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	642 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	643
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	644 fn get_all_parents_children(&self) -> DirsChildrenMultiset {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	645 // TODO cache
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	646 let thing = self
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	647 .dirs
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	648 .iter()
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	649 .chain(self.roots.iter())
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	650 .chain(self.parents.iter());
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	651 DirsChildrenMultiset::new(thing, Some(&self.parents))
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	652 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	653 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	654
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	655 impl<'a> Display for IncludeMatcher<'a> {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	656 fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
44803 de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	657 // XXX What about exact matches?
de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	658 // I'm not sure it's worth it to clone the HashSet and keep it
de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	659 // around just in case someone wants to display the matcher, plus
de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	660 // it's going to be unreadable after a few entries, but we need to
de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	661 // inform in this display that exact matches are being used and are
de0fb4463a3d rust-matchers: add TODO about incomplete `Display` for `IncludeMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	662 // (on purpose) missing from the `includes`.
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	663 write!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	664 f,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	665 "IncludeMatcher(includes='{}')",
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	666 String::from_utf8_lossy(&self.patterns.escaped_bytes())
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	667 )
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	668 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	669 }
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	670
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	671 #[cfg(test)]
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	672 mod tests {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	673 use super::*;
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	674 use pretty_assertions::assert_eq;
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	675 use std::path::Path;
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	676
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	677 #[test]
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	678 fn test_roots_and_dirs() {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	679 let pats = vec![
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	680 IgnorePattern::new(PatternSyntax::Glob, b"g/h/*", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	681 IgnorePattern::new(PatternSyntax::Glob, b"g/h", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	682 IgnorePattern::new(PatternSyntax::Glob, b"g*", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	683 ];
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	684 let (roots, dirs) = roots_and_dirs(&pats);
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	685
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	686 assert_eq!(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	687 roots,
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	688 vec!(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	689 HgPathBuf::from_bytes(b"g/h"),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	690 HgPathBuf::from_bytes(b"g/h"),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	691 HgPathBuf::new()
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	692 ),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	693 );
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	694 assert_eq!(dirs, vec!());
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	695 }
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	696
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	697 #[test]
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	698 fn test_roots_dirs_and_parents() {
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	699 let pats = vec![
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	700 IgnorePattern::new(PatternSyntax::Glob, b"g/h/*", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	701 IgnorePattern::new(PatternSyntax::Glob, b"g/h", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	702 IgnorePattern::new(PatternSyntax::Glob, b"g*", Path::new("")),
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	703 ];
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	704
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	705 let mut roots = HashSet::new();
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	706 roots.insert(HgPathBuf::from_bytes(b"g/h"));
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	707 roots.insert(HgPathBuf::new());
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	708
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	709 let dirs = HashSet::new();
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	710
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	711 let mut parents = HashSet::new();
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	712 parents.insert(HgPathBuf::new());
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	713 parents.insert(HgPathBuf::from_bytes(b"g"));
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	714
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	715 assert_eq!(
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	716 roots_dirs_and_parents(&pats).unwrap(),
44524 483fce658e43 rust-status: refactor options into a `StatusOptions` struct Rapha?l Gom?s <rgomes@octobus.net> parents: 44522 diff changeset	717 RootsDirsAndParents {
483fce658e43 rust-status: refactor options into a `StatusOptions` struct Rapha?l Gom?s <rgomes@octobus.net> parents: 44522 diff changeset	718 roots,
483fce658e43 rust-status: refactor options into a `StatusOptions` struct Rapha?l Gom?s <rgomes@octobus.net> parents: 44522 diff changeset	719 dirs,
483fce658e43 rust-status: refactor options into a `StatusOptions` struct Rapha?l Gom?s <rgomes@octobus.net> parents: 44522 diff changeset	720 parents
483fce658e43 rust-status: refactor options into a `StatusOptions` struct Rapha?l Gom?s <rgomes@octobus.net> parents: 44522 diff changeset	721 }
44520 d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	722 );
d4e8cfcde012 rust-matchers: add functions to get roots, dirs and parents from patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44519 diff changeset	723 }
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	724
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	725 #[test]
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	726 fn test_filematcher_visit_children_set() {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	727 // Visitchildrenset
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	728 let files = vec![HgPath::new(b"dir/subdir/foo.txt")];
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	729 let matcher = FileMatcher::new(&files).unwrap();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	730
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	731 let mut set = HashSet::new();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	732 set.insert(HgPath::new(b"dir"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	733 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	734 matcher.visit_children_set(HgPath::new(b"")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	735 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	736 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	737
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	738 let mut set = HashSet::new();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	739 set.insert(HgPath::new(b"subdir"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	740 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	741 matcher.visit_children_set(HgPath::new(b"dir")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	742 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	743 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	744
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	745 let mut set = HashSet::new();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	746 set.insert(HgPath::new(b"foo.txt"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	747 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	748 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	749 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	750 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	751
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	752 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	753 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	754 VisitChildrenSet::Empty
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	755 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	756 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	757 matcher.visit_children_set(HgPath::new(b"dir/subdir/foo.txt")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	758 VisitChildrenSet::Empty
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	759 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	760 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	761 matcher.visit_children_set(HgPath::new(b"folder")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	762 VisitChildrenSet::Empty
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	763 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	764 }
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	765
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	766 #[test]
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	767 fn test_filematcher_visit_children_set_files_and_dirs() {
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	768 let files = vec![
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	769 HgPath::new(b"rootfile.txt"),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	770 HgPath::new(b"a/file1.txt"),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	771 HgPath::new(b"a/b/file2.txt"),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	772 // No file in a/b/c
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	773 HgPath::new(b"a/b/c/d/file4.txt"),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	774 ];
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	775 let matcher = FileMatcher::new(&files).unwrap();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	776
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	777 let mut set = HashSet::new();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	778 set.insert(HgPath::new(b"a"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	779 set.insert(HgPath::new(b"rootfile.txt"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	780 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	781 matcher.visit_children_set(HgPath::new(b"")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	782 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	783 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	784
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	785 let mut set = HashSet::new();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	786 set.insert(HgPath::new(b"b"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	787 set.insert(HgPath::new(b"file1.txt"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	788 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	789 matcher.visit_children_set(HgPath::new(b"a")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	790 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	791 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	792
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	793 let mut set = HashSet::new();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	794 set.insert(HgPath::new(b"c"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	795 set.insert(HgPath::new(b"file2.txt"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	796 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	797 matcher.visit_children_set(HgPath::new(b"a/b")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	798 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	799 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	800
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	801 let mut set = HashSet::new();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	802 set.insert(HgPath::new(b"d"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	803 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	804 matcher.visit_children_set(HgPath::new(b"a/b/c")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	805 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	806 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	807 let mut set = HashSet::new();
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	808 set.insert(HgPath::new(b"file4.txt"));
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	809 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	810 matcher.visit_children_set(HgPath::new(b"a/b/c/d")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	811 VisitChildrenSet::Set(set)
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	812 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	813
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	814 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	815 matcher.visit_children_set(HgPath::new(b"a/b/c/d/e")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	816 VisitChildrenSet::Empty
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	817 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	818 assert_eq!(
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	819 matcher.visit_children_set(HgPath::new(b"folder")),
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	820 VisitChildrenSet::Empty
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	821 );
54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	822 }
44522 c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	823
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	824 #[test]
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	825 fn test_includematcher() {
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	826 // VisitchildrensetPrefix
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	827 let (matcher, _) = IncludeMatcher::new(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	828 vec![IgnorePattern::new(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	829 PatternSyntax::RelPath,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	830 b"dir/subdir",
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	831 Path::new(""),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	832 )],
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	833 "",
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	834 )
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	835 .unwrap();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	836
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	837 let mut set = HashSet::new();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	838 set.insert(HgPath::new(b"dir"));
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	839 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	840 matcher.visit_children_set(HgPath::new(b"")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	841 VisitChildrenSet::Set(set)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	842 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	843
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	844 let mut set = HashSet::new();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	845 set.insert(HgPath::new(b"subdir"));
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	846 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	847 matcher.visit_children_set(HgPath::new(b"dir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	848 VisitChildrenSet::Set(set)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	849 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	850 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	851 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	852 VisitChildrenSet::Recursive
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	853 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	854 // OPT: This should probably be 'all' if its parent is?
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	855 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	856 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	857 VisitChildrenSet::This
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	858 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	859 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	860 matcher.visit_children_set(HgPath::new(b"folder")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	861 VisitChildrenSet::Empty
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	862 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	863
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	864 // VisitchildrensetRootfilesin
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	865 let (matcher, _) = IncludeMatcher::new(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	866 vec![IgnorePattern::new(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	867 PatternSyntax::RootFiles,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	868 b"dir/subdir",
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	869 Path::new(""),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	870 )],
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	871 "",
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	872 )
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	873 .unwrap();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	874
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	875 let mut set = HashSet::new();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	876 set.insert(HgPath::new(b"dir"));
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	877 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	878 matcher.visit_children_set(HgPath::new(b"")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	879 VisitChildrenSet::Set(set)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	880 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	881
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	882 let mut set = HashSet::new();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	883 set.insert(HgPath::new(b"subdir"));
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	884 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	885 matcher.visit_children_set(HgPath::new(b"dir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	886 VisitChildrenSet::Set(set)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	887 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	888
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	889 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	890 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	891 VisitChildrenSet::This
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	892 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	893 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	894 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	895 VisitChildrenSet::Empty
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	896 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	897 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	898 matcher.visit_children_set(HgPath::new(b"folder")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	899 VisitChildrenSet::Empty
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	900 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	901
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	902 // VisitchildrensetGlob
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	903 let (matcher, _) = IncludeMatcher::new(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	904 vec![IgnorePattern::new(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	905 PatternSyntax::Glob,
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	906 b"dir/z*",
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	907 Path::new(""),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	908 )],
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	909 "",
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	910 )
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	911 .unwrap();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	912
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	913 let mut set = HashSet::new();
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	914 set.insert(HgPath::new(b"dir"));
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	915 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	916 matcher.visit_children_set(HgPath::new(b"")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	917 VisitChildrenSet::Set(set)
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	918 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	919 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	920 matcher.visit_children_set(HgPath::new(b"folder")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	921 VisitChildrenSet::Empty
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	922 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	923 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	924 matcher.visit_children_set(HgPath::new(b"dir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	925 VisitChildrenSet::This
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	926 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	927 // OPT: these should probably be set().
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	928 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	929 matcher.visit_children_set(HgPath::new(b"dir/subdir")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	930 VisitChildrenSet::This
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	931 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	932 assert_eq!(
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	933 matcher.visit_children_set(HgPath::new(b"dir/subdir/x")),
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	934 VisitChildrenSet::This
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	935 );
c697638e0e91 rust-matchers: add `IgnoreMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44521 diff changeset	936 }
44353 54d185eb24b5 rust-matchers: implement `visit_children_set` for `FileMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 44006 diff changeset	937 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/matchers.rs @ 45591:f38adf8b0711