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

annotate rust/hg-core/src/filepatterns.rs @ 50284:a43f0562220c stable

undo-files: have the transaction directly tracks and manages journal rename This is much simpler this way.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Mon, 06 Mar 2023 19:22:34 +0100
parents	e98fd81bb151
children	1c31b343e514

rev	line source
42767 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
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	10 use crate::{
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	11 utils::{
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 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: 44346 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: 44346 diff changeset	14 SliceExt,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	15 },
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	16 FastHashMap, PatternError,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	17 };
42609 326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42498 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};
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	20 use std::ops::Deref;
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42871 diff changeset	21 use std::path::{Path, PathBuf};
42349 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! {
42498 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42454 diff changeset	25 static ref RE_ESCAPE: Vec<Vec<u8>> = {
42349 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
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 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: 43844 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: 43844 diff changeset	41
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	42 #[derive(Debug, Clone, PartialEq, Eq)]
42349 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 {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	44 /// A regular expression
42349 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,
42851 ce6797ef6eab rust: apply more formatting fixes Yuya Nishihara <yuya@tcha.org> parents: 42767 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: 42767 diff changeset	49 /// slashes)
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	50 Glob,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	51 /// a path relative to repository root, which is matched recursively
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	52 Path,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	53 /// A path relative to cwd
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	54 RelPath,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	55 /// an unrooted glob (*.rs matches Rust files in all dirs)
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	56 RelGlob,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	57 /// A regexp that needn't match the start of a name
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	58 RelRegexp,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 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: 43844 diff changeset	60 /// (will not match subdirectories)
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	61 RootFiles,
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 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: 44346 diff changeset	63 Include,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 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: 44346 diff changeset	65 SubInclude,
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 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: 47384 diff changeset	67 ///
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 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: 47384 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: 47384 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: 47384 diff changeset	71 ///
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 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: 47384 diff changeset	73 ExpandedSubInclude(Box<SubInclude>),
42349 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 {
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 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: 42851 diff changeset	89 input = rest;
42349 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 };
42498 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42454 diff changeset	139 res.extend(&RE_ESCAPE[*c as usize])
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	140 }
42498 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42454 diff changeset	141 _ => res.extend(&RE_ESCAPE[*c as usize]),
42349 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()
42498 a4a468b00d44 rust-filepatterns: silence warning of non_upper_case_globals Yuya Nishihara <yuya@tcha.org> parents: 42454 diff changeset	150 .flat_map(\|c\| RE_ESCAPE[*c as usize].clone())
42349 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
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 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: 43844 diff changeset	155 kind: &[u8],
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	156 ) -> Result<PatternSyntax, PatternError> {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	157 match kind {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 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: 43844 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: 43844 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: 43844 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: 43844 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: 43844 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: 43844 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: 43844 diff changeset	165 b"rootglob:" => Ok(PatternSyntax::RootGlob),
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 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: 44346 diff changeset	167 b"subinclude:" => Ok(PatternSyntax::SubInclude),
42349 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
49576 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	174 lazy_static! {
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	175 static ref FLAG_RE: Regex = Regex::new(r"^$\?[aiLmsux]+$").unwrap();
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	176 }
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	177
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	178 /// 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	179 /// 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	180 /// otherwise, returns the corresponding regex.
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	181 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: 43844 diff changeset	182 let IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	183 syntax, pattern, ..
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	184 } = entry;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	185 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	186 return vec![];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	187 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	188 match syntax {
44891 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44879 diff changeset	189 PatternSyntax::Regexp => pattern.to_owned(),
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	190 PatternSyntax::RelRegexp => {
44601 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44347 diff changeset	191 // 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: 44347 diff changeset	192 // 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: 44347 diff changeset	193 // engines.
44892 1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44891 diff changeset	194 if pattern[0] == b'^'
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44891 diff changeset	195 \|\| pattern[0] == b'*'
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44891 diff changeset	196 \|\| pattern.starts_with(b".*")
1e9bfeaec9ba rust-regex: prevent nonsensical `..` pattern from happening Rapha?l Gom?s <rgomes@octobus.net> parents: 44891 diff changeset	197 {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	198 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	199 }
49576 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	200 match FLAG_RE.find(pattern) {
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	201 Some(mat) => {
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	202 let s = mat.start();
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	203 let e = mat.end();
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	204 [
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	205 &b"(?"[..],
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	206 &pattern[s + 2..e - 1],
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	207 &b":"[..],
49577 b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	208 if pattern[e] == b'^'
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	209 \|\| pattern[e] == b'*'
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	210 \|\| pattern[e..].starts_with(b".*")
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	211 {
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	212 &b""[..]
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	213 } else {
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	214 &b".*"[..]
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	215 },
49576 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	216 &pattern[e..],
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	217 &b")"[..],
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	218 ]
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	219 .concat()
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	220 }
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	221 None => [&b".*"[..], pattern].concat(),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	222 }
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	223 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	224 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	225 if pattern == b"." {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	226 return vec![];
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	227 }
42871 69195b6f8f97 rustfilepatterns: shorter code for concatenating slices Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42870 diff changeset	228 [escape_pattern(pattern).as_slice(), b"(?:/\|$)"].concat()
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	229 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	230 PatternSyntax::RootFiles => {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	231 let mut res = if pattern == b"." {
44891 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44879 diff changeset	232 vec![]
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	233 } else {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	234 // Pattern is a directory name.
44891 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44879 diff changeset	235 [escape_pattern(pattern).as_slice(), b"/"].concat()
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	236 };
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	237
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	238 // 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	239 res.extend(b"[^/]+$");
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	240 res
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	241 }
42870 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	242 PatternSyntax::RelGlob => {
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	243 let glob_re = glob_to_re(pattern);
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	244 if let Some(rest) = glob_re.drop_prefix(b"[^/]*") {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	245 [b".*", rest, GLOB_SUFFIX].concat()
42870 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	246 } else {
44601 496868f1030c rust-matchers: use the `regex` crate Rapha?l Gom?s <rgomes@octobus.net> parents: 44347 diff changeset	247 [b"(?:.*/)?", glob_re.as_slice(), GLOB_SUFFIX].concat()
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	248 }
42870 72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	249 }
72890d8f9860 match: simplify the regexps created for glob patterns Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42869 diff changeset	250 PatternSyntax::Glob \| PatternSyntax::RootGlob => {
44891 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44879 diff changeset	251 [glob_to_re(pattern).as_slice(), GLOB_SUFFIX].concat()
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	252 }
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	253 PatternSyntax::Include
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	254 \| PatternSyntax::SubInclude
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	255 \| PatternSyntax::ExpandedSubInclude(_) => unreachable!(),
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	256 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	257 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	258
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	259 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	260 [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	261
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	262 /// TODO support other platforms
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	263 #[cfg(unix)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	264 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: 43844 diff changeset	265 if bytes.is_empty() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	266 return b".".to_vec();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	267 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	268 let sep = b'/';
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	269
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	270 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: 43844 diff changeset	271 if initial_slashes > 2 {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	272 // 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: 43844 diff changeset	273 // as single slash.
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	274 initial_slashes = 1;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	275 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	276 let components = bytes
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	277 .split(\|b\| *b == sep)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	278 .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: 43844 diff changeset	279 .fold(vec![], \|mut acc, component\| {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	280 if component != b".."
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	281 \|\| (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: 43844 diff changeset	282 \|\| (!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: 43844 diff changeset	283 {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	284 acc.push(component)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	285 } else if !acc.is_empty() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	286 acc.pop();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	287 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	288 acc
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	289 });
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	290 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: 43844 diff changeset	291
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	292 if initial_slashes > 0 {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	293 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: 43844 diff changeset	294 buf.extend(new_bytes);
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	295 new_bytes = buf;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	296 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	297 if new_bytes.is_empty() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	298 b".".to_vec()
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	299 } else {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	300 new_bytes
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	301 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	302 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	303
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	304 /// 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	305 /// 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	306 pub fn build_single_regex(
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	307 entry: &IgnorePattern,
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	308 ) -> Result<Option<Vec<u8>>, PatternError> {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	309 let IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	310 pattern, syntax, ..
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	311 } = entry;
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	312 let pattern = match syntax {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	313 PatternSyntax::RootGlob
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	314 \| PatternSyntax::Path
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	315 \| PatternSyntax::RelGlob
50003 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 50001 diff changeset	316 \| PatternSyntax::RootFiles => normalize_path_bytes(pattern),
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	317 PatternSyntax::Include \| PatternSyntax::SubInclude => {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	318 return Err(PatternError::NonRegexPattern(entry.clone()))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	319 }
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	320 _ => pattern.to_owned(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	321 };
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	322 if *syntax == PatternSyntax::RootGlob
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	323 && !pattern.iter().any(\|b\| GLOB_SPECIAL_CHARACTERS.contains(b))
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	324 {
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	325 Ok(None)
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	326 } else {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	327 let mut entry = entry.clone();
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	328 entry.pattern = pattern;
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	329 Ok(Some(_build_single_regex(&entry)))
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	330 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	331 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	332
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	333 lazy_static! {
43844 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 42960 diff changeset	334 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: 42960 diff changeset	335 let mut m = FastHashMap::default();
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	336
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	337 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: 42349 diff changeset	338 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: 42349 diff changeset	339 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: 42349 diff changeset	340 m.insert(b"rootglob".as_ref(), b"rootglob:".as_ref());
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	341 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: 43844 diff changeset	342 m.insert(b"subinclude".as_ref(), b"subinclude:".as_ref());
49502 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49496 diff changeset	343 m.insert(b"path".as_ref(), b"path:".as_ref());
7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49496 diff changeset	344 m.insert(b"rootfilesin".as_ref(), b"rootfilesin:".as_ref());
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	345 m
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	346 };
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	347 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	348
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	349 #[derive(Debug)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	350 pub enum PatternFileWarning {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	351 /// (file path, syntax bytes)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	352 InvalidSyntax(PathBuf, Vec<u8>),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	353 /// File path
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	354 NoSuchFile(PathBuf),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	355 }
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	356
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	357 pub fn parse_pattern_file_contents(
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	358 lines: &[u8],
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	359 file_path: &Path,
49496 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	360 default_syntax_override: Option<&[u8]>,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	361 warn: bool,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	362 ) -> Result<(Vec<IgnorePattern>, Vec<PatternFileWarning>), PatternError> {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	363 let comment_regex = Regex::new(r"((?:^\|[^\\])(?:\\\\))#.").unwrap();
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	364
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	365 #[allow(clippy::trivial_regex)]
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	366 let comment_escape_regex = Regex::new(r"\\#").unwrap();
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	367 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: 43844 diff changeset	368 let mut warnings: Vec<PatternFileWarning> = vec![];
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	369
49496 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	370 let mut current_syntax =
50003 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 50001 diff changeset	371 default_syntax_override.unwrap_or_else(\|\| b"relre:".as_ref());
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	372
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	373 for (line_number, mut line) in lines.split(\|c\| *c == b'\n').enumerate() {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	374 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	375
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	376 let line_buf;
42635 30f8e786868c rust-filepatterns: use literal b'#' instead of cast Yuya Nishihara <yuya@tcha.org> parents: 42634 diff changeset	377 if line.contains(&b'#') {
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	378 if let Some(cap) = comment_regex.captures(line) {
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	379 line = &line[..cap.get(1).unwrap().end()]
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	380 }
42636 12addcc7956c rust-filepatterns: unescape comment character property Yuya Nishihara <yuya@tcha.org> parents: 42635 diff changeset	381 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	382 line = &line_buf;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	383 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	384
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	385 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	386
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	387 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	388 continue;
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
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	391 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: 42851 diff changeset	392 let syntax = syntax.trim();
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	393
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	394 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	395 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	396 } else if warn {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	397 warnings.push(PatternFileWarning::InvalidSyntax(
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	398 file_path.to_owned(),
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	399 syntax.to_owned(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	400 ));
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	401 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	402 continue;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	403 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	404
50003 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 50001 diff changeset	405 let mut line_syntax: &[u8] = current_syntax;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	406
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	407 for (s, rels) in SYNTAXES.iter() {
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	408 if let Some(rest) = line.drop_prefix(rels) {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	409 line_syntax = rels;
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	410 line = rest;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	411 break;
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	412 }
62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	413 if let Some(rest) = line.drop_prefix(&[s, &b":"[..]].concat()) {
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	414 line_syntax = rels;
42869 62eabdf91f85 rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42851 diff changeset	415 line = rest;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	416 break;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	417 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	418 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	419
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	420 inputs.push(IgnorePattern::new(
50003 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 50001 diff changeset	421 parse_pattern_syntax(line_syntax).map_err(\|e\| match e {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	422 PatternError::UnsupportedSyntax(syntax) => {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	423 PatternError::UnsupportedSyntaxInFile(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	424 syntax,
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	425 file_path.to_string_lossy().into(),
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	426 line_number,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	427 )
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	428 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	429 _ => e,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	430 })?,
50003 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 50001 diff changeset	431 line,
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	432 file_path,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	433 ));
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	434 }
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	435 Ok((inputs, warnings))
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	436 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	437
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	438 pub fn read_pattern_file(
777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	439 file_path: &Path,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	440 warn: bool,
49550 363923bd51cd dirstate-v2: hash the source of the ignore patterns as well Rapha?l Gom?s <rgomes@octobus.net> parents: 49502 diff changeset	441 inspect_pattern_bytes: &mut impl FnMut(&Path, &[u8]),
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	442 ) -> Result<(Vec<IgnorePattern>, Vec<PatternFileWarning>), PatternError> {
47415 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	443 match std::fs::read(file_path) {
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	444 Ok(contents) => {
49550 363923bd51cd dirstate-v2: hash the source of the ignore patterns as well Rapha?l Gom?s <rgomes@octobus.net> parents: 49502 diff changeset	445 inspect_pattern_bytes(file_path, &contents);
49496 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	446 parse_pattern_file_contents(&contents, file_path, None, warn)
47415 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	447 }
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	448 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: 47385 diff changeset	449 vec![],
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	450 vec![PatternFileWarning::NoSuchFile(file_path.to_owned())],
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	451 )),
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	452 Err(e) => Err(e.into()),
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	453 }
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	454 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	455
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	456 /// 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: 43844 diff changeset	457 #[derive(Debug, Eq, PartialEq, Clone)]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	458 pub struct IgnorePattern {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	459 pub syntax: PatternSyntax,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	460 pub pattern: Vec<u8>,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	461 pub source: PathBuf,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	462 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	463
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	464 impl IgnorePattern {
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	465 pub fn new(syntax: PatternSyntax, pattern: &[u8], source: &Path) -> Self {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	466 Self {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	467 syntax,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	468 pattern: pattern.to_owned(),
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	469 source: source.to_owned(),
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	470 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	471 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	472 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	473
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	474 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: 43844 diff changeset	475
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	476 /// Wrapper for `read_pattern_file` that also recursively expands `include:`
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	477 /// and `subinclude:` patterns.
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	478 ///
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	479 /// 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: 47384 diff changeset	480 /// is used for the latter to form a tree of patterns.
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	481 pub fn get_patterns_from_file(
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	482 pattern_file: &Path,
777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	483 root_dir: &Path,
49550 363923bd51cd dirstate-v2: hash the source of the ignore patterns as well Rapha?l Gom?s <rgomes@octobus.net> parents: 49502 diff changeset	484 inspect_pattern_bytes: &mut impl FnMut(&Path, &[u8]),
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	485 ) -> PatternResult<(Vec<IgnorePattern>, Vec<PatternFileWarning>)> {
47415 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	486 let (patterns, mut warnings) =
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	487 read_pattern_file(pattern_file, true, inspect_pattern_bytes)?;
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	488 let patterns = patterns
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	489 .into_iter()
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	490 .flat_map(\|entry\| -> PatternResult<_> {
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	491 Ok(match &entry.syntax {
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	492 PatternSyntax::Include => {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	493 let inner_include =
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	494 root_dir.join(get_path_from_bytes(&entry.pattern));
47415 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	495 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: 47385 diff changeset	496 &inner_include,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	497 root_dir,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	498 inspect_pattern_bytes,
0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	499 )?;
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	500 warnings.extend(inner_warnings);
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	501 inner_pats
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	502 }
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	503 PatternSyntax::SubInclude => {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	504 let mut sub_include = SubInclude::new(
50003 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 50001 diff changeset	505 root_dir,
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	506 &entry.pattern,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	507 &entry.source,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	508 )?;
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	509 let (inner_patterns, inner_warnings) =
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	510 get_patterns_from_file(
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	511 &sub_include.path,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	512 &sub_include.root,
47415 0ef8231e413f dirstate-v2: Store a hash of ignore patterns (.hgignore) Simon Sapin <simon.sapin@octobus.net> parents: 47385 diff changeset	513 inspect_pattern_bytes,
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	514 )?;
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	515 sub_include.included_patterns = inner_patterns;
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	516 warnings.extend(inner_warnings);
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	517 vec![IgnorePattern {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	518 syntax: PatternSyntax::ExpandedSubInclude(Box::new(
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	519 sub_include,
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	520 )),
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	521 ..entry
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	522 }]
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	523 }
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	524 _ => vec![entry],
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	525 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	526 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	527 .flatten()
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	528 .collect();
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	529
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	530 Ok((patterns, warnings))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	531 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	532
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	533 /// Holds all the information needed to handle a `subinclude:` pattern.
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	534 #[derive(Debug, PartialEq, Eq, Clone)]
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	535 pub struct SubInclude {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	536 /// 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: 44346 diff changeset	537 /// 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: 44346 diff changeset	538 /// repository paths is painless.
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	539 pub prefix: HgPathBuf,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	540 /// The file itself, containing the patterns
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	541 pub path: PathBuf,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	542 /// 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: 44346 diff changeset	543 pub root: PathBuf,
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	544
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	545 pub included_patterns: Vec<IgnorePattern>,
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	546 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	547
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	548 impl SubInclude {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	549 pub fn new(
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	550 root_dir: &Path,
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	551 pattern: &[u8],
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	552 source: &Path,
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	553 ) -> Result<SubInclude, HgPathError> {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	554 let normalized_source =
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	555 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: 44346 diff changeset	556
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	557 let source_root = get_path_from_bytes(&normalized_source);
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	558 let source_root =
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	559 source_root.parent().unwrap_or_else(\|\| source_root.deref());
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	560
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	561 let path = source_root.join(get_path_from_bytes(pattern));
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44893 diff changeset	562 let new_root = path.parent().unwrap_or_else(\|\| path.deref());
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	563
47384 777c3d231913 rust: Make some file path parameters less generic Simon Sapin <simon.sapin@octobus.net> parents: 44998 diff changeset	564 let prefix = canonical_path(root_dir, root_dir, new_root)?;
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	565
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	566 Ok(Self {
50003 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 50001 diff changeset	567 prefix: path_to_hg_path_buf(prefix).map(\|mut p\| {
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	568 if !p.is_empty() {
48311 6d69e83e6b6e rhg: more efficient `HgPath::join` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47415 diff changeset	569 p.push_byte(b'/');
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	570 }
50003 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 50001 diff changeset	571 p
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	572 })?,
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	573 path: path.to_owned(),
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	574 root: new_root.to_owned(),
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	575 included_patterns: Vec::new(),
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	576 })
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	577 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	578 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	579
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	580 /// 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: 44346 diff changeset	581 /// phase.
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	582 pub fn filter_subincludes(
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	583 ignore_patterns: Vec<IgnorePattern>,
50001 ccb6cfb0f2c0 rust-filepatterns: don't `Box` subincludes unnecessarily Rapha?l Gom?s <rgomes@octobus.net> parents: 49577 diff changeset	584 ) -> Result<(Vec<SubInclude>, Vec<IgnorePattern>), HgPathError> {
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	585 let mut subincludes = vec![];
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	586 let mut others = vec![];
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	587
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	588 for pattern in ignore_patterns {
f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	589 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: 47384 diff changeset	590 {
50001 ccb6cfb0f2c0 rust-filepatterns: don't `Box` subincludes unnecessarily Rapha?l Gom?s <rgomes@octobus.net> parents: 49577 diff changeset	591 subincludes.push(*sub_include);
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	592 } else {
47385 f6bb181c75f8 rust: Parse "subinclude"d files along the way, not later Simon Sapin <simon.sapin@octobus.net> parents: 47384 diff changeset	593 others.push(pattern)
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	594 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	595 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	596 Ok((subincludes, others))
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	597 }
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	598
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	599 #[cfg(test)]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	600 mod tests {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	601 use super::*;
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	602 use pretty_assertions::assert_eq;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	603
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	604 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	605 fn escape_pattern_test() {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	606 let untouched =
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	607 br#"!"%',/0123456789:;<=>@ABCDEFGHIJKLMNOPQRSTUVWXYZ_`abcdefghijklmnopqrstuvwxyz"#;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	608 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	609 // All escape codes
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	610 assert_eq!(
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	611 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	612 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	613 .to_vec()
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	614 );
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	615 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	616
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	617 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	618 fn glob_test() {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	619 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	620 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	621 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	622 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	623 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	624 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	625 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	626 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	627 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	628
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	629 #[test]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	630 fn test_parse_pattern_file_contents() {
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	631 let lines = b"syntax: glob\n*.elc";
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	632
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	633 assert_eq!(
49496 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	634 parse_pattern_file_contents(
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	635 lines,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	636 Path::new("file_path"),
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	637 None,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	638 false
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	639 )
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	640 .unwrap()
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	641 .0,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	642 vec![IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	643 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	644 b"*.elc",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	645 Path::new("file_path")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	646 )],
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	647 );
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	648
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	649 let lines = b"syntax: include\nsyntax: glob";
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	650
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	651 assert_eq!(
49496 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	652 parse_pattern_file_contents(
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	653 lines,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	654 Path::new("file_path"),
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	655 None,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	656 false
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	657 )
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	658 .unwrap()
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	659 .0,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	660 vec![]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	661 );
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	662 let lines = b"glob:**.o";
9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	663 assert_eq!(
49496 5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	664 parse_pattern_file_contents(
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	665 lines,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	666 Path::new("file_path"),
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	667 None,
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	668 false
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	669 )
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	670 .unwrap()
5fbdd88824dc rust-filepatterns: allow overriding default syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 48311 diff changeset	671 .0,
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	672 vec![IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	673 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	674 b"**.o",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	675 Path::new("file_path")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	676 )]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	677 );
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	678 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	679
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	680 #[test]
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	681 fn test_build_single_regex() {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	682 assert_eq!(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	683 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	684 PatternSyntax::RelGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	685 b"rust/target/",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	686 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	687 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	688 .unwrap(),
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	689 Some(br"(?:.*/)?rust/target(?:/\|$)".to_vec()),
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	690 );
44893 be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	691 assert_eq!(
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	692 build_single_regex(&IgnorePattern::new(
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	693 PatternSyntax::Regexp,
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	694 br"rust/target/\d+",
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	695 Path::new("")
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	696 ))
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	697 .unwrap(),
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	698 Some(br"rust/target/\d+".to_vec()),
be6401a25726 rust-regex: add test for verbatim regex syntax Rapha?l Gom?s <rgomes@octobus.net> parents: 44892 diff changeset	699 );
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	700 }
42454 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	701
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	702 #[test]
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	703 fn test_build_single_regex_shortcut() {
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	704 assert_eq!(
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	705 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	706 PatternSyntax::RootGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	707 b"",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	708 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	709 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	710 .unwrap(),
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	711 None,
42454 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	712 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	713 assert_eq!(
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	714 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	715 PatternSyntax::RootGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	716 b"whatever",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	717 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	718 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	719 .unwrap(),
44879 e0414fcd35e0 rust-filepatterns: match exact `rootglob`s with a `HashSet`, not in the regex Rapha?l Gom?s <rgomes@octobus.net> parents: 44601 diff changeset	720 None,
42454 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	721 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	722 assert_eq!(
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	723 build_single_regex(&IgnorePattern::new(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	724 PatternSyntax::RootGlob,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	725 b"*.o",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	726 Path::new("")
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	727 ))
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 43844 diff changeset	728 .unwrap(),
44891 ad1ec40975aa rust-regex: fix issues with regex anchoring and performance Rapha?l Gom?s <rgomes@octobus.net> parents: 44879 diff changeset	729 Some(br"[^/]*\.o(?:/\|$)".to_vec()),
42454 48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	730 );
48f1f864d928 rust-regex: fix shortcut for exact matches Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	731 }
49576 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	732
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	733 #[test]
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	734 fn test_build_single_relregex() {
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	735 assert_eq!(
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	736 build_single_regex(&IgnorePattern::new(
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	737 PatternSyntax::RelRegexp,
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	738 b"^ba{2}r",
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	739 Path::new("")
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	740 ))
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	741 .unwrap(),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	742 Some(b"^ba{2}r".to_vec()),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	743 );
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	744 assert_eq!(
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	745 build_single_regex(&IgnorePattern::new(
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	746 PatternSyntax::RelRegexp,
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	747 b"ba{2}r",
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	748 Path::new("")
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	749 ))
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	750 .unwrap(),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	751 Some(b".*ba{2}r".to_vec()),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	752 );
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	753 assert_eq!(
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	754 build_single_regex(&IgnorePattern::new(
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	755 PatternSyntax::RelRegexp,
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	756 b"(?ia)ba{2}r",
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	757 Path::new("")
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	758 ))
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	759 .unwrap(),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	760 Some(b"(?ia:.*ba{2}r)".to_vec()),
086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	761 );
49577 b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	762 assert_eq!(
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	763 build_single_regex(&IgnorePattern::new(
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	764 PatternSyntax::RelRegexp,
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	765 b"(?ia)^ba{2}r",
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	766 Path::new("")
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	767 ))
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	768 .unwrap(),
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	769 Some(b"(?ia:^ba{2}r)".to_vec()),
b3480822a251 matcher: do not prepend '.' to pattern using ^ after flags Pierre-Yves David <pierre-yves.david@octobus.net>* parents: 49576 diff changeset	770 );
49576 086b0c4f8663 matcher: fix the issue with regex inline-flag in rust oo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49550 diff changeset	771 }
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	772 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/filepatterns.rs @ 50284:a43f0562220c stable