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

annotate rust/hg-core/src/revlog/mod.rs @ 53040:cdd7bf612c7b stable tip

bundle-spec: properly format boolean parameter (issue6960) This was breaking automatic clone bundle generation. This changeset fixes it and add a test to catch it in the future.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 11 Mar 2025 02:29:42 +0100
parents	155e1e8dc055
children

rev	line source
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	1 // Copyright 2018-2023 Georges Racinet <georges.racinet@octobus.net>
44008 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	2 // and Mercurial contributors
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	3 //
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	4 // This software may be used and distributed according to the terms of the
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	5 // GNU General Public License version 2 or any later version.
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	6 //! Mercurial concepts for handling revision history
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	7
44228 7f86426fdd2c rust-node: binary Node ID and conversion utilities Georges Racinet <georges.racinet@octobus.net> parents: 44227 diff changeset	8 pub mod node;
44227 63db6657d280 rust-nodemap: building blocks for nodetree structures Georges Racinet <georges.racinet@octobus.net> parents: 44088 diff changeset	9 pub mod nodemap;
46091 9eb07ab3f2d4 rhg: use persistent nodemap when available Simon Sapin <simon-commits@exyr.org> parents: 45545 diff changeset	10 mod nodemap_docket;
45545 aebc976fd7d5 hg-core: add path_encode Antoine Cezar <antoine.cezar@octobus.net> parents: 45539 diff changeset	11 pub mod path_encode;
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	12 use inner_revlog::CoreRevisionBuffer;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	13 use inner_revlog::InnerRevlog;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	14 use inner_revlog::RevisionBuffer;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	15 use memmap2::MmapOptions;
52308 bd8081e9fd62 rust: don't star export from the `revlog` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52307 diff changeset	16 pub use node::{FromHexError, Node, NodePrefix, NULL_NODE, NULL_NODE_ID};
52286 039b7caeb4d9 rust-revlog: introduce an `options` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52285 diff changeset	17 use options::RevlogOpenOptions;
45538 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: 45532 diff changeset	18 pub mod changelog;
52284 0744248cc541 rust-revlog: add compression helpers Rapha?l Gom?s <rgomes@octobus.net> parents: 52084 diff changeset	19 pub mod compression;
52285 426696af24d3 rust-revlog: add file IO helpers Rapha?l Gom?s <rgomes@octobus.net> parents: 52284 diff changeset	20 pub mod file_io;
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 46821 diff changeset	21 pub mod filelog;
45532 26c53ee51c68 hg-core: Add a limited read only `revlog` implementation Antoine Cezar <antoine.cezar@octobus.net> parents: 44998 diff changeset	22 pub mod index;
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	23 pub mod inner_revlog;
45539 89ac95bd4993 hg-core: add `Manifest` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: 45538 diff changeset	24 pub mod manifest;
52286 039b7caeb4d9 rust-revlog: introduce an `options` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52285 diff changeset	25 pub mod options;
45532 26c53ee51c68 hg-core: Add a limited read only `revlog` implementation Antoine Cezar <antoine.cezar@octobus.net> parents: 44998 diff changeset	26 pub mod patch;
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	27
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	28 use std::borrow::Cow;
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	29 use std::io::ErrorKind;
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	30 use std::io::Read;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	31 use std::ops::Deref;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	32 use std::path::Path;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	33
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	34 use self::nodemap_docket::NodeMapDocket;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	35 use crate::errors::HgError;
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	36 use crate::errors::IoResultExt;
51903 0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	37 use crate::exit_codes;
52308 bd8081e9fd62 rust: don't star export from the `revlog` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52307 diff changeset	38 use crate::revlog::index::Index;
bd8081e9fd62 rust: don't star export from the `revlog` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52307 diff changeset	39 use crate::revlog::nodemap::{NodeMap, NodeMapError};
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	40 use crate::vfs::Vfs;
51906 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51905 diff changeset	41 use crate::vfs::VfsImpl;
44227 63db6657d280 rust-nodemap: building blocks for nodetree structures Georges Racinet <georges.racinet@octobus.net> parents: 44088 diff changeset	42
44008 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	43 /// As noted in revlog.c, revision numbers are actually encoded in
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	44 /// 4 bytes, and are liberally converted to ints, whence the i32
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	45 pub type BaseRevision = i32;
44008 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	46
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	47 /// Mercurial revision numbers
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	48 /// In contrast to the more general [`UncheckedRevision`], these are "checked"
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	49 /// in the sense that they should only be used for revisions that are
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	50 /// valid for a given index (i.e. in bounds).
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	51 #[derive(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	52 Debug,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	53 derive_more::Display,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	54 Clone,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	55 Copy,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	56 Hash,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	57 PartialEq,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	58 Eq,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	59 PartialOrd,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	60 Ord,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	61 )]
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	62 pub struct Revision(pub BaseRevision);
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	63
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	64 impl format_bytes::DisplayBytes for Revision {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	65 fn display_bytes(
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	66 &self,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	67 output: &mut dyn std::io::Write,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	68 ) -> std::io::Result<()> {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	69 self.0.display_bytes(output)
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	70 }
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	71 }
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	72
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	73 /// Unchecked Mercurial revision numbers.
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	74 ///
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	75 /// Values of this type have no guarantee of being a valid revision number
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	76 /// in any context. Use method `check_revision` to get a valid revision within
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	77 /// the appropriate index object.
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	78 #[derive(
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	79 Debug,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	80 derive_more::Display,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	81 Clone,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	82 Copy,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	83 Hash,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	84 PartialEq,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	85 Eq,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	86 PartialOrd,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	87 Ord,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	88 )]
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	89 pub struct UncheckedRevision(pub BaseRevision);
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	90
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	91 impl format_bytes::DisplayBytes for UncheckedRevision {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	92 fn display_bytes(
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	93 &self,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	94 output: &mut dyn std::io::Write,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	95 ) -> std::io::Result<()> {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	96 self.0.display_bytes(output)
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	97 }
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	98 }
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	99
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	100 impl From<Revision> for UncheckedRevision {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	101 fn from(value: Revision) -> Self {
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	102 Self(value.0)
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	103 }
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	104 }
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	105
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	106 impl From<BaseRevision> for UncheckedRevision {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	107 fn from(value: BaseRevision) -> Self {
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	108 Self(value)
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	109 }
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	110 }
44008 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	111
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	112 /// Marker expressing the absence of a parent
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	113 ///
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	114 /// Independently of the actual representation, `NULL_REVISION` is guaranteed
44088 b3ec1ea95ee6 rust-core: fix typo in comment Aay Jay Chan <aayjaychan@itopia.com.hk> parents: 44008 diff changeset	115 /// to be smaller than all existing revisions.
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	116 pub const NULL_REVISION: Revision = Revision(-1);
44008 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	117
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	118 /// Same as `mercurial.node.wdirrev`
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	119 ///
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	120 /// This is also equal to `i32::max_value()`, but it's better to spell
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	121 /// it out explicitely, same as in `mercurial.node`
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44257 diff changeset	122 #[allow(clippy::unreadable_literal)]
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	123 pub const WORKING_DIRECTORY_REVISION: UncheckedRevision =
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	124 UncheckedRevision(0x7fffffff);
44008 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	125
46821 e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46499 diff changeset	126 pub const WORKING_DIRECTORY_HEX: &str =
e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46499 diff changeset	127 "ffffffffffffffffffffffffffffffffffffffff";
e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46499 diff changeset	128
44008 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	129 /// The simplest expression of what we need of Mercurial DAGs.
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	130 pub trait Graph {
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	131 /// Return the two parents of the given `Revision`.
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	132 ///
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	133 /// Each of the parents can be independently `NULL_REVISION`
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	134 fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError>;
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	135 }
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	136
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	137 #[derive(Clone, Debug, PartialEq)]
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	138 pub enum GraphError {
52785 2fb13c3f4496 rust: add GraphError::ParentOutOfOrder Mitchell Kember <mkember@janestreet.com> parents: 52776 diff changeset	139 /// Parent revision does not exist, i.e. below 0 or above max revision.
44008 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	140 ParentOutOfRange(Revision),
52785 2fb13c3f4496 rust: add GraphError::ParentOutOfOrder Mitchell Kember <mkember@janestreet.com> parents: 52776 diff changeset	141 /// Parent revision number is greater than one of its descendants.
2fb13c3f4496 rust: add GraphError::ParentOutOfOrder Mitchell Kember <mkember@janestreet.com> parents: 52776 diff changeset	142 ParentOutOfOrder(Revision),
44008 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	143 }
44256 3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	144
52069 652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	145 impl std::fmt::Display for GraphError {
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	146 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	147 match self {
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	148 GraphError::ParentOutOfRange(revision) => {
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	149 write!(f, "parent out of range ({})", revision)
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	150 }
52785 2fb13c3f4496 rust: add GraphError::ParentOutOfOrder Mitchell Kember <mkember@janestreet.com> parents: 52776 diff changeset	151 GraphError::ParentOutOfOrder(revision) => {
2fb13c3f4496 rust: add GraphError::ParentOutOfOrder Mitchell Kember <mkember@janestreet.com> parents: 52776 diff changeset	152 write!(f, "parent out of order ({})", revision)
2fb13c3f4496 rust: add GraphError::ParentOutOfOrder Mitchell Kember <mkember@janestreet.com> parents: 52776 diff changeset	153 }
52069 652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	154 }
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	155 }
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	156 }
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	157
51495 b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51277 diff changeset	158 impl<T: Graph> Graph for &T {
b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51277 diff changeset	159 fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> {
b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51277 diff changeset	160 (*self).parents(rev)
b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51277 diff changeset	161 }
b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51277 diff changeset	162 }
b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51277 diff changeset	163
44256 3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	164 /// The Mercurial Revlog Index
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	165 ///
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	166 /// This is currently limited to the minimal interface that is needed for
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	167 /// the [`nodemap`](nodemap/index.html) module
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	168 pub trait RevlogIndex {
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	169 /// Total number of Revisions referenced in this index
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	170 fn len(&self) -> usize;
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	171
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44257 diff changeset	172 fn is_empty(&self) -> bool {
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44257 diff changeset	173 self.len() == 0
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44257 diff changeset	174 }
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44257 diff changeset	175
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	176 /// Return a reference to the Node or `None` for `NULL_REVISION`
44256 3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	177 fn node(&self, rev: Revision) -> Option<&Node>;
50985 c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	178
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	179 /// Return a [`Revision`] if `rev` is a valid revision number for this
51224 7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	180 /// index.
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	181 ///
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	182 /// [`NULL_REVISION`] is considered to be valid.
51277 83de5a06f6eb rust-index: allow inlining `check_revision` across crates Rapha?l Gom?s <rgomes@octobus.net> parents: 51224 diff changeset	183 #[inline(always)]
50985 c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	184 fn check_revision(&self, rev: UncheckedRevision) -> Option<Revision> {
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	185 let rev = rev.0;
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	186
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	187 if rev == NULL_REVISION.0 \|\| (rev >= 0 && (rev as usize) < self.len())
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	188 {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	189 Some(Revision(rev))
50985 c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	190 } else {
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	191 None
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	192 }
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	193 }
44256 3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44228 diff changeset	194 }
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	195
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	196 const REVISION_FLAG_CENSORED: u16 = 1 << 15;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	197 const REVISION_FLAG_ELLIPSIS: u16 = 1 << 14;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	198 const REVISION_FLAG_EXTSTORED: u16 = 1 << 13;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	199 const REVISION_FLAG_HASCOPIESINFO: u16 = 1 << 12;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	200
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	201 // Keep this in sync with REVIDX_KNOWN_FLAGS in
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	202 // mercurial/revlogutils/flagutil.py
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	203 const REVIDX_KNOWN_FLAGS: u16 = REVISION_FLAG_CENSORED
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	204 \| REVISION_FLAG_ELLIPSIS
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	205 \| REVISION_FLAG_EXTSTORED
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	206 \| REVISION_FLAG_HASCOPIESINFO;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	207
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	208 const NULL_REVLOG_ENTRY_FLAGS: u16 = 0;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	209
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	210 #[derive(Debug, derive_more::From, derive_more::Display)]
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	211 pub enum RevlogError {
52069 652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	212 #[display(fmt = "invalid revision identifier: {}", "_0")]
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	213 InvalidRevision(String),
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	214 /// Working directory is not supported
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	215 WDirUnsupported,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	216 /// Found more than one entry whose ID match the requested prefix
52375 393ad2685fb4 rust: make RevlogError AmbiguousPrefix case contain the actual prefix Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52330 diff changeset	217 AmbiguousPrefix(String),
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	218 #[from]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	219 Other(HgError),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	220 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	221
52375 393ad2685fb4 rust: make RevlogError AmbiguousPrefix case contain the actual prefix Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52330 diff changeset	222 impl From<(NodeMapError, String)> for RevlogError {
393ad2685fb4 rust: make RevlogError AmbiguousPrefix case contain the actual prefix Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52330 diff changeset	223 fn from((error, rev): (NodeMapError, String)) -> Self {
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	224 match error {
52375 393ad2685fb4 rust: make RevlogError AmbiguousPrefix case contain the actual prefix Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52330 diff changeset	225 NodeMapError::MultipleResults => RevlogError::AmbiguousPrefix(rev),
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	226 NodeMapError::RevisionNotInIndex(rev) => RevlogError::corrupted(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	227 format!("nodemap point to revision {} not in index", rev),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	228 ),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	229 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	230 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	231 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	232
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	233 fn corrupted<S: AsRef<str>>(context: S) -> HgError {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	234 HgError::corrupted(format!("corrupted revlog, {}", context.as_ref()))
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	235 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	236
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	237 impl RevlogError {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	238 fn corrupted<S: AsRef<str>>(context: S) -> Self {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	239 RevlogError::Other(corrupted(context))
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	240 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	241 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	242
51905 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51904 diff changeset	243 #[derive(derive_more::Display, Debug, Copy, Clone, PartialEq, Eq)]
51903 0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	244 pub enum RevlogType {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	245 Changelog,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	246 Manifestlog,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	247 Filelog,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	248 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	249
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	250 impl TryFrom<usize> for RevlogType {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	251 type Error = HgError;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	252
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	253 fn try_from(value: usize) -> Result<Self, Self::Error> {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	254 match value {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	255 1001 => Ok(Self::Changelog),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	256 1002 => Ok(Self::Manifestlog),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	257 1003 => Ok(Self::Filelog),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	258 t => Err(HgError::abort(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	259 format!("Unknown revlog type {}", t),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	260 exit_codes::ABORT,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	261 None,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	262 )),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	263 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	264 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	265 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51633 diff changeset	266
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	267 pub struct Revlog {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	268 inner: InnerRevlog,
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	269 /// When present on disk: the persistent nodemap for this revlog
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	270 nodemap: Option<nodemap::NodeTree>,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	271 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	272
50989 27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	273 impl Graph for Revlog {
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	274 fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	275 self.index().parents(rev)
50989 27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	276 }
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	277 }
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	278 impl Revlog {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	279 /// Open a revlog index file.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	280 ///
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	281 /// It will also open the associated data file if index and data are not
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	282 /// interleaved.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	283 pub fn open(
51906 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51905 diff changeset	284 // Todo use the `Vfs` trait here once we create a function for mmap
db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51905 diff changeset	285 store_vfs: &VfsImpl,
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	286 index_path: impl AsRef<Path>,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	287 data_path: Option<&Path>,
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	288 options: RevlogOpenOptions,
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	289 ) -> Result<Self, HgError> {
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	290 Self::open_gen(store_vfs, index_path, data_path, options, None)
50785 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	291 }
eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	292
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	293 fn index(&self) -> &Index {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	294 &self.inner.index
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	295 }
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	296
50785 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	297 fn open_gen(
51906 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51905 diff changeset	298 // Todo use the `Vfs` trait here once we create a function for mmap
db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51905 diff changeset	299 store_vfs: &VfsImpl,
50785 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	300 index_path: impl AsRef<Path>,
eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	301 data_path: Option<&Path>,
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	302 options: RevlogOpenOptions,
50785 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	303 nodemap_for_test: Option<nodemap::NodeTree>,
eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	304 ) -> Result<Self, HgError> {
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	305 let index_path = index_path.as_ref();
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	306 let index = open_index(store_vfs, index_path, options)?;
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	307
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	308 let default_data_path = index_path.with_extension("d");
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	309 let data_path = data_path.unwrap_or(&default_data_path);
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	310
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	311 let nodemap = if index.is_inline() \|\| !options.use_nodemap {
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	312 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	313 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	314 NodeMapDocket::read_from_file(store_vfs, index_path)?.map(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	315 \|(docket, data)\| {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	316 nodemap::NodeTree::load_bytes(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	317 Box::new(data),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	318 docket.data_length,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	319 )
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	320 },
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	321 )
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	322 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	323
50785 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	324 let nodemap = nodemap_for_test.or(nodemap);
eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	325
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	326 Ok(Revlog {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	327 inner: InnerRevlog::new(
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	328 Box::new(store_vfs.clone()),
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	329 index,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	330 index_path.to_path_buf(),
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	331 data_path.to_path_buf(),
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	332 options.data_config,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	333 options.delta_config,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	334 options.feature_config,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	335 ),
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	336 nodemap,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	337 })
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	338 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	339
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	340 /// Return number of entries of the `Revlog`.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	341 pub fn len(&self) -> usize {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	342 self.index().len()
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	343 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	344
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	345 /// Returns `true` if the `Revlog` has zero `entries`.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	346 pub fn is_empty(&self) -> bool {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	347 self.index().is_empty()
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	348 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	349
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	350 /// Returns the node ID for the given revision number, if it exists in this
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	351 /// revlog
52776 169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	352 pub fn node_from_rev(&self, rev: Revision) -> &Node {
169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	353 match self.index().get_entry(rev) {
169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	354 None => &NULL_NODE,
169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	355 Some(entry) => entry.hash(),
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	356 }
52776 169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	357 }
169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	358
169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	359 /// Like [`Self::node_from_rev`] but checks `rev` first.
169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	360 pub fn node_from_unchecked_rev(
169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	361 &self,
169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	362 rev: UncheckedRevision,
169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	363 ) -> Option<&Node> {
169ccd142ef8 rust: add methods that take checked revisions Mitchell Kember <mkember@janestreet.com> parents: 52775 diff changeset	364 Some(self.node_from_rev(self.index().check_revision(rev)?))
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	365 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	366
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	367 /// Return the revision number for the given node ID, if it exists in this
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	368 /// revlog
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	369 pub fn rev_from_node(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	370 &self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	371 node: NodePrefix,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	372 ) -> Result<Revision, RevlogError> {
50784 363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	373 if let Some(nodemap) = &self.nodemap {
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	374 nodemap
52375 393ad2685fb4 rust: make RevlogError AmbiguousPrefix case contain the actual prefix Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52330 diff changeset	375 .find_bin(self.index(), node)
393ad2685fb4 rust: make RevlogError AmbiguousPrefix case contain the actual prefix Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52330 diff changeset	376 .map_err(\|err\| (err, format!("{:x}", node)))?
53003 155e1e8dc055 rust-nodemap: don't compute the error string unless needed Rapha?l Gom?s <rgomes@octobus.net> parents: 52785 diff changeset	377 .ok_or_else(\|\| {
155e1e8dc055 rust-nodemap: don't compute the error string unless needed Rapha?l Gom?s <rgomes@octobus.net> parents: 52785 diff changeset	378 RevlogError::InvalidRevision(format!("{:x}", node))
155e1e8dc055 rust-nodemap: don't compute the error string unless needed Rapha?l Gom?s <rgomes@octobus.net> parents: 52785 diff changeset	379 })
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	380 } else {
52303 1da6995835b4 rust-revlog: move non-persistent-nodemap rev lookup to the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52297 diff changeset	381 self.index().rev_from_node_no_persistent_nodemap(node)
50784 363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	382 }
50740 0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50542 diff changeset	383 }
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	384
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	385 /// Returns whether the given revision exists in this revlog.
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	386 pub fn has_rev(&self, rev: UncheckedRevision) -> bool {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	387 self.index().check_revision(rev).is_some()
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	388 }
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	389
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	390 pub fn get_entry(
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	391 &self,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	392 rev: Revision,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	393 ) -> Result<RevlogEntry, RevlogError> {
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	394 self.inner.get_entry(rev)
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	395 }
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	396
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	397 pub fn get_entry_for_unchecked_rev(
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	398 &self,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	399 rev: UncheckedRevision,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	400 ) -> Result<RevlogEntry, RevlogError> {
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	401 self.inner.get_entry_for_unchecked_rev(rev)
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	402 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	403
52772 df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	404 /// Returns the delta parent of the given revision.
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	405 pub fn delta_parent(&self, rev: Revision) -> Revision {
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	406 if rev == NULL_REVISION {
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	407 NULL_REVISION
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	408 } else {
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	409 self.inner.delta_parent(rev)
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	410 }
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	411 }
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	412
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	413 /// Returns the link revision (a.k.a. "linkrev") of the given revision.
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	414 /// Returns an error if the linkrev does not exist in `linked_revlog`.
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	415 pub fn link_revision(
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	416 &self,
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	417 rev: Revision,
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	418 linked_revlog: &Self,
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	419 ) -> Result<Revision, RevlogError> {
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	420 let Some(entry) = self.index().get_entry(rev) else {
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	421 return Ok(NULL_REVISION);
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	422 };
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	423 linked_revlog
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	424 .index()
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	425 .check_revision(entry.link_revision())
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	426 .ok_or_else(\|\| {
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	427 RevlogError::corrupted(format!(
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	428 "linkrev for rev {} is invalid",
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	429 rev
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	430 ))
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	431 })
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	432 }
df7fb698f7a8 rust-revlog: add methods for delta parent, linkrev, and chunk Mitchell Kember <mkember@janestreet.com> parents: 52375 diff changeset	433
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	434 /// Return the full data associated to a revision.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	435 ///
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	436 /// All entries required to build the final data out of deltas will be
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	437 /// retrieved as needed, and the deltas will be applied to the initial
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	438 /// snapshot to rebuild the final data.
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	439 pub fn get_data_for_unchecked_rev(
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	440 &self,
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	441 rev: UncheckedRevision,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	442 ) -> Result<Cow<[u8]>, RevlogError> {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	443 if rev == NULL_REVISION.into() {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	444 return Ok(Cow::Borrowed(&[]));
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	445 };
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	446 self.get_entry_for_unchecked_rev(rev)?.data()
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	447 }
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	448
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	449 /// [`Self::get_data_for_unchecked_rev`] for a checked [`Revision`].
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	450 pub fn get_data(&self, rev: Revision) -> Result<Cow<[u8]>, RevlogError> {
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	451 if rev == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	452 return Ok(Cow::Borrowed(&[]));
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	453 };
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	454 self.get_entry(rev)?.data()
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	455 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	456
52775 8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	457 /// Gets the raw uncompressed data stored for a revision, which is either
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	458 /// the full text or a delta. Panics if `rev` is null.
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	459 pub fn get_data_incr(
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	460 &self,
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	461 rev: Revision,
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	462 ) -> Result<RawdataBuf, RevlogError> {
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	463 let index = self.index();
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	464 let entry = index.get_entry(rev).expect("rev should not be null");
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	465 let delta_base = entry.base_revision_or_base_of_delta_chain();
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	466 let base = if UncheckedRevision::from(rev) == delta_base {
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	467 None
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	468 } else if index.uses_generaldelta() {
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	469 Some(delta_base)
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	470 } else {
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	471 Some(UncheckedRevision(rev.0 - 1))
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	472 };
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	473 let data = self.inner.chunk_for_rev(rev)?;
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	474 Ok(RawdataBuf { base, data })
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	475 }
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	476
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	477 /// Check the hash of some given data against the recorded hash.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	478 pub fn check_hash(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	479 &self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	480 p1: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	481 p2: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	482 expected: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	483 data: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	484 ) -> bool {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	485 self.inner.check_hash(p1, p2, expected, data)
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	486 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	487
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	488 /// Build the full data of a revision out its snapshot
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	489 /// and its deltas.
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	490 fn build_data_from_deltas<T>(
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	491 buffer: &mut dyn RevisionBuffer<Target = T>,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	492 snapshot: &[u8],
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	493 deltas: &[impl AsRef<[u8]>],
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	494 ) -> Result<(), RevlogError> {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	495 if deltas.is_empty() {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	496 buffer.extend_from_slice(snapshot);
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	497 return Ok(());
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	498 }
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	499 let patches: Result<Vec<_>, _> = deltas
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	500 .iter()
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	501 .map(\|d\| patch::PatchList::new(d.as_ref()))
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	502 .collect();
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	503 let patch = patch::fold_patch_lists(&patches?);
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	504 patch.apply(buffer, snapshot);
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	505 Ok(())
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	506 }
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	507 }
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	508
52775 8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	509 pub struct RawdataBuf {
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	510 // If `Some`, data is a delta.
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	511 base: Option<UncheckedRevision>,
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	512 data: std::sync::Arc<[u8]>,
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	513 }
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	514
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	515 impl RawdataBuf {
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	516 fn as_patch_list(&self) -> Result<patch::PatchList, RevlogError> {
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	517 match self.base {
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	518 None => Ok(patch::PatchList::full_snapshot(&self.data)),
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	519 Some(_) => patch::PatchList::new(&self.data),
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	520 }
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	521 }
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	522 }
8497cfb0d76c rust-manifest: add Manifestlog::inexact_data_delta_parents Mitchell Kember <mkember@janestreet.com> parents: 52772 diff changeset	523
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	524 type IndexData = Box<dyn Deref<Target = [u8]> + Send + Sync>;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	525
52307 3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	526 /// TODO We should check for version 5.14+ at runtime, but we either should
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	527 /// add the `nix` dependency to get it efficiently, or vendor the code to read
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	528 /// both of which are overkill for such a feature. If we need this dependency
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	529 /// for more things later, we'll use it here too.
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	530 #[cfg(target_os = "linux")]
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	531 fn can_advise_populate_read() -> bool {
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	532 true
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	533 }
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	534
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	535 #[cfg(not(target_os = "linux"))]
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	536 fn can_advise_populate_read() -> bool {
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	537 false
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	538 }
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	539
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	540 /// Call `madvise` on the mmap with `MADV_POPULATE_READ` in a separate thread
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	541 /// to populate the mmap in the background for a small perf improvement.
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	542 #[cfg(target_os = "linux")]
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	543 fn advise_populate_read_mmap(mmap: &memmap2::Mmap) {
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	544 const MADV_POPULATE_READ: i32 = 22;
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	545
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	546 // This is fine because the mmap is still referenced for at least
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	547 // the duration of this function, and the kernel will reject any wrong
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	548 // address.
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	549 let ptr = mmap.as_ptr() as u64;
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	550 let len = mmap.len();
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	551
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	552 // Fire and forget. The `JoinHandle` returned by `spawn` is dropped right
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	553 // after the call, the thread is thus detached. We don't care about success
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	554 // or failure here.
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	555 std::thread::spawn(move \|\| unsafe {
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	556 // mmap's pointer is always page-aligned on Linux. In the case of
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	557 // file-based mmap (which is our use-case), the length should be
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	558 // correct. If not, it's not a safety concern as the kernel will just
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	559 // ignore unmapped pages and return ENOMEM, which we will promptly
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	560 // ignore, because we don't care about any errors.
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	561 libc::madvise(ptr as *mut libc::c_void, len, MADV_POPULATE_READ);
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	562 });
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	563 }
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	564
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	565 #[cfg(not(target_os = "linux"))]
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	566 fn advise_populate_read_mmap(mmap: &memmap2::Mmap) {}
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	567
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	568 /// Open the revlog [`Index`] at `index_path`, through the `store_vfs` and the
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	569 /// given `options`. This controls whether (and how) we `mmap` the index file,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	570 /// and returns an empty buffer if the index does not exist on disk.
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	571 /// This is only used when doing pure-Rust work, in Python contexts this is
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	572 /// unused at the time of writing.
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	573 pub fn open_index(
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	574 store_vfs: &impl Vfs,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	575 index_path: &Path,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	576 options: RevlogOpenOptions,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	577 ) -> Result<Index, HgError> {
52330 645d247d4c75 rust-vfs: rename `open` to `open_write` and `open_read` to `open` Rapha?l Gom?s <rgomes@octobus.net> parents: 52326 diff changeset	578 let buf: IndexData = match store_vfs.open(index_path) {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	579 Ok(mut file) => {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	580 let mut buf = if let Some(threshold) =
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	581 options.data_config.mmap_index_threshold
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	582 {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	583 let size = store_vfs.file_size(&file)?;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	584 if size >= threshold {
52295 84b5802ba7d3 rust: populate mmap by default if available Rapha?l Gom?s <rgomes@octobus.net> parents: 52290 diff changeset	585 // TODO madvise populate read in a background thread
84b5802ba7d3 rust: populate mmap by default if available Rapha?l Gom?s <rgomes@octobus.net> parents: 52290 diff changeset	586 let mut mmap_options = MmapOptions::new();
52307 3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	587 if !can_advise_populate_read() {
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	588 // Fall back to populating in the main thread if
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	589 // post-creation advice is not supported.
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	590 // Does nothing on platforms where it's not defined.
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	591 mmap_options.populate();
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	592 }
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	593 // Safety is "enforced" by locks and assuming other
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	594 // processes are well-behaved. If any misbehaving or
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	595 // malicious process does touch the index, it could lead
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	596 // to corruption. This is somewhat inherent to file-based
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	597 // `mmap`, though some platforms have some ways of
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	598 // mitigating.
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	599 // TODO linux: set the immutable flag with `chattr(1)`?
52295 84b5802ba7d3 rust: populate mmap by default if available Rapha?l Gom?s <rgomes@octobus.net> parents: 52290 diff changeset	600 let mmap = unsafe { mmap_options.map(&file) }
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	601 .when_reading_file(index_path)?;
52307 3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	602
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	603 if can_advise_populate_read() {
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	604 advise_populate_read_mmap(&mmap);
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	605 }
3d797007905d rust: populate mmaps in a separate thread if possible Rapha?l Gom?s <rgomes@octobus.net> parents: 52303 diff changeset	606
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	607 Some(Box::new(mmap) as IndexData)
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	608 } else {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	609 None
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	610 }
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	611 } else {
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	612 None
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	613 };
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	614
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	615 if buf.is_none() {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	616 let mut data = vec![];
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	617 file.read_to_end(&mut data).when_reading_file(index_path)?;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	618 buf = Some(Box::new(data) as IndexData);
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	619 }
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	620 buf.unwrap()
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	621 }
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	622 Err(err) => match err {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	623 HgError::IoError { error, context } => match error.kind() {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	624 ErrorKind::NotFound => Box::<Vec<u8>>::default(),
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	625 _ => return Err(HgError::IoError { error, context }),
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	626 },
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	627 e => return Err(e),
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	628 },
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	629 };
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	630
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	631 let index = Index::new(buf, options.index_header())?;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	632 Ok(index)
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	633 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	634
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	635 /// The revlog entry's bytes and the necessary informations to extract
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	636 /// the entry's data.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	637 #[derive(Clone)]
50446 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 50010 diff changeset	638 pub struct RevlogEntry<'revlog> {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	639 revlog: &'revlog InnerRevlog,
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	640 rev: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	641 uncompressed_len: i32,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	642 p1: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	643 p2: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	644 flags: u16,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	645 hash: Node,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	646 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	647
50446 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 50010 diff changeset	648 impl<'revlog> RevlogEntry<'revlog> {
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	649 pub fn revision(&self) -> Revision {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	650 self.rev
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	651 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	652
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	653 pub fn node(&self) -> &Node {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	654 &self.hash
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	655 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	656
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	657 pub fn uncompressed_len(&self) -> Option<u32> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	658 u32::try_from(self.uncompressed_len).ok()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	659 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	660
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	661 pub fn has_p1(&self) -> bool {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	662 self.p1 != NULL_REVISION
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	663 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	664
50447 c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50446 diff changeset	665 pub fn p1_entry(
c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50446 diff changeset	666 &self,
c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50446 diff changeset	667 ) -> Result<Option<RevlogEntry<'revlog>>, RevlogError> {
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	668 if self.p1 == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	669 Ok(None)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	670 } else {
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	671 Ok(Some(self.revlog.get_entry(self.p1)?))
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	672 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	673 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	674
50447 c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50446 diff changeset	675 pub fn p2_entry(
c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50446 diff changeset	676 &self,
c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50446 diff changeset	677 ) -> Result<Option<RevlogEntry<'revlog>>, RevlogError> {
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	678 if self.p2 == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	679 Ok(None)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	680 } else {
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	681 Ok(Some(self.revlog.get_entry(self.p2)?))
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	682 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	683 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	684
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	685 pub fn p1(&self) -> Option<Revision> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	686 if self.p1 == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	687 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	688 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	689 Some(self.p1)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	690 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	691 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	692
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	693 pub fn p2(&self) -> Option<Revision> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	694 if self.p2 == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	695 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	696 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	697 Some(self.p2)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	698 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	699 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	700
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	701 pub fn is_censored(&self) -> bool {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	702 (self.flags & REVISION_FLAG_CENSORED) != 0
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	703 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	704
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	705 pub fn has_length_affecting_flag_processor(&self) -> bool {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	706 // Relevant Python code: revlog.size()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	707 // note: ELLIPSIS is known to not change the content
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	708 (self.flags & (REVIDX_KNOWN_FLAGS ^ REVISION_FLAG_ELLIPSIS)) != 0
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	709 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	710
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	711 /// The data for this entry, after resolving deltas if any.
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	712 /// Non-Python callers should probably call [`Self::data`] instead.
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	713 fn rawdata<G, T>(
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	714 &self,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	715 stop_rev: Option<(Revision, &[u8])>,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	716 with_buffer: G,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	717 ) -> Result<(), RevlogError>
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	718 where
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	719 G: FnOnce(
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	720 usize,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	721 &mut dyn FnMut(
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	722 &mut dyn RevisionBuffer<Target = T>,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	723 ) -> Result<(), RevlogError>,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	724 ) -> Result<(), RevlogError>,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	725 {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	726 let (delta_chain, stopped) = self
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	727 .revlog
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	728 .delta_chain(self.revision(), stop_rev.map(\|(r, _)\| r))?;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	729 let target_size =
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	730 self.uncompressed_len().map(\|raw_size\| 4 * raw_size as u64);
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	731
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	732 let deltas = self.revlog.chunks(delta_chain, target_size)?;
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	733
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	734 let (base_text, deltas) = if stopped {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	735 (
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	736 stop_rev.as_ref().expect("last revision should be cached").1,
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	737 &deltas[..],
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	738 )
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	739 } else {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	740 let (buf, deltas) = deltas.split_at(1);
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	741 (buf[0].as_ref(), deltas)
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	742 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	743
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	744 let size = self
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	745 .uncompressed_len()
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	746 .map(\|l\| l as usize)
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	747 .unwrap_or(base_text.len());
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	748 with_buffer(size, &mut \|buf\| {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	749 Revlog::build_data_from_deltas(buf, base_text, deltas)?;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	750 Ok(())
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	751 })?;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	752 Ok(())
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	753 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	754
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	755 fn check_data(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	756 &self,
50446 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 50010 diff changeset	757 data: Cow<'revlog, [u8]>,
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	758 ) -> Result<Cow<'revlog, [u8]>, RevlogError> {
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	759 if self.revlog.check_hash(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	760 self.p1,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	761 self.p2,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	762 self.hash.as_bytes(),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	763 &data,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	764 ) {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	765 Ok(data)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	766 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	767 if (self.flags & REVISION_FLAG_ELLIPSIS) != 0 {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	768 return Err(HgError::unsupported(
52084 8b7123c8947b update: add a Rust fast-path when updating from null (and clean) Rapha?l Gom?s <rgomes@octobus.net> parents: 52069 diff changeset	769 "support for ellipsis nodes is missing",
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	770 )
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	771 .into());
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	772 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	773 Err(corrupted(format!(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	774 "hash check failed for revision {}",
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	775 self.rev
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	776 ))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	777 .into())
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	778 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	779 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	780
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	781 pub fn data(&self) -> Result<Cow<'revlog, [u8]>, RevlogError> {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	782 // TODO figure out if there is ever a need for `Cow` here anymore.
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	783 let mut data = CoreRevisionBuffer::new();
50743 124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	784 if self.rev == NULL_REVISION {
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	785 return Ok(data.finish().into());
50743 124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	786 }
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	787 self.rawdata(None, \|size, f\| {
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	788 // Pre-allocate the expected size (received from the index)
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	789 data.resize(size);
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	790 // Actually fill the buffer
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	791 f(&mut data)?;
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	792 Ok(())
e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	793 })?;
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	794 if self.is_censored() {
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	795 return Err(HgError::CensoredNodeError.into());
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	796 }
52290 e01e84e5e426 rust-revlog: add a Rust-only `InnerRevlog` Rapha?l Gom?s <rgomes@octobus.net> parents: 52286 diff changeset	797 self.check_data(data.finish().into())
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	798 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	799 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	800
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	801 #[cfg(test)]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	802 mod tests {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	803 use super::*;
52308 bd8081e9fd62 rust: don't star export from the `revlog` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52307 diff changeset	804 use crate::revlog::index::IndexEntryBuilder;
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	805 use itertools::Itertools;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	806
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	807 #[test]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	808 fn test_empty() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	809 let temp = tempfile::tempdir().unwrap();
52297 7be39c5110c9 hg-core: add a complete VFS Rapha?l Gom?s <rgomes@octobus.net> parents: 52295 diff changeset	810 let vfs = VfsImpl::new(temp.path().to_owned(), false);
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	811 std::fs::write(temp.path().join("foo.i"), b"").unwrap();
51905 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51904 diff changeset	812 std::fs::write(temp.path().join("foo.d"), b"").unwrap();
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	813 let revlog =
51905 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51904 diff changeset	814 Revlog::open(&vfs, "foo.i", None, RevlogOpenOptions::default())
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	815 .unwrap();
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	816 assert!(revlog.is_empty());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	817 assert_eq!(revlog.len(), 0);
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	818 assert!(revlog.get_entry_for_unchecked_rev(0.into()).is_err());
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50987 diff changeset	819 assert!(!revlog.has_rev(0.into()));
50742 3338c6ffdaa3 rust-revlog: using constant in test Georges Racinet <georges.racinet@octobus.net> parents: 50741 diff changeset	820 assert_eq!(
3338c6ffdaa3 rust-revlog: using constant in test Georges Racinet <georges.racinet@octobus.net> parents: 50741 diff changeset	821 revlog.rev_from_node(NULL_NODE.into()).unwrap(),
3338c6ffdaa3 rust-revlog: using constant in test Georges Racinet <georges.racinet@octobus.net> parents: 50741 diff changeset	822 NULL_REVISION
3338c6ffdaa3 rust-revlog: using constant in test Georges Racinet <georges.racinet@octobus.net> parents: 50741 diff changeset	823 );
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	824 let null_entry = revlog
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	825 .get_entry_for_unchecked_rev(NULL_REVISION.into())
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	826 .ok()
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	827 .unwrap();
50743 124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	828 assert_eq!(null_entry.revision(), NULL_REVISION);
124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	829 assert!(null_entry.data().unwrap().is_empty());
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	830 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	831
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	832 #[test]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	833 fn test_inline() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	834 let temp = tempfile::tempdir().unwrap();
52297 7be39c5110c9 hg-core: add a complete VFS Rapha?l Gom?s <rgomes@octobus.net> parents: 52295 diff changeset	835 let vfs = VfsImpl::new(temp.path().to_owned(), false);
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	836 let node0 = Node::from_hex("2ed2a3912a0b24502043eae84ee4b279c18b90dd")
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	837 .unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	838 let node1 = Node::from_hex("b004912a8510032a0350a74daa2803dadfb00e12")
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	839 .unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	840 let node2 = Node::from_hex("dd6ad206e907be60927b5a3117b97dffb2590582")
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	841 .unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	842 let entry0_bytes = IndexEntryBuilder::new()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	843 .is_first(true)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	844 .with_version(1)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	845 .with_inline(true)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	846 .with_node(node0)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	847 .build();
51512 c3f2a9b55f59 rust-index: stop calling `with_offset` in the tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51277 diff changeset	848 let entry1_bytes = IndexEntryBuilder::new().with_node(node1).build();
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	849 let entry2_bytes = IndexEntryBuilder::new()
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	850 .with_p1(Revision(0))
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	851 .with_p2(Revision(1))
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	852 .with_node(node2)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	853 .build();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	854 let contents = vec![entry0_bytes, entry1_bytes, entry2_bytes]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	855 .into_iter()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	856 .flatten()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	857 .collect_vec();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	858 std::fs::write(temp.path().join("foo.i"), contents).unwrap();
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	859 let revlog =
51905 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51904 diff changeset	860 Revlog::open(&vfs, "foo.i", None, RevlogOpenOptions::default())
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	861 .unwrap();
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	862
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	863 let entry0 =
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	864 revlog.get_entry_for_unchecked_rev(0.into()).ok().unwrap();
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	865 assert_eq!(entry0.revision(), Revision(0));
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	866 assert_eq!(*entry0.node(), node0);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	867 assert!(!entry0.has_p1());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	868 assert_eq!(entry0.p1(), None);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	869 assert_eq!(entry0.p2(), None);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	870 let p1_entry = entry0.p1_entry().unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	871 assert!(p1_entry.is_none());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	872 let p2_entry = entry0.p2_entry().unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	873 assert!(p2_entry.is_none());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	874
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	875 let entry1 =
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	876 revlog.get_entry_for_unchecked_rev(1.into()).ok().unwrap();
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	877 assert_eq!(entry1.revision(), Revision(1));
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	878 assert_eq!(*entry1.node(), node1);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	879 assert!(!entry1.has_p1());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	880 assert_eq!(entry1.p1(), None);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	881 assert_eq!(entry1.p2(), None);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	882 let p1_entry = entry1.p1_entry().unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	883 assert!(p1_entry.is_none());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	884 let p2_entry = entry1.p2_entry().unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	885 assert!(p2_entry.is_none());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	886
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	887 let entry2 =
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	888 revlog.get_entry_for_unchecked_rev(2.into()).ok().unwrap();
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	889 assert_eq!(entry2.revision(), Revision(2));
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	890 assert_eq!(*entry2.node(), node2);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	891 assert!(entry2.has_p1());
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	892 assert_eq!(entry2.p1(), Some(Revision(0)));
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	893 assert_eq!(entry2.p2(), Some(Revision(1)));
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	894 let p1_entry = entry2.p1_entry().unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	895 assert!(p1_entry.is_some());
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	896 assert_eq!(p1_entry.unwrap().revision(), Revision(0));
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	897 let p2_entry = entry2.p2_entry().unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	898 assert!(p2_entry.is_some());
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	899 assert_eq!(p2_entry.unwrap().revision(), Revision(1));
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	900 }
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	901
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	902 #[test]
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	903 fn test_nodemap() {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	904 let temp = tempfile::tempdir().unwrap();
52297 7be39c5110c9 hg-core: add a complete VFS Rapha?l Gom?s <rgomes@octobus.net> parents: 52295 diff changeset	905 let vfs = VfsImpl::new(temp.path().to_owned(), false);
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	906
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	907 // building a revlog with a forced Node starting with zeros
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	908 // This is a corruption, but it does not preclude using the nodemap
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	909 // if we don't try and access the data
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	910 let node0 = Node::from_hex("00d2a3912a0b24502043eae84ee4b279c18b90dd")
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	911 .unwrap();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	912 let node1 = Node::from_hex("b004912a8510032a0350a74daa2803dadfb00e12")
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	913 .unwrap();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	914 let entry0_bytes = IndexEntryBuilder::new()
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	915 .is_first(true)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	916 .with_version(1)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	917 .with_inline(true)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	918 .with_node(node0)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	919 .build();
51512 c3f2a9b55f59 rust-index: stop calling `with_offset` in the tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51277 diff changeset	920 let entry1_bytes = IndexEntryBuilder::new().with_node(node1).build();
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	921 let contents = vec![entry0_bytes, entry1_bytes]
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	922 .into_iter()
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	923 .flatten()
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	924 .collect_vec();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	925 std::fs::write(temp.path().join("foo.i"), contents).unwrap();
50785 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	926
eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	927 let mut idx = nodemap::tests::TestNtIndex::new();
50998 12c308c55e53 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50990 50785 diff changeset	928 idx.insert_node(Revision(0), node0).unwrap();
12c308c55e53 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50990 50785 diff changeset	929 idx.insert_node(Revision(1), node1).unwrap();
50785 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50784 diff changeset	930
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	931 let revlog = Revlog::open_gen(
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	932 &vfs,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	933 "foo.i",
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	934 None,
51905 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51904 diff changeset	935 RevlogOpenOptions::default(),
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	936 Some(idx.nt),
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	937 )
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	938 .unwrap();
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	939
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	940 // accessing the data shows the corruption
52326 a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	941 revlog
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	942 .get_entry_for_unchecked_rev(0.into())
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	943 .unwrap()
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	944 .data()
a3fa37bdb7ec rust: normalize `_for_unchecked_rev` naming among revlogs and the index Rapha?l Gom?s <rgomes@octobus.net> parents: 52308 diff changeset	945 .unwrap_err();
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	946
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	947 assert_eq!(
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	948 revlog.rev_from_node(NULL_NODE.into()).unwrap(),
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	949 Revision(-1)
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	950 );
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	951 assert_eq!(revlog.rev_from_node(node0.into()).unwrap(), Revision(0));
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	952 assert_eq!(revlog.rev_from_node(node1.into()).unwrap(), Revision(1));
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	953 assert_eq!(
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	954 revlog
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	955 .rev_from_node(NodePrefix::from_hex("000").unwrap())
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	956 .unwrap(),
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	957 Revision(-1)
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	958 );
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	959 assert_eq!(
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	960 revlog
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	961 .rev_from_node(NodePrefix::from_hex("b00").unwrap())
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	962 .unwrap(),
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	963 Revision(1)
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	964 );
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	965 // RevlogError does not implement PartialEq
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	966 // (ultimately because io::Error does not)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	967 match revlog
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	968 .rev_from_node(NodePrefix::from_hex("00").unwrap())
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	969 .expect_err("Expected to give AmbiguousPrefix error")
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	970 {
52375 393ad2685fb4 rust: make RevlogError AmbiguousPrefix case contain the actual prefix Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52330 diff changeset	971 RevlogError::AmbiguousPrefix(_) => (),
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	972 e => {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	973 panic!("Got another error than AmbiguousPrefix: {:?}", e);
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	974 }
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	975 };
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	976 }
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47989 diff changeset	977 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/revlog/mod.rs @ 53040:cdd7bf612c7b stable tip