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

annotate rust/hg-core/src/lib.rs @ 44538:c8891bca40fb

rust-status: add bare `hg status` support in hg-core A lot of performance remains to be gained, most notably by doing more things in parallel, but also by caching, not falling back to Python but switching to another regex engine, etc.. I have measured on multiple repositories that this change, when in combination with the next two patches, improve bare `hg status` performance, and has no observable impact when falling back (because it does so early). On the Netbeans repository: C: 840ms Rust+C: 556ms Mozilla Central with the one pattern that causes a fallback removed: C: 2.315s Rust+C: 1.700 s Differential Revision: https://phab.mercurial-scm.org/D7929

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Fri, 17 Jan 2020 15:43:46 +0100
parents	f13d19549efd
children	d880805d5442

rev	line source
44006 cb2e2b095dc9 rust-core: updated copyright notice Georges Racinet <georges.racinet@octobus.net> parents: 43922 diff changeset	1 // Copyright 2018-2020 Georges Racinet <georges.racinet@octobus.net>
cb2e2b095dc9 rust-core: updated copyright notice Georges Racinet <georges.racinet@octobus.net> parents: 43922 diff changeset	2 // and Mercurial contributors
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	3 //
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	4 // This software may be used and distributed according to the terms of the
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	5 // GNU General Public License version 2 or any later version.
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	6 mod ancestors;
41242 47881d2a9d99 rust: dagop.headrevs() Rust counterparts Georges Racinet on ishtar.racinet.fr <georges@racinet.fr> parents: 41241 diff changeset	7 pub mod dagops;
41057 ef54bd33b476 rust: core implementation for lazyancestors Georges Racinet <gracinet@anybox.fr> parents: 40972 diff changeset	8 pub use ancestors::{AncestorsIterator, LazyAncestors, MissingAncestors};
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: 42329 diff changeset	9 mod dirstate;
42216 10b465d61556 rust-discovery: starting core implementation Georges Racinet <georges.racinet@octobus.net> parents: 41728 diff changeset	10 pub mod discovery;
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: 42329 diff changeset	11 pub mod testing; // unconditionally built, for use from integration tests
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: 42329 diff changeset	12 pub use dirstate::{
42891 a03a29462c0a rust-dirstate: specify concrete return type of DirsMultiset::iter() Yuya Nishihara <yuya@tcha.org> parents: 42818 diff changeset	13 dirs_multiset::{DirsMultiset, DirsMultisetIter},
42769 fce6dc93a510 rust-dirstate: rust implementation of dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: 42765 diff changeset	14 dirstate_map::DirstateMap,
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42610 diff changeset	15 parsers::{pack_dirstate, parse_dirstate, PARENT_SIZE},
44538 c8891bca40fb rust-status: add bare `hg status` support in hg-core Rapha?l Gom?s <rgomes@octobus.net> parents: 44535 diff changeset	16 status::{
c8891bca40fb rust-status: add bare `hg status` support in hg-core Rapha?l Gom?s <rgomes@octobus.net> parents: 44535 diff changeset	17 status, BadMatch, BadType, DirstateStatus, StatusError, StatusOptions,
c8891bca40fb rust-status: add bare `hg status` support in hg-core Rapha?l Gom?s <rgomes@octobus.net> parents: 44535 diff changeset	18 },
42892 7083ac37314f rust-dirstate: provide CopyMapIter and StateMapIter types Yuya Nishihara <yuya@tcha.org> parents: 42891 diff changeset	19 CopyMap, CopyMapIter, DirstateEntry, DirstateParents, EntryState,
7083ac37314f rust-dirstate: provide CopyMapIter and StateMapIter types Yuya Nishihara <yuya@tcha.org> parents: 42891 diff changeset	20 StateMap, StateMapIter,
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: 42329 diff changeset	21 };
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	22 mod filepatterns;
43490 a77d4fe347a4 rust-matchers: add `Matcher` trait and implement `AlwaysMatcher` Rapha?l Gom?s <rgomes@octobus.net> parents: 43271 diff changeset	23 pub mod matchers;
44008 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: 44006 diff changeset	24 pub mod revlog;
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: 44006 diff changeset	25 pub use revlog::*;
44348 d8d4fa9a7f18 rust-re2: add wrapper for calling Re2 from Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 44347 diff changeset	26 #[cfg(feature = "with-re2")]
d8d4fa9a7f18 rust-re2: add wrapper for calling Re2 from Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 44347 diff changeset	27 pub mod re2;
42610 5672bb73f61e rust-utils: add docstrings and doctests for utils.rs Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	28 pub mod utils;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	29
44329 934a79697c36 rust-dirs-multiset: improve temporary error message Rapha?l Gom?s <rgomes@octobus.net> parents: 44008 diff changeset	30 use crate::utils::hg_path::{HgPathBuf, HgPathError};
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	31 pub use filepatterns::{
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	32 parse_pattern_syntax, read_pattern_file, IgnorePattern,
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	33 PatternFileWarning, PatternSyntax,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	34 };
43844 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 43808 diff changeset	35 use std::collections::HashMap;
5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 43808 diff changeset	36 use twox_hash::RandomXxHashBuilder64;
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	37
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	38 pub type LineNumber = usize;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	39
43844 5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 43808 diff changeset	40 /// Rust's default hasher is too slow because it tries to prevent collision
5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 43808 diff changeset	41 /// attacks. We are not concerned about those: if an ill-minded person has
5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 43808 diff changeset	42 /// write access to your repository, you have other issues.
5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 43808 diff changeset	43 pub type FastHashMap<K, V> = HashMap<K, V, RandomXxHashBuilder64>;
5ac243a92e37 rust-performance: introduce FastHashMap type alias for HashMap Rapha?l Gom?s <rgomes@octobus.net> parents: 43808 diff changeset	44
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	45 #[derive(Clone, Debug, PartialEq)]
42329 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	46 pub enum DirstateParseError {
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	47 TooLittleData,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	48 Overflow,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	49 CorruptedEntry(String),
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42610 diff changeset	50 Damaged,
42329 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	51 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	52
42765 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	53 impl From<std::io::Error> for DirstateParseError {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	54 fn from(e: std::io::Error) -> Self {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	55 DirstateParseError::CorruptedEntry(e.to_string())
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	56 }
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	57 }
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	58
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	59 impl ToString for DirstateParseError {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	60 fn to_string(&self) -> String {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	61 use crate::DirstateParseError::*;
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	62 match self {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	63 TooLittleData => "Too little data for dirstate.".to_string(),
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	64 Overflow => "Overflow in dirstate.".to_string(),
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	65 CorruptedEntry(e) => format!("Corrupted entry: {:?}.", e),
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	66 Damaged => "Dirstate appears to be damaged.".to_string(),
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	67 }
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	68 }
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	69 }
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	70
42329 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	71 #[derive(Debug, PartialEq)]
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	72 pub enum DirstatePackError {
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	73 CorruptedEntry(String),
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	74 CorruptedParent,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	75 BadSize(usize, usize),
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	76 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	77
42765 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	78 impl From<std::io::Error> for DirstatePackError {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	79 fn from(e: std::io::Error) -> Self {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	80 DirstatePackError::CorruptedEntry(e.to_string())
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	81 }
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	82 }
42543 2dcee6497b0b rust-dirstate: add "dirs" Rust implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	83 #[derive(Debug, PartialEq)]
2dcee6497b0b rust-dirstate: add "dirs" Rust implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	84 pub enum DirstateMapError {
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42892 diff changeset	85 PathNotFound(HgPathBuf),
42543 2dcee6497b0b rust-dirstate: add "dirs" Rust implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	86 EmptyPath,
44329 934a79697c36 rust-dirs-multiset: improve temporary error message Rapha?l Gom?s <rgomes@octobus.net> parents: 44008 diff changeset	87 InvalidPath(HgPathError),
43808 1fe2e574616e rust-dirs: address failing tests for `dirs` impl with a temporary fix Rapha?l Gom?s <rgomes@octobus.net> parents: 43490 diff changeset	88 }
1fe2e574616e rust-dirs: address failing tests for `dirs` impl with a temporary fix Rapha?l Gom?s <rgomes@octobus.net> parents: 43490 diff changeset	89
1fe2e574616e rust-dirs: address failing tests for `dirs` impl with a temporary fix Rapha?l Gom?s <rgomes@octobus.net> parents: 43490 diff changeset	90 impl ToString for DirstateMapError {
1fe2e574616e rust-dirs: address failing tests for `dirs` impl with a temporary fix Rapha?l Gom?s <rgomes@octobus.net> parents: 43490 diff changeset	91 fn to_string(&self) -> String {
1fe2e574616e rust-dirs: address failing tests for `dirs` impl with a temporary fix Rapha?l Gom?s <rgomes@octobus.net> parents: 43490 diff changeset	92 match self {
44329 934a79697c36 rust-dirs-multiset: improve temporary error message Rapha?l Gom?s <rgomes@octobus.net> parents: 44008 diff changeset	93 DirstateMapError::PathNotFound(_) => {
934a79697c36 rust-dirs-multiset: improve temporary error message Rapha?l Gom?s <rgomes@octobus.net> parents: 44008 diff changeset	94 "expected a value, found none".to_string()
43808 1fe2e574616e rust-dirs: address failing tests for `dirs` impl with a temporary fix Rapha?l Gom?s <rgomes@octobus.net> parents: 43490 diff changeset	95 }
44329 934a79697c36 rust-dirs-multiset: improve temporary error message Rapha?l Gom?s <rgomes@octobus.net> parents: 44008 diff changeset	96 DirstateMapError::EmptyPath => "Overflow in dirstate.".to_string(),
934a79697c36 rust-dirs-multiset: improve temporary error message Rapha?l Gom?s <rgomes@octobus.net> parents: 44008 diff changeset	97 DirstateMapError::InvalidPath(e) => e.to_string(),
43808 1fe2e574616e rust-dirs: address failing tests for `dirs` impl with a temporary fix Rapha?l Gom?s <rgomes@octobus.net> parents: 43490 diff changeset	98 }
1fe2e574616e rust-dirs: address failing tests for `dirs` impl with a temporary fix Rapha?l Gom?s <rgomes@octobus.net> parents: 43490 diff changeset	99 }
42543 2dcee6497b0b rust-dirstate: add "dirs" Rust implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	100 }
2dcee6497b0b rust-dirstate: add "dirs" Rust implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 42453 diff changeset	101
42765 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	102 pub enum DirstateError {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	103 Parse(DirstateParseError),
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	104 Pack(DirstatePackError),
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	105 Map(DirstateMapError),
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	106 IO(std::io::Error),
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	107 }
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	108
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	109 impl From<DirstateParseError> for DirstateError {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	110 fn from(e: DirstateParseError) -> Self {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	111 DirstateError::Parse(e)
42329 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	112 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	113 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	114
42765 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	115 impl From<DirstatePackError> for DirstateError {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	116 fn from(e: DirstatePackError) -> Self {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	117 DirstateError::Pack(e)
42329 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	118 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	119 }
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	120
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	121 #[derive(Debug)]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	122 pub enum PatternError {
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	123 Path(HgPathError),
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	124 UnsupportedSyntax(String),
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	125 UnsupportedSyntaxInFile(String, String, usize),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	126 TooLong(usize),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	127 IO(std::io::Error),
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	128 /// Needed a pattern that can be turned into a regex but got one that
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	129 /// can't. This should only happen through programmer error.
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	130 NonRegexPattern(IgnorePattern),
44529 52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44348 diff changeset	131 /// This is temporary, see `re2/mod.rs`.
52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44348 diff changeset	132 /// This will cause a fallback to Python.
52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44348 diff changeset	133 Re2NotInstalled,
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	134 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	135
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	136 impl ToString for PatternError {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	137 fn to_string(&self) -> String {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	138 match self {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	139 PatternError::UnsupportedSyntax(syntax) => {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	140 format!("Unsupported syntax {}", syntax)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	141 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	142 PatternError::UnsupportedSyntaxInFile(syntax, file_path, line) => {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	143 format!(
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	144 "{}:{}: unsupported syntax {}",
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	145 file_path, line, syntax
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	146 )
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	147 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	148 PatternError::TooLong(size) => {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	149 format!("matcher pattern is too long ({} bytes)", size)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	150 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	151 PatternError::IO(e) => e.to_string(),
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	152 PatternError::Path(e) => e.to_string(),
44347 2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	153 PatternError::NonRegexPattern(pattern) => {
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	154 format!("'{:?}' cannot be turned into a regex", pattern)
2fe89bec8011 rust-filepatterns: add support for `include` and `subinclude` patterns Rapha?l Gom?s <rgomes@octobus.net> parents: 44346 diff changeset	155 }
44529 52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44348 diff changeset	156 PatternError::Re2NotInstalled => {
52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44348 diff changeset	157 "Re2 is not installed, cannot use regex functionality."
52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44348 diff changeset	158 .to_string()
52d40f8fb82d rust-matchers: add function to generate a regex matcher function Rapha?l Gom?s <rgomes@octobus.net> parents: 44348 diff changeset	159 }
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	160 }
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	161 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	162 }
42765 7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	163
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	164 impl From<DirstateMapError> for DirstateError {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	165 fn from(e: DirstateMapError) -> Self {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	166 DirstateError::Map(e)
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	167 }
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	168 }
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	169
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	170 impl From<std::io::Error> for DirstateError {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	171 fn from(e: std::io::Error) -> Self {
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	172 DirstateError::IO(e)
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	173 }
7ceded4419a3 rust-dirstate: use EntryState enum instead of literals Rapha?l Gom?s <rgomes@octobus.net> parents: 42764 diff changeset	174 }
44346 d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	175
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	176 impl From<std::io::Error> for PatternError {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	177 fn from(e: std::io::Error) -> Self {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	178 PatternError::IO(e)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	179 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	180 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	181
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	182 impl From<HgPathError> for PatternError {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	183 fn from(e: HgPathError) -> Self {
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	184 PatternError::Path(e)
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	185 }
d42eea9a0494 rust-filepatterns: improve API and robustness for pattern files parsing Rapha?l Gom?s <rgomes@octobus.net> parents: 44329 diff changeset	186 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/lib.rs @ 44538:c8891bca40fb