rust-matchers: add `build_regex_match` function
ClosedPublic

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	19403		Jan 17 2020, 5:41 AM	★	★
Diff 2	19419		Jan 17 2020, 11:52 AM	★	★
Diff 3	19940		Feb 6 2020, 10:15 AM	★	★
Diff 4	20042		Feb 10 2020, 11:29 AM	★	★
Diff 5	20162		Feb 11 2020, 6:13 AM	★	★
Diff 6	20714	rHGa21881b40942ef4e35420ded204a58937ebf433a	Jan 17 2020, 5:32 AM	★	★

Status	Author	Revision
Closed	Alphare	D8253 hg-core: add function timing information
Closed	Alphare	D8252 rust: add logging utils
Closed	Alphare	D8251 rust-status: traverse working directory in parallel
Closed	Alphare	D8250 rust-status: wrap `stat_dmap_entries` to ease profiling
Closed	Alphare	D8249 rust-status: refactor handling of unknown files
Closed	Alphare	D8215 rust-status: move to recursive traversal to prepare for parallel traversal
Closed	Alphare	D8213 rust-pathauditor: use interior mutability for use in multi-threaded contexts
Closed	Alphare	D8212 rust-pathauditor: actually populate the `audited_dirs` cache
Closed	Alphare	D8211 rust-pathauditor: actually split Windows shortname aliases at `~`
Closed	Alphare	D8226 debuginstall: add entry about re2 Rust bindings when applicable
Closed	Alphare	D8225 rust-cpython: add `debug` module to expose debug information to Python
Closed	Alphare	D7931 rust-status: use bare hg status fastpath from Python
Closed	Alphare	D7930 rust-status: update rust-cpython bridge to account for the changes in core
Closed	Alphare	D7929 rust-status: add bare `hg status` support in hg-core
Closed	Alphare	D7928 rust-status: add function for sequential traversal of the working directory
Closed	Alphare	D8088 rust-status: add missing variants to `Dispatch` enum
Closed	Alphare	D8087 rust-status: rename `StatusResult` to `DirstateStatus`
Closed	Alphare	D8086 rust-status: refactor options into a `StatusOptions` struct
Closed	Alphare	D7927 rust-status: add util for listing a directory
Closed	Alphare	D7926 rust-dependencies: update rayon
Closed	Alphare	D7925 rust-matchers: add `IgnoreMatcher`
Closed	Alphare	D7924 rust-matchers: add `build_regex_match` function
Closed	Alphare	D7923 rust-matchers: add functions to get roots, dirs and parents from patterns
Closed	Alphare	D7922 rust-matchers: add function to generate a regex matcher function
Closed	Alphare	D8224 rust-format: cleanup ancestors.rs to make rustfmt happy

Diff 20714

rust/hg-core/src/matchers.rs

	// matchers.rs			// matchers.rs
	//			//
	// Copyright 2019 Raphaël Gomès <rgomes@octobus.net>			// Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
	//			//
	// This software may be used and distributed according to the terms of the			// This software may be used and distributed according to the terms of the
	// GNU General Public License version 2 or any later version.			// GNU General Public License version 2 or any later version.

	//! Structs and types for matching files and directories.			//! Structs and types for matching files and directories.

	#[cfg(feature = "with-re2")]			#[cfg(feature = "with-re2")]
	use crate::re2::Re2;			use crate::re2::Re2;
	use crate::{			use crate::{
	filepatterns::PatternResult,			filepatterns::{build_single_regex, PatternResult},
	utils::hg_path::{HgPath, HgPathBuf},			utils::hg_path::{HgPath, HgPathBuf},
	DirsMultiset, DirstateMapError, IgnorePattern, PatternError,			DirsMultiset, DirstateMapError, IgnorePattern, PatternError,
	PatternSyntax,			PatternSyntax,
	};			};
	use std::collections::HashSet;			use std::collections::HashSet;
	use std::iter::FromIterator;			use std::iter::FromIterator;
	use std::ops::Deref;			use std::ops::Deref;

	Ok(move \|path: &HgPath\| regex.is_match(path.as_bytes()))			Ok(move \|path: &HgPath\| regex.is_match(path.as_bytes()))
	}			}

	#[cfg(not(feature = "with-re2"))]			#[cfg(not(feature = "with-re2"))]
	fn re_matcher(_: &[u8]) -> PatternResult<Box<dyn Fn(&HgPath) -> bool + Sync>> {			fn re_matcher(_: &[u8]) -> PatternResult<Box<dyn Fn(&HgPath) -> bool + Sync>> {
	Err(PatternError::Re2NotInstalled)			Err(PatternError::Re2NotInstalled)
	}			}

				/// Returns the regex pattern and a function that matches an `HgPath` against
				/// said regex formed by the given ignore patterns.
				kevincoxUnsubmitted Done Can you describe the return value here? It seems odd that we return the regex and a matcher. It would be good to point that out. kevincox: Can you describe the return value here? It seems odd that we return the regex and a matcher. It…
				fn build_regex_match<'a>(
				ignore_patterns: &'a [&'a IgnorePattern],
				) -> PatternResult<(Vec<u8>, Box<dyn Fn(&HgPath) -> bool + Sync>)> {
				let regexps: Result<Vec<_>, PatternError> = ignore_patterns
				.into_iter()
				.map(\|k\| build_single_regex(*k))
				.collect();
				let regexps = regexps?;
				let full_regex = regexps.join(&b'\|');

				let matcher = re_matcher(&full_regex)?;
				let func = Box::new(move \|filename: &HgPath\| matcher(filename));

				Ok((full_regex, func))
				}

	/// Returns roots and directories corresponding to each pattern.			/// Returns roots and directories corresponding to each pattern.
	///			///
	/// This calculates the roots and directories exactly matching the patterns and			/// This calculates the roots and directories exactly matching the patterns and
	/// returns a tuple of (roots, dirs). It does not return other directories			/// returns a tuple of (roots, dirs). It does not return other directories
	/// which may also need to be considered, like the parent directories.			/// which may also need to be considered, like the parent directories.
	fn roots_and_dirs(			fn roots_and_dirs(
	ignore_patterns: &[IgnorePattern],			ignore_patterns: &[IgnorePattern],
	) -> (Vec<HgPathBuf>, Vec<HgPathBuf>) {			) -> (Vec<HgPathBuf>, Vec<HgPathBuf>) {

This is an archive of the discontinued Mercurial Phabricator instance.

rust-matchers: add `build_regex_match` functionClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 20714

rust/hg-core/src/matchers.rs

rust-matchers: add `build_regex_match` function
ClosedPublic

Revision Contents
Changeset List