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

annotate rust/hg-core/src/filepatterns.rs @ 49482:5fbdd88824dc

rust-filepatterns: allow overriding default syntax This will be used when parsing pattern files other than .hgignore like the sparse spec.

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Mon, 18 Jul 2022 17:25:49 +0200
parents	6d69e83e6b6e
children	7c93e38a0bbd

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 },
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	16 FastHashMap, PatternError,
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};
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	20 use std::ops::Deref;
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42865 diff changeset	21 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	22 use std::vec::Vec;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	23
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	24 lazy_static! {
42483 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42438 diff changeset	25 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	26 let mut v: Vec<Vec<u8>> = (0..=255).map(\|byte\| vec![byte]).collect();
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	27 let to_escape = b"()[]{}?*+-\|^$\\.&~# \t\n\r\x0b\x0c";
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	28 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	29 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	30 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	31 v
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	32 };
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	33 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	34
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	35 /// 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	36 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	37 &[(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	38
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	39 /// Appended to the regexp of globs
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	40 const GLOB_SUFFIX: &[u8; 7] = b"(?:/\|$)";
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	41
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	42 #[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	43 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	44 /// 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	45 Regexp,
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	46 /// 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	47 RootGlob,
42841 ce6797ef6eab rust: apply more formatting fixes Yuya Nishihara <yuya@tcha.org> parents: 42751 diff changeset	48 /// 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	49 /// slashes)
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	50 Glob,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	51 /// 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	52 Path,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	53 /// 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	54 RelPath,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	55 /// 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	56 RelGlob,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	57 /// 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	58 RelRegexp,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	59 /// 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	60 /// (will not match subdirectories)
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	61 RootFiles,
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	62 /// 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	63 Include,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	64 /// 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	65 SubInclude,
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	66 /// 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	67 ///
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	68 /// 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	69 /// 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	70 /// 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	71 ///
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	72 /// 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	73 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	74 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	75
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	76 /// Transforms a glob pattern into a regex
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	77 fn glob_to_re(pat: &[u8]) -> Vec<u8> {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	78 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	79 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	80 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	81
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	82 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	83 input = rest;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	84
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	85 match c {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	86 b'*' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	87 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	88 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	89 input = rest;
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	90 res.extend(*repl);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	91 break;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	92 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	93 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	94 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	95 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	96 b'[' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	97 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	98 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	99 Some(end) => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	100 // 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	101 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	102
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	103 res.extend(b"[");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	104
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	105 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	106 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	107 res.extend(b"^")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	108 } 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	109 res.extend(b"\\^")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	110 } 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	111 res.extend(b"\\\\")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	112 } else {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	113 res.push(*b)
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	114 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	115 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	116 res.extend(b"]");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	117 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	118 }
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 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	121 b'{' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	122 group_depth += 1;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	123 res.extend(b"(?:")
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	124 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	125 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	126 group_depth -= 1;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	127 res.extend(b")");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	128 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	129 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	130 b'\\' => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	131 let c = {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	132 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	133 input = rest;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	134 c
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	135 } else {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	136 c
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	137 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	138 };
42483 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42438 diff changeset	139 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	140 }
42483 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42438 diff changeset	141 _ => 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	142 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	143 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	144 res
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	145 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	146
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	147 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	148 pattern
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	149 .iter()
42483 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42438 diff changeset	150 .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	151 .collect()
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
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	154 pub fn parse_pattern_syntax(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	155 kind: &[u8],
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	156 ) -> 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	157 match kind {
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	158 b"re:" => Ok(PatternSyntax::Regexp),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	159 b"path:" => Ok(PatternSyntax::Path),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	160 b"relpath:" => Ok(PatternSyntax::RelPath),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	161 b"rootfilesin:" => Ok(PatternSyntax::RootFiles),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	162 b"relglob:" => Ok(PatternSyntax::RelGlob),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	163 b"relre:" => Ok(PatternSyntax::RelRegexp),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	164 b"glob:" => Ok(PatternSyntax::Glob),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	165 b"rootglob:" => Ok(PatternSyntax::RootGlob),
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	166 b"include:" => Ok(PatternSyntax::Include),
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	167 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	168 _ => Err(PatternError::UnsupportedSyntax(
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	169 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	170 )),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	171 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	172 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	173
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	174 /// 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	175 /// 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	176 /// otherwise, returns the corresponding regex.
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	177 fn _build_single_regex(entry: &IgnorePattern) -> Vec<u8> {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	178 let IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	179 syntax, pattern, ..
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	180 } = entry;
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	181 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	182 return vec![];
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 match syntax {
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	185 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	186 PatternSyntax::RelRegexp => {
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44304 diff changeset	187 // 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	188 // 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	189 // engines.
44833 1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44832 diff changeset	190 if pattern[0] == b'^'
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44832 diff changeset	191 \|\| pattern[0] == b'*'
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44832 diff changeset	192 \|\| pattern.starts_with(b".*")
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44832 diff changeset	193 {
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	194 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	195 }
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	196 [&b".*"[..], pattern].concat()
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	197 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	198 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	199 if pattern == b"." {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	200 return vec![];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	201 }
42865 69195b6f8f97 rustfilepatterns: shorter code for concatenating slices Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42864 diff changeset	202 [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	203 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	204 PatternSyntax::RootFiles => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	205 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	206 vec![]
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	207 } else {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	208 // 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	209 [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	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 // 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	213 res.extend(b"[^/]+$");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	214 res
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	215 }
42864 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42863 diff changeset	216 PatternSyntax::RelGlob => {
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42863 diff changeset	217 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	218 if let Some(rest) = glob_re.drop_prefix(b"[^/]*") {
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	219 [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	220 } else {
44593 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44304 diff changeset	221 [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	222 }
42864 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42863 diff changeset	223 }
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42863 diff changeset	224 PatternSyntax::Glob \| PatternSyntax::RootGlob => {
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	225 [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	226 }
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	227 PatternSyntax::Include
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	228 \| PatternSyntax::SubInclude
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	229 \| PatternSyntax::ExpandedSubInclude(_) => unreachable!(),
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	230 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	231 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	232
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	233 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	234 [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	235
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	236 /// 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	237 #[cfg(unix)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	238 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	239 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	240 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	241 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	242 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	243
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	244 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	245 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	246 // 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	247 // 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	248 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	249 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	250 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	251 .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	252 .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	253 .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	254 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	255 \|\| (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	256 \|\| (!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	257 {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	258 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	259 } 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	260 acc.pop();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	261 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	262 acc
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	263 });
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	264 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	265
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	266 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	267 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	268 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	269 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	270 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	271 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	272 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	273 } else {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	274 new_bytes
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	275 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	276 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	277
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	278 /// 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	279 /// 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	280 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	281 entry: &IgnorePattern,
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	282 ) -> 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	283 let IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	284 pattern, syntax, ..
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	285 } = entry;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	286 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	287 PatternSyntax::RootGlob
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	288 \| PatternSyntax::Path
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	289 \| PatternSyntax::RelGlob
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	290 \| PatternSyntax::RootFiles => 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	291 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	292 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	293 }
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	294 _ => 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	295 };
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	296 if *syntax == PatternSyntax::RootGlob
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	297 && !pattern.iter().any(\|b\| GLOB_SPECIAL_CHARACTERS.contains(b))
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	298 {
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	299 Ok(None)
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	300 } else {
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	301 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	302 entry.pattern = pattern;
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	303 Ok(Some(_build_single_regex(&entry)))
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	304 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	305 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	306
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	307 lazy_static! {
43826 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42957 diff changeset	308 static ref SYNTAXES: FastHashMap<&'static [u8], &'static [u8]> = {
5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42957 diff changeset	309 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	310
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	311 m.insert(b"re".as_ref(), b"relre:".as_ref());
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	312 m.insert(b"regexp".as_ref(), b"relre:".as_ref());
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	313 m.insert(b"glob".as_ref(), b"relglob:".as_ref());
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	314 m.insert(b"rootglob".as_ref(), b"rootglob:".as_ref());
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	315 m.insert(b"include".as_ref(), b"include:".as_ref());
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	316 m.insert(b"subinclude".as_ref(), b"subinclude:".as_ref());
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	317 m
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	318 };
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	319 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	320
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	321 #[derive(Debug)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	322 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	323 /// (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	324 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	325 /// File path
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	326 NoSuchFile(PathBuf),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	327 }
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	328
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	329 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	330 lines: &[u8],
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	331 file_path: &Path,
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	332 default_syntax_override: Option<&[u8]>,
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	333 warn: bool,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	334 ) -> 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	335 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	336
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44834 diff changeset	337 #[allow(clippy::trivial_regex)]
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	338 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	339 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	340 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	341
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	342 let mut current_syntax =
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	343 default_syntax_override.unwrap_or(b"relre:".as_ref());
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	344
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	345 for (line_number, mut line) in lines.split(\|c\| *c == b'\n').enumerate() {
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	346 let line_number = line_number + 1;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	347
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	348 let line_buf;
42635 30f8e786868c rust-filepatterns: use literal b'#' instead of cast Yuya Nishihara <yuya@tcha.org> parents: 42634 diff changeset	349 if line.contains(&b'#') {
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	350 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	351 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	352 }
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	353 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	354 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	355 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	356
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	357 let mut line = line.trim_end();
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	358
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	359 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	360 continue;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	361 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	362
42863 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42841 diff changeset	363 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	364 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	365
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	366 if let Some(rel_syntax) = SYNTAXES.get(syntax) {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	367 current_syntax = rel_syntax;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	368 } 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	369 warnings.push(PatternFileWarning::InvalidSyntax(
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	370 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	371 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	372 ));
42327 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 continue;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	375 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	376
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	377 let mut line_syntax: &[u8] = &current_syntax;
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	378
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	379 for (s, rels) in SYNTAXES.iter() {
42863 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42841 diff changeset	380 if let Some(rest) = line.drop_prefix(rels) {
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	381 line_syntax = rels;
42863 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42841 diff changeset	382 line = rest;
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	383 break;
42863 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42841 diff changeset	384 }
62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42841 diff changeset	385 if let Some(rest) = line.drop_prefix(&[s, &b":"[..]].concat()) {
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	386 line_syntax = rels;
42863 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42841 diff changeset	387 line = rest;
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	388 break;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	389 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	390 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	391
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	392 inputs.push(IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	393 parse_pattern_syntax(&line_syntax).map_err(\|e\| match e {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	394 PatternError::UnsupportedSyntax(syntax) => {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	395 PatternError::UnsupportedSyntaxInFile(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	396 syntax,
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	397 file_path.to_string_lossy().into(),
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	398 line_number,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	399 )
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	400 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	401 _ => e,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	402 })?,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	403 &line,
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	404 file_path,
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	405 ));
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	406 }
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	407 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	408 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	409
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	410 pub fn read_pattern_file(
777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	411 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	412 warn: bool,
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	413 inspect_pattern_bytes: &mut impl FnMut(&[u8]),
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	414 ) -> 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	415 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	416 Ok(contents) => {
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	417 inspect_pattern_bytes(&contents);
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	418 parse_pattern_file_contents(&contents, file_path, None, warn)
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	419 }
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	420 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	421 vec![],
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	422 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	423 )),
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	424 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	425 }
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	426 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	427
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	428 /// 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	429 #[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	430 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	431 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	432 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	433 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	434 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	435
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	436 impl IgnorePattern {
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	437 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	438 Self {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	439 syntax,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	440 pattern: pattern.to_owned(),
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	441 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	442 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	443 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	444 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	445
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	446 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	447
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	448 /// 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	449 /// 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	450 ///
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	451 /// 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	452 /// 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	453 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	454 pattern_file: &Path,
777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	455 root_dir: &Path,
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	456 inspect_pattern_bytes: &mut impl FnMut(&[u8]),
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	457 ) -> 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	458 let (patterns, mut warnings) =
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	459 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	460 let patterns = patterns
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	461 .into_iter()
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	462 .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	463 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	464 PatternSyntax::Include => {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	465 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	466 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	467 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	468 &inner_include,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	469 root_dir,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	470 inspect_pattern_bytes,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	471 )?;
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	472 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	473 inner_pats
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	474 }
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	475 PatternSyntax::SubInclude => {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	476 let mut sub_include = SubInclude::new(
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	477 &root_dir,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	478 &entry.pattern,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	479 &entry.source,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	480 )?;
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	481 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	482 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	483 &sub_include.path,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	484 &sub_include.root,
47409 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47379 diff changeset	485 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	486 )?;
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	487 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	488 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	489 vec![IgnorePattern {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	490 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	491 sub_include,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	492 )),
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	493 ..entry
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	494 }]
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	495 }
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	496 _ => vec![entry],
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	497 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	498 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	499 .flatten()
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	500 .collect();
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	501
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	502 Ok((patterns, warnings))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	503 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	504
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	505 /// 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	506 #[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	507 pub struct SubInclude {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	508 /// 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	509 /// 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	510 /// 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	511 pub prefix: HgPathBuf,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	512 /// 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	513 pub path: PathBuf,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	514 /// 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	515 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	516
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	517 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	518 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	519
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	520 impl SubInclude {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	521 pub fn new(
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	522 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	523 pattern: &[u8],
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	524 source: &Path,
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	525 ) -> Result<SubInclude, HgPathError> {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	526 let normalized_source =
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	527 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	528
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	529 let source_root = get_path_from_bytes(&normalized_source);
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44834 diff changeset	530 let source_root =
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44834 diff changeset	531 source_root.parent().unwrap_or_else(\|\| source_root.deref());
44304 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	532
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	533 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	534 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	535
47378 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44973 diff changeset	536 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	537
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	538 Ok(Self {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	539 prefix: path_to_hg_path_buf(prefix).and_then(\|mut p\| {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	540 if !p.is_empty() {
48311 6d69e83e6b6e rhg: more efficient `HgPath::join` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47409 diff changeset	541 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	542 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	543 Ok(p)
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	544 })?,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	545 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	546 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	547 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	548 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	549 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	550 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	551
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	552 /// 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	553 /// phase.
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	554 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	555 ignore_patterns: Vec<IgnorePattern>,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	556 ) -> Result<(Vec<Box<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	557 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	558 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	559
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	560 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	561 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	562 {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	563 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	564 } else {
47379 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47378 diff changeset	565 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	566 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	567 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	568 Ok((subincludes, others))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	569 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44303 diff changeset	570
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	571 #[cfg(test)]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	572 mod tests {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	573 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	574 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	575
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	576 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	577 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	578 let untouched =
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	579 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	580 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	581 // All escape codes
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	582 assert_eq!(
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	583 escape_pattern(br#"()[]{}?*+-\|^$\\.&~# \t\n\r\v\f"#),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	584 br#"\[\]\{\}\?\*\+\-\\|\^\$\\\\\.\&\~\#\ \\t\\n\\r\\v\\f"#
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	585 .to_vec()
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	586 );
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	587 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	588
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	589 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	590 fn glob_test() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	591 assert_eq!(glob_to_re(br#"?"#), br#"."#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	592 assert_eq!(glob_to_re(br#""#), br#"[^/]"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	593 assert_eq!(glob_to_re(br#"*"#), br#"."#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	594 assert_eq!(glob_to_re(br#"*/a"#), br#"(?:./)?a"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	595 assert_eq!(glob_to_re(br#"a/*/b"#), br#"a/(?:./)?b"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	596 assert_eq!(glob_to_re(br#"[a?!^][^b][!c]"#), br#"[a?!^][\^b][^c]"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	597 assert_eq!(glob_to_re(br#"{a,b}"#), br#"(?:a\|b)"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	598 assert_eq!(glob_to_re(br#".\\?"#), br#"\.\\?"#);
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	599 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	600
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	601 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	602 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	603 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	604
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	605 assert_eq!(
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	606 parse_pattern_file_contents(
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	607 lines,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	608 Path::new("file_path"),
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	609 None,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	610 false
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	611 )
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	612 .unwrap()
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	613 .0,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	614 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	615 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	616 b"*.elc",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	617 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	618 )],
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	619 );
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	620
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	621 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	622
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	623 assert_eq!(
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	624 parse_pattern_file_contents(
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	625 lines,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	626 Path::new("file_path"),
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	627 None,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	628 false
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	629 )
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	630 .unwrap()
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	631 .0,
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	632 vec![]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	633 );
42437 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	634 let lines = b"glob:**.o";
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42327 diff changeset	635 assert_eq!(
49482 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	636 parse_pattern_file_contents(
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	637 lines,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	638 Path::new("file_path"),
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	639 None,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	640 false
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	641 )
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	642 .unwrap()
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	643 .0,
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	644 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	645 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	646 b"**.o",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	647 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	648 )]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	649 );
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	650 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	651
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	652 #[test]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	653 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	654 assert_eq!(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	655 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	656 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	657 b"rust/target/",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	658 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	659 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	660 .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	661 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	662 );
44834 be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	663 assert_eq!(
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	664 build_single_regex(&IgnorePattern::new(
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	665 PatternSyntax::Regexp,
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	666 br"rust/target/\d+",
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	667 Path::new("")
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	668 ))
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	669 .unwrap(),
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44833 diff changeset	670 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	671 );
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	672 }
42438 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	673
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	674 #[test]
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	675 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	676 assert_eq!(
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	677 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	678 PatternSyntax::RootGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	679 b"",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	680 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	681 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	682 .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	683 None,
42438 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	684 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	685 assert_eq!(
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	686 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	687 PatternSyntax::RootGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	688 b"whatever",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	689 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	690 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	691 .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	692 None,
42438 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	693 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	694 assert_eq!(
44303 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	695 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	696 PatternSyntax::RootGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	697 b"*.o",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	698 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	699 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43826 diff changeset	700 .unwrap(),
44832 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44802 diff changeset	701 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	702 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42437 diff changeset	703 }
42327 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	704 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/filepatterns.rs @ 49482:5fbdd88824dc