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

annotate rust/hg-core/src/lib.rs @ 42453:9609430d3625

rust-filepatterns: use bytes instead of String In my initial patch, I introduced an unnecessary hard constraint on UTF-8 filenames and patterns which I forgot to remove. Although the performance penalty for using String might be negligible, we don't want to break compatibility with non-UTF-8 encodings for no reason. Moreover, this change allows for a cleaner Rust core API. This patch introduces a new utils module that is used with this fix. Finally, PatternError was not put inside the Python module generated by Rust, which would have raised a NameError. Differential Revision: https://phab.mercurial-scm.org/D6485

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Thu, 06 Jun 2019 15:30:56 +0200
parents	d3b5cbe311d9
children	2dcee6497b0b

rev	line source
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	1 // Copyright 2018 Georges Racinet <gracinet@anybox.fr>
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	2 //
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	3 // 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	4 // GNU General Public License version 2 or any later version.
42329 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	5 extern crate byteorder;
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	6 extern crate memchr;
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	7 #[macro_use]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	8 extern crate lazy_static;
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	9 extern crate regex;
42329 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	10
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	11 mod ancestors;
41242 47881d2a9d99 rust: dagop.headrevs() Rust counterparts Georges Racinet on ishtar.racinet.fr <georges@racinet.fr> parents: 41241 diff changeset	12 pub mod dagops;
41057 ef54bd33b476 rust: core implementation for lazyancestors Georges Racinet <gracinet@anybox.fr> parents: 40972 diff changeset	13 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	14 mod dirstate;
42216 10b465d61556 rust-discovery: starting core implementation Georges Racinet <georges.racinet@octobus.net> parents: 41728 diff changeset	15 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	16 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	17 pub use dirstate::{
42440 d3b5cbe311d9 rust-dirstate: create dirstate submodule Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	18 parsers::{pack_dirstate, parse_dirstate},
d3b5cbe311d9 rust-dirstate: create dirstate submodule Rapha?l Gom?s <rgomes@octobus.net> parents: 42349 diff changeset	19 CopyVec, CopyVecEntry, DirstateEntry, DirstateParents, DirstateVec,
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	20 };
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	21 mod filepatterns;
42453 9609430d3625 rust-filepatterns: use bytes instead of String Rapha?l Gom?s <rgomes@octobus.net> parents: 42440 diff changeset	22 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	23
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	24 pub use filepatterns::{
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	25 build_single_regex, read_pattern_file, PatternSyntax, PatternTuple,
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	26 };
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	27
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	28 /// Mercurial revision numbers
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	29 ///
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	30 /// As noted in revlog.c, revision numbers are actually encoded in
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	31 /// 4 bytes, and are liberally converted to ints, whence the i32
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	32 pub type Revision = i32;
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	33
41728 9060af281be7 rust: itering less on MissingAncestors.bases for max() Georges Racinet <georges.racinet@octobus.net> parents: 41703 diff changeset	34 /// Marker expressing the absence of a parent
9060af281be7 rust: itering less on MissingAncestors.bases for max() Georges Racinet <georges.racinet@octobus.net> parents: 41703 diff changeset	35 ///
9060af281be7 rust: itering less on MissingAncestors.bases for max() Georges Racinet <georges.racinet@octobus.net> parents: 41703 diff changeset	36 /// Independently of the actual representation, `NULL_REVISION` is guaranteed
9060af281be7 rust: itering less on MissingAncestors.bases for max() Georges Racinet <georges.racinet@octobus.net> parents: 41703 diff changeset	37 /// to be smaller that all existing revisions.
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	38 pub const NULL_REVISION: Revision = -1;
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	39
41308 2f54f31c41aa rust: working directory revision number constant Georges Racinet <georges.racinet@octobus.net> parents: 41242 diff changeset	40 /// Same as `mercurial.node.wdirrev`
2f54f31c41aa rust: working directory revision number constant Georges Racinet <georges.racinet@octobus.net> parents: 41242 diff changeset	41 ///
2f54f31c41aa rust: working directory revision number constant Georges Racinet <georges.racinet@octobus.net> parents: 41242 diff changeset	42 /// This is also equal to `i32::max_value()`, but it's better to spell
2f54f31c41aa rust: working directory revision number constant Georges Racinet <georges.racinet@octobus.net> parents: 41242 diff changeset	43 /// it out explicitely, same as in `mercurial.node`
2f54f31c41aa rust: working directory revision number constant Georges Racinet <georges.racinet@octobus.net> parents: 41242 diff changeset	44 pub const WORKING_DIRECTORY_REVISION: Revision = 0x7fffffff;
2f54f31c41aa rust: working directory revision number constant Georges Racinet <georges.racinet@octobus.net> parents: 41242 diff changeset	45
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	46 /// The simplest expression of what we need of Mercurial DAGs.
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	47 pub trait Graph {
40972 d097dd0afc19 rust: translation of missingancestors Georges Racinet <gracinet@anybox.fr> parents: 40950 diff changeset	48 /// Return the two parents of the given `Revision`.
d097dd0afc19 rust: translation of missingancestors Georges Racinet <gracinet@anybox.fr> parents: 40950 diff changeset	49 ///
d097dd0afc19 rust: translation of missingancestors Georges Racinet <gracinet@anybox.fr> parents: 40950 diff changeset	50 /// Each of the parents can be independently `NULL_REVISION`
40950 18513d6ef7d4 rust: changed Graph.parents to return [Revision; 2] Georges Racinet <gracinet@anybox.fr> parents: 40271 diff changeset	51 fn parents(&self, Revision) -> Result<[Revision; 2], GraphError>;
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	52 }
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	53
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	54 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	55
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	56 #[derive(Clone, Debug, PartialEq)]
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	57 pub enum GraphError {
dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	58 ParentOutOfRange(Revision),
41309 ee943a920606 rust: error for WdirUnsupported with cpython conversion as exception Georges Racinet <georges.racinet@octobus.net> parents: 41308 diff changeset	59 WorkingDirectoryUnsupported,
40271 dbc28c91f7ff rust: pure Rust lazyancestors iterator Georges Racinet <gracinet@anybox.fr> parents: diff changeset	60 }
42329 d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	61
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	62 #[derive(Clone, 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	63 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	64 TooLittleData,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	65 Overflow,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	66 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	67 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	68
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	69 #[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	70 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	71 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	72 CorruptedParent,
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	73 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	74 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	75
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	76 impl From<std::io::Error> for DirstatePackError {
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	77 fn from(e: std::io::Error) -> Self {
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	78 DirstatePackError::CorruptedEntry(e.to_string())
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	79 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	80 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	81
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	82 impl From<std::io::Error> for DirstateParseError {
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	83 fn from(e: std::io::Error) -> Self {
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	84 DirstateParseError::CorruptedEntry(e.to_string())
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	85 }
d1786c1d34fa rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 42216 diff changeset	86 }
42349 e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	87
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	88 #[derive(Debug)]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	89 pub enum PatternError {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	90 UnsupportedSyntax(String),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	91 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	92
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	93 #[derive(Debug)]
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	94 pub enum PatternFileError {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	95 IO(std::io::Error),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	96 Pattern(PatternError, LineNumber),
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	97 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	98
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	99 impl From<std::io::Error> for PatternFileError {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	100 fn from(e: std::io::Error) -> Self {
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	101 PatternFileError::IO(e)
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	102 }
e8f3740cc067 rust-filepatterns: add a Rust implementation of pattern-related utils Rapha?l Gom?s <rgomes@octobus.net> parents: 42330 diff changeset	103 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/lib.rs @ 42453:9609430d3625