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

annotate rust/hg-core/src/filepatterns.rs @ 52302:f33b87b46135

rust-lib: move `PatternError` to the `filepatterns` module This is where it belongs

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Mon, 04 Nov 2024 11:21:43 +0100
parents	e4b9f8a74d5f
children	2ff004fb491c

rev	line source
42751 4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	1 // filepatterns.rs
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	2 //
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	3 // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	4 //
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	5 // This software may be used and distributed according to the terms of the
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	6 // GNU General Public License version 2 or any later version.
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	7
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	8 //! Handling of Mercurial-specific patterns.
4b3b27d567d5 rust-docstrings: add missing module docstrings Rapha?l Gom?s <rgomes@octobus.net> parents: 42636 diff changeset	9
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	10 use crate::{
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	11 utils::{
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	12 files::{canonical_path, get_bytes_from_path, get_path_from_bytes},
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	13 hg_path::{path_to_hg_path_buf, HgPathBuf, HgPathError},
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	14 SliceExt,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	15 },
52302 f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	16 FastHashMap,
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	17 };
42609 326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42483 diff changeset	18 use lazy_static::lazy_static;
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	19 use regex::bytes::{NoExpand, Regex};
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42865 diff changeset	20 use std::path::{Path, PathBuf};
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	21 use std::vec::Vec;
52302 f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	22 use std::{fmt, ops::Deref};
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	23
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	24 #[derive(Debug, derive_more::From)]
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	25 pub enum PatternError {
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	26 #[from]
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	27 Path(HgPathError),
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	28 UnsupportedSyntax(String),
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	29 UnsupportedSyntaxInFile(String, String, usize),
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	30 TooLong(usize),
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	31 #[from]
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	32 IO(std::io::Error),
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	33 /// Needed a pattern that can be turned into a regex but got one that
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	34 /// can't. This should only happen through programmer error.
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	35 NonRegexPattern(IgnorePattern),
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	36 }
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	37
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	38 impl fmt::Display for PatternError {
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	39 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	40 match self {
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	41 PatternError::UnsupportedSyntax(syntax) => {
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	42 write!(f, "Unsupported syntax {}", syntax)
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	43 }
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	44 PatternError::UnsupportedSyntaxInFile(syntax, file_path, line) => {
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	45 write!(
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	46 f,
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	47 "{}:{}: unsupported syntax {}",
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	48 file_path, line, syntax
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	49 )
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	50 }
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	51 PatternError::TooLong(size) => {
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	52 write!(f, "matcher pattern is too long ({} bytes)", size)
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	53 }
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	54 PatternError::IO(error) => error.fmt(f),
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	55 PatternError::Path(error) => error.fmt(f),
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	56 PatternError::NonRegexPattern(pattern) => {
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	57 write!(f, "'{:?}' cannot be turned into a regex", pattern)
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	58 }
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	59 }
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	60 }
f33b87b46135 rust-lib: move `PatternError` to the `filepatterns` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51602 diff changeset	61 }
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	62
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	63 lazy_static! {
42483 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42438 diff changeset	64 static ref RE_ESCAPE: Vec<Vec<u8>> = {
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	65 let mut v: Vec<Vec<u8>> = (0..=255).map(\|byte\| vec![byte]).collect();
50856 2b4bcdc948e7 rust: don't escape spaces in regex Spencer Baugh <sbaugh@janestreet.com> parents: 50855 diff changeset	66 let to_escape = b"()[]{}?*+-\|^$\\.&~#\t\n\r\x0b\x0c";
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	67 for byte in to_escape {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	68 v[*byte as usize].insert(0, b'\\');
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	69 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	70 v
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	71 };
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	72 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	73
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	74 /// These are matched in order
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	75 const GLOB_REPLACEMENTS: &[(&[u8], &[u8])] =
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	76 &[(b"/", b"(?:./)?"), (b"", b"."), (b"", b"[^/]*")];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	77
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	78 #[derive(Debug, Clone, PartialEq, Eq)]
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	79 pub enum PatternSyntax {
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	80 /// A regular expression
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	81 Regexp,
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	82 /// Glob that matches at the front of the path
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	83 RootGlob,
42841 ce6797ef6eab rust: apply more formatting fixes Yuya Nishihara <yuya@tcha.org> parents: 42751 diff changeset	84 /// Glob that matches at any suffix of the path (still anchored at
ce6797ef6eab rust: apply more formatting fixes Yuya Nishihara <yuya@tcha.org> parents: 42751 diff changeset	85 /// slashes)
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	86 Glob,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	87 /// a path relative to repository root, which is matched recursively
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	88 Path,
50692 1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	89 /// a single exact path relative to repository root
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	90 FilePath,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	91 /// A path relative to cwd
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	92 RelPath,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	93 /// an unrooted glob (*.rs matches Rust files in all dirs)
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	94 RelGlob,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	95 /// A regexp that needn't match the start of a name
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	96 RelRegexp,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	97 /// A path relative to repository root, which is matched non-recursively
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	98 /// (will not match subdirectories)
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51467 diff changeset	99 RootFilesIn,
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	100 /// A file of patterns to read and include
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	101 Include,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	102 /// A file of patterns to match against files under the same directory
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	103 SubInclude,
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	104 /// SubInclude with the result of parsing the included file
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	105 ///
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	106 /// Note: there is no ExpandedInclude because that expansion can be done
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	107 /// in place by replacing the Include pattern by the included patterns.
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	108 /// SubInclude requires more handling.
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	109 ///
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	110 /// Note: `Box` is used to minimize size impact on other enum variants
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	111 ExpandedSubInclude(Box<SubInclude>),
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	112 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	113
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	114 /// Transforms a glob pattern into a regex
51467 406b413e3cf2 rust-filepatterns: export glob_to_re function Georges Racinet <georges.racinet@octobus.net> parents: 51117 diff changeset	115 pub fn glob_to_re(pat: &[u8]) -> Vec<u8> {
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	116 let mut input = pat;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	117 let mut res: Vec<u8> = vec![];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	118 let mut group_depth = 0;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	119
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	120 while let Some((c, rest)) = input.split_first() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	121 input = rest;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	122
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	123 match c {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	124 b'*' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	125 for (source, repl) in GLOB_REPLACEMENTS {
42863 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42841 diff changeset	126 if let Some(rest) = input.drop_prefix(source) {
62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42841 diff changeset	127 input = rest;
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	128 res.extend(*repl);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	129 break;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	130 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	131 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	132 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	133 b'?' => res.extend(b"."),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	134 b'[' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	135 match input.iter().skip(1).position(\|b\| *b == b']') {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	136 None => res.extend(b"\\["),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	137 Some(end) => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	138 // Account for the one we skipped
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	139 let end = end + 1;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	140
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	141 res.extend(b"[");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	142
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	143 for (i, b) in input[..end].iter().enumerate() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	144 if *b == b'!' && i == 0 {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	145 res.extend(b"^")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	146 } else if *b == b'^' && i == 0 {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	147 res.extend(b"\\^")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	148 } else if *b == b'\\' {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	149 res.extend(b"\\\\")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	150 } else {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	151 res.push(*b)
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	152 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	153 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	154 res.extend(b"]");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	155 input = &input[end + 1..];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	156 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	157 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	158 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	159 b'{' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	160 group_depth += 1;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	161 res.extend(b"(?:")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	162 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	163 b'}' if group_depth > 0 => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	164 group_depth -= 1;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	165 res.extend(b")");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	166 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	167 b',' if group_depth > 0 => res.extend(b"\|"),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	168 b'\\' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	169 let c = {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	170 if let Some((c, rest)) = input.split_first() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	171 input = rest;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	172 c
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	173 } else {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	174 c
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	175 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	176 };
42483 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42438 diff changeset	177 res.extend(&RE_ESCAPE[*c as usize])
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	178 }
42483 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42438 diff changeset	179 _ => res.extend(&RE_ESCAPE[*c as usize]),
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	180 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	181 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	182 res
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	183 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	184
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	185 fn escape_pattern(pattern: &[u8]) -> Vec<u8> {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	186 pattern
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	187 .iter()
42483 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42438 diff changeset	188 .flat_map(\|c\| RE_ESCAPE[*c as usize].clone())
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	189 .collect()
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	190 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	191
51602 e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	192 pub fn parse_pattern_syntax_kind(
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	193 kind: &[u8],
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	194 ) -> Result<PatternSyntax, PatternError> {
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	195 match kind {
51602 e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	196 b"re" => Ok(PatternSyntax::Regexp),
e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	197 b"path" => Ok(PatternSyntax::Path),
e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	198 b"filepath" => Ok(PatternSyntax::FilePath),
e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	199 b"relpath" => Ok(PatternSyntax::RelPath),
e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	200 b"rootfilesin" => Ok(PatternSyntax::RootFilesIn),
e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	201 b"relglob" => Ok(PatternSyntax::RelGlob),
e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	202 b"relre" => Ok(PatternSyntax::RelRegexp),
e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	203 b"glob" => Ok(PatternSyntax::Glob),
e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	204 b"rootglob" => Ok(PatternSyntax::RootGlob),
e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	205 b"include" => Ok(PatternSyntax::Include),
e4b9f8a74d5f match: simplify the rust-side file pattern kind parsing Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51565 diff changeset	206 b"subinclude" => Ok(PatternSyntax::SubInclude),
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	207 _ => Err(PatternError::UnsupportedSyntax(
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	208 String::from_utf8_lossy(kind).to_string(),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	209 )),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	210 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	211 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	212
49604 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	213 lazy_static! {
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	214 static ref FLAG_RE: Regex = Regex::new(r"^$\?[aiLmsux]+$").unwrap();
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	215 }
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	216
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	217 /// Builds the regex that corresponds to the given pattern.
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	218 /// If within a `syntax: regexp` context, returns the pattern,
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	219 /// otherwise, returns the corresponding regex.
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	220 fn _build_single_regex(entry: &IgnorePattern, glob_suffix: &[u8]) -> Vec<u8> {
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	221 let IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	222 syntax, pattern, ..
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	223 } = entry;
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	224 if pattern.is_empty() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	225 return vec![];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	226 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	227 match syntax {
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	228 PatternSyntax::Regexp => pattern.to_owned(),
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	229 PatternSyntax::RelRegexp => {
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44304 diff changeset	230 // The `regex` crate accepts `**` while `re2` and Python's `re`
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44304 diff changeset	231 // do not. Checking for `*` correctly triggers the same error all
496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44304 diff changeset	232 // engines.
44833 1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44832 diff changeset	233 if pattern[0] == b'^'
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44832 diff changeset	234 \|\| pattern[0] == b'*'
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44832 diff changeset	235 \|\| pattern.starts_with(b".*")
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44832 diff changeset	236 {
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	237 return pattern.to_owned();
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	238 }
49604 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	239 match FLAG_RE.find(pattern) {
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	240 Some(mat) => {
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	241 let s = mat.start();
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	242 let e = mat.end();
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	243 [
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	244 &b"(?"[..],
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	245 &pattern[s + 2..e - 1],
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	246 &b":"[..],
49605 b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	247 if pattern[e] == b'^'
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	248 \|\| pattern[e] == b'*'
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	249 \|\| pattern[e..].starts_with(b".*")
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	250 {
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	251 &b""[..]
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	252 } else {
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	253 &b".*"[..]
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	254 },
49604 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	255 &pattern[e..],
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	256 &b")"[..],
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	257 ]
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	258 .concat()
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	259 }
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	260 None => [&b".*"[..], pattern].concat(),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	261 }
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	262 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	263 PatternSyntax::Path \| PatternSyntax::RelPath => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	264 if pattern == b"." {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	265 return vec![];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	266 }
42865 69195b6f8f97 rustfilepatterns: shorter code for concatenating slices Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42864 diff changeset	267 [escape_pattern(pattern).as_slice(), b"(?:/\|$)"].concat()
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	268 }
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51467 diff changeset	269 PatternSyntax::RootFilesIn => {
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	270 let mut res = if pattern == b"." {
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	271 vec![]
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	272 } else {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	273 // Pattern is a directory name.
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	274 [escape_pattern(pattern).as_slice(), b"/"].concat()
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	275 };
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	276
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	277 // Anything after the pattern must be a non-directory.
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	278 res.extend(b"[^/]+$");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	279 res
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	280 }
42864 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42863 diff changeset	281 PatternSyntax::RelGlob => {
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42863 diff changeset	282 let glob_re = glob_to_re(pattern);
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42863 diff changeset	283 if let Some(rest) = glob_re.drop_prefix(b"[^/]*") {
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	284 [b".*", rest, glob_suffix].concat()
42864 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42863 diff changeset	285 } else {
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	286 [b"(?:.*/)?", glob_re.as_slice(), glob_suffix].concat()
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	287 }
42864 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42863 diff changeset	288 }
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42863 diff changeset	289 PatternSyntax::Glob \| PatternSyntax::RootGlob => {
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	290 [glob_to_re(pattern).as_slice(), glob_suffix].concat()
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	291 }
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	292 PatternSyntax::Include
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	293 \| PatternSyntax::SubInclude
50692 1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	294 \| PatternSyntax::ExpandedSubInclude(_)
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	295 \| PatternSyntax::FilePath => unreachable!(),
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	296 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	297 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	298
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	299 const GLOB_SPECIAL_CHARACTERS: [u8; 7] =
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	300 [b'*', b'?', b'[', b']', b'{', b'}', b'\\'];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	301
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	302 /// TODO support other platforms
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	303 #[cfg(unix)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	304 pub fn normalize_path_bytes(bytes: &[u8]) -> Vec<u8> {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	305 if bytes.is_empty() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	306 return b".".to_vec();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	307 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	308 let sep = b'/';
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	309
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	310 let mut initial_slashes = bytes.iter().take_while(\|b\| **b == sep).count();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	311 if initial_slashes > 2 {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	312 // POSIX allows one or two initial slashes, but treats three or more
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	313 // as single slash.
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	314 initial_slashes = 1;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	315 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	316 let components = bytes
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	317 .split(\|b\| *b == sep)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	318 .filter(\|c\| !(c.is_empty() \|\| c == b"."))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	319 .fold(vec![], \|mut acc, component\| {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	320 if component != b".."
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	321 \|\| (initial_slashes == 0 && acc.is_empty())
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	322 \|\| (!acc.is_empty() && acc[acc.len() - 1] == b"..")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	323 {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	324 acc.push(component)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	325 } else if !acc.is_empty() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	326 acc.pop();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	327 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	328 acc
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	329 });
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	330 let mut new_bytes = components.join(&sep);
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	331
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	332 if initial_slashes > 0 {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	333 let mut buf: Vec<_> = (0..initial_slashes).map(\|_\| sep).collect();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	334 buf.extend(new_bytes);
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	335 new_bytes = buf;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	336 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	337 if new_bytes.is_empty() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	338 b".".to_vec()
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	339 } else {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	340 new_bytes
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	341 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	342 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	343
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	344 /// Wrapper function to `_build_single_regex` that short-circuits 'exact' globs
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	345 /// that don't need to be transformed into a regex.
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	346 pub fn build_single_regex(
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	347 entry: &IgnorePattern,
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	348 glob_suffix: &[u8],
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	349 ) -> Result<Option<Vec<u8>>, PatternError> {
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	350 let IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	351 pattern, syntax, ..
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	352 } = entry;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	353 let pattern = match syntax {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	354 PatternSyntax::RootGlob
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	355 \| PatternSyntax::Path
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	356 \| PatternSyntax::RelGlob
50855 df6dfad5009a rust-filepatterns: also normalize RelPath Spencer Baugh <sbaugh@janestreet.com> parents: 50854 diff changeset	357 \| PatternSyntax::RelPath
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51467 diff changeset	358 \| PatternSyntax::RootFilesIn => normalize_path_bytes(pattern),
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	359 PatternSyntax::Include \| PatternSyntax::SubInclude => {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	360 return Err(PatternError::NonRegexPattern(entry.clone()))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	361 }
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	362 _ => pattern.to_owned(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	363 };
50692 1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	364 let is_simple_rootglob = *syntax == PatternSyntax::RootGlob
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	365 && !pattern.iter().any(\|b\| GLOB_SPECIAL_CHARACTERS.contains(b));
1c31b343e514 match: add `filepath:` pattern to match an exact filepath relative to the root Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	366 if is_simple_rootglob \|\| syntax == &PatternSyntax::FilePath {
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	367 Ok(None)
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	368 } else {
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	369 let mut entry = entry.clone();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	370 entry.pattern = pattern;
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	371 Ok(Some(_build_single_regex(&entry, glob_suffix)))
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	372 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	373 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	374
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	375 lazy_static! {
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	376 static ref SYNTAXES: FastHashMap<&'static [u8], PatternSyntax> = {
43826 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42957 diff changeset	377 let mut m = FastHashMap::default();
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	378
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	379 m.insert(b"re:".as_ref(), PatternSyntax::Regexp);
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	380 m.insert(b"regexp:".as_ref(), PatternSyntax::Regexp);
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	381 m.insert(b"path:".as_ref(), PatternSyntax::Path);
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	382 m.insert(b"filepath:".as_ref(), PatternSyntax::FilePath);
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	383 m.insert(b"relpath:".as_ref(), PatternSyntax::RelPath);
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51467 diff changeset	384 m.insert(b"rootfilesin:".as_ref(), PatternSyntax::RootFilesIn);
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	385 m.insert(b"relglob:".as_ref(), PatternSyntax::RelGlob);
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	386 m.insert(b"relre:".as_ref(), PatternSyntax::RelRegexp);
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	387 m.insert(b"glob:".as_ref(), PatternSyntax::Glob);
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	388 m.insert(b"rootglob:".as_ref(), PatternSyntax::RootGlob);
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	389 m.insert(b"include:".as_ref(), PatternSyntax::Include);
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	390 m.insert(b"subinclude:".as_ref(), PatternSyntax::SubInclude);
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	391
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	392 m
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	393 };
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	394 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	395
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	396 #[derive(Debug)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	397 pub enum PatternFileWarning {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	398 /// (file path, syntax bytes)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	399 InvalidSyntax(PathBuf, Vec<u8>),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	400 /// File path
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	401 NoSuchFile(PathBuf),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	402 }
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	403
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	404 pub fn parse_one_pattern(
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	405 pattern: &[u8],
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	406 source: &Path,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	407 default: PatternSyntax,
50863 c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	408 normalize: bool,
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	409 ) -> IgnorePattern {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	410 let mut pattern_bytes: &[u8] = pattern;
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	411 let mut syntax = default;
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	412
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	413 for (s, val) in SYNTAXES.iter() {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	414 if let Some(rest) = pattern_bytes.drop_prefix(s) {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	415 syntax = val.clone();
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	416 pattern_bytes = rest;
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	417 break;
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	418 }
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	419 }
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	420
50863 c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	421 let pattern = match syntax {
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	422 PatternSyntax::RootGlob
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	423 \| PatternSyntax::Path
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	424 \| PatternSyntax::Glob
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	425 \| PatternSyntax::RelGlob
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	426 \| PatternSyntax::RelPath
51565 2a89d2f6336f match: rename RootFiles to RootFilesIn for more consistency Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51467 diff changeset	427 \| PatternSyntax::RootFilesIn
50863 c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	428 if normalize =>
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	429 {
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	430 normalize_path_bytes(pattern_bytes)
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	431 }
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	432 _ => pattern_bytes.to_vec(),
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	433 };
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	434
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	435 IgnorePattern {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	436 syntax,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	437 pattern,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	438 source: source.to_owned(),
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	439 }
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	440 }
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	441
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	442 pub fn parse_pattern_file_contents(
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	443 lines: &[u8],
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	444 file_path: &Path,
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	445 default_syntax_override: Option<PatternSyntax>,
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	446 warn: bool,
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	447 relativize: bool,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	448 ) -> Result<(Vec<IgnorePattern>, Vec<PatternFileWarning>), PatternError> {
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	449 let comment_regex = Regex::new(r"((?:^\|[^\\])(?:\\\\))#.").unwrap();
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44834 diff changeset	450
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44834 diff changeset	451 #[allow(clippy::trivial_regex)]
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	452 let comment_escape_regex = Regex::new(r"\\#").unwrap();
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	453 let mut inputs: Vec<IgnorePattern> = vec![];
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	454 let mut warnings: Vec<PatternFileWarning> = vec![];
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	455
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	456 let mut current_syntax =
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	457 default_syntax_override.unwrap_or(PatternSyntax::RelRegexp);
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	458
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	459 for mut line in lines.split(\|c\| *c == b'\n') {
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	460 let line_buf;
42635 30f8e786868c rust-filepatterns: use literal b'#' instead of cast Yuya Nishihara <yuya@tcha.org> parents: 42634 diff changeset	461 if line.contains(&b'#') {
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	462 if let Some(cap) = comment_regex.captures(line) {
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	463 line = &line[..cap.get(1).unwrap().end()]
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	464 }
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	465 line_buf = comment_escape_regex.replace_all(line, NoExpand(b"#"));
12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	466 line = &line_buf;
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	467 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	468
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	469 let line = line.trim_end();
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	470
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	471 if line.is_empty() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	472 continue;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	473 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	474
42863 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42841 diff changeset	475 if let Some(syntax) = line.drop_prefix(b"syntax:") {
62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42841 diff changeset	476 let syntax = syntax.trim();
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	477
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	478 if let Some(parsed) =
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	479 SYNTAXES.get([syntax, &b":"[..]].concat().as_slice())
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	480 {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	481 current_syntax = parsed.clone();
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	482 } else if warn {
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	483 warnings.push(PatternFileWarning::InvalidSyntax(
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	484 file_path.to_owned(),
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	485 syntax.to_owned(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	486 ));
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	487 }
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	488 } else {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	489 let pattern = parse_one_pattern(
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	490 line,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	491 file_path,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	492 current_syntax.clone(),
50863 c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	493 false,
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	494 );
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	495 inputs.push(if relativize {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	496 pattern.to_relative()
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	497 } else {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	498 pattern
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	499 })
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	500 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	501 }
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	502 Ok((inputs, warnings))
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	503 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	504
50863 c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	505 pub fn parse_pattern_args(
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	506 patterns: Vec<Vec<u8>>,
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	507 cwd: &Path,
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	508 root: &Path,
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	509 ) -> Result<Vec<IgnorePattern>, HgPathError> {
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	510 let mut ignore_patterns: Vec<IgnorePattern> = Vec::new();
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	511 for pattern in patterns {
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	512 let pattern = parse_one_pattern(
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	513 &pattern,
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	514 Path::new("<args>"),
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	515 PatternSyntax::RelPath,
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	516 true,
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	517 );
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	518 match pattern.syntax {
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	519 PatternSyntax::RelGlob \| PatternSyntax::RelPath => {
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	520 let name = get_path_from_bytes(&pattern.pattern);
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	521 let canon = canonical_path(root, cwd, name)?;
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	522 ignore_patterns.push(IgnorePattern {
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	523 syntax: pattern.syntax,
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	524 pattern: get_bytes_from_path(canon),
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	525 source: pattern.source,
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	526 })
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	527 }
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	528 _ => ignore_patterns.push(pattern.to_owned()),
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	529 };
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	530 }
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	531 Ok(ignore_patterns)
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	532 }
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50858 diff changeset	533
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	534 pub fn read_pattern_file(
777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	535 file_path: &Path,
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	536 warn: bool,
49558 363923bd51cd dirstate-v2: hash the source of the ignore patterns as well Rapha?l Gom?s <rgomes@octobus.net> parents: 49489 diff changeset	537 inspect_pattern_bytes: &mut impl FnMut(&Path, &[u8]),
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	538 ) -> Result<(Vec<IgnorePattern>, Vec<PatternFileWarning>), PatternError> {
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	539 match std::fs::read(file_path) {
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	540 Ok(contents) => {
49558 363923bd51cd dirstate-v2: hash the source of the ignore patterns as well Rapha?l Gom?s <rgomes@octobus.net> parents: 49489 diff changeset	541 inspect_pattern_bytes(file_path, &contents);
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	542 parse_pattern_file_contents(&contents, file_path, None, warn, true)
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	543 }
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	544 Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok((
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	545 vec![],
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	546 vec![PatternFileWarning::NoSuchFile(file_path.to_owned())],
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	547 )),
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	548 Err(e) => Err(e.into()),
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	549 }
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	550 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	551
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	552 /// Represents an entry in an "ignore" file.
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	553 #[derive(Debug, Eq, PartialEq, Clone)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	554 pub struct IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	555 pub syntax: PatternSyntax,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	556 pub pattern: Vec<u8>,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	557 pub source: PathBuf,
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	558 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	559
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	560 impl IgnorePattern {
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	561 pub fn new(syntax: PatternSyntax, pattern: &[u8], source: &Path) -> Self {
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	562 Self {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	563 syntax,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	564 pattern: pattern.to_owned(),
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	565 source: source.to_owned(),
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	566 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	567 }
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	568
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	569 pub fn to_relative(self) -> Self {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	570 let Self {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	571 syntax,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	572 pattern,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	573 source,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	574 } = self;
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	575 Self {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	576 syntax: match syntax {
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	577 PatternSyntax::Regexp => PatternSyntax::RelRegexp,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	578 PatternSyntax::Glob => PatternSyntax::RelGlob,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	579 x => x,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	580 },
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	581 pattern,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	582 source,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	583 }
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	584 }
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	585 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	586
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	587 pub type PatternResult<T> = Result<T, PatternError>;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	588
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	589 /// Wrapper for `read_pattern_file` that also recursively expands `include:`
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	590 /// and `subinclude:` patterns.
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	591 ///
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	592 /// The former are expanded in place, while `PatternSyntax::ExpandedSubInclude`
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	593 /// is used for the latter to form a tree of patterns.
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	594 pub fn get_patterns_from_file(
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	595 pattern_file: &Path,
777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	596 root_dir: &Path,
49558 363923bd51cd dirstate-v2: hash the source of the ignore patterns as well Rapha?l Gom?s <rgomes@octobus.net> parents: 49489 diff changeset	597 inspect_pattern_bytes: &mut impl FnMut(&Path, &[u8]),
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	598 ) -> PatternResult<(Vec<IgnorePattern>, Vec<PatternFileWarning>)> {
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	599 let (patterns, mut warnings) =
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	600 read_pattern_file(pattern_file, true, inspect_pattern_bytes)?;
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	601 let patterns = patterns
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	602 .into_iter()
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	603 .flat_map(\|entry\| -> PatternResult<_> {
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	604 Ok(match &entry.syntax {
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	605 PatternSyntax::Include => {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	606 let inner_include =
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	607 root_dir.join(get_path_from_bytes(&entry.pattern));
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	608 let (inner_pats, inner_warnings) = get_patterns_from_file(
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	609 &inner_include,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	610 root_dir,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	611 inspect_pattern_bytes,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	612 )?;
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	613 warnings.extend(inner_warnings);
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	614 inner_pats
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	615 }
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	616 PatternSyntax::SubInclude => {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	617 let mut sub_include = SubInclude::new(
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49928 diff changeset	618 root_dir,
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	619 &entry.pattern,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	620 &entry.source,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	621 )?;
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	622 let (inner_patterns, inner_warnings) =
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	623 get_patterns_from_file(
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	624 &sub_include.path,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	625 &sub_include.root,
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	626 inspect_pattern_bytes,
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	627 )?;
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	628 sub_include.included_patterns = inner_patterns;
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	629 warnings.extend(inner_warnings);
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	630 vec![IgnorePattern {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	631 syntax: PatternSyntax::ExpandedSubInclude(Box::new(
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	632 sub_include,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	633 )),
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	634 ..entry
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	635 }]
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	636 }
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	637 _ => vec![entry],
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	638 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	639 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	640 .flatten()
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	641 .collect();
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	642
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	643 Ok((patterns, warnings))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	644 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	645
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	646 /// Holds all the information needed to handle a `subinclude:` pattern.
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	647 #[derive(Debug, PartialEq, Eq, Clone)]
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	648 pub struct SubInclude {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	649 /// Will be used for repository (hg) paths that start with this prefix.
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	650 /// It is relative to the current working directory, so comparing against
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	651 /// repository paths is painless.
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	652 pub prefix: HgPathBuf,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	653 /// The file itself, containing the patterns
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	654 pub path: PathBuf,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	655 /// Folder in the filesystem where this it applies
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	656 pub root: PathBuf,
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	657
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	658 pub included_patterns: Vec<IgnorePattern>,
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	659 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	660
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	661 impl SubInclude {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	662 pub fn new(
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	663 root_dir: &Path,
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	664 pattern: &[u8],
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	665 source: &Path,
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	666 ) -> Result<SubInclude, HgPathError> {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	667 let normalized_source =
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	668 normalize_path_bytes(&get_bytes_from_path(source));
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	669
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	670 let source_root = get_path_from_bytes(&normalized_source);
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	671 let source_root = source_root.parent().unwrap_or(source_root);
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	672
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	673 let path = source_root.join(get_path_from_bytes(pattern));
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44834 diff changeset	674 let new_root = path.parent().unwrap_or_else(\|\| path.deref());
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	675
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	676 let prefix = canonical_path(root_dir, root_dir, new_root)?;
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	677
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	678 Ok(Self {
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49928 diff changeset	679 prefix: path_to_hg_path_buf(prefix).map(\|mut p\| {
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	680 if !p.is_empty() {
48311 6d69e83e6b6e rhg: more efficient `HgPath::join` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47409 diff changeset	681 p.push_byte(b'/');
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	682 }
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49928 diff changeset	683 p
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	684 })?,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	685 path: path.to_owned(),
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	686 root: new_root.to_owned(),
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	687 included_patterns: Vec::new(),
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	688 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	689 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	690 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	691
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	692 /// Separate and pre-process subincludes from other patterns for the "ignore"
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	693 /// phase.
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	694 pub fn filter_subincludes(
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	695 ignore_patterns: Vec<IgnorePattern>,
49928 ccb6cfb0f2c0 rust-filepatterns: don't `Box` subincludes unnecessarily Rapha?l Gom?s <rgomes@octobus.net> parents: 49605 diff changeset	696 ) -> Result<(Vec<SubInclude>, Vec<IgnorePattern>), HgPathError> {
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	697 let mut subincludes = vec![];
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	698 let mut others = vec![];
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	699
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	700 for pattern in ignore_patterns {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	701 if let PatternSyntax::ExpandedSubInclude(sub_include) = pattern.syntax
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	702 {
49928 ccb6cfb0f2c0 rust-filepatterns: don't `Box` subincludes unnecessarily Rapha?l Gom?s <rgomes@octobus.net> parents: 49605 diff changeset	703 subincludes.push(*sub_include);
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	704 } else {
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	705 others.push(pattern)
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	706 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	707 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	708 Ok((subincludes, others))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	709 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	710
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	711 #[cfg(test)]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	712 mod tests {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	713 use super::*;
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	714 use pretty_assertions::assert_eq;
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	715
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	716 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	717 fn escape_pattern_test() {
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	718 let untouched =
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	719 br#"!"%',/0123456789:;<=>@ABCDEFGHIJKLMNOPQRSTUVWXYZ_`abcdefghijklmnopqrstuvwxyz"#;
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	720 assert_eq!(escape_pattern(untouched), untouched.to_vec());
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	721 // All escape codes
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	722 assert_eq!(
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	723 escape_pattern(br"()[]{}?*+-\|^$\\.&~#\t\n\r\v\f"),
532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	724 br"\[\]\{\}\?\*\+\-\\|\^\$\\\\\.\&\~\#\\t\\n\\r\\v\\f".to_vec()
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	725 );
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	726 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	727
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	728 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	729 fn glob_test() {
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	730 assert_eq!(glob_to_re(br"?"), br".");
532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	731 assert_eq!(glob_to_re(br""), br"[^/]");
532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	732 assert_eq!(glob_to_re(br"*"), br".");
532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	733 assert_eq!(glob_to_re(br"*/a"), br"(?:./)?a");
532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	734 assert_eq!(glob_to_re(br"a/*/b"), br"a/(?:./)?b");
532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	735 assert_eq!(glob_to_re(br"[a?!^][^b][!c]"), br"[a?!^][\^b][^c]");
532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	736 assert_eq!(glob_to_re(br"{a,b}"), br"(?:a\|b)");
532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50863 diff changeset	737 assert_eq!(glob_to_re(br".\\?"), br"\.\\?");
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	738 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	739
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	740 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	741 fn test_parse_pattern_file_contents() {
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	742 let lines = b"syntax: glob\n*.elc";
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	743
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	744 assert_eq!(
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	745 parse_pattern_file_contents(
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	746 lines,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	747 Path::new("file_path"),
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	748 None,
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	749 false,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	750 true,
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	751 )
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	752 .unwrap()
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	753 .0,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	754 vec![IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	755 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	756 b"*.elc",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	757 Path::new("file_path")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	758 )],
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	759 );
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	760
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	761 let lines = b"syntax: include\nsyntax: glob";
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	762
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	763 assert_eq!(
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	764 parse_pattern_file_contents(
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	765 lines,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	766 Path::new("file_path"),
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	767 None,
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	768 false,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	769 true,
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	770 )
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	771 .unwrap()
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	772 .0,
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	773 vec![]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	774 );
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	775 let lines = b"glob:**.o";
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	776 assert_eq!(
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	777 parse_pattern_file_contents(
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	778 lines,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	779 Path::new("file_path"),
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	780 None,
50854 796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	781 false,
796b5d6693a4 rust: simplify pattern file parsing Spencer Baugh <sbaugh@janestreet.com> parents: 50692 diff changeset	782 true,
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	783 )
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	784 .unwrap()
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	785 .0,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	786 vec![IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	787 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	788 b"**.o",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	789 Path::new("file_path")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	790 )]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	791 );
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	792 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	793
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	794 #[test]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	795 fn test_build_single_regex() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	796 assert_eq!(
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	797 build_single_regex(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	798 &IgnorePattern::new(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	799 PatternSyntax::RelGlob,
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	800 b"rust/target/",
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	801 Path::new("")
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	802 ),
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	803 b"(?:/\|$)"
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	804 )
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	805 .unwrap(),
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	806 Some(br"(?:.*/)?rust/target(?:/\|$)".to_vec()),
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	807 );
44834 be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	808 assert_eq!(
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	809 build_single_regex(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	810 &IgnorePattern::new(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	811 PatternSyntax::Regexp,
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	812 br"rust/target/\d+",
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	813 Path::new("")
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	814 ),
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	815 b"(?:/\|$)"
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	816 )
44834 be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	817 .unwrap(),
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	818 Some(br"rust/target/\d+".to_vec()),
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	819 );
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	820 }
42438 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	821
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	822 #[test]
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	823 fn test_build_single_regex_shortcut() {
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	824 assert_eq!(
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	825 build_single_regex(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	826 &IgnorePattern::new(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	827 PatternSyntax::RootGlob,
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	828 b"",
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	829 Path::new("")
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	830 ),
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	831 b"(?:/\|$)"
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	832 )
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	833 .unwrap(),
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	834 None,
42438 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	835 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	836 assert_eq!(
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	837 build_single_regex(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	838 &IgnorePattern::new(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	839 PatternSyntax::RootGlob,
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	840 b"whatever",
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	841 Path::new("")
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	842 ),
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	843 b"(?:/\|$)"
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	844 )
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	845 .unwrap(),
44802 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44593 diff changeset	846 None,
42438 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	847 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	848 assert_eq!(
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	849 build_single_regex(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	850 &IgnorePattern::new(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	851 PatternSyntax::RootGlob,
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	852 b"*.o",
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	853 Path::new("")
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	854 ),
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	855 b"(?:/\|$)"
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	856 )
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	857 .unwrap(),
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	858 Some(br"[^/]*\.o(?:/\|$)".to_vec()),
42438 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	859 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	860 }
49604 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	861
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	862 #[test]
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	863 fn test_build_single_relregex() {
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	864 assert_eq!(
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	865 build_single_regex(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	866 &IgnorePattern::new(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	867 PatternSyntax::RelRegexp,
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	868 b"^ba{2}r",
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	869 Path::new("")
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	870 ),
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	871 b"(?:/\|$)"
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	872 )
49604 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	873 .unwrap(),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	874 Some(b"^ba{2}r".to_vec()),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	875 );
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	876 assert_eq!(
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	877 build_single_regex(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	878 &IgnorePattern::new(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	879 PatternSyntax::RelRegexp,
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	880 b"ba{2}r",
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	881 Path::new("")
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	882 ),
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	883 b"(?:/\|$)"
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	884 )
49604 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	885 .unwrap(),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	886 Some(b".*ba{2}r".to_vec()),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	887 );
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	888 assert_eq!(
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	889 build_single_regex(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	890 &IgnorePattern::new(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	891 PatternSyntax::RelRegexp,
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	892 b"(?ia)ba{2}r",
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	893 Path::new("")
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	894 ),
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	895 b"(?:/\|$)"
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	896 )
49604 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	897 .unwrap(),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	898 Some(b"(?ia:.*ba{2}r)".to_vec()),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	899 );
49605 b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	900 assert_eq!(
50858 090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	901 build_single_regex(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	902 &IgnorePattern::new(
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	903 PatternSyntax::RelRegexp,
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	904 b"(?ia)^ba{2}r",
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	905 Path::new("")
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	906 ),
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	907 b"(?:/\|$)"
090658724abf rust: de-hardcode glob_suffix Spencer Baugh <sbaugh@janestreet.com> parents: 50856 diff changeset	908 )
49605 b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	909 .unwrap(),
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	910 Some(b"(?ia:^ba{2}r)".to_vec()),
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49604 diff changeset	911 );
49604 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49558 diff changeset	912 }
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	913 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/filepatterns.rs @ 52302:f33b87b46135